* libvlc.c: main libvlc source
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
- * $Id: libvlc.c,v 1.64 2003/02/14 18:22:23 sam Exp $
+ * $Id: libvlc.c,v 1.93 2003/07/19 14:22:08 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
-#elif defined( _MSC_VER ) && defined( _WIN32 ) && !defined( UNDER_CE )
+#elif defined( WIN32 ) && !defined( UNDER_CE )
# include <io.h>
#endif
#include "vlc_cpu.h" /* CPU detection */
#include "os_specific.h"
-#include "error.h"
-#include "netutils.h" /* network_ChannelJoin */
+#include "vlc_error.h"
#include "stream_control.h"
#include "input_ext-intf.h"
#include "vlc_playlist.h"
-#include "interface.h"
+#include "vlc_interface.h"
#include "audio_output.h"
-#include "video.h"
+#include "vlc_video.h"
#include "video_output.h"
#include "libvlc.h"
/*****************************************************************************
* The evil global variable. We handle it with care, don't worry.
*****************************************************************************/
-static libvlc_t libvlc;
-static vlc_t * p_static_vlc;
+static libvlc_t libvlc;
+static libvlc_t * p_libvlc;
+static vlc_t * p_static_vlc;
/*****************************************************************************
* Local prototypes
vlc_t * p_vlc = NULL;
vlc_value_t lockval;
+ /* &libvlc never changes, so we can safely call this multiple times. */
+ p_libvlc = &libvlc;
+
/* vlc_threads_init *must* be the first internal call! No other call is
* allowed before the thread system has been initialized. */
- i_ret = vlc_threads_init( &libvlc );
+ i_ret = vlc_threads_init( p_libvlc );
if( i_ret < 0 )
{
return i_ret;
/* Now that the thread system is initialized, we don't have much, but
* at least we have var_Create */
- var_Create( &libvlc, "libvlc", VLC_VAR_MUTEX );
- var_Get( &libvlc, "libvlc", &lockval );
+ var_Create( p_libvlc, "libvlc", VLC_VAR_MUTEX );
+ var_Get( p_libvlc, "libvlc", &lockval );
vlc_mutex_lock( lockval.p_address );
if( !libvlc.b_ready )
{
psz_env = getenv( "VLC_VERBOSE" );
libvlc.i_verbose = psz_env ? atoi( psz_env ) : -1;
-#ifdef HAVE_ISATTY
+#if defined( HAVE_ISATTY ) && !defined( WIN32 )
libvlc.b_color = isatty( 2 ); /* 2 is for stderr */
#else
libvlc.b_color = VLC_FALSE;
#endif
/* Initialize message queue */
- msg_Create( &libvlc );
+ msg_Create( p_libvlc );
/* Announce who we are */
- msg_Dbg( &libvlc, COPYRIGHT_MESSAGE );
- msg_Dbg( &libvlc, "libvlc was configured with %s", CONFIGURE_LINE );
+ msg_Dbg( p_libvlc, COPYRIGHT_MESSAGE );
+ msg_Dbg( p_libvlc, "libvlc was configured with %s", CONFIGURE_LINE );
/* The module bank will be initialized later */
libvlc.p_module_bank = NULL;
libvlc.b_ready = VLC_TRUE;
}
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( &libvlc, "libvlc" );
+ var_Destroy( p_libvlc, "libvlc" );
/* Allocate a vlc object */
- p_vlc = vlc_object_create( &libvlc, VLC_OBJECT_VLC );
+ p_vlc = vlc_object_create( p_libvlc, VLC_OBJECT_VLC );
if( p_vlc == NULL )
{
return VLC_EGENERIC;
}
+ vlc_thread_set_priority( p_vlc, VLC_THREAD_PRIORITY_LOW );
p_vlc->psz_object_name = "root";
/* Initialize mutexes */
vlc_mutex_init( p_vlc, &p_vlc->config_lock );
+#ifdef SYS_DARWIN
+ vlc_mutex_init( p_vlc, &p_vlc->quicktime_lock );
+#endif
/* Store our newly allocated structure in the global list */
- vlc_object_attach( p_vlc, &libvlc );
+ vlc_object_attach( p_vlc, p_libvlc );
/* Store data for the non-reentrant API */
p_static_vlc = p_vlc;
char * p_tmp;
char * psz_modules;
char * psz_parser;
+ char * psz_language;
vlc_bool_t b_exit = VLC_FALSE;
vlc_t * p_vlc;
module_t *p_help_module;
playlist_t *p_playlist;
vlc_value_t lockval;
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+ p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
if( !p_vlc )
{
* main module. We need to do this at this stage to be able to display
* a short help if required by the user. (short help == main module
* options) */
- var_Create( &libvlc, "libvlc", VLC_VAR_MUTEX );
- var_Get( &libvlc, "libvlc", &lockval );
+ var_Create( p_libvlc, "libvlc", VLC_VAR_MUTEX );
+ var_Get( p_libvlc, "libvlc", &lockval );
vlc_mutex_lock( lockval.p_address );
if( libvlc.p_module_bank == NULL )
{
- module_InitBank( &libvlc );
- module_LoadMain( &libvlc );
+ module_InitBank( p_libvlc );
+ module_LoadMain( p_libvlc );
}
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( &libvlc, "libvlc" );
+ var_Destroy( p_libvlc, "libvlc" );
/* Hack: insert the help module here */
p_help_module = vlc_object_create( p_vlc, VLC_OBJECT_MODULE );
if( p_help_module == NULL )
{
- //module_EndBank( p_vlc );
+ /*module_EndBank( p_vlc );*/
if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
vlc_object_detach( p_help_module );
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
- //module_EndBank( p_vlc );
+ /*module_EndBank( p_vlc );*/
if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
{
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
- //module_EndBank( p_vlc );
+ /*module_EndBank( p_vlc );*/
if( i_object ) vlc_object_release( p_vlc );
return VLC_EEXIT;
}
+ /* Check for translation config option */
+#if defined( ENABLE_NLS ) \
+ && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
+
+ /* This ain't really nice to have to reload the config here but it seems
+ * the only way to do it. */
+ p_vlc->psz_homedir = config_GetHomeDir();
+ config_LoadConfigFile( p_vlc, "main" );
+ config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_TRUE );
+
+ /* Check if the user specified a custom language */
+ psz_language = config_GetPsz( p_vlc, "language" );
+ if( psz_language && *psz_language && strcmp( psz_language, "auto" ) )
+ {
+ /* Reset the default domain */
+ SetLanguage( psz_language );
+
+ /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */
+ msg_Dbg( p_vlc, "translation test: code is \"%s\"", _("C") );
+
+ textdomain( PACKAGE );
+
+#if defined( SYS_BEOS ) || defined ( SYS_DARWIN ) || \
+ ( defined( WIN32 ) && !defined( HAVE_INCLUDED_GETTEXT ) )
+ /* BeOS only support UTF8 strings */
+ /* Mac OS X prefers UTF8 */
+ bind_textdomain_codeset( PACKAGE, "UTF-8" );
+#endif
+
+ module_EndBank( p_vlc );
+ module_InitBank( p_libvlc );
+ module_LoadMain( p_libvlc );
+ config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_TRUE );
+ }
+ if( psz_language ) free( psz_language );
+#endif
+
/*
* Load the builtins and plugins into the module_bank.
* We have to do it before config_Load*() because this also gets the
* list of configuration options exported by each module and loads their
* default values.
*/
- module_LoadBuiltins( &libvlc );
- module_LoadPlugins( &libvlc );
+ module_LoadBuiltins( p_libvlc );
+ module_LoadPlugins( p_libvlc );
msg_Dbg( p_vlc, "module bank initialized, found %i modules",
libvlc.p_module_bank->i_children );
if( b_exit )
{
- //module_EndBank( p_vlc );
+ /*module_EndBank( p_vlc );*/
if( i_object ) vlc_object_release( p_vlc );
return VLC_EEXIT;
}
"that they are valid.\nPress the RETURN key to continue..." );
getchar();
#endif
- //module_EndBank( p_vlc );
+ /*module_EndBank( p_vlc );*/
if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
libvlc.i_verbose = __MIN( i_tmp, 2 );
}
}
- libvlc.b_color = libvlc.b_color || config_GetInt( p_vlc, "color" );
+ libvlc.b_color = libvlc.b_color && config_GetInt( p_vlc, "color" );
/*
* Output messages that may still be in the queue
p_vlc->pf_memset = memset;
}
- /*
- * Initialize shared resources and libraries
- */
- if( config_GetInt( p_vlc, "network-channel" )
- && network_ChannelCreate( p_vlc ) )
- {
- /* On error during Channels initialization, switch off channels */
- msg_Warn( p_vlc,
- "channels initialization failed, deactivating channels" );
- config_PutInt( p_vlc, "network-channel", VLC_FALSE );
- }
-
/*
* Initialize playlist and get commandline files
*/
{
module_Unneed( p_vlc, p_vlc->p_memcpy_module );
}
- //module_EndBank( p_vlc );
+ /*module_EndBank( p_vlc );*/
if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
psz_parser = psz_modules;
while ( psz_parser && *psz_parser )
{
- char *psz_module;
+ char *psz_module, *psz_temp;
psz_module = psz_parser;
psz_parser = strchr( psz_module, ',' );
if ( psz_parser )
*psz_parser = '\0';
psz_parser++;
}
- VLC_AddIntf( 0, psz_module, VLC_FALSE );
+ psz_temp = (char *)malloc( strlen(psz_module) + sizeof(",none") );
+ if( psz_temp )
+ {
+ sprintf( psz_temp, "%s,none", psz_module );
+ VLC_AddIntf( 0, psz_temp, VLC_FALSE );
+ free( psz_temp );
+ }
}
if ( psz_modules )
{
intf_thread_t *p_intf;
vlc_t *p_vlc;
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+ p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
if( !p_vlc )
{
if( p_intf == NULL )
{
- msg_Err( p_vlc, "interface initialization failed" );
+ msg_Err( p_vlc, "interface \"%s\" initialization failed", psz_module );
if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
{
vlc_t *p_vlc;
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+ p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
if( !p_vlc )
{
return VLC_ENOOBJ;
}
- /*
- * Go back into channel 0 which is the network
- */
- if( config_GetInt( p_vlc, "network-channel" ) && p_vlc->p_channel )
- {
- network_ChannelJoin( p_vlc, COMMON_CHANNEL );
- }
-
/*
* Free allocated memory
*/
/*
* XXX: Free module bank !
*/
- //module_EndBank( p_vlc );
+ /*module_EndBank( p_vlc );*/
/*
* System specific cleaning code
/* Destroy mutexes */
vlc_mutex_destroy( &p_vlc->config_lock );
+#ifdef SYS_DARWIN
+ vlc_mutex_destroy( &p_vlc->quicktime_lock );
+#endif
vlc_object_detach( p_vlc );
vlc_object_destroy( p_vlc );
/* Stop thread system: last one out please shut the door! */
- vlc_threads_end( &libvlc );
+ vlc_threads_end( p_libvlc );
return VLC_SUCCESS;
}
{
vlc_t *p_vlc;
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+ p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
if( !p_vlc )
{
playlist_t *p_playlist;
vlc_t *p_vlc;
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+ p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
if( !p_vlc )
{
vlc_t *p_vlc;
int i_ret;
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+ p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
if( !p_vlc )
{
vlc_t *p_vlc;
int i_ret;
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+ p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
if( !p_vlc )
{
playlist_t * p_playlist;
vlc_t *p_vlc;
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+ p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
/* Check that the handle is valid */
if( !p_vlc )
return VLC_ENOOBJ;
}
- vlc_thread_set_priority( p_vlc, VLC_THREAD_PRIORITY_LOW );
-
p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
if( !p_playlist )
aout_instance_t * p_aout;
vlc_t *p_vlc;
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+ p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
/* Check that the handle is valid */
if( !p_vlc )
input_thread_t *p_input;
vlc_t *p_vlc;
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+ p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
if( !p_vlc )
{
vout_thread_t *p_vout;
vlc_t *p_vlc;
- p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
+ p_vlc = i_object ? vlc_object_get( p_libvlc, i_object ) : p_static_vlc;
if( !p_vlc )
{
&& ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
char * psz_path;
-#ifdef SYS_DARWIN
+#if defined( SYS_DARWIN ) || defined ( WIN32 ) || defined( SYS_BEOS )
char psz_tmp[1024];
#endif
-# if defined( HAVE_INCLUDED_GETTEXT ) && !defined( HAVE_LC_MESSAGES )
- if( *psz_lang )
+ if( psz_lang && !*psz_lang )
{
+# if defined( HAVE_LC_MESSAGES )
+ setlocale( LC_MESSAGES, psz_lang );
+# endif
+ setlocale( LC_CTYPE, psz_lang );
+ }
+ else if( psz_lang )
+ {
+#ifdef SYS_DARWIN
+ /* I need that under Darwin, please check it doesn't disturb
+ * other platforms. --Meuuh */
+ setenv( "LANG", psz_lang, 1 );
+
+#elif defined( SYS_BEOS ) || defined( WIN32 )
/* We set LC_ALL manually because it is the only way to set
* the language at runtime under eg. Windows. Beware that this
* makes the environment unconsistent when libvlc is unloaded and
snprintf( psz_lcall, 19, "LC_ALL=%s", psz_lang );
psz_lcall[19] = '\0';
putenv( psz_lcall );
- }
-# endif
+#endif
-# if defined( HAVE_LC_MESSAGES )
- setlocale( LC_MESSAGES, psz_lang );
-# endif
- setlocale( LC_CTYPE, psz_lang );
+ setlocale( LC_ALL, psz_lang );
+ }
/* Specify where to find the locales for current domain */
-#ifndef SYS_DARWIN
+#if !defined( SYS_DARWIN ) && !defined( WIN32 ) && !defined( SYS_BEOS )
psz_path = LOCALEDIR;
#else
snprintf( psz_tmp, sizeof(psz_tmp), "%s/%s", libvlc.psz_vlcpath,
/* Set the default domain */
textdomain( PACKAGE );
+
+#if defined( SYS_BEOS ) || defined ( SYS_DARWIN ) || \
+ ( defined( WIN32 ) && !defined( HAVE_INCLUDED_GETTEXT ) )
+ /* BeOS only support UTF8 strings */
+ /* Mac OS X prefers UTF8 */
+ bind_textdomain_codeset( PACKAGE, "UTF-8" );
+#endif
+
#endif
}
char *psz_bra = NULL, *psz_type = NULL, *psz_ket = NULL;
char *psz_suf = "", *psz_prefix = NULL;
int i;
-
+ if ( p_item->b_advanced && !config_GetInt( p_this, "advanced" ))
+ {
+ continue;
+ }
switch( p_item->i_type )
{
case CONFIG_HINT_CATEGORY:
*****************************************************************************/
static int ConsoleWidth( void )
{
+ int i_width = 80;
+
+#ifndef WIN32
char buf[20], *psz_parser;
FILE *file;
- int i_ret, i_width = 80;
+ int i_ret;
file = popen( "stty size 2>/dev/null", "r" );
if( file )
pclose( file );
}
+#endif
return i_width;
}
-