Forward port of rev 17335. Implement versionInfo() method

diff --git a/mozilla/control/npolibvlc.cpp b/mozilla/control/npolibvlc.cpp
index 40ef5d045aae11f3cbde50a9df1b3f9140f6ff0d..8a7f9a489ac8f319b5cc0bdf1ea6e95fd53b5729 100755 (executable)
--- a/mozilla/control/npolibvlc.cpp
+++ b/mozilla/control/npolibvlc.cpp
@@ -97,11 +97,46 @@ RuntimeNPObject::InvokeResult LibvlcRootNPObject::getProperty(int index, NPVaria
 \r
 const NPUTF8 * const LibvlcRootNPObject::methodNames[] =\r
 {\r
-    /* no methods */\r
+    "versionInfo",\r
 };\r
 \r
 const int LibvlcRootNPObject::methodCount = sizeof(LibvlcRootNPObject::methodNames)/sizeof(NPUTF8 *);\r
 \r
+enum LibvlcRootNPObjectMethodIds\r
+{\r
+    ID_version,\r
+};\r
+\r
+RuntimeNPObject::InvokeResult LibvlcRootNPObject::invoke(int index, const NPVariant *args, uint32_t argCount, NPVariant &result)\r
+{\r
+    VlcPlugin *p_plugin = reinterpret_cast<VlcPlugin *>(_instance->pdata);\r
+    if( p_plugin )\r
+    {\r
+        libvlc_exception_t ex;\r
+        libvlc_exception_init(&ex);\r
+\r
+        switch( index )\r
+        {\r
+            case ID_version:\r
+                if( argCount == 0 )\r
+                {\r
+                    NPUTF8 *versionStr = NULL;\r
+\r
+                    versionStr = strdup( VLC_Version() );\r
+                    if (!versionStr)\r
+                        return INVOKERESULT_GENERIC_ERROR;\r
+\r
+                    STRINGZ_TO_NPVARIANT(versionStr, result);\r
+                    return INVOKERESULT_NO_ERROR;\r
+                }\r
+                return INVOKERESULT_NO_SUCH_METHOD;\r
+            default:\r
+                return INVOKERESULT_NO_SUCH_METHOD;\r
+        }\r
+    }\r
+    return INVOKERESULT_GENERIC_ERROR;\r
+}\r
+\r
 /*\r
 ** implementation of libvlc audio object\r
 */\r

diff --git a/mozilla/control/npolibvlc.h b/mozilla/control/npolibvlc.h
index 4beb637c688a9a6b19e3684732a5ec1ed8ec4778..80c767353a975de795de1f40132b43a5a6c9641a 100755 (executable)
--- a/mozilla/control/npolibvlc.h
+++ b/mozilla/control/npolibvlc.h
@@ -43,6 +43,8 @@ protected:
     static const int methodCount;\r
     static const NPUTF8 * const methodNames[];\r
 \r
+    InvokeResult invoke(int index, const NPVariant *args, uint32_t argCount, NPVariant &result);\r
+\r
     NPObject *audioObj;\r
     NPObject *inputObj;\r
     NPObject *logObj;\r

diff --git a/mozilla/vlcshell.cpp b/mozilla/vlcshell.cpp
index 039a40d79a6da971b79b24c92a0161000634087e..6f4313ffef3dd39a9115c06b1ff7271072e20417 100644 (file)
--- a/mozilla/vlcshell.cpp
+++ b/mozilla/vlcshell.cpp
@@ -177,7 +177,7 @@ int16 NPP_HandleEvent( NPP instance, void * event )
             }
 
             const NPWindow *npwindow = p_plugin->getWindow();
-                
+
             if( needsDisplay && npwindow->window )
             {
                 /* draw the beautiful "No Picture" */