* libvlc.c: main libvlc source
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
- * $Id: libvlc.c,v 1.58 2003/01/22 22:19:29 sigmunau Exp $
+ * $Id: libvlc.c,v 1.72 2003/03/29 12:22:15 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
#ifdef WIN32
static void ShowConsole ( void );
#endif
+static int ConsoleWidth ( void );
/*****************************************************************************
* VLC_Version: return the libvlc version.
msg_Dbg( &libvlc, COPYRIGHT_MESSAGE );
msg_Dbg( &libvlc, "libvlc was configured with %s", CONFIGURE_LINE );
- /* Initialize the module bank and load the configuration of the
- * 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) */
- module_InitBank( &libvlc );
- module_LoadMain( &libvlc );
+ /* The module bank will be initialized later */
+ libvlc.p_module_bank = NULL;
libvlc.b_ready = VLC_TRUE;
}
{
return VLC_EGENERIC;
}
+ vlc_thread_set_priority( p_vlc, VLC_THREAD_PRIORITY_LOW );
p_vlc->psz_object_name = "root";
char * p_tmp;
char * psz_modules;
char * psz_parser;
- vlc_bool_t b_exit;
+ 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;
/* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */
msg_Dbg( p_vlc, "translation test: code is \"%s\"", _("C") );
+ /* Initialize the module bank and load the configuration of the
+ * 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 );
+ vlc_mutex_lock( lockval.p_address );
+ if( libvlc.p_module_bank == NULL )
+ {
+ module_InitBank( &libvlc );
+ module_LoadMain( &libvlc );
+ }
+ vlc_mutex_unlock( lockval.p_address );
+ var_Destroy( &libvlc, "libvlc" );
+
/* Hack: insert the help module here */
p_help_module = vlc_object_create( p_vlc, VLC_OBJECT_MODULE );
if( p_help_module == NULL )
return VLC_EGENERIC;
}
- b_exit = VLC_FALSE;
-
/* Check for short help option */
if( config_GetInt( p_vlc, "help" ) )
{
return VLC_EEXIT;
}
+ /* Check for translation config option */
+ if( !config_GetInt( p_vlc, "translation" ) )
+ {
+ /* Reset the default domain */
+ SetLanguage( "C" );
+
+#if defined( ENABLE_NLS ) \
+ && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
+ textdomain( "dummy" );
+#endif
+ }
+
/*
* Load the builtins and plugins into the module_bank.
* We have to do it before config_Load*() because this also gets the
*/
msg_Flush( p_vlc );
- /* p_vlc inititalization. FIXME ? */
+ /* p_vlc initialization. FIXME ? */
p_vlc->i_desync = config_GetInt( p_vlc, "desync" ) * (mtime_t)1000;
#if defined( __i386__ )
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 )
{
free( psz_modules );
}
-
+
+ /*
+ * FIXME: kludge to use a p_vlc-local variable for the Mozilla plugin
+ */
+ var_Create( p_vlc, "drawable", VLC_VAR_INTEGER );
+
/*
* Get input filenames given as commandline arguments
*/
int i_err;
intf_thread_t *p_intf;
vlc_t *p_vlc;
- char *psz_oldmodule = NULL;
p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
return VLC_ENOOBJ;
}
- if( psz_module )
- {
- psz_oldmodule = config_GetPsz( p_vlc, "intf" );
- config_PutPsz( p_vlc, "intf", psz_module );
- }
-
/* Try to create the interface */
- p_intf = intf_Create( p_vlc );
-
- if( psz_module )
- {
- config_PutPsz( p_vlc, "intf", psz_oldmodule );
- if( psz_oldmodule )
- {
- free( psz_oldmodule );
- }
- }
+ p_intf = intf_Create( p_vlc, psz_module ? psz_module : "$intf" );
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;
}
{
network_ChannelJoin( p_vlc, COMMON_CHANNEL );
}
-
+
/*
* Free allocated memory
*/
* XXX: Free module bank !
*/
//module_EndBank( p_vlc );
-
+
/*
* System specific cleaning code
*/
system_End( p_vlc );
-
+
/* Destroy mutexes */
vlc_mutex_destroy( &p_vlc->config_lock );
vlc_object_detach( p_vlc );
+ /* Release object before destroying it */
+ if( i_object ) vlc_object_release( p_vlc );
+
vlc_object_destroy( p_vlc );
/* Stop thread system: last one out please shut the door! */
vlc_threads_end( &libvlc );
- if( i_object ) vlc_object_release( p_vlc );
return VLC_SUCCESS;
}
{
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 );
&& ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
char * psz_path;
-#ifdef SYS_DARWIN
+#if defined( SYS_DARWIN ) || defined ( WIN32 )
char psz_tmp[1024];
#endif
}
# endif
+ if( psz_lang && !*psz_lang )
+ {
# if defined( HAVE_LC_MESSAGES )
- setlocale( LC_MESSAGES, psz_lang );
+ setlocale( LC_MESSAGES, psz_lang );
# endif
- setlocale( LC_CTYPE, psz_lang );
+ setlocale( LC_CTYPE, psz_lang );
+ }
+ else
+ {
+ setlocale( LC_ALL, psz_lang );
+ }
/* Specify where to find the locales for current domain */
-#ifndef SYS_DARWIN
+#if !defined( SYS_DARWIN ) && !defined( WIN32 )
psz_path = LOCALEDIR;
#else
snprintf( psz_tmp, sizeof(psz_tmp), "%s/%s", libvlc.psz_vlcpath,
*****************************************************************************/
static void Usage( vlc_t *p_this, char const *psz_module_name )
{
-#define FORMAT_STRING " --%s%s%s%s%s%s%s %s%s\n"
- /* option name -------------' | | | | | |
- * <bra --------------------------' | | | | |
- * option type or "" ---------------' | | | |
- * ket> ------------------------------' | | |
- * padding spaces ----------------------' | |
- * comment --------------------------------' |
- * comment suffix ---------------------------'
+#define FORMAT_STRING " %s --%s%s%s%s%s%s%s "
+ /* short option ------' | | | | | | |
+ * option name ------------' | | | | | |
+ * <bra -------------------------' | | | | |
+ * option type or "" --------------' | | | |
+ * ket> -----------------------------' | | |
+ * padding spaces ---------------------' | |
+ * comment -------------------------------' |
+ * comment suffix --------------------------'
*
* The purpose of having bra and ket is that we might i18n them as well.
*/
#define LINE_START 8
#define PADDING_SPACES 25
- vlc_list_t list;
+ vlc_list_t *p_list;
module_t *p_parser;
module_config_t *p_item;
char psz_spaces[PADDING_SPACES+LINE_START+1];
char psz_format[sizeof(FORMAT_STRING)];
+ char psz_buffer[1000];
+ char psz_short[4];
int i_index;
+ int i_width = ConsoleWidth() - (PADDING_SPACES+LINE_START+1);
memset( psz_spaces, ' ', PADDING_SPACES+LINE_START );
psz_spaces[PADDING_SPACES+LINE_START] = '\0';
#endif
/* List all modules */
- list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+ p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
/* Enumerate the config for each module */
- for( i_index = 0; i_index < list.i_count; i_index++ )
+ for( i_index = 0; i_index < p_list->i_count; i_index++ )
{
vlc_bool_t b_help_module;
- p_parser = (module_t *)list.p_values[i_index].p_object ;
+ p_parser = (module_t *)p_list->p_values[i_index].p_object ;
if( psz_module_name && strcmp( psz_module_name,
p_parser->psz_object_name ) )
p_item->i_type != CONFIG_HINT_END;
p_item++ )
{
+ char *psz_text;
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:
}
else
{
- psz_bra = " [";
- psz_type = malloc( 1000 );
- memset( psz_type, 0, 1000 );
- for( i=0; p_item->ppsz_list[i]; i++ )
+ psz_bra = " {";
+ psz_type = psz_buffer;
+ psz_type[0] = '\0';
+ for( i = 0; p_item->ppsz_list[i]; i++ )
{
+ if( i ) strcat( psz_type, "," );
strcat( psz_type, p_item->ppsz_list[i] );
- strcat( psz_type, "|" );
}
- psz_type[ strlen( psz_type ) - 1 ] = '\0';
- psz_ket = "]";
+ psz_ket = "}";
break;
}
case CONFIG_ITEM_INTEGER:
break;
}
+ if( !psz_type )
+ {
+ continue;
+ }
+
/* Add short option if any */
if( p_item->i_short )
{
- psz_format[2] = '-';
- psz_format[3] = p_item->i_short;
- psz_format[4] = ',';
+ sprintf( psz_short, "-%c,", p_item->i_short );
+ }
+ else
+ {
+ strcpy( psz_short, " " );
+ }
+
+ i = PADDING_SPACES - strlen( p_item->psz_name )
+ - strlen( psz_bra ) - strlen( psz_type )
+ - strlen( psz_ket ) - 1;
+
+ if( p_item->i_type == CONFIG_ITEM_BOOL && !b_help_module )
+ {
+ /* If option is of type --foo-bar, we print its counterpart
+ * as --no-foo-bar, but if it is of type --foobar (without
+ * dashes in the name) we print it as --nofoobar. Both
+ * values are of course valid, only the display changes. */
+ psz_prefix = strchr( p_item->psz_name, '-' ) ? ", --no-"
+ : ", --no";
+ i -= strlen( p_item->psz_name ) + strlen( psz_prefix );
+ }
+
+ if( i < 0 )
+ {
+ psz_spaces[0] = '\n';
+ i = 0;
}
else
{
- psz_format[2] = ' ';
- psz_format[3] = ' ';
- psz_format[4] = ' ';
+ psz_spaces[i] = '\0';
}
- if( psz_type )
+ if( p_item->i_type == CONFIG_ITEM_BOOL && !b_help_module )
{
- i = PADDING_SPACES - strlen( p_item->psz_name )
- - strlen( psz_bra ) - strlen( psz_type )
- - strlen( psz_ket ) - 1;
- if( p_item->i_type == CONFIG_ITEM_BOOL
- && !b_help_module )
- {
- /* If option is of type --foo-bar, we print its counterpart
- * as --no-foo-bar, but if it is of type --foobar (without
- * dashes in the name) we print it as --nofoobar. Both
- * values are of course valid, only the display changes. */
- vlc_bool_t b_dash = VLC_FALSE;
- psz_prefix = p_item->psz_name;
- while( *psz_prefix )
- {
- if( *psz_prefix++ == '-' )
- {
- b_dash = VLC_TRUE;
- break;
- }
- }
+ fprintf( stdout, psz_format, psz_short, p_item->psz_name,
+ psz_prefix, p_item->psz_name, psz_bra, psz_type,
+ psz_ket, psz_spaces );
+ }
+ else
+ {
+ fprintf( stdout, psz_format, psz_short, p_item->psz_name,
+ "", "", psz_bra, psz_type, psz_ket, psz_spaces );
+ }
- if( b_dash )
- {
- psz_prefix = ", --no-";
- i -= strlen( p_item->psz_name ) + strlen( ", --no-" );
- }
- else
- {
- psz_prefix = ", --no";
- i -= strlen( p_item->psz_name ) + strlen( ", --no" );
- }
- }
+ psz_spaces[i] = ' ';
- if( i < 0 )
- {
- i = 0;
- psz_spaces[i] = '\n';
- }
- else
+ /* We wrap the rest of the output */
+ sprintf( psz_buffer, "%s%s", p_item->psz_text, psz_suf );
+ psz_text = psz_buffer;
+ while( *psz_text )
+ {
+ char *psz_parser, *psz_word;
+ int i_end = strlen( psz_text );
+
+ /* If the remaining text fits in a line, print it. */
+ if( i_end <= i_width )
{
- psz_spaces[i] = '\0';
+ fprintf( stdout, "%s\n", psz_text );
+ break;
}
- if( p_item->i_type == CONFIG_ITEM_BOOL &&
- !b_help_module )
+ /* Otherwise, eat as many words as possible */
+ psz_parser = psz_text;
+ do
{
- fprintf( stdout, psz_format, p_item->psz_name, psz_prefix,
- p_item->psz_name, psz_bra, psz_type, psz_ket,
- psz_spaces, p_item->psz_text, psz_suf );
- }
- else
+ psz_word = psz_parser;
+ psz_parser = strchr( psz_word, ' ' );
+ /* If no space was found, we reached the end of the text
+ * block; otherwise, we skip the space we just found. */
+ psz_parser = psz_parser ? psz_parser + 1
+ : psz_text + i_end;
+
+ } while( psz_parser - psz_text <= i_width );
+
+ /* We cut a word in one of these cases:
+ * - it's the only word in the line and it's too long.
+ * - we used less than 80% of the width and the word we are
+ * going to wrap is longer than 40% of the width, and even
+ * if the word would have fit in the next line. */
+ if( psz_word == psz_text
+ || ( psz_word - psz_text < 80 * i_width / 100
+ && psz_parser - psz_word > 40 * i_width / 100 ) )
{
- fprintf( stdout, psz_format, p_item->psz_name, "", "",
- psz_bra, psz_type, psz_ket, psz_spaces,
- p_item->psz_text, psz_suf );
+ char c = psz_text[i_width];
+ psz_text[i_width] = '\0';
+ fprintf( stdout, "%s\n%s", psz_text, psz_spaces );
+ psz_text += i_width;
+ psz_text[0] = c;
}
- psz_spaces[i] = ' ';
- if ( p_item->ppsz_list )
+ else
{
- free( psz_type );
+ psz_word[-1] = '\0';
+ fprintf( stdout, "%s\n%s", psz_text, psz_spaces );
+ psz_text = psz_word;
}
}
}
}
/* Release the module list */
- vlc_list_release( &list );
+ vlc_list_release( p_list );
#ifdef WIN32 /* Pause the console because it's destroyed when we exit */
- fprintf( stdout, _("\nPress the RETURN key to continue...\n") );
- getchar();
+ fprintf( stdout, _("\nPress the RETURN key to continue...\n") );
+ getchar();
#endif
}
*****************************************************************************/
static void ListModules( vlc_t *p_this )
{
- vlc_list_t list;
+ vlc_list_t *p_list;
module_t *p_parser;
char psz_spaces[22];
int i_index;
fprintf( stdout, _("[module] [description]\n") );
/* List all modules */
- list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+ p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
/* Enumerate each module */
- for( i_index = 0; i_index < list.i_count; i_index++ )
+ for( i_index = 0; i_index < p_list->i_count; i_index++ )
{
int i;
- p_parser = (module_t *)list.p_values[i_index].p_object ;
+ p_parser = (module_t *)p_list->p_values[i_index].p_object ;
/* Nasty hack, but right now I'm too tired to think about a nice
* solution */
psz_spaces[i] = ' ';
}
- vlc_list_release( &list );
+ vlc_list_release( p_list );
#ifdef WIN32 /* Pause the console because it's destroyed when we exit */
fprintf( stdout, _("\nPress the RETURN key to continue...\n") );
return;
}
#endif
+
+/*****************************************************************************
+ * ConsoleWidth: Return the console width in characters
+ *****************************************************************************
+ * We use the stty shell command to get the console width; if this fails or
+ * if the width is less than 80, we default to 80.
+ *****************************************************************************/
+static int ConsoleWidth( void )
+{
+ int i_width = 80;
+
+#ifndef WIN32
+ char buf[20], *psz_parser;
+ FILE *file;
+ int i_ret;
+
+ file = popen( "stty size 2>/dev/null", "r" );
+ if( file )
+ {
+ i_ret = fread( buf, 1, 20, file );
+ if( i_ret > 0 )
+ {
+ buf[19] = '\0';
+ psz_parser = strchr( buf, ' ' );
+ if( psz_parser )
+ {
+ i_ret = atoi( psz_parser + 1 );
+ if( i_ret >= 80 )
+ {
+ i_width = i_ret;
+ }
+ }
+ }
+
+ pclose( file );
+ }
+#endif
+
+ return i_width;
+}
projects / vlc / blobdiff