Commit 2e685724 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Use libvlc_Quit

parent 484b0aa1
......@@ -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;
}
......
......@@ -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):
......
......@@ -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" ) );
......
......@@ -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
......
......@@ -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 );
}
......
......@@ -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;
}
......
......@@ -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;
}
}
......
......@@ -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, ' ' ) )
......
......@@ -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];
......
......@@ -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();
......
......@@ -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 */
......
......@@ -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" );
......
......@@ -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 )
......
......@@ -46,5 +46,5 @@ void CmdQuit::execute()
pOsFactory->getOSLoop()->exit();
// Kill libvlc
vlc_object_kill( getIntf()->p_libvlc );
libvlc_Quit( getIntf()->p_libvlc );
}
......@@ -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:
......
......@@ -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;
}
......
......@@ -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
......
......@@ -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:
......
......@@ -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:
......
......@@ -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;
......
......@@ -243,7 +243,7 @@ bool VlcApplication::QuitRequested()
{
if( !fReadyToQuit )
{
vlc_object_kill( p_this->p_libvlc );
libvlc_Quit( p_this->p_libvlc );
return false;
}
......
......@@ -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 );
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment