# include "config.h"
#endif
+#include <assert.h>
#include <vlc_common.h>
+#include <vlc_modules.h>
+#include <vlc_interface.h>
-#include <vlc_aout.h>
-#include <vlc_vout.h>
-
-#include "vlc_interface.h"
#if defined( __APPLE__ ) || defined( WIN32 )
#include "../control/libvlc_internal.h"
#endif
* Local prototypes
*****************************************************************************/
static void* RunInterface( vlc_object_t *p_this );
-#if defined( __APPLE__ ) || defined( WIN32 )
+#if defined( __APPLE__ )
static void * MonitorLibVLCDeath( vlc_object_t *p_this );
#endif
static int AddIntfCallback( vlc_object_t *, char const *,
vlc_value_t , vlc_value_t , void * );
-/**
- * Destroy the interface after the main loop endeed.
- *
- * @param p_obj: the interface thread
- */
-static void intf_Destroy( vlc_object_t *obj )
-{
- intf_thread_t *p_intf = (intf_thread_t *)obj;
-
- free( p_intf->psz_intf );
- config_ChainDestroy( p_intf->p_cfg );
-}
-
+static vlc_mutex_t lock = VLC_STATIC_MUTEX;
#undef intf_Create
/**
*/
int intf_Create( vlc_object_t *p_this, const char *psz_module )
{
+ libvlc_int_t *p_libvlc = p_this->p_libvlc;
intf_thread_t * p_intf;
+ static const char psz_type[] = "interface";
/* Allocate structure */
- p_intf = vlc_object_create( p_this, VLC_OBJECT_INTF );
+ p_intf = vlc_custom_create( p_libvlc, sizeof( *p_intf ),
+ VLC_OBJECT_GENERIC, psz_type );
if( !p_intf )
return VLC_ENOMEM;
- /* Attach interface to its parent object */
- vlc_object_attach( p_intf, p_this );
- vlc_object_set_destructor( p_intf, intf_Destroy );
-#if defined( __APPLE__ ) || defined( WIN32 )
+ /* Variable used for interface spawning */
+ vlc_value_t val, text;
+ var_Create( p_intf, "intf-add", VLC_VAR_STRING |
+ VLC_VAR_HASCHOICE | VLC_VAR_ISCOMMAND );
+ text.psz_string = _("Add Interface");
+ var_Change( p_intf, "intf-add", VLC_VAR_SETTEXT, &text, NULL );
+
+ val.psz_string = (char *)"rc";
+ text.psz_string = (char *)_("Console");
+ var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
+ val.psz_string = (char *)"telnet";
+ text.psz_string = (char *)_("Telnet Interface");
+ var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
+ val.psz_string = (char *)"http";
+ text.psz_string = (char *)_("Web Interface");
+ var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
+ val.psz_string = (char *)"logger";
+ text.psz_string = (char *)_("Debug logging");
+ var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
+ val.psz_string = (char *)"gestures";
+ text.psz_string = (char *)_("Mouse Gestures");
+ var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
+
+ var_AddCallback( p_intf, "intf-add", AddIntfCallback, NULL );
+
+ /* Attach interface to LibVLC */
+ vlc_object_attach( p_intf, p_libvlc );
+#if defined( __APPLE__ )
p_intf->b_should_run_on_first_thread = false;
#endif
if( p_intf->p_module == NULL )
{
msg_Err( p_intf, "no suitable interface module" );
- vlc_object_release( p_intf );
- return VLC_EGENERIC;
+ goto error;
}
-#if defined( __APPLE__ ) || defined( WIN32 )
+ vlc_mutex_lock( &lock );
+#if defined( __APPLE__ )
/* Hack to get Mac OS X Cocoa runtime running
* (it needs access to the main thread) */
if( p_intf->b_should_run_on_first_thread )
VLC_THREAD_PRIORITY_LOW ) )
{
msg_Err( p_intf, "cannot spawn libvlc death monitoring thread" );
- vlc_object_release( p_intf );
- return VLC_ENOMEM;
+ vlc_mutex_unlock( &lock );
+ goto error;
}
- RunInterface( VLC_OBJECT(p_intf) );
+ assert( p_intf->pf_run );
+ p_intf->pf_run( p_intf );
- /* Make sure our MonitorLibVLCDeath thread exit */
- vlc_object_kill( p_intf );
/* It is monitoring libvlc, not the p_intf */
vlc_object_kill( p_intf->p_libvlc );
- vlc_thread_join( p_intf );
-
- vlc_object_detach( p_intf );
- vlc_object_release( p_intf );
- return VLC_SUCCESS;
}
+ else
#endif
/* Run the interface in a separate thread */
- if( vlc_thread_create( p_intf, "interface", RunInterface,
+ if( p_intf->pf_run
+ && vlc_thread_create( p_intf, "interface", RunInterface,
VLC_THREAD_PRIORITY_LOW ) )
{
msg_Err( p_intf, "cannot spawn interface thread" );
- vlc_object_release( p_intf );
- return VLC_EGENERIC;
+ vlc_mutex_unlock( &lock );
+ goto error;
}
+ p_intf->p_next = libvlc_priv( p_libvlc )->p_intf;
+ libvlc_priv( p_libvlc )->p_intf = p_intf;
+ vlc_mutex_unlock( &lock );
+
return VLC_SUCCESS;
+
+error:
+ if( p_intf->p_module )
+ module_unneed( p_intf, p_intf->p_module );
+ config_ChainDestroy( p_intf->p_cfg );
+ free( p_intf->psz_intf );
+ vlc_object_release( p_intf );
+ return VLC_EGENERIC;
}
/**
- * Stops the interface thread
- *
- * This function asks the interface thread to stop
- * @param p_intf the interface thread
+ * Stops and destroys all interfaces
+ * @param p_libvlc the LibVLC instance
*/
-void intf_StopThread( intf_thread_t *p_intf )
+void intf_DestroyAll( libvlc_int_t *p_libvlc )
{
- /* Tell the interface to die */
- vlc_object_kill( p_intf );
- vlc_thread_join( p_intf );
+ intf_thread_t *p_first;
- module_unneed( p_intf, p_intf->p_module );
-}
+ vlc_mutex_lock( &lock );
+ p_first = libvlc_priv( p_libvlc )->p_intf;
+#ifndef NDEBUG
+ libvlc_priv( p_libvlc )->p_intf = NULL;
+#endif
+ vlc_mutex_unlock( &lock );
+
+ /* Tell the interfaces to die */
+ for( intf_thread_t *p_intf = p_first; p_intf; p_intf = p_intf->p_next )
+ vlc_object_kill( p_intf );
+
+ /* Cleanup the interfaces */
+ for( intf_thread_t *p_intf = p_first; p_intf != NULL; )
+ {
+ intf_thread_t *p_next = p_intf->p_next;
+ if( p_intf->pf_run )
+ vlc_thread_join( p_intf );
+ module_unneed( p_intf, p_intf->p_module );
+ free( p_intf->psz_intf );
+ config_ChainDestroy( p_intf->p_cfg );
+ vlc_object_release( p_intf );
+ p_intf = p_next;
+ }
+}
/* Following functions are local */
static void* RunInterface( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
- vlc_value_t val, text;
- int canc = vlc_savecancel ();
-
- /* Variable used for interface spawning */
- var_Create( p_intf, "intf-add", VLC_VAR_STRING |
- VLC_VAR_HASCHOICE | VLC_VAR_ISCOMMAND );
- text.psz_string = _("Add Interface");
- var_Change( p_intf, "intf-add", VLC_VAR_SETTEXT, &text, NULL );
-
- val.psz_string = (char *)"rc";
- text.psz_string = (char *)_("Console");
- var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
- val.psz_string = (char *)"telnet";
- text.psz_string = (char *)_("Telnet Interface");
- var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
- val.psz_string = (char *)"http";
- text.psz_string = (char *)_("Web Interface");
- var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
- val.psz_string = (char *)"logger";
- text.psz_string = (char *)_("Debug logging");
- var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
- val.psz_string = (char *)"gestures";
- text.psz_string = (char *)_("Mouse Gestures");
- var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
-
- var_AddCallback( p_intf, "intf-add", AddIntfCallback, NULL );
- vlc_restorecancel (canc);
-
- /* Give control to the interface */
- if( p_intf->pf_run )
- p_intf->pf_run( p_intf );
+ p_intf->pf_run( p_intf );
return NULL;
}
-#if defined( __APPLE__ ) || defined( WIN32 )
+#if defined( __APPLE__ )
#include "control/libvlc_internal.h" /* libvlc_InternalWait */
/**
* MonitorLibVLCDeath: Used when b_should_run_on_first_thread is set.
if( asprintf( &psz_intf, "%s,none", newval.psz_string ) == -1 )
return VLC_ENOMEM;
- int ret = intf_Create( p_this->p_libvlc, psz_intf );
+ int ret = intf_Create( VLC_OBJECT(p_this->p_libvlc), psz_intf );
free( psz_intf );
if( ret )
msg_Err( p_this, "interface \"%s\" initialization failed",