Merge branch 'master' of git://git.videolan.org/vlc

[vlc] / projects / mozilla / vlcshell.cpp

diff --git a/projects/mozilla/vlcshell.cpp b/projects/mozilla/vlcshell.cpp
index 575c2b1b91710d5707b6443cface096c34a0e8ff..829ae7a5da3de60cb804dcad00420dbf83defa36 100644 (file)
--- a/projects/mozilla/vlcshell.cpp
+++ b/projects/mozilla/vlcshell.cpp
@@ -31,11 +31,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-/* This is from mozilla java, do we really need it? */
-#if 0
-#include <jri.h>
-#endif
-
 #include "vlcplugin.h"
 #include "vlcshell.h"
 
@@ -110,7 +105,7 @@ NPError NPP_GetValue( NPP instance, NPPVariable variable, void *value )
     VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(instance->pdata);
     if( NULL == p_plugin )
     {
-        // plugin has not been initialized yet !
+        /* plugin has not been initialized yet ! */
         return NPERR_INVALID_INSTANCE_ERROR;
     }
 
@@ -163,6 +158,7 @@ int16_t NPP_HandleEvent( NPP instance, void * event )
         return false;
     }
 
+#ifndef __x86_64__  
     EventRecord *myEvent = (EventRecord*)event;
 
     switch( myEvent->what )
@@ -212,8 +208,7 @@ int16_t NPP_HandleEvent( NPP instance, void * event )
 
                 if( ! hasVout )
                 {
-                    /* draw the beautiful "No Picture" */
-
+                    /* draw the text from p_plugin->psz_text */
                     ForeColor(blackColor);
                     PenMode( patCopy );
 
@@ -255,6 +250,7 @@ int16_t NPP_HandleEvent( NPP instance, void * event )
         default:
             ;
     }
+#endif // __x86_64__
     return false;
 }
 #endif /* XP_MACOSX */