* 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.
*****************************************************************************/
/**
#endif
#include <assert.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
#include <vlc_common.h>
#include <vlc_modules.h>
#include <vlc_interface.h>
-
-#if defined( __APPLE__ ) || defined( WIN32 )
-#include "../control/libvlc_internal.h"
-#endif
#include "libvlc.h"
/*****************************************************************************
* 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;
- static const char psz_type[] = "interface";
/* Allocate structure */
- p_intf = vlc_custom_create( p_libvlc, sizeof( *p_intf ),
- VLC_OBJECT_GENERIC, psz_type );
+ 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 );
+#if !defined(WIN32) && defined(HAVE_ISATTY)
if( isatty( 0 ) )
+#endif
{
val.psz_string = (char *)"rc";
text.psz_string = (char *)_("Console");
/* 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;
}
- vlc_mutex_lock( &lock );
#if defined( __APPLE__ )
/* Hack to get Mac OS X Cocoa runtime running
* (it needs access to the main thread) */
MonitorLibVLCDeath, p_intf, VLC_THREAD_PRIORITY_LOW ) )
{
msg_Err( p_intf, "cannot spawn libvlc death monitoring thread" );
- vlc_mutex_unlock( &lock );
goto error;
}
assert( p_intf->pf_run );
RunInterface, p_intf, VLC_THREAD_PRIORITY_LOW ) )
{
msg_Err( p_intf, "cannot spawn interface thread" );
- vlc_mutex_unlock( &lock );
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 );
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;
}
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 );
}
#if defined( __APPLE__ )
-#include "control/libvlc_internal.h" /* libvlc_InternalWait */
+#include "../lib/libvlc_internal.h" /* libvlc_InternalWait */
/**
* MonitorLibVLCDeath: Used when b_should_run_on_first_thread is set.
*