libvlc_run_interface -> libvlc_add_intf (non-blocking)

diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h
index cd81feaa89679f3bdfbb373756fb1a53fc9a07cb..50377f758f82ce2614a414add4fd1e88d743ab2e 100644 (file)
--- 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 5d4bf63241d1bd9ac803abd0c5eb71017a4f6c02..d8232d11a4be258ecde0e853f52903b595d4cb5e 100644 (file)
--- 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 a7547d3459dfeb30eac9d8f130ab682a4ac16ddf..1e7743027dc1d706163a014036277f56ac1dfef1 100644 (file)
--- 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 c75c2f377ec7e66d9ae5b15da54060e980bdeac9..0cabc0287ea11f8ba2bc0f3312001b8f566f810d 100644 (file)
--- 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 810a67aade90809ec9a56048bb506c55352b3726..d15da3535f4bb977879d6f234a271288f6e82f80 100644 (file)
--- 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);
     }