[Cvs-annodex] commit (annodex): AnnodexFirefoxExtension/trunk/Docs/Patches/VLC-0.85.patch

cchiu nobody at lists.annodex.net
Thu Jun 15 00:30:36 UTC 2006 

Update of /var/local/lib/svn/annodex (new revision 2337)

Modified files:
   AnnodexFirefoxExtension/trunk/Docs/Patches/VLC-0.85.patch

Log Message:
Updated patch to correct errors

Modified: AnnodexFirefoxExtension/trunk/Docs/Patches/VLC-0.85.patch
===================================================================
--- AnnodexFirefoxExtension/trunk/Docs/Patches/VLC-0.85.patch	2006-06-14 07:57:20 UTC (rev 2336)
+++ AnnodexFirefoxExtension/trunk/Docs/Patches/VLC-0.85.patch	2006-06-15 00:30:35 UTC (rev 2337)
@@ -786,20 +786,31 @@
  	vlcruntime.cpp \
  	vlcruntime.h \
  	support/classinfo.h
-@@ -177,11 +184,11 @@
+@@ -175,14 +182,18 @@
+ 	@if test -f "$@.exe"; then mv -f "$@.exe" "$@"; fi
+ 
  vlcintf_xptdir = $(libdir)/mozilla/components
- vlcintf.xpt: vlcintf.idl
- 	$(XPIDL) $(XPIDL_INCL) \
+-vlcintf.xpt: vlcintf.idl
+-	$(XPIDL) $(XPIDL_INCL) \
 -	  -m typelib -o vlcintf $(srcdir)/vlcintf.idl
-+	  -m typelib -o vlcintf $(VLCIDL_FILE)
++vlcintf.xpt:
  
- vlcintf.h: vlcintf.idl
- 	$(XPIDL) $(XPIDL_INCL) \
+-vlcintf.h: vlcintf.idl
+-	$(XPIDL) $(XPIDL_INCL) \
 -	  -m header -o vlcintf $(srcdir)/vlcintf.idl
-+	  -m header -o vlcintf $(VLCIDL_FILE)
++vlcintf.h:
  
++# vlcintf.xpt: vlcintf.idl
++#	$(XPIDL) $(XPIDL_INCL) \
++#	  -m typelib -o vlcintf $(VLCIDL_FILE)
++#
++# vlcintf.h: vlcintf.idl
++#	$(XPIDL) $(XPIDL_INCL) \
++#	  -m header -o vlcintf $(VLCIDL_FILE)
++
  ###############################################################################
  # Stamp rules
+ ###############################################################################
 Index: mozilla/npvlc_rc.rc
 ===================================================================
 --- mozilla/npvlc_rc.rc	(revision 15815)
@@ -907,6 +918,376 @@
      };
  };
  
+Index: mozilla/vlcintf.h
+===================================================================
+--- mozilla/vlcintf.h	(revision 0)
++++ mozilla/vlcintf.h	(revision 0)
+@@ -0,0 +1,365 @@
++/*
++ * DO NOT EDIT.  THIS FILE IS GENERATED FROM c:\Cygwin/annodex/mozilla/vlcintf.idl
++ */
++
++#ifndef __gen_vlcintf_h__
++#define __gen_vlcintf_h__
++
++
++#ifndef __gen_nsISupports_h__
++#include "nsISupports.h"
++#endif
++
++/* For IDL files that don't want to include root IDL files. */
++#ifndef NS_NO_VTABLE
++#define NS_NO_VTABLE
++#endif
++
++/* starting interface:    VlcIntf */
++#define VLCINTF_IID_STR "ea92ef52-afe4-4212-bacb-dfe9fca94cd6"
++
++#define VLCINTF_IID \
++  {0xea92ef52, 0xafe4, 0x4212, \
++    { 0xba, 0xcb, 0xdf, 0xe9, 0xfc, 0xa9, 0x4c, 0xd6 }}
++
++class NS_NO_VTABLE VlcIntf : public nsISupports {
++ public: 
++
++  NS_DEFINE_STATIC_IID_ACCESSOR(VLCINTF_IID)
++
++  /* void play (); */
++  NS_IMETHOD Play(void) = 0;
++
++  /* void pause (); */
++  NS_IMETHOD Pause(void) = 0;
++
++  /* void stop (); */
++  NS_IMETHOD Stop(void) = 0;
++
++  /* void fullscreen (); */
++  NS_IMETHOD Fullscreen(void) = 0;
++
++  /* void set_volume (in PRInt64 i_volume); */
++  NS_IMETHOD Set_volume(PRInt64 i_volume) = 0;
++
++  /* PRInt64 get_volume (); */
++  NS_IMETHOD Get_volume(PRInt64 *_retval) = 0;
++
++  /* void mute (); */
++  NS_IMETHOD Mute(void) = 0;
++
++  /* void set_int_variable (in string psz_var, in PRInt64 i_value); */
++  NS_IMETHOD Set_int_variable(const char *psz_var, PRInt64 i_value) = 0;
++
++  /* void set_bool_variable (in string psz_var, in PRBool b_value); */
++  NS_IMETHOD Set_bool_variable(const char *psz_var, PRBool b_value) = 0;
++
++  /* void set_str_variable (in string psz_var, in string psz_value); */
++  NS_IMETHOD Set_str_variable(const char *psz_var, const char *psz_value) = 0;
++
++  /* PRInt64 get_int_variable (in string psz_var); */
++  NS_IMETHOD Get_int_variable(const char *psz_var, PRInt64 *_retval) = 0;
++
++  /* PRBool get_bool_variable (in string psz_var); */
++  NS_IMETHOD Get_bool_variable(const char *psz_var, PRBool *_retval) = 0;
++
++  /* string get_str_variable (in string psz_var); */
++  NS_IMETHOD Get_str_variable(const char *psz_var, char **_retval) = 0;
++
++  /* void clear_playlist (); */
++  NS_IMETHOD Clear_playlist(void) = 0;
++
++  /* void add_item (in string psz_name); */
++  NS_IMETHOD Add_item(const char *psz_name) = 0;
++
++  /* void next (); */
++  NS_IMETHOD Next(void) = 0;
++
++  /* void previous (); */
++  NS_IMETHOD Previous(void) = 0;
++
++  /* PRBool isplaying (); */
++  NS_IMETHOD Isplaying(PRBool *_retval) = 0;
++
++  /* PRInt64 get_length (); */
++  NS_IMETHOD Get_length(PRInt64 *_retval) = 0;
++
++  /* PRInt64 get_position (); */
++  NS_IMETHOD Get_position(PRInt64 *_retval) = 0;
++
++  /* PRInt64 get_time (); */
++  NS_IMETHOD Get_time(PRInt64 *_retval) = 0;
++
++  /* PRInt64 get_video_width (); */
++  NS_IMETHOD Get_video_width(PRInt64 *_retval) = 0;
++
++  /* PRInt64 get_video_height (); */
++  NS_IMETHOD Get_video_height(PRInt64 *_retval) = 0;
++
++  /* void seek (in PRInt64 i_secs, in PRInt64 b_relative); */
++  NS_IMETHOD Seek(PRInt64 i_secs, PRInt64 b_relative) = 0;
++
++};
++
++/* Use this macro when declaring classes that implement this interface. */
++#define NS_DECL_VLCINTF \
++  NS_IMETHOD Play(void); \
++  NS_IMETHOD Pause(void); \
++  NS_IMETHOD Stop(void); \
++  NS_IMETHOD Fullscreen(void); \
++  NS_IMETHOD Set_volume(PRInt64 i_volume); \
++  NS_IMETHOD Get_volume(PRInt64 *_retval); \
++  NS_IMETHOD Mute(void); \
++  NS_IMETHOD Set_int_variable(const char *psz_var, PRInt64 i_value); \
++  NS_IMETHOD Set_bool_variable(const char *psz_var, PRBool b_value); \
++  NS_IMETHOD Set_str_variable(const char *psz_var, const char *psz_value); \
++  NS_IMETHOD Get_int_variable(const char *psz_var, PRInt64 *_retval); \
++  NS_IMETHOD Get_bool_variable(const char *psz_var, PRBool *_retval); \
++  NS_IMETHOD Get_str_variable(const char *psz_var, char **_retval); \
++  NS_IMETHOD Clear_playlist(void); \
++  NS_IMETHOD Add_item(const char *psz_name); \
++  NS_IMETHOD Next(void); \
++  NS_IMETHOD Previous(void); \
++  NS_IMETHOD Isplaying(PRBool *_retval); \
++  NS_IMETHOD Get_length(PRInt64 *_retval); \
++  NS_IMETHOD Get_position(PRInt64 *_retval); \
++  NS_IMETHOD Get_time(PRInt64 *_retval); \
++  NS_IMETHOD Get_video_width(PRInt64 *_retval); \
++  NS_IMETHOD Get_video_height(PRInt64 *_retval); \
++  NS_IMETHOD Seek(PRInt64 i_secs, PRInt64 b_relative); 
++
++/* Use this macro to declare functions that forward the behavior of this interface to another object. */
++#define NS_FORWARD_VLCINTF(_to) \
++  NS_IMETHOD Play(void) { return _to Play(); } \
++  NS_IMETHOD Pause(void) { return _to Pause(); } \
++  NS_IMETHOD Stop(void) { return _to Stop(); } \
++  NS_IMETHOD Fullscreen(void) { return _to Fullscreen(); } \
++  NS_IMETHOD Set_volume(PRInt64 i_volume) { return _to Set_volume(i_volume); } \
++  NS_IMETHOD Get_volume(PRInt64 *_retval) { return _to Get_volume(_retval); } \
++  NS_IMETHOD Mute(void) { return _to Mute(); } \
++  NS_IMETHOD Set_int_variable(const char *psz_var, PRInt64 i_value) { return _to Set_int_variable(psz_var, i_value); } \
++  NS_IMETHOD Set_bool_variable(const char *psz_var, PRBool b_value) { return _to Set_bool_variable(psz_var, b_value); } \
++  NS_IMETHOD Set_str_variable(const char *psz_var, const char *psz_value) { return _to Set_str_variable(psz_var, psz_value); } \
++  NS_IMETHOD Get_int_variable(const char *psz_var, PRInt64 *_retval) { return _to Get_int_variable(psz_var, _retval); } \
++  NS_IMETHOD Get_bool_variable(const char *psz_var, PRBool *_retval) { return _to Get_bool_variable(psz_var, _retval); } \
++  NS_IMETHOD Get_str_variable(const char *psz_var, char **_retval) { return _to Get_str_variable(psz_var, _retval); } \
++  NS_IMETHOD Clear_playlist(void) { return _to Clear_playlist(); } \
++  NS_IMETHOD Add_item(const char *psz_name) { return _to Add_item(psz_name); } \
++  NS_IMETHOD Next(void) { return _to Next(); } \
++  NS_IMETHOD Previous(void) { return _to Previous(); } \
++  NS_IMETHOD Isplaying(PRBool *_retval) { return _to Isplaying(_retval); } \
++  NS_IMETHOD Get_length(PRInt64 *_retval) { return _to Get_length(_retval); } \
++  NS_IMETHOD Get_position(PRInt64 *_retval) { return _to Get_position(_retval); } \
++  NS_IMETHOD Get_time(PRInt64 *_retval) { return _to Get_time(_retval); } \
++  NS_IMETHOD Get_video_width(PRInt64 *_retval) { return _to Get_video_width(_retval); } \
++  NS_IMETHOD Get_video_height(PRInt64 *_retval) { return _to Get_video_height(_retval); } \
++  NS_IMETHOD Seek(PRInt64 i_secs, PRInt64 b_relative) { return _to Seek(i_secs, b_relative); } 
++
++/* Use this macro to declare functions that forward the behavior of this interface to another object in a safe way. */
++#define NS_FORWARD_SAFE_VLCINTF(_to) \
++  NS_IMETHOD Play(void) { return !_to ? NS_ERROR_NULL_POINTER : _to->Play(); } \
++  NS_IMETHOD Pause(void) { return !_to ? NS_ERROR_NULL_POINTER : _to->Pause(); } \
++  NS_IMETHOD Stop(void) { return !_to ? NS_ERROR_NULL_POINTER : _to->Stop(); } \
++  NS_IMETHOD Fullscreen(void) { return !_to ? NS_ERROR_NULL_POINTER : _to->Fullscreen(); } \
++  NS_IMETHOD Set_volume(PRInt64 i_volume) { return !_to ? NS_ERROR_NULL_POINTER : _to->Set_volume(i_volume); } \
++  NS_IMETHOD Get_volume(PRInt64 *_retval) { return !_to ? NS_ERROR_NULL_POINTER : _to->Get_volume(_retval); } \
++  NS_IMETHOD Mute(void) { return !_to ? NS_ERROR_NULL_POINTER : _to->Mute(); } \
++  NS_IMETHOD Set_int_variable(const char *psz_var, PRInt64 i_value) { return !_to ? NS_ERROR_NULL_POINTER : _to->Set_int_variable(psz_var, i_value); } \
++  NS_IMETHOD Set_bool_variable(const char *psz_var, PRBool b_value) { return !_to ? NS_ERROR_NULL_POINTER : _to->Set_bool_variable(psz_var, b_value); } \
++  NS_IMETHOD Set_str_variable(const char *psz_var, const char *psz_value) { return !_to ? NS_ERROR_NULL_POINTER : _to->Set_str_variable(psz_var, psz_value); } \
++  NS_IMETHOD Get_int_variable(const char *psz_var, PRInt64 *_retval) { return !_to ? NS_ERROR_NULL_POINTER : _to->Get_int_variable(psz_var, _retval); } \
++  NS_IMETHOD Get_bool_variable(const char *psz_var, PRBool *_retval) { return !_to ? NS_ERROR_NULL_POINTER : _to->Get_bool_variable(psz_var, _retval); } \
++  NS_IMETHOD Get_str_variable(const char *psz_var, char **_retval) { return !_to ? NS_ERROR_NULL_POINTER : _to->Get_str_variable(psz_var, _retval); } \
++  NS_IMETHOD Clear_playlist(void) { return !_to ? NS_ERROR_NULL_POINTER : _to->Clear_playlist(); } \
++  NS_IMETHOD Add_item(const char *psz_name) { return !_to ? NS_ERROR_NULL_POINTER : _to->Add_item(psz_name); } \
++  NS_IMETHOD Next(void) { return !_to ? NS_ERROR_NULL_POINTER : _to->Next(); } \
++  NS_IMETHOD Previous(void) { return !_to ? NS_ERROR_NULL_POINTER : _to->Previous(); } \
++  NS_IMETHOD Isplaying(PRBool *_retval) { return !_to ? NS_ERROR_NULL_POINTER : _to->Isplaying(_retval); } \
++  NS_IMETHOD Get_length(PRInt64 *_retval) { return !_to ? NS_ERROR_NULL_POINTER : _to->Get_length(_retval); } \
++  NS_IMETHOD Get_position(PRInt64 *_retval) { return !_to ? NS_ERROR_NULL_POINTER : _to->Get_position(_retval); } \
++  NS_IMETHOD Get_time(PRInt64 *_retval) { return !_to ? NS_ERROR_NULL_POINTER : _to->Get_time(_retval); } \
++  NS_IMETHOD Get_video_width(PRInt64 *_retval) { return !_to ? NS_ERROR_NULL_POINTER : _to->Get_video_width(_retval); } \
++  NS_IMETHOD Get_video_height(PRInt64 *_retval) { return !_to ? NS_ERROR_NULL_POINTER : _to->Get_video_height(_retval); } \
++  NS_IMETHOD Seek(PRInt64 i_secs, PRInt64 b_relative) { return !_to ? NS_ERROR_NULL_POINTER : _to->Seek(i_secs, b_relative); } 
++
++#if 0
++/* Use the code below as a template for the implementation class for this interface. */
++
++/* Header file */
++class _MYCLASS_ : public VlcIntf
++{
++public:
++  NS_DECL_ISUPPORTS
++  NS_DECL_VLCINTF
++
++  _MYCLASS_();
++
++private:
++  ~_MYCLASS_();
++
++protected:
++  /* additional members */
++};
++
++/* Implementation file */
++NS_IMPL_ISUPPORTS1(_MYCLASS_, VlcIntf)
++
++_MYCLASS_::_MYCLASS_()
++{
++  /* member initializers and constructor code */
++}
++
++_MYCLASS_::~_MYCLASS_()
++{
++  /* destructor code */
++}
++
++/* void play (); */
++NS_IMETHODIMP _MYCLASS_::Play()
++{
++    return NS_ERROR_NOT_IMPLEMENTED;
++}
++
++/* void pause (); */
++NS_IMETHODIMP _MYCLASS_::Pause()
++{
++    return NS_ERROR_NOT_IMPLEMENTED;
++}
++
++/* void stop (); */
++NS_IMETHODIMP _MYCLASS_::Stop()
++{
++    return NS_ERROR_NOT_IMPLEMENTED;
++}
++
++/* void fullscreen (); */
++NS_IMETHODIMP _MYCLASS_::Fullscreen()
++{
++    return NS_ERROR_NOT_IMPLEMENTED;
++}
++
++/* void set_volume (in PRInt64 i_volume); */
++NS_IMETHODIMP _MYCLASS_::Set_volume(PRInt64 i_volume)
++{
++    return NS_ERROR_NOT_IMPLEMENTED;
++}
++
++/* PRInt64 get_volume (); */
++NS_IMETHODIMP _MYCLASS_::Get_volume(PRInt64 *_retval)
++{
++    return NS_ERROR_NOT_IMPLEMENTED;
++}
++
++/* void mute (); */
++NS_IMETHODIMP _MYCLASS_::Mute()
++{
++    return NS_ERROR_NOT_IMPLEMENTED;
++}
++
++/* void set_int_variable (in string psz_var, in PRInt64 i_value); */
++NS_IMETHODIMP _MYCLASS_::Set_int_variable(const char *psz_var, PRInt64 i_value)
++{
++    return NS_ERROR_NOT_IMPLEMENTED;
++}
++
++/* void set_bool_variable (in string psz_var, in PRBool b_value); */
++NS_IMETHODIMP _MYCLASS_::Set_bool_variable(const char *psz_var, PRBool b_value)
++{
++    return NS_ERROR_NOT_IMPLEMENTED;
++}
++
++/* void set_str_variable (in string psz_var, in string psz_value); */
++NS_IMETHODIMP _MYCLASS_::Set_str_variable(const char *psz_var, const char *psz_value)
++{
++    return NS_ERROR_NOT_IMPLEMENTED;
++}
++
++/* PRInt64 get_int_variable (in string psz_var); */
++NS_IMETHODIMP _MYCLASS_::Get_int_variable(const char *psz_var, PRInt64 *_retval)
++{
++    return NS_ERROR_NOT_IMPLEMENTED;
++}
++
++/* PRBool get_bool_variable (in string psz_var); */
++NS_IMETHODIMP _MYCLASS_::Get_bool_variable(const char *psz_var, PRBool *_retval)
++{
++    return NS_ERROR_NOT_IMPLEMENTED;
++}
++
++/* string get_str_variable (in string psz_var); */
++NS_IMETHODIMP _MYCLASS_::Get_str_variable(const char *psz_var, char **_retval)
++{
++    return NS_ERROR_NOT_IMPLEMENTED;
++}
++
++/* void clear_playlist (); */
++NS_IMETHODIMP _MYCLASS_::Clear_playlist()
++{
++    return NS_ERROR_NOT_IMPLEMENTED;
++}
++
++/* void add_item (in string psz_name); */
++NS_IMETHODIMP _MYCLASS_::Add_item(const char *psz_name)
++{
++    return NS_ERROR_NOT_IMPLEMENTED;
++}
++
++/* void next (); */
++NS_IMETHODIMP _MYCLASS_::Next()
++{
++    return NS_ERROR_NOT_IMPLEMENTED;
++}
++
++/* void previous (); */
++NS_IMETHODIMP _MYCLASS_::Previous()
++{
++    return NS_ERROR_NOT_IMPLEMENTED;
++}
++
++/* PRBool isplaying (); */
++NS_IMETHODIMP _MYCLASS_::Isplaying(PRBool *_retval)
++{
++    return NS_ERROR_NOT_IMPLEMENTED;
++}
++
++/* PRInt64 get_length (); */
++NS_IMETHODIMP _MYCLASS_::Get_length(PRInt64 *_retval)
++{
++    return NS_ERROR_NOT_IMPLEMENTED;
++}
++
++/* PRInt64 get_position (); */
++NS_IMETHODIMP _MYCLASS_::Get_position(PRInt64 *_retval)
++{
++    return NS_ERROR_NOT_IMPLEMENTED;
++}
++
++/* PRInt64 get_time (); */
++NS_IMETHODIMP _MYCLASS_::Get_time(PRInt64 *_retval)
++{
++    return NS_ERROR_NOT_IMPLEMENTED;
++}
++
++/* PRInt64 get_video_width (); */
++NS_IMETHODIMP _MYCLASS_::Get_video_width(PRInt64 *_retval)
++{
++    return NS_ERROR_NOT_IMPLEMENTED;
++}
++
++/* PRInt64 get_video_height (); */
++NS_IMETHODIMP _MYCLASS_::Get_video_height(PRInt64 *_retval)
++{
++    return NS_ERROR_NOT_IMPLEMENTED;
++}
++
++/* void seek (in PRInt64 i_secs, in PRInt64 b_relative); */
++NS_IMETHODIMP _MYCLASS_::Seek(PRInt64 i_secs, PRInt64 b_relative)
++{
++    return NS_ERROR_NOT_IMPLEMENTED;
++}
++
++/* End of implementation class template. */
++#endif
++
++
++#endif /* __gen_vlcintf_h__ */
 Index: mozilla/vlcintf.idl
 ===================================================================
 --- mozilla/vlcintf.idl	(revision 15815)


-- 
cchiu

More information about the cvs-annodex mailing list