Release the display mode when we are done with it.

[vlc] / projects / mozilla / vlcshell.h

diff --git a/projects/mozilla/vlcshell.h b/projects/mozilla/vlcshell.h
index 6dd156158f4cc21c7e4305f00c4d058ec3b38d93..909bcecd2e3a5b444fde3ae986c59cb8137ba1a9 100644 (file)
--- a/projects/mozilla/vlcshell.h
+++ b/projects/mozilla/vlcshell.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
- * vlcshell.hp:
+ * vlcshell.h:
  *****************************************************************************
- * Copyright (C) 2009 the VideoLAN team
+ * Copyright (C) 2009-2010 the VideoLAN team
  * $Id$
  *
  * Authors: Jean-Paul Saman <jpsaman@videolan.org>
@@ -27,11 +27,20 @@
 char * NPP_GetMIMEDescription( void );
 
 NPError NPP_Initialize( void );
+
+#ifdef OJI 
 jref NPP_GetJavaClass( void );
+#endif
 void NPP_Shutdown( void );
 
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
 NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc,
                  char* argn[], char* argv[], NPSavedData* saved );
+#else
+NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc,
+                 char* argn[], char* argv[], NPSavedData* saved );
+#endif
+
 NPError NPP_Destroy( NPP instance, NPSavedData** save );
 
 NPError NPP_GetValue( NPP instance, NPPVariable variable, void *value );
@@ -40,20 +49,34 @@ NPError NPP_SetValue( NPP instance, NPNVariable variable, void *value );
 NPError NPP_SetWindow( NPP instance, NPWindow* window );
 
 NPError NPP_NewStream( NPP instance, NPMIMEType type, NPStream *stream,
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
                        NPBool seekable, uint16 *stype );
+#else
+                       NPBool seekable, uint16_t *stype );
+#endif
 NPError NPP_DestroyStream( NPP instance, NPStream *stream, NPError reason );
 void NPP_StreamAsFile( NPP instance, NPStream *stream, const char* fname );
 
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
 int32 NPP_WriteReady( NPP instance, NPStream *stream );
 int32 NPP_Write( NPP instance, NPStream *stream, int32 offset,
                  int32 len, void *buffer );
+#else
+int32_t NPP_WriteReady( NPP instance, NPStream *stream );
+int32_t NPP_Write( NPP instance, NPStream *stream, int32_t offset,
+                 int32_t len, void *buffer );
+#endif
 
 void NPP_URLNotify( NPP instance, const char* url,
                     NPReason reason, void* notifyData );
 void NPP_Print( NPP instance, NPPrint* printInfo );
 
 #ifdef XP_MACOSX
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
 int16 NPP_HandleEvent( NPP instance, void * event );
+#else
+int16_t NPP_HandleEvent( NPP instance, void * event );
+#endif
 #endif
 
 #endif