* libvlc.c: main libvlc source
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
- * $Id: libvlc.c,v 1.40 2002/10/15 08:35:24 sam Exp $
+ * $Id: libvlc.c,v 1.53 2002/12/14 19:43:25 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <errno.h> /* ENOMEM */
+#include <vlc/vlc.h>
+
+#ifdef HAVE_ERRNO_H
+# include <errno.h> /* ENOMEM */
+#endif
#include <stdio.h> /* sprintf() */
#include <string.h> /* strerror() */
#include <stdlib.h> /* free() */
-#include <vlc/vlc.h>
-
#ifndef WIN32
# include <netinet/in.h> /* BSD: struct in_addr */
#endif
#ifdef HAVE_UNISTD_H
# include <unistd.h>
-#elif defined( _MSC_VER ) && defined( _WIN32 )
+#elif defined( _MSC_VER ) && defined( _WIN32 ) && !defined( UNDER_CE )
# include <io.h>
#endif
#ifdef WIN32 /* optind, getopt(), included in unistd.h */
-# include "extras/GNUgetopt/getopt.h"
+# include "extras/getopt.h"
#endif
#ifdef HAVE_LOCALE_H
/*****************************************************************************
* Local prototypes
*****************************************************************************/
+static void SetLanguage ( char const * );
static int GetFilenames ( vlc_t *, int, char *[] );
static void Usage ( vlc_t *, char const *psz_module_name );
static void ListModules ( vlc_t * );
return VLC_ENOOBJ;
}
- /* Support for gettext */
-#if defined( ENABLE_NLS ) && defined ( HAVE_GETTEXT )
-# if defined( HAVE_LOCALE_H ) && defined( HAVE_LC_MESSAGES )
- if( !setlocale( LC_MESSAGES, "" ) )
- {
- fprintf( stderr, "warning: unsupported locale settings\n" );
- }
-
- setlocale( LC_CTYPE, "" );
-# endif
-
- if( !bindtextdomain( PACKAGE, LOCALEDIR ) )
- {
- fprintf( stderr, "warning: no domain %s in directory %s\n",
- PACKAGE, LOCALEDIR );
- }
-
- textdomain( PACKAGE );
-#endif
+ /*
+ * Support for gettext
+ */
+ SetLanguage( "" );
/*
* System specific initialization code
if( p_help_module == NULL )
{
//module_EndBank( p_vlc );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
p_help_module->psz_object_name = "help";
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
//module_EndBank( p_vlc );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
/* Check for short help option */
if( config_GetInt( p_vlc, "help" ) )
{
- fprintf( stderr, _("Usage: %s [options] [items]...\n\n"),
+ fprintf( stdout, _("Usage: %s [options] [items]...\n\n"),
p_vlc->psz_object_name );
Usage( p_vlc, "main" );
Usage( p_vlc, "help" );
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
//module_EndBank( p_vlc );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_EEXIT;
}
if( b_exit )
{
//module_EndBank( p_vlc );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_EEXIT;
}
getchar();
#endif
//module_EndBank( p_vlc );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
module_Unneed( p_vlc, p_vlc->p_memcpy_module );
}
//module_EndBank( p_vlc );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
*/
GetFilenames( p_vlc, i_argc, ppsz_argv );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_SUCCESS;
}
if( p_intf == NULL )
{
msg_Err( p_vlc, "interface initialization failed" );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
{
vlc_object_detach( p_intf );
intf_Destroy( p_intf );
+ if( i_object ) vlc_object_release( p_vlc );
return i_err;
}
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_SUCCESS;
}
/* 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;
}
p_vlc->b_die = VLC_TRUE;
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_SUCCESS;
}
if( p_playlist == NULL )
{
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
vlc_object_release( p_playlist );
+ if( i_object ) vlc_object_release( p_vlc );
return i_err;
}
int VLC_Set( int i_object, char const *psz_var, vlc_value_t value )
{
vlc_t *p_vlc;
+ int i_ret;
p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
config_PutPsz( p_vlc, psz_newvar, value.psz_string );
break;
}
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_SUCCESS;
}
}
- return var_Set( p_vlc, psz_var, value );
+ i_ret = var_Set( p_vlc, psz_var, value );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return i_ret;
}
/*****************************************************************************
int VLC_Get( int i_object, char const *psz_var, vlc_value_t *p_value )
{
vlc_t *p_vlc;
+ int i_ret;
p_vlc = i_object ? vlc_object_get( &libvlc, i_object ) : p_static_vlc;
return VLC_ENOOBJ;
}
- return var_Get( p_vlc, psz_var, p_value );
+ i_ret = var_Get( p_vlc, psz_var, p_value );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return i_ret;
}
/* FIXME: temporary hacks */
{
return VLC_ENOOBJ;
}
+
+ /* add pseudo sap interface; non blocking */
+ if( config_GetInt( p_vlc, "sap" ) )
+ {
+ msg_Dbg( p_vlc, "adding sap interface" );
+ VLC_AddIntf( 0, "sap", VLC_FALSE );
+ }
+
+ 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 )
{
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_ENOOBJ;
}
vlc_object_release( p_playlist );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_SUCCESS;
}
{
vlc_object_detach( p_vout );
vlc_object_release( p_vout );
- vout_DestroyThread( p_vout );
+ vout_Destroy( p_vout );
}
/*
aout_Delete( p_aout );
}
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_SUCCESS;
}
if( !p_input )
{
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_ENOOBJ;
}
input_SetStatus( p_input, INPUT_STATUS_PAUSE );
vlc_object_release( p_input );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_SUCCESS;
}
if( !p_vout )
{
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_ENOOBJ;
}
p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
vlc_object_release( p_vout );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_SUCCESS;
}
/* following functions are local */
+/*****************************************************************************
+ * SetLanguage: set the interface language.
+ *****************************************************************************
+ * We set the LC_MESSAGES locale category for interface messages and buttons,
+ * as well as the LC_CTYPE category for string sorting and possible wide
+ * character support.
+ *****************************************************************************/
+static void SetLanguage ( char const *psz_lang )
+{
+#if defined( ENABLE_NLS ) \
+ && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
+
+# if defined( HAVE_INCLUDED_GETTEXT ) && !defined( HAVE_LC_MESSAGES )
+ if( *psz_lang )
+ {
+ /* 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
+ * should probably be moved to a safer place like vlc.c. */
+ static char psz_lcall[20];
+ snprintf( psz_lcall, 19, "LC_ALL=%s", psz_lang );
+ psz_lcall[19] = '\0';
+ putenv( psz_lcall );
+ }
+# endif
+
+# if defined( HAVE_LC_MESSAGES )
+ setlocale( LC_MESSAGES, psz_lang );
+# endif
+ setlocale( LC_CTYPE, psz_lang );
+
+ /* Specify where to find the locales for current domain */
+ if( !bindtextdomain( PACKAGE, LOCALEDIR ) )
+ {
+ fprintf( stderr, "warning: no domain %s in directory %s\n",
+ PACKAGE, LOCALEDIR );
+ }
+
+ /* Set the default domain */
+ textdomain( PACKAGE );
+#endif
+}
+
/*****************************************************************************
* GetFilenames: parse command line options which are not flags
*****************************************************************************
int i_opt;
/* We assume that the remaining parameters are filenames */
- for( i_opt = optind; i_opt < i_argc; i_opt++ )
+ for( i_opt = i_argc - 1; i_opt > optind; i_opt-- )
{
/* TODO: write an internal function of this one, to avoid
* unnecessary lookups. */
VLC_AddTarget( p_vlc->i_object_id, ppsz_argv[ i_opt ],
- PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END );
+ PLAYLIST_INSERT, 0 );
+ }
+
+ /* If there is at least one target, play it */
+ if( i_argc > optind )
+ {
+ VLC_AddTarget( p_vlc->i_object_id, ppsz_argv[ optind ],
+ PLAYLIST_INSERT | PLAYLIST_GO, 0 );
}
return VLC_SUCCESS;
*/
#define LINE_START 8
#define PADDING_SPACES 25
- vlc_list_t *p_list;
- module_t **pp_parser;
+ vlc_list_t list;
+ module_t *p_parser;
module_config_t *p_item;
char psz_spaces[PADDING_SPACES+LINE_START+1];
char psz_format[sizeof(FORMAT_STRING)];
+ int i_index;
memset( psz_spaces, ' ', PADDING_SPACES+LINE_START );
psz_spaces[PADDING_SPACES+LINE_START] = '\0';
#endif
/* List all modules */
- p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+ list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
/* Enumerate the config for each module */
- for( pp_parser = (module_t **)p_list->pp_objects ;
- *pp_parser ;
- pp_parser++ )
+ for( i_index = 0; i_index < list.i_count; i_index++ )
{
vlc_bool_t b_help_module;
+ p_parser = (module_t *)list.p_values[i_index].p_object ;
+
if( psz_module_name && strcmp( psz_module_name,
- (*pp_parser)->psz_object_name ) )
+ p_parser->psz_object_name ) )
{
continue;
}
/* Ignore modules without config options */
- if( !(*pp_parser)->i_config_items )
+ if( !p_parser->i_config_items )
{
continue;
}
- b_help_module = !strcmp( "help", (*pp_parser)->psz_object_name );
+ b_help_module = !strcmp( "help", p_parser->psz_object_name );
/* Print module options */
- for( p_item = (*pp_parser)->p_config;
+ for( p_item = p_parser->p_config;
p_item->i_type != CONFIG_HINT_END;
p_item++ )
{
{
case CONFIG_HINT_CATEGORY:
case CONFIG_HINT_USAGE:
- fprintf( stderr, " %s\n", p_item->psz_text );
+ fprintf( stdout, " %s\n", p_item->psz_text );
break;
case CONFIG_ITEM_STRING:
if( p_item->i_type == CONFIG_ITEM_BOOL &&
!b_help_module )
{
- fprintf( stderr, psz_format, p_item->psz_name, psz_prefix,
+ 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
{
- fprintf( stderr, psz_format, p_item->psz_name, "", "",
+ fprintf( stdout, psz_format, p_item->psz_name, "", "",
psz_bra, psz_type, psz_ket, psz_spaces,
p_item->psz_text, psz_suf );
}
}
/* Release the module list */
- vlc_list_release( p_list );
+ vlc_list_release( &list );
#ifdef WIN32 /* Pause the console because it's destroyed when we exit */
- fprintf( stderr, _("\nPress the RETURN key to continue...\n") );
+ fprintf( stdout, _("\nPress the RETURN key to continue...\n") );
getchar();
#endif
}
*****************************************************************************/
static void ListModules( vlc_t *p_this )
{
- vlc_list_t *p_list;
- module_t **pp_parser;
+ vlc_list_t list;
+ module_t *p_parser;
char psz_spaces[22];
+ int i_index;
memset( psz_spaces, ' ', 22 );
#endif
/* Usage */
- fprintf( stderr, _("Usage: %s [options] [items]...\n\n"),
+ fprintf( stdout, _("Usage: %s [options] [items]...\n\n"),
p_this->p_vlc->psz_object_name );
- fprintf( stderr, _("[module] [description]\n") );
+ fprintf( stdout, _("[module] [description]\n") );
/* List all modules */
- p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+ list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
/* Enumerate each module */
- for( pp_parser = (module_t **)p_list->pp_objects ;
- *pp_parser ;
- pp_parser++ )
+ for( i_index = 0; i_index < list.i_count; i_index++ )
{
int i;
+ p_parser = (module_t *)list.p_values[i_index].p_object ;
+
/* Nasty hack, but right now I'm too tired to think about a nice
* solution */
- i = 22 - strlen( (*pp_parser)->psz_object_name ) - 1;
+ i = 22 - strlen( p_parser->psz_object_name ) - 1;
if( i < 0 ) i = 0;
psz_spaces[i] = 0;
- fprintf( stderr, " %s%s %s\n", (*pp_parser)->psz_object_name,
- psz_spaces, (*pp_parser)->psz_longname );
+ fprintf( stdout, " %s%s %s\n", p_parser->psz_object_name,
+ psz_spaces, p_parser->psz_longname );
psz_spaces[i] = ' ';
}
- vlc_list_release( p_list );
+ vlc_list_release( &list );
#ifdef WIN32 /* Pause the console because it's destroyed when we exit */
- fprintf( stderr, _("\nPress the RETURN key to continue...\n") );
+ fprintf( stdout, _("\nPress the RETURN key to continue...\n") );
getchar();
#endif
}
ShowConsole();
#endif
- fprintf( stderr, VERSION_MESSAGE "\n" );
- fprintf( stderr,
+ fprintf( stdout, VERSION_MESSAGE "\n" );
+ fprintf( stdout,
_("This program comes with NO WARRANTY, to the extent permitted by "
"law.\nYou may redistribute it under the terms of the GNU General "
"Public License;\nsee the file named COPYING for details.\n"
"Written by the VideoLAN team at Ecole Centrale, Paris.\n") );
#ifdef WIN32 /* Pause the console because it's destroyed when we exit */
- fprintf( stderr, _("\nPress the RETURN key to continue...\n") );
+ fprintf( stdout, _("\nPress the RETURN key to continue...\n") );
getchar();
#endif
}
#ifdef WIN32 /* */
static void ShowConsole( void )
{
+# ifndef UNDER_CE
AllocConsole();
freopen( "CONOUT$", "w", stdout );
freopen( "CONOUT$", "w", stderr );
freopen( "CONIN$", "r", stdin );
+# endif
return;
}
#endif
-