* This library provides basic functions for threads to interact with user
* interface, such as command line.
*****************************************************************************
- * Copyright (C) 1998-2007 the VideoLAN team
+ * Copyright (C) 1998-2007 VLC authors and VideoLAN
* $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/**
# include "config.h"
#endif
-#include <vlc_common.h>
-
-#include <vlc_aout.h>
-#include <vlc_vout.h>
-
-#include "vlc_interface.h"
-#if defined( __APPLE__ ) || defined( WIN32 )
-#include "../control/libvlc_internal.h"
+#include <assert.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
#endif
+
+#include <vlc_common.h>
+#include <vlc_modules.h>
+#include <vlc_interface.h>
#include "libvlc.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static void* RunInterface( vlc_object_t *p_this );
-#if defined( __APPLE__ ) || defined( WIN32 )
+static void* RunInterface( void * );
+#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 * );
+static vlc_mutex_t lock = VLC_STATIC_MUTEX;
+
#undef intf_Create
/**
* Create and start an interface.
*
* @param p_this the calling vlc_object_t
- * @param psz_module a preferred interface module
+ * @param chain configuration chain string
* @return VLC_SUCCESS or an error code
*/
-int intf_Create( vlc_object_t *p_this, const char *psz_module )
+int intf_Create( vlc_object_t *p_this, const char *chain )
{
+ libvlc_int_t *p_libvlc = p_this->p_libvlc;
intf_thread_t * p_intf;
/* Allocate structure */
- p_intf = vlc_object_create( p_this, VLC_OBJECT_INTF );
+ p_intf = vlc_custom_create( p_libvlc, sizeof( *p_intf ), "interface" );
if( !p_intf )
return VLC_ENOMEM;
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 );
+#if !defined(WIN32) && defined(HAVE_ISATTY)
+ if( isatty( 0 ) )
+#endif
+ {
+ 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");
+ text.psz_string = (char *)_("Telnet");
var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
val.psz_string = (char *)"http";
- text.psz_string = (char *)_("Web Interface");
+ text.psz_string = (char *)_("Web");
var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text );
val.psz_string = (char *)"logger";
text.psz_string = (char *)_("Debug logging");
var_AddCallback( p_intf, "intf-add", AddIntfCallback, NULL );
- /* Attach interface to its parent object */
- vlc_object_attach( p_intf, p_this );
-#if defined( __APPLE__ ) || defined( WIN32 )
+ /* Attach interface to LibVLC */
+#if defined( __APPLE__ )
p_intf->b_should_run_on_first_thread = false;
#endif
/* Choose the best module */
p_intf->p_cfg = NULL;
- char *psz_parser = *psz_module == '$'
- ? var_CreateGetString(p_intf,psz_module+1)
- : strdup( psz_module );
- char *psz_tmp = config_ChainCreate( &p_intf->psz_intf, &p_intf->p_cfg,
+ char *psz_parser = *chain == '$'
+ ? var_CreateGetString(p_intf, chain+1)
+ : strdup( chain );
+ char *module;
+ char *psz_tmp = config_ChainCreate( &module, &p_intf->p_cfg,
psz_parser );
free( psz_tmp );
free( psz_parser );
- p_intf->p_module = module_need( p_intf, "interface", p_intf->psz_intf, true );
+ p_intf->p_module = module_need( p_intf, "interface", module, true );
+ free(module);
if( p_intf->p_module == NULL )
{
msg_Err( p_intf, "no suitable interface module" );
goto error;
}
- if( p_intf->pf_run == NULL )
- return VLC_SUCCESS;
-
-#if defined( __APPLE__ ) || defined( WIN32 )
+#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 )
{
- if( vlc_thread_create( p_intf, "interface", MonitorLibVLCDeath,
- VLC_THREAD_PRIORITY_LOW ) )
+ if( vlc_clone( &p_intf->thread,
+ MonitorLibVLCDeath, p_intf, VLC_THREAD_PRIORITY_LOW ) )
{
msg_Err( p_intf, "cannot spawn libvlc death monitoring thread" );
goto error;
}
+ assert( p_intf->pf_run );
p_intf->pf_run( p_intf );
/* It is monitoring libvlc, not the p_intf */
vlc_object_kill( p_intf->p_libvlc );
+
+ vlc_join( p_intf->thread, NULL );
}
else
#endif
/* Run the interface in a separate thread */
- if( vlc_thread_create( p_intf, "interface", RunInterface,
- VLC_THREAD_PRIORITY_LOW ) )
+ if( p_intf->pf_run
+ && vlc_clone( &p_intf->thread,
+ RunInterface, p_intf, VLC_THREAD_PRIORITY_LOW ) )
{
msg_Err( p_intf, "cannot spawn interface thread" );
goto error;
}
+ vlc_mutex_lock( &lock );
+ 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;
}
*/
void intf_DestroyAll( libvlc_int_t *p_libvlc )
{
- vlc_list_t *l = vlc_list_find( VLC_OBJECT(p_libvlc), VLC_OBJECT_INTF, FIND_CHILD );
+ intf_thread_t *p_first;
+
+ 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( int i = 0; i < l->i_count; i++ )
- vlc_object_kill( l->p_values[i].p_object );
+ 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( int i = 0; i < l->i_count; i++ )
+ for( intf_thread_t *p_intf = p_first; p_intf != NULL; )
{
- intf_thread_t *p_intf = (intf_thread_t *)l->p_values[i].p_object;
+ intf_thread_t *p_next = p_intf->p_next;
if( p_intf->pf_run )
- vlc_thread_join( p_intf );
+ {
+ vlc_cancel( p_intf->thread );
+ vlc_join( p_intf->thread, NULL );
+ }
module_unneed( p_intf, p_intf->p_module );
- free( p_intf->psz_intf );
config_ChainDestroy( p_intf->p_cfg );
- }
+ vlc_object_release( p_intf );
- /* Destroy objects */
- for( int i = 0; i < l->i_count; i++ )
- vlc_object_release( l->p_values[i].p_object ); /* for intf_Create() */
- vlc_list_release( l );
+ p_intf = p_next;
+ }
}
/* Following functions are local */
*
* @param p_this: interface object
*/
-static void* RunInterface( vlc_object_t *p_this )
+static void* RunInterface( void *p_this )
{
- intf_thread_t *p_intf = (intf_thread_t *)p_this;
+ intf_thread_t *p_intf = p_this;
p_intf->pf_run( p_intf );
return NULL;
}
-#if defined( __APPLE__ ) || defined( WIN32 )
-#include "control/libvlc_internal.h" /* libvlc_InternalWait */
+#if defined( __APPLE__ )
+#include "../lib/libvlc_internal.h" /* libvlc_InternalWait */
/**
* MonitorLibVLCDeath: Used when b_should_run_on_first_thread is set.
*
- * @param p_this: the interface object
+ * @param p_this: the interface object
*/
static void * MonitorLibVLCDeath( vlc_object_t * p_this )
{
projects / vlc / blobdiff