Use libvlc_Quit

diff --git a/modules/control/dbus.c b/modules/control/dbus.c
index fe3b771a356b79e88601f56494b73df1dabdf2bc..c67efe01960cac468ac84ea57accf7371fa75b00 100644 (file)
--- a/modules/control/dbus.c
+++ b/modules/control/dbus.c
@@ -125,7 +125,7 @@ vlc_module_end ()
 DBUS_METHOD( Quit )
 { /* exits vlc */
     REPLY_INIT;
-    vlc_object_kill(((vlc_object_t*)p_this)->p_libvlc);
+    libvlc_Quit(((vlc_object_t*)p_this)->p_libvlc);
     REPLY_SEND;
 }
 

diff --git a/modules/control/gestures.c b/modules/control/gestures.c
index 5a187bb6ef3446dbdf6778d59fcd89019d182ed2..8fc9b020878b9e6b329777b11ba7a4541b870976 100644 (file)
--- a/modules/control/gestures.c
+++ b/modules/control/gestures.c
@@ -396,7 +396,7 @@ static void RunIntf( intf_thread_t *p_intf )
                 break;
             case GESTURE(DOWN,LEFT,NONE,NONE):
                 /* FIXME: Should close the vout!"*/
-                vlc_object_kill( p_intf->p_libvlc );
+                libvlc_Quit( p_intf->p_libvlc );
                 break;
             case GESTURE(DOWN,LEFT,UP,RIGHT):
             case GESTURE(UP,RIGHT,DOWN,LEFT):

diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index c8927b7a66361d99a163085475195eb147465962..d531106d0878db4049662b3f4e403c5b54836621 100644 (file)
--- a/modules/control/hotkeys.c
+++ b/modules/control/hotkeys.c
@@ -195,7 +195,7 @@ static void Run( intf_thread_t *p_intf )
         /* Quit */
         if( i_action == ACTIONID_QUIT )
         {
-            vlc_object_kill( p_intf->p_libvlc );
+            libvlc_Quit( p_intf->p_libvlc );
 
             ClearChannels( p_intf, p_vout );
             vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Quit" ) );

diff --git a/modules/control/http/macro.c b/modules/control/http/macro.c
index 6c6a443b250660dd0c1ff039f3e7c594bf107ae1..0d5d90a6400e98675991258867b099b2b4c7449d 100644 (file)
--- a/modules/control/http/macro.c
+++ b/modules/control/http/macro.c
@@ -520,7 +520,7 @@ static void MacroDo( httpd_file_sys_t *p_args,
                 case MVLC_SHUTDOWN:
                 {
                     msg_Dbg( p_intf, "requested shutdown" );
-                    vlc_object_kill( p_intf->p_libvlc );
+                    libvlc_Quit( p_intf->p_libvlc );
                     break;
                 }
 #ifdef ENABLE_VLM

diff --git a/modules/control/ntservice.c b/modules/control/ntservice.c
index 1791a29f351945a7f54ad6c84b63ebd3b128e339..3bb1b6f145fcb2a17e17c094011b3ec073343e31 100644 (file)
--- a/modules/control/ntservice.c
+++ b/modules/control/ntservice.c
@@ -159,7 +159,7 @@ static void Run( intf_thread_t *p_intf )
     free( p_intf->p_sys->psz_service );
 
     /* Make sure we exit (In case other interfaces have been spawned) */
-    vlc_object_kill( p_intf->p_libvlc );
+    libvlc_Quit( p_intf->p_libvlc );
     vlc_restorecancel( canc );
 }
 

diff --git a/modules/control/rc.c b/modules/control/rc.c
index b8723b8301b991edd74a947910acec8679426943..6f5d2055f19ea27e6ffc1c4693cd538e7f417434 100644 (file)
--- a/modules/control/rc.c
+++ b/modules/control/rc.c
@@ -1543,7 +1543,7 @@ static int Quit( vlc_object_t *p_this, char const *psz_cmd,
     VLC_UNUSED(p_data); VLC_UNUSED(psz_cmd);
     VLC_UNUSED(oldval); VLC_UNUSED(newval);
 
-    vlc_object_kill( p_this->p_libvlc );
+    libvlc_Quit( p_this->p_libvlc );
     return VLC_SUCCESS;
 }
 

diff --git a/modules/control/signals.c b/modules/control/signals.c
index 1b481ccd7dbaf53fca75e226d517b90b4ea71d03..f1f4b3cc397aa98160ac09fbe397c449a5ab9bd6 100644 (file)
--- a/modules/control/signals.c
+++ b/modules/control/signals.c
@@ -117,7 +117,7 @@ static void *SigThread (void *data)
             case SIGQUIT:
                 msg_Err (obj, "Caught %s signal, exiting...",
                          strsignal (signum));
-                vlc_object_kill (obj->p_libvlc);
+                libvlc_Quit (obj->p_libvlc);
                 break;
         }
     }

diff --git a/modules/control/telnet.c b/modules/control/telnet.c
index ab7e31d1d856935b9234df274256e308fb3690e2..f1273ba0af146a4d5733fa19dd6a0e1f3bf569cd 100644 (file)
--- a/modules/control/telnet.c
+++ b/modules/control/telnet.c
@@ -428,7 +428,7 @@ static void Run( intf_thread_t *p_intf )
                 else if( !strncmp( cl->buffer_read, "shutdown", 8 ) )
                 {
                     msg_Err( p_intf, "shutdown requested" );
-                    vlc_object_kill( p_intf->p_libvlc );
+                    libvlc_Quit( p_intf->p_libvlc );
                 }
                 else if( *cl->buffer_read == '@'
                           && strchr( cl->buffer_read, ' ' ) )

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index f0191e3b844c9efd6fe44cc91ff53a19ddcf360a..d1cf047c1e5974d13370a620d6e516b9712b6168 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -751,7 +751,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     vlc_object_kill( p_playlist );
     pl_Release( p_intf );
 
-    vlc_object_kill( p_intf->p_libvlc );
+    libvlc_Quit( p_intf->p_libvlc );
 
     [self setIntf:nil];
 

diff --git a/modules/gui/maemo/maemo_callbacks.c b/modules/gui/maemo/maemo_callbacks.c
index e89aa66be3556e8fef389050c718e46fa5f745a3..97ee4dfa84999216da830d34548baabca591dd34 100644 (file)
--- a/modules/gui/maemo/maemo_callbacks.c
+++ b/modules/gui/maemo/maemo_callbacks.c
@@ -54,7 +54,7 @@ gboolean delete_event_cb( GtkWidget *widget,
     intf_thread_t *p_intf = get_intf_from_widget( widget );
 
     vlc_mutex_lock( &p_intf->change_lock );
-    vlc_object_kill( p_intf->p_libvlc );
+    libvlc_Quit( p_intf->p_libvlc );
     vlc_mutex_unlock( &p_intf->change_lock );
 
     gtk_main_quit();

diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c
index 9f16757a3ff4efba63a0bba96917002ee283c456..aadf1fbda412f0e20406121cbf2278c78aa68918 100644 (file)
--- a/modules/gui/ncurses.c
+++ b/modules/gui/ncurses.c
@@ -1038,7 +1038,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key )
         case 'q':
         case 'Q':
         case KEY_EXIT:
-            vlc_object_kill( p_intf->p_libvlc );
+            libvlc_Quit( p_intf->p_libvlc );
             ReturnFalse;
 
         /* Box switching */

diff --git a/modules/gui/pda/pda_callbacks.c b/modules/gui/pda/pda_callbacks.c
index 282b2f5724497a193bfb8746f2888583f44e7963..c0c93c28a6cc568fdf3976485cdb17dad53ead71 100644 (file)
--- a/modules/gui/pda/pda_callbacks.c
+++ b/modules/gui/pda/pda_callbacks.c
@@ -347,7 +347,7 @@ gboolean onPDADeleteEvent(GtkWidget *widget, GdkEvent *event, gpointer user_data
     intf_thread_t *p_intf = GtkGetIntf( widget );
 
     vlc_mutex_lock( &p_intf->change_lock );
-    vlc_object_kill( p_intf->p_libvlc );
+    libvlc_Quit( p_intf->p_libvlc );
     vlc_mutex_unlock( &p_intf->change_lock );
     msg_Dbg( p_intf, "about to exit vlc ... signaled" );
 

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index dd67c06bdab809127841cfd5c979c3dfd8e81a16..e314df61c721ea44317b8f426f8c6db2aa2d45c9 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -99,7 +99,7 @@ DialogsProvider::~DialogsProvider()
 void DialogsProvider::quit()
 {
     b_isDying = true;
-    vlc_object_kill( p_intf->p_libvlc );
+    libvlc_Quit( p_intf->p_libvlc );
 }
 
 void DialogsProvider::customEvent( QEvent *event )

diff --git a/modules/gui/skins2/commands/cmd_quit.cpp b/modules/gui/skins2/commands/cmd_quit.cpp
index 7e287cadc669def4c711eada3ed653b066192caa..75455c16e3953bac899f06a933b54d3143e55a51 100644 (file)
--- a/modules/gui/skins2/commands/cmd_quit.cpp
+++ b/modules/gui/skins2/commands/cmd_quit.cpp
@@ -46,5 +46,5 @@ void CmdQuit::execute()
     pOsFactory->getOSLoop()->exit();
 
     // Kill libvlc
-    vlc_object_kill( getIntf()->p_libvlc );
+    libvlc_Quit( getIntf()->p_libvlc );
 }

diff --git a/modules/misc/dummy/input.c b/modules/misc/dummy/input.c
index f43861436a8e949bf20ba4df4054f35de3c9c7bf..19e430fc80a14a8d3def549a8c9a9fb62dafae3c 100644 (file)
--- a/modules/misc/dummy/input.c
+++ b/modules/misc/dummy/input.c
@@ -203,7 +203,7 @@ static int Demux( demux_t *p_demux )
     {
         case COMMAND_QUIT:
             b_eof = true;
-            vlc_object_kill( p_demux->p_libvlc );
+            libvlc_Quit( p_demux->p_libvlc );
             break;
 
         case COMMAND_PAUSE:

diff --git a/modules/misc/lua/libs/misc.c b/modules/misc/lua/libs/misc.c
index b3ecbdf7cc81a766dd5bf0fe7f6fda458562c3d5..7aab9ec9d223921843ac8fc965a9adc3ac6e7491 100644 (file)
--- a/modules/misc/lua/libs/misc.c
+++ b/modules/misc/lua/libs/misc.c
@@ -105,7 +105,7 @@ static int vlclua_quit( lua_State *L )
     vlc_object_t *p_this = vlclua_get_this( L );
     /* The rc.c code also stops the playlist ... not sure if this is needed
      * though. */
-    vlc_object_kill( p_this->p_libvlc );
+    libvlc_Quit( p_this->p_libvlc );
     return 0;
 }
 

diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c
index 79f079dc5fb3ffc94814c7f9b3aa47334eef2945..b94e71f0392bea9b5759f5b9e272c1c6bcc5103a 100644 (file)
--- a/modules/video_output/caca.c
+++ b/modules/video_output/caca.c
@@ -377,7 +377,7 @@ static int Manage( vout_thread_t *p_vout )
                 playlist_Stop( p_playlist );
                 pl_Release( p_vout );
             }
-            vlc_object_kill( p_vout->p_libvlc );
+            libvlc_Quit( p_vout->p_libvlc );
             break;
         }
 #endif

diff --git a/modules/video_output/fb.c b/modules/video_output/fb.c
index c8968cdff02a28ea02cab961bd8d5312370151dc..09f982a86e0c7d3c16d676d189fbcd7c8284e493 100644 (file)
--- a/modules/video_output/fb.c
+++ b/modules/video_output/fb.c
@@ -681,7 +681,7 @@ static int Manage( vout_thread_t *p_vout )
         switch( buf )
         {
         case 'q':
-            vlc_object_kill( p_vout->p_libvlc );
+            libvlc_Quit( p_vout->p_libvlc );
             break;
 
         default:

diff --git a/modules/video_output/ggi.c b/modules/video_output/ggi.c
index 8735396f17b8fb549223c3caab1e0727e61c17e6..348fc4f68485976ae0353674c2d8e2aaa7dc684a 100644 (file)
--- a/modules/video_output/ggi.c
+++ b/modules/video_output/ggi.c
@@ -293,7 +293,7 @@ static int Manage( vout_thread_t *p_vout )
                     case 'q':
                     case 'Q':
                     case GIIUC_Escape:
-                        vlc_object_kill( p_vout->p_libvlc );
+                        libvlc_Quit( p_vout->p_libvlc );
                         break;
 
                     default:

diff --git a/modules/video_output/svgalib.c b/modules/video_output/svgalib.c
index a947600e789a3d79b151c83d51796d52a8e3e6d5..88284c070e3b0af75f7d028277ce885979adc618 100644 (file)
--- a/modules/video_output/svgalib.c
+++ b/modules/video_output/svgalib.c
@@ -235,7 +235,7 @@ static int Manage( vout_thread_t *p_vout )
     if( keyboard_keypressed(SCANCODE_ESCAPE)
          || keyboard_keypressed(SCANCODE_Q ) )
     {
-        vlc_object_kill( p_vout->p_libvlc );
+        libvlc_Quit( p_vout->p_libvlc );
     }
 
     return VLC_SUCCESS;

diff --git a/src/misc/beos_specific.cpp b/src/misc/beos_specific.cpp
index 8dbec2e1637e0322a230bd3fc2bf16022fffda4d..51c70cf8a8182b9caeb871e1b55dab9c037c16f0 100644 (file)
--- a/src/misc/beos_specific.cpp
+++ b/src/misc/beos_specific.cpp
@@ -243,7 +243,7 @@ bool VlcApplication::QuitRequested()
 {
     if( !fReadyToQuit )
     {
-        vlc_object_kill( p_this->p_libvlc );
+        libvlc_Quit( p_this->p_libvlc );
         return false;
     }
 

diff --git a/src/playlist/thread.c b/src/playlist/thread.c
index 3005793f3960b7c4e3c7734774a5165492fa233b..88036193ac068a34876ce6a0f61c1327e4d17570 100644 (file)
--- a/src/playlist/thread.c
+++ b/src/playlist/thread.c
@@ -572,7 +572,7 @@ static void LoopRequest( playlist_t *p_playlist )
     if( var_GetBool( p_playlist, "play-and-exit" ) )
     {
         msg_Info( p_playlist, "end of playlist, exiting" );
-        vlc_object_kill( p_playlist->p_libvlc );
+        libvlc_Quit( p_playlist->p_libvlc );
     }
 }