From 19091cce427c769cc586270d85ea2b448e61d6cc Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Thu, 29 May 2008 22:49:31 +0300 Subject: [PATCH] libvlc_run_interface -> libvlc_add_intf (non-blocking) --- include/vlc/libvlc.h | 4 ++-- src/control/core.c | 6 +++--- src/libvlc.sym | 2 +- src/vlc.c | 3 ++- src/winvlc.c | 3 ++- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h index cd81feaa89..50377f758f 100644 --- a/include/vlc/libvlc.h +++ b/include/vlc/libvlc.h @@ -154,8 +154,8 @@ VLC_PUBLIC_API void libvlc_retain( libvlc_instance_t * ); * \param p_exception an initialized exception pointer */ VLC_PUBLIC_API -void libvlc_run_interface( libvlc_instance_t *p_instance, const char *name, - libvlc_exception_t *p_exception ); +void libvlc_add_intf( libvlc_instance_t *p_instance, const char *name, + libvlc_exception_t *p_exception ); /** * Waits until an interface causes the instance to exit. diff --git a/src/control/core.c b/src/control/core.c index 5d4bf63241..d8232d11a4 100644 --- a/src/control/core.c +++ b/src/control/core.c @@ -166,10 +166,10 @@ void libvlc_release( libvlc_instance_t *p_instance ) } } -void libvlc_run_interface( libvlc_instance_t *p_i, const char *name, - libvlc_exception_t *p_e ) +void libvlc_add_intf( libvlc_instance_t *p_i, const char *name, + libvlc_exception_t *p_e ) { - if( libvlc_InternalAddIntf( p_i->p_libvlc_int, name, true, true, 0, NULL ) ) + if( libvlc_InternalAddIntf( p_i->p_libvlc_int, name, false, true, 0, NULL ) ) RAISEVOID( "Interface initialization failed" ); } diff --git a/src/libvlc.sym b/src/libvlc.sym index a7547d3459..1e7743027d 100644 --- a/src/libvlc.sym +++ b/src/libvlc.sym @@ -1,3 +1,4 @@ +libvlc_add_intf libvlc_audio_get_channel libvlc_audio_get_mute libvlc_audio_get_track @@ -157,7 +158,6 @@ libvlc_playlist_stop libvlc_playlist_unlock libvlc_release libvlc_retain -libvlc_run_interface libvlc_set_fullscreen libvlc_set_log_verbosity libvlc_toggle_fullscreen diff --git a/src/vlc.c b/src/vlc.c index c75c2f377e..0cabc0287e 100644 --- a/src/vlc.c +++ b/src/vlc.c @@ -134,7 +134,8 @@ int main( int i_argc, const char *ppsz_argv[] ) if (vlc != NULL) { - libvlc_run_interface (vlc, NULL, &ex); + libvlc_add_intf (vlc, NULL, &ex); + libvlc_wait (vlc); libvlc_release (vlc); } i_ret = libvlc_exception_raised (&ex); diff --git a/src/winvlc.c b/src/winvlc.c index 810a67aade..d15da3535f 100644 --- a/src/winvlc.c +++ b/src/winvlc.c @@ -197,7 +197,8 @@ int WINAPI wWinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, libvlc_instance_t *vlc = libvlc_new (argc, (const char **)argv, &ex); if (vlc != NULL) { - libvlc_run_interface (vlc, NULL, &ex); + libvlc_add_intf (vlc, NULL, &ex); + libvlc_wait (vlc); libvlc_release (vlc); } -- 2.39.2