Mozilla: Reflect libvlc changes: media_instance destroy_and_detach->release.

diff --git a/mozilla/control/npolibvlc.cpp b/mozilla/control/npolibvlc.cpp
index 5b75aacf52c2cdbde8e1286df86c4816b69ae53c..63c8c413697750fd305a3b624d43f4a296930983 100755 (executable)
--- a/mozilla/control/npolibvlc.cpp
+++ b/mozilla/control/npolibvlc.cpp
@@ -250,7 +250,7 @@ RuntimeNPObject::InvokeResult LibvlcAudioNPObject::getProperty(int index, NPVari
                     return INVOKERESULT_GENERIC_ERROR;\r
                 }\r
                 int track = libvlc_audio_get_track(p_md, &ex);\r
-                libvlc_media_instance_destroy_and_detach(p_md);\r
+                libvlc_media_instance_release(p_md);\r
                 if( libvlc_exception_raised(&ex) )\r
                 {\r
                     NPN_SetException(this, libvlc_exception_get_message(&ex));\r
@@ -330,7 +330,7 @@ RuntimeNPObject::InvokeResult LibvlcAudioNPObject::setProperty(int index, const
                     }\r
                     libvlc_audio_set_track(p_md,\r
                                            numberValue(value), &ex);\r
-                    libvlc_media_instance_destroy_and_detach(p_md);\r
+                    libvlc_media_instance_release(p_md);\r
                     if( libvlc_exception_raised(&ex) )\r
                     {\r
                         NPN_SetException(this, libvlc_exception_get_message(&ex));\r
@@ -467,7 +467,7 @@ RuntimeNPObject::InvokeResult LibvlcInputNPObject::getProperty(int index, NPVari
             case ID_input_length:\r
             {\r
                 double val = (double)libvlc_media_instance_get_length(p_md, &ex);\r
-                libvlc_media_instance_destroy_and_detach(p_md);\r
+                libvlc_media_instance_release(p_md);\r
                 if( libvlc_exception_raised(&ex) )\r
                 {\r
                     NPN_SetException(this, libvlc_exception_get_message(&ex));\r
@@ -480,7 +480,7 @@ RuntimeNPObject::InvokeResult LibvlcInputNPObject::getProperty(int index, NPVari
             case ID_input_position:\r
             {\r
                 double val = libvlc_media_instance_get_position(p_md, &ex);\r
-                libvlc_media_instance_destroy_and_detach(p_md);\r
+                libvlc_media_instance_release(p_md);\r
                 if( libvlc_exception_raised(&ex) )\r
                 {\r
                     NPN_SetException(this, libvlc_exception_get_message(&ex));\r
@@ -493,7 +493,7 @@ RuntimeNPObject::InvokeResult LibvlcInputNPObject::getProperty(int index, NPVari
             case ID_input_time:\r
             {\r
                 double val = (double)libvlc_media_instance_get_time(p_md, &ex);\r
-                libvlc_media_instance_destroy_and_detach(p_md);\r
+                libvlc_media_instance_release(p_md);\r
                 if( libvlc_exception_raised(&ex) )\r
                 {\r
                     NPN_SetException(this, libvlc_exception_get_message(&ex));\r
@@ -506,7 +506,7 @@ RuntimeNPObject::InvokeResult LibvlcInputNPObject::getProperty(int index, NPVari
             case ID_input_state:\r
             {\r
                 int val = libvlc_media_instance_get_state(p_md, &ex);\r
-                libvlc_media_instance_destroy_and_detach(p_md);\r
+                libvlc_media_instance_release(p_md);\r
                 if( libvlc_exception_raised(&ex) )\r
                 {\r
                     NPN_SetException(this, libvlc_exception_get_message(&ex));\r
@@ -519,7 +519,7 @@ RuntimeNPObject::InvokeResult LibvlcInputNPObject::getProperty(int index, NPVari
             case ID_input_rate:\r
             {\r
                 float val = libvlc_media_instance_get_rate(p_md, &ex);\r
-                libvlc_media_instance_destroy_and_detach(p_md);\r
+                libvlc_media_instance_release(p_md);\r
                 if( libvlc_exception_raised(&ex) )\r
                 {\r
                     NPN_SetException(this, libvlc_exception_get_message(&ex));\r
@@ -532,7 +532,7 @@ RuntimeNPObject::InvokeResult LibvlcInputNPObject::getProperty(int index, NPVari
             case ID_input_fps:\r
             {\r
                 double val = libvlc_media_instance_get_fps(p_md, &ex);\r
-                libvlc_media_instance_destroy_and_detach(p_md);\r
+                libvlc_media_instance_release(p_md);\r
                 if( libvlc_exception_raised(&ex) )\r
                 {\r
                     NPN_SetException(this, libvlc_exception_get_message(&ex));\r
@@ -545,7 +545,7 @@ RuntimeNPObject::InvokeResult LibvlcInputNPObject::getProperty(int index, NPVari
             case ID_input_hasvout:\r
             {\r
                 vlc_bool_t val = libvlc_media_instance_has_vout(p_md, &ex);\r
-                libvlc_media_instance_destroy_and_detach(p_md);\r
+                libvlc_media_instance_release(p_md);\r
                 if( libvlc_exception_raised(&ex) )\r
                 {\r
                     NPN_SetException(this, libvlc_exception_get_message(&ex));\r
@@ -558,7 +558,7 @@ RuntimeNPObject::InvokeResult LibvlcInputNPObject::getProperty(int index, NPVari
             default:\r
                 ;\r
         }\r
-        libvlc_media_instance_destroy_and_detach(p_md);\r
+        libvlc_media_instance_release(p_md);\r
     }\r
     return INVOKERESULT_GENERIC_ERROR;\r
 }\r
@@ -586,13 +586,13 @@ RuntimeNPObject::InvokeResult LibvlcInputNPObject::setProperty(int index, const
             {\r
                 if( ! NPVARIANT_IS_DOUBLE(value) )\r
                 {\r
-                    libvlc_media_instance_destroy_and_detach(p_md);\r
+                    libvlc_media_instance_release(p_md);\r
                     return INVOKERESULT_INVALID_VALUE;\r
                 }\r
 \r
                 float val = (float)NPVARIANT_TO_DOUBLE(value);\r
                 libvlc_media_instance_set_position(p_md, val, &ex);\r
-                libvlc_media_instance_destroy_and_detach(p_md);\r
+                libvlc_media_instance_release(p_md);\r
                 if( libvlc_exception_raised(&ex) )\r
                 {\r
                     NPN_SetException(this, libvlc_exception_get_message(&ex));\r
@@ -610,12 +610,12 @@ RuntimeNPObject::InvokeResult LibvlcInputNPObject::setProperty(int index, const
                     val = (vlc_int64_t)NPVARIANT_TO_DOUBLE(value);\r
                 else\r
                 {\r
-                    libvlc_media_instance_destroy_and_detach(p_md);\r
+                    libvlc_media_instance_release(p_md);\r
                     return INVOKERESULT_INVALID_VALUE;\r
                 }\r
 \r
                 libvlc_media_instance_set_time(p_md, val, &ex);\r
-                libvlc_media_instance_destroy_and_detach(p_md);\r
+                libvlc_media_instance_release(p_md);\r
                 if( libvlc_exception_raised(&ex) )\r
                 {\r
                     NPN_SetException(this, libvlc_exception_get_message(&ex));\r
@@ -633,12 +633,12 @@ RuntimeNPObject::InvokeResult LibvlcInputNPObject::setProperty(int index, const
                     val = (float)NPVARIANT_TO_DOUBLE(value);\r
                 else\r
                 {\r
-                    libvlc_media_instance_destroy_and_detach(p_md);\r
+                    libvlc_media_instance_release(p_md);\r
                     return INVOKERESULT_INVALID_VALUE;\r
                 }\r
 \r
                 libvlc_media_instance_set_rate(p_md, val, &ex);\r
-                libvlc_media_instance_destroy_and_detach(p_md);\r
+                libvlc_media_instance_release(p_md);\r
                 if( libvlc_exception_raised(&ex) )\r
                 {\r
                     NPN_SetException(this, libvlc_exception_get_message(&ex));\r
@@ -650,7 +650,7 @@ RuntimeNPObject::InvokeResult LibvlcInputNPObject::setProperty(int index, const
             default:\r
                 ;\r
         }\r
-        libvlc_media_instance_destroy_and_detach(p_md);\r
+        libvlc_media_instance_release(p_md);\r
     }\r
     return INVOKERESULT_GENERIC_ERROR;\r
 }\r
@@ -1826,7 +1826,7 @@ RuntimeNPObject::InvokeResult LibvlcVideoNPObject::getProperty(int index, NPVari
             case ID_video_fullscreen:\r
             {\r
                 int val = libvlc_get_fullscreen(p_md, &ex);\r
-                libvlc_media_instance_destroy_and_detach(p_md);\r
+                libvlc_media_instance_release(p_md);\r
                 if( libvlc_exception_raised(&ex) )\r
                 {\r
                     NPN_SetException(this, libvlc_exception_get_message(&ex));\r
@@ -1839,7 +1839,7 @@ RuntimeNPObject::InvokeResult LibvlcVideoNPObject::getProperty(int index, NPVari
             case ID_video_height:\r
             {\r
                 int val = libvlc_video_get_height(p_md, &ex);\r
-                libvlc_media_instance_destroy_and_detach(p_md);\r
+                libvlc_media_instance_release(p_md);\r
                 if( libvlc_exception_raised(&ex) )\r
                 {\r
                     NPN_SetException(this, libvlc_exception_get_message(&ex));\r
@@ -1852,7 +1852,7 @@ RuntimeNPObject::InvokeResult LibvlcVideoNPObject::getProperty(int index, NPVari
             case ID_video_width:\r
             {\r
                 int val = libvlc_video_get_width(p_md, &ex);\r
-                libvlc_media_instance_destroy_and_detach(p_md);\r
+                libvlc_media_instance_release(p_md);\r
                 if( libvlc_exception_raised(&ex) )\r
                 {\r
                     NPN_SetException(this, libvlc_exception_get_message(&ex));\r
@@ -1865,7 +1865,7 @@ RuntimeNPObject::InvokeResult LibvlcVideoNPObject::getProperty(int index, NPVari
             case ID_video_aspectratio:\r
             {\r
                 NPUTF8 *psz_aspect = libvlc_video_get_aspect_ratio(p_md, &ex);\r
-                libvlc_media_instance_destroy_and_detach(p_md);\r
+                libvlc_media_instance_release(p_md);\r
                 if( libvlc_exception_raised(&ex) )\r
                 {\r
                     NPN_SetException(this, libvlc_exception_get_message(&ex));\r
@@ -1881,7 +1881,7 @@ RuntimeNPObject::InvokeResult LibvlcVideoNPObject::getProperty(int index, NPVari
             case ID_video_subtitle:\r
             {\r
                 int i_spu = libvlc_video_get_spu(p_md, &ex);\r
-                libvlc_media_instance_destroy_and_detach(p_md);\r
+                libvlc_media_instance_release(p_md);\r
                 if( libvlc_exception_raised(&ex) )\r
                 {\r
                     NPN_SetException(this, libvlc_exception_get_message(&ex));\r
@@ -1894,7 +1894,7 @@ RuntimeNPObject::InvokeResult LibvlcVideoNPObject::getProperty(int index, NPVari
             case ID_video_crop:\r
             {\r
                 NPUTF8 *psz_geometry = libvlc_video_get_crop_geometry(p_md, &ex);\r
-                libvlc_media_instance_destroy_and_detach(p_md);\r
+                libvlc_media_instance_release(p_md);\r
                 if( libvlc_exception_raised(&ex) )\r
                 {\r
                     NPN_SetException(this, libvlc_exception_get_message(&ex));\r
@@ -1908,7 +1908,7 @@ RuntimeNPObject::InvokeResult LibvlcVideoNPObject::getProperty(int index, NPVari
                 return INVOKERESULT_NO_ERROR;\r
             }\r
         }\r
-        libvlc_media_instance_destroy_and_detach(p_md);\r
+        libvlc_media_instance_release(p_md);\r
     }\r
     return INVOKERESULT_GENERIC_ERROR;\r
 }\r
@@ -1936,13 +1936,13 @@ RuntimeNPObject::InvokeResult LibvlcVideoNPObject::setProperty(int index, const
             {\r
                 if( ! NPVARIANT_IS_BOOLEAN(value) )\r
                 {\r
-                    libvlc_media_instance_destroy_and_detach(p_md);\r
+                    libvlc_media_instance_release(p_md);\r
                     return INVOKERESULT_INVALID_VALUE;\r
                 }\r
 \r
                 int val = NPVARIANT_TO_BOOLEAN(value);\r
                 libvlc_set_fullscreen(p_md, val, &ex);\r
-                libvlc_media_instance_destroy_and_detach(p_md);\r
+                libvlc_media_instance_release(p_md);\r
 \r
                 if( libvlc_exception_raised(&ex) )\r
                 {\r
@@ -1958,20 +1958,20 @@ RuntimeNPObject::InvokeResult LibvlcVideoNPObject::setProperty(int index, const
 \r
                 if( ! NPVARIANT_IS_STRING(value) )\r
                 {\r
-                    libvlc_media_instance_destroy_and_detach(p_md);\r
+                    libvlc_media_instance_release(p_md);\r
                     return INVOKERESULT_INVALID_VALUE;\r
                 }\r
 \r
                 psz_aspect = stringValue(NPVARIANT_TO_STRING(value));\r
                 if( !psz_aspect )\r
                 {\r
-                    libvlc_media_instance_destroy_and_detach(p_md);\r
+                    libvlc_media_instance_release(p_md);\r
                     return INVOKERESULT_GENERIC_ERROR;\r
                 }\r
 \r
                 libvlc_video_set_aspect_ratio(p_md, psz_aspect, &ex);\r
                 delete psz_aspect;\r
-                libvlc_media_instance_destroy_and_detach(p_md);\r
+                libvlc_media_instance_release(p_md);\r
 \r
                 if( libvlc_exception_raised(&ex) )\r
                 {\r
@@ -1987,7 +1987,7 @@ RuntimeNPObject::InvokeResult LibvlcVideoNPObject::setProperty(int index, const
                 {\r
                     libvlc_video_set_spu(p_md,\r
                                          numberValue(value), &ex);\r
-                    libvlc_media_instance_destroy_and_detach(p_md);\r
+                    libvlc_media_instance_release(p_md);\r
                     if( libvlc_exception_raised(&ex) )\r
                     {\r
                         NPN_SetException(this, libvlc_exception_get_message(&ex));\r
@@ -1996,7 +1996,7 @@ RuntimeNPObject::InvokeResult LibvlcVideoNPObject::setProperty(int index, const
                     }\r
                     return INVOKERESULT_NO_ERROR;\r
                 }\r
-                libvlc_media_instance_destroy_and_detach(p_md);\r
+                libvlc_media_instance_release(p_md);\r
                 return INVOKERESULT_INVALID_VALUE;\r
             }\r
             case ID_video_crop:\r
@@ -2005,20 +2005,20 @@ RuntimeNPObject::InvokeResult LibvlcVideoNPObject::setProperty(int index, const
 \r
                 if( ! NPVARIANT_IS_STRING(value) )\r
                 {\r
-                    libvlc_media_instance_destroy_and_detach(p_md);\r
+                    libvlc_media_instance_release(p_md);\r
                     return INVOKERESULT_INVALID_VALUE;\r
                 }\r
 \r
                 psz_geometry = stringValue(NPVARIANT_TO_STRING(value));\r
                 if( !psz_geometry )\r
                 {\r
-                    libvlc_media_instance_destroy_and_detach(p_md);\r
+                    libvlc_media_instance_release(p_md);\r
                     return INVOKERESULT_GENERIC_ERROR;\r
                 }\r
 \r
                 libvlc_video_set_crop_geometry(p_md, psz_geometry, &ex);\r
                 delete psz_geometry;\r
-                libvlc_media_instance_destroy_and_detach(p_md);\r
+                libvlc_media_instance_release(p_md);\r
 \r
                 if( libvlc_exception_raised(&ex) )\r
                 {\r
@@ -2029,7 +2029,7 @@ RuntimeNPObject::InvokeResult LibvlcVideoNPObject::setProperty(int index, const
                 return INVOKERESULT_NO_ERROR;\r
             }\r
         }\r
-        libvlc_media_instance_destroy_and_detach(p_md);\r
+        libvlc_media_instance_release(p_md);\r
     }\r
     return INVOKERESULT_GENERIC_ERROR;\r
 }\r
@@ -2069,7 +2069,7 @@ RuntimeNPObject::InvokeResult LibvlcVideoNPObject::invoke(int index, const NPVar
                 if( argCount == 0 )\r
                 {\r
                     libvlc_toggle_fullscreen(p_md, &ex);\r
-                    libvlc_media_instance_destroy_and_detach(p_md);\r
+                    libvlc_media_instance_release(p_md);\r
                     if( libvlc_exception_raised(&ex) )\r
                     {\r
                         NPN_SetException(this, libvlc_exception_get_message(&ex));\r

diff --git a/mozilla/control/npovlc.cpp b/mozilla/control/npovlc.cpp
index 1accbdb1918ddcf3cf9a63d2abcaf537eab132af..5e6e4ded8a5f8580931d4d759cf15232d238dac2 100755 (executable)
--- a/mozilla/control/npovlc.cpp
+++ b/mozilla/control/npovlc.cpp
@@ -169,7 +169,7 @@ RuntimeNPObject::InvokeResult VlcNPObject::invoke(int index, const NPVariant *ar
                     if( p_md )\r
                     {\r
                         libvlc_toggle_fullscreen(p_md, &ex);\r
-                        libvlc_media_instance_destroy_and_detach(p_md);\r
+                        libvlc_media_instance_release(p_md);\r
                         if( libvlc_exception_raised(&ex) )\r
                         {\r
                             NPN_SetException(this, libvlc_exception_get_message(&ex));\r
@@ -533,7 +533,7 @@ RuntimeNPObject::InvokeResult VlcNPObject::invoke(int index, const NPVariant *ar
                     if( p_md )\r
                     {\r
                         vlc_int64_t val = libvlc_media_instance_get_length(p_md, &ex);\r
-                        libvlc_media_instance_destroy_and_detach(p_md);\r
+                        libvlc_media_instance_release(p_md);\r
                         if( libvlc_exception_raised(&ex) )\r
                         {\r
                             NPN_SetException(this, libvlc_exception_get_message(&ex));\r
@@ -565,7 +565,7 @@ RuntimeNPObject::InvokeResult VlcNPObject::invoke(int index, const NPVariant *ar
                     if( p_md )\r
                     {\r
                         float val = libvlc_media_instance_get_position(p_md, &ex);\r
-                        libvlc_media_instance_destroy_and_detach(p_md);\r
+                        libvlc_media_instance_release(p_md);\r
                         if( libvlc_exception_raised(&ex) )\r
                         {\r
                             NPN_SetException(this, libvlc_exception_get_message(&ex));\r
@@ -597,7 +597,7 @@ RuntimeNPObject::InvokeResult VlcNPObject::invoke(int index, const NPVariant *ar
                     if( p_md )\r
                     {\r
                         vlc_int64_t val = libvlc_media_instance_get_time(p_md, &ex);\r
-                        libvlc_media_instance_destroy_and_detach(p_md);\r
+                        libvlc_media_instance_release(p_md);\r
                         if( libvlc_exception_raised(&ex) )\r
                         {\r
                             NPN_SetException(this, libvlc_exception_get_message(&ex));\r
@@ -642,7 +642,7 @@ RuntimeNPObject::InvokeResult VlcNPObject::invoke(int index, const NPVariant *ar
                             vlc_int64_t from = libvlc_media_instance_get_time(p_md, &ex);\r
                             if( libvlc_exception_raised(&ex) )\r
                             {\r
-                                libvlc_media_instance_destroy_and_detach(p_md);\r
+                                libvlc_media_instance_release(p_md);\r
                                 NPN_SetException(this, libvlc_exception_get_message(&ex));\r
                                 libvlc_exception_clear(&ex);\r
                                 return INVOKERESULT_GENERIC_ERROR;\r
@@ -651,7 +651,7 @@ RuntimeNPObject::InvokeResult VlcNPObject::invoke(int index, const NPVariant *ar
                         }\r
                         /* jump to time */\r
                         libvlc_media_instance_set_time(p_md, pos, &ex);\r
-                        libvlc_media_instance_destroy_and_detach(p_md);\r
+                        libvlc_media_instance_release(p_md);\r
                         if( libvlc_exception_raised(&ex) )\r
                         {\r
                             NPN_SetException(this, libvlc_exception_get_message(&ex));\r

diff --git a/mozilla/vlcshell.cpp b/mozilla/vlcshell.cpp
index dd06580e753015bcd1c791139812bfde66157a92..6c57dda38aed12551a94266c80ec29cbed8af48c 100644 (file)
--- a/mozilla/vlcshell.cpp
+++ b/mozilla/vlcshell.cpp
@@ -188,7 +188,7 @@ int16 NPP_HandleEvent( NPP instance, void * event )
                         if( p_md )
                         {
                             libvlc_toggle_fullscreen(p_md, NULL);
-                            libvlc_media_instance_destroy_and_detach(p_md);
+                            libvlc_media_instance_release(p_md);
                         }
                     }
                 }
@@ -227,7 +227,7 @@ int16 NPP_HandleEvent( NPP instance, void * event )
                                 area.bottom = npwindow.height;
                                 libvlc_video_redraw_rectangle(p_md, &area, NULL);
                             }
-                            libvlc_media_instance_destroy_and_detach(p_md);
+                            libvlc_media_instance_release(p_md);
                         }
                     }
                 }