#undef XP_UNIX
#endif
-#if 0
#ifdef XP_WIN
/* Windows stuff */
#endif
# include <X11/Intrinsic.h>
# include <X11/StringDefs.h>
#endif
-#endif
class VlcPlugin
{
public:
- VlcPlugin( NPP, uint16 );
+ VlcPlugin( NPP, uint16 );
virtual ~VlcPlugin();
NPError init(int argc, char* const argn[], char* const argv[]);
- libvlc_instance_t* getVLC()
+ libvlc_instance_t* getVLC()
{ return libvlc_instance; };
NPP getBrowser()
{ return p_browser; };
char* getAbsoluteURL(const char *url);
- const NPWindow* getWindow()
- { return &npwindow; };
- void setWindow(const NPWindow *window)
- { npwindow = *window; };
+ NPWindow& getWindow()
+ { return npwindow; };
+ void setWindow(const NPWindow &window)
+ { npwindow = window; };
NPClass* getScriptClass()
- { return scriptClass; };
+ { return p_scriptClass; };
+ void setLog(libvlc_log_t *log)
+ { libvlc_log = log; };
+ libvlc_log_t* getLog()
+ { return libvlc_log; };
#if XP_WIN
WNDPROC getWindowProc()
{ return pf_wndproc; };
private:
/* VLC reference */
- libvlc_instance_t *libvlc_instance;
- NPClass *scriptClass;
+ libvlc_instance_t *libvlc_instance;
+ libvlc_log_t *libvlc_log;
+ NPClass *p_scriptClass;
/* browser reference */
NPP p_browser;
/*******************************************************************************
* Plugin properties.
******************************************************************************/
-#define PLUGIN_NAME "VLC multimedia plugin"
+#define PLUGIN_NAME "VLC Multimedia Plugin"
#define PLUGIN_DESCRIPTION \
- "VLC multimedia plugin <br>" \
- " <br>" \
- "version %s <br>" \
- "VideoLAN WWW: <a href=\"http://www.videolan.org/\">http://www.videolan.org/</a>"
+ "Version %s, copyright 1996-2007 The VideoLAN Team" \
+ "<br><a href=\"http://www.videolan.org/\">http://www.videolan.org/</a>"
#define PLUGIN_MIMETYPES \
/* MPEG-1 and MPEG-2 */ \
"video/x-msvideo:avi:AVI video;" \
/* QuickTime */ \
"video/quicktime:mov,qt:QuickTime video;" \
- /* Ogg */ \
+ /* OGG */ \
"application/x-ogg:ogg:Ogg stream;" \
"application/ogg:ogg:Ogg stream;" \
- /* explicit plugin call */ \
- "application/x-vlc-plugin::VLC plugin;" \
- /* windows media */ \
+ /* VLC */ \
+ "application/x-vlc-plugin:vlc:VLC plugin;" \
+ /* Windows Media */ \
"video/x-ms-asf-plugin:asf,asx:Windows Media Video;" \
"video/x-ms-asf:asf,asx:Windows Media Video;" \
"application/x-mplayer2::Windows Media;" \
"video/x-ms-wmv:wmv:Windows Media;" \
- /* Google VLC mime */ \
- "application/x-google-vlc-plugin::Google VLC plugin" \
- /* Misc */ \
- "audio/wav::WAV audio" \
- "audio/x-wav::WAV audio" \
+ /* Google VLC */ \
+ "application/x-google-vlc-plugin::Google VLC plugin;" \
+ /* WAV audio */ \
+ "audio/wav:wav:WAV audio;" \
+ "audio/x-wav:wav:WAV audio;" \
+ /* 3GPP */ \
+ "audio/3gpp:3gp,3gpp:3GPP audio;" \
+ "video/3gpp:3gp,3gpp:3GPP video;" \
+ /* 3GPP2 */ \
+ "audio/3gpp2:3g2,3gpp2:3GPP2 audio;" \
+ "video/3gpp2:3g2,3gpp2:3GPP2 video;" \
#endif