/*****************************************************************************
* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include "control/libvlc_internal.h"
#include <vlc_input.h>
#include "modules/modules.h"
-#include "config/config.h"
+#include "config/configuration.h"
+#include "interface/interface.h"
#include <errno.h> /* ENOMEM */
#include <stdio.h> /* sprintf() */
# include <hal/libhal.h>
#endif
-#include "vlc_os_specific.h"
-
#include <vlc_playlist.h>
#include <vlc_interface.h>
* The evil global variable. We handle it with care, don't worry.
*****************************************************************************/
static libvlc_global_data_t libvlc_global;
-#define p_libvlc_global (&libvlc_global)
+static libvlc_global_data_t *p_libvlc_global = &libvlc_global;
static libvlc_int_t * p_static_vlc = NULL;
static volatile unsigned int i_instances = 0;
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-#if defined (__APPLE__) || defined (WIN32)
+#if defined( ENABLE_NLS ) && (defined (__APPLE__) || defined (WIN32)) && \
+ ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
static void SetLanguage ( char const * );
#endif
static inline int LoadMessages (void);
*****************************************************************************/
libvlc_int_t * vlc_current_object( int i_object )
{
- if( i_object )
- {
- return vlc_object_get( p_libvlc_global, i_object );
- }
-
- return p_static_vlc;
+ return i_object ? vlc_object_get( i_object ) : p_static_vlc;
}
return NULL;
}
p_libvlc->p_playlist = NULL;
+ p_libvlc->p_interaction = NULL;
p_libvlc->psz_object_name = "libvlc";
/* Initialize message queue */
/* Announce who we are - Do it only for first instance ? */
msg_Dbg( p_libvlc, COPYRIGHT_MESSAGE );
msg_Dbg( p_libvlc, "libvlc was configured with %s", CONFIGURE_LINE );
- if( strcmp( p_libvlc->psz_object_name, "cvlc" ) ) /* Not running with cvlc */
- msg_Info( p_libvlc, "Running vlc with the default interface. Use 'cvlc' to use vlc without interface.");
/* Initialize mutexes */
+ vlc_mutex_init( p_libvlc, &p_libvlc->timer_lock );
vlc_mutex_init( p_libvlc, &p_libvlc->config_lock );
#ifdef __APPLE__
vlc_mutex_init( p_libvlc, &p_libvlc->quicktime_lock );
}
/* Check for short help option */
- if( config_GetInt( p_libvlc, "help" ) )
+ if( config_GetInt( p_libvlc, "help" ) > 0 )
{
Help( p_libvlc, "help" );
b_exit = VLC_TRUE;
i_ret = VLC_EEXITSUCCESS;
}
/* Check for version option */
- else if( config_GetInt( p_libvlc, "version" ) )
+ else if( config_GetInt( p_libvlc, "version" ) > 0 )
{
Version();
b_exit = VLC_TRUE;
p_libvlc->psz_configfile = config_GetCustomConfigFile( p_libvlc );
/* Check for plugins cache options */
- if( config_GetInt( p_libvlc, "reset-plugins-cache" ) )
+ if( config_GetInt( p_libvlc, "reset-plugins-cache" ) > 0 )
{
libvlc_global.p_module_bank->b_cache_delete = VLC_TRUE;
}
#ifndef WIN32
if( config_GetInt( p_libvlc, "daemon" ) )
{
-#if HAVE_DAEMON
+#ifdef HAVE_DAEMON
char *psz_pidfile = NULL;
if( daemon( 1, 0) != 0 )
config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE );
libvlc_global.p_module_bank->b_cache_delete = b_cache_delete;
}
- if( psz_language ) free( psz_language );
+ free( psz_language );
# endif
#endif
i_ret = VLC_EEXITSUCCESS;
}
/* Check for long help option */
- else if( config_GetInt( p_libvlc, "longhelp" ) )
+ else if( config_GetInt( p_libvlc, "longhelp" ) > 0 )
{
Help( p_libvlc, "longhelp" );
b_exit = VLC_TRUE;
i_ret = VLC_EEXITSUCCESS;
}
/* Check for module list option */
- else if( config_GetInt( p_libvlc, "list" ) )
+ else if( config_GetInt( p_libvlc, "list" ) > 0 )
{
ListModules( p_libvlc, VLC_FALSE );
b_exit = VLC_TRUE;
i_ret = VLC_EEXITSUCCESS;
}
- else if( config_GetInt( p_libvlc, "list-verbose" ) )
+ else if( config_GetInt( p_libvlc, "list-verbose" ) > 0 )
{
ListModules( p_libvlc, VLC_TRUE );
b_exit = VLC_TRUE;
}
/* Check for config file options */
- if( config_GetInt( p_libvlc, "reset-config" ) )
+ if( config_GetInt( p_libvlc, "reset-config" ) > 0 )
{
config_ResetAll( p_libvlc );
config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE );
config_SaveConfigFile( p_libvlc, NULL );
}
- if( config_GetInt( p_libvlc, "save-config" ) )
+ if( config_GetInt( p_libvlc, "save-config" ) > 0 )
{
config_LoadConfigFile( p_libvlc, NULL );
config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE );
#ifdef HAVE_DBUS_3
dbus_threads_init_default();
- if( config_GetInt( p_libvlc, "one-instance" ) )
+ if( config_GetInt( p_libvlc, "one-instance" ) > 0 )
{
/* Initialise D-Bus interface, check for other instances */
DBusConnection *p_conn = NULL;
exit( VLC_ENOMEM );
}
b_play = TRUE;
- if( config_GetInt( p_libvlc, "playlist-enqueue" ) )
+ if( config_GetInt( p_libvlc, "playlist-enqueue" ) > 0 )
b_play = FALSE;
if ( !dbus_message_iter_append_basic( &dbus_args,
DBUS_TYPE_BOOLEAN, &b_play ) )
*/
var_Create( p_libvlc, "verbose", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- if( config_GetInt( p_libvlc, "quiet" ) )
+ if( config_GetInt( p_libvlc, "quiet" ) > 0 )
{
val.i_int = -1;
var_Set( p_libvlc, "verbose", val );
var_AddCallback( p_libvlc, "verbose", VerboseCallback, NULL );
var_Change( p_libvlc, "verbose", VLC_VAR_TRIGGER_CALLBACKS, NULL, NULL );
- p_libvlc->b_color = p_libvlc->b_color && config_GetInt( p_libvlc, "color" );
+ if( p_libvlc->b_color )
+ p_libvlc->b_color = config_GetInt( p_libvlc, "color" ) > 0;
/*
* Output messages that may still be in the queue
p_libvlc->pf_memset = memset;
}
- p_libvlc->b_stats = config_GetInt( p_libvlc, "stats" );
+ p_libvlc->b_stats = config_GetInt( p_libvlc, "stats" ) > 0;
p_libvlc->i_timers = 0;
p_libvlc->pp_timers = NULL;
- vlc_mutex_init( p_libvlc, &p_libvlc->timer_lock );
+
+ /* Init stats */
+ p_libvlc->p_stats = (global_stats_t *)malloc( sizeof( global_stats_t ) );
+ if( !p_libvlc->p_stats )
+ {
+ vlc_object_release( p_libvlc );
+ return VLC_ENOMEM;
+ }
+ vlc_mutex_init( p_libvlc, &p_libvlc->p_stats->lock );
+ p_libvlc->p_stats_computer = NULL;
+
+ /* Init the array that holds every input item */
+ ARRAY_INIT( p_libvlc->input_items );
+ p_libvlc->i_last_input_id = 0;
/*
* Initialize hotkey handling
*/
var_Create( p_libvlc, "key-pressed", VLC_VAR_INTEGER );
+ var_Create( p_libvlc, "key-action", VLC_VAR_INTEGER );
p_libvlc->p_hotkeys = malloc( libvlc_hotkeys_size );
/* Do a copy (we don't need to modify the strings) */
memcpy( p_libvlc->p_hotkeys, libvlc_hotkeys, libvlc_hotkeys_size );
+ var_AddCallback( p_libvlc, "key-pressed", vlc_key_to_action,
+ p_libvlc->p_hotkeys );
+
+ /* Initialize interaction */
+ p_libvlc->p_interaction = interaction_Init( p_libvlc );
/* Initialize playlist and get commandline files */
playlist_ThreadCreate( p_libvlc );
/* Add service discovery modules */
playlist_ServicesDiscoveryAdd( p_playlist, psz_modules );
}
- if( psz_modules ) free( psz_modules );
+ free( psz_modules );
/*
* Load background interfaces
#ifdef HAVE_DBUS_3
/* loads dbus control interface if in one-instance mode
* we do it only when playlist exists, because dbus module needs it */
- if( config_GetInt( p_libvlc, "one-instance" ) )
+ if( config_GetInt( p_libvlc, "one-instance" ) > 0 )
VLC_AddIntf( 0, "dbus,none", VLC_FALSE, VLC_FALSE );
/* Prevents the power management daemon to suspend the computer
* when VLC is active */
- if( config_GetInt( p_libvlc, "inhibit" ) )
+ if( config_GetInt( p_libvlc, "inhibit" ) > 0 )
VLC_AddIntf( 0, "inhibit,none", VLC_FALSE, VLC_FALSE );
#endif
* Currently, only for X
*/
#ifdef HAVE_X11_XLIB_H
- if( config_GetInt( p_libvlc, "disable-screensaver" ) == 1 )
+ if( config_GetInt( p_libvlc, "disable-screensaver" ) )
{
VLC_AddIntf( 0, "screensaver,none", VLC_FALSE, VLC_FALSE );
}
#endif
- if( config_GetInt( p_libvlc, "file-logging" ) == 1 )
+ if( config_GetInt( p_libvlc, "file-logging" ) > 0 )
{
VLC_AddIntf( 0, "logger,none", VLC_FALSE, VLC_FALSE );
}
#ifdef HAVE_SYSLOG_H
- if( config_GetInt( p_libvlc, "syslog" ) == 1 )
+ if( config_GetInt( p_libvlc, "syslog" ) > 0 )
{
const char *psz_logmode = "logmode=syslog";
libvlc_InternalAddIntf( p_libvlc, "logger,none", VLC_FALSE, VLC_FALSE,
}
#endif
- if( config_GetInt( p_libvlc, "show-intf" ) == 1 )
+ if( config_GetInt( p_libvlc, "show-intf" ) > 0 )
{
VLC_AddIntf( 0, "showintf,none", VLC_FALSE, VLC_FALSE );
}
- if( config_GetInt( p_libvlc, "network-synchronisation") == 1 )
+ if( config_GetInt( p_libvlc, "network-synchronisation") > 0 )
{
VLC_AddIntf( 0, "netsync,none", VLC_FALSE, VLC_FALSE );
}
#ifdef WIN32
- if( config_GetInt( p_libvlc, "prefer-system-codecs") == 1 )
+ if( config_GetInt( p_libvlc, "prefer-system-codecs") > 0 )
{
char *psz_codecs = config_GetPsz( p_playlist, "codec" );
if( psz_codecs )
if( psz_morecodecs )
{
config_PutPsz( p_libvlc, "codec", psz_morecodecs);
- free(psz_morecodecs);
+ free( psz_morecodecs );
}
}
else
config_PutPsz( p_libvlc, "codec", "dmo,quicktime");
- free(psz_codecs);
+ free( psz_codecs );
}
#endif
VLC_AddTarget( p_libvlc->i_object_id, val.psz_string, NULL, 0,
PLAYLIST_INSERT, 0 );
}
- if ( val.psz_string != NULL ) free( val.psz_string );
+ free( val.psz_string );
return VLC_SUCCESS;
}
{
intf_thread_t * p_intf = NULL;
vout_thread_t * p_vout = NULL;
+ input_thread_t * p_input = NULL;
aout_instance_t * p_aout = NULL;
announce_handler_t * p_announce = NULL;
msg_Dbg( p_libvlc, "removing playlist" );
playlist_ThreadDestroy( p_libvlc->p_playlist );
+ /* Free input */
+ msg_Dbg( p_libvlc, "waiting all input end" );
+ while( (p_input = vlc_object_find( p_libvlc, VLC_OBJECT_INPUT, FIND_CHILD )) )
+ {
+ vlc_object_kill( p_input );
+ vlc_thread_join( p_input );
+ vlc_object_release( p_input );
+ }
+
/* Free video outputs */
msg_Dbg( p_libvlc, "removing all video outputs" );
while( (p_vout = vlc_object_find( p_libvlc, VLC_OBJECT_VOUT, FIND_CHILD )) )
aout_Delete( p_aout );
}
+ /* Free interaction */
+ msg_Dbg( p_libvlc, "removing interaction" );
+ vlc_object_release( p_libvlc->p_interaction );
+
stats_TimersDumpAll( p_libvlc );
stats_TimersClean( p_libvlc );
vlc_object_release( p_announce );
announce_HandlerDestroy( p_announce );
}
+
+ msg_Dbg( p_libvlc, "removing remaining input items" );
+ FOREACH_ARRAY( input_item_t *p_del, p_libvlc->input_items )
+ msg_Dbg( p_libvlc, "WARNING: %p input item has not been deleted properly", p_del );
+ input_ItemClean( p_del );
+ free( p_del );
+ FOREACH_END();
+ ARRAY_RESET( p_libvlc->input_items );
+
+ msg_Dbg( p_libvlc, "removing stats" );
+ vlc_mutex_destroy( &p_libvlc->p_stats->lock );
+ FREENULL( p_libvlc->p_stats );
+
return VLC_SUCCESS;
}
char* psz_pidfile = NULL;
if( libvlc_global.p_module_bank )
- if( config_GetInt( p_libvlc, "daemon" ) )
+ if( config_GetInt( p_libvlc, "daemon" ) > 0 )
{
psz_pidfile = config_GetPsz( p_libvlc, "pidfile" );
if( psz_pidfile != NULL )
psz_pidfile );
}
}
- free ( psz_pidfile );
+ free( psz_pidfile );
}
#endif
FREENULL( p_libvlc->psz_datadir );
FREENULL( p_libvlc->psz_cachedir );
FREENULL( p_libvlc->psz_configfile );
+ var_DelCallback( p_libvlc, "key-pressed", vlc_key_to_action,
+ p_libvlc->p_hotkeys );
FREENULL( p_libvlc->p_hotkeys );
var_Create( p_libvlc_global, "libvlc", VLC_VAR_MUTEX );
vlc_mutex_destroy( &p_libvlc->timer_lock );
if( b_release ) vlc_object_release( p_libvlc );
- vlc_object_destroy( p_libvlc );
+ vlc_object_release( p_libvlc );
p_libvlc = NULL;
/* Stop thread system: last one out please shut the door!
if( !p_libvlc )
return VLC_EGENERIC;
+ if( !psz_module ) /* requesting the default interface */
+ {
+ char *psz_interface = config_GetPsz( p_libvlc, "intf" );
+ if( !psz_interface || !*psz_interface ) /* "intf" has not been set */
+ msg_Info( p_libvlc, _("Running vlc with the default interface. Use 'cvlc' to use vlc without interface.") );
+ free( psz_interface );
+ }
+
#ifndef WIN32
if( libvlc_global.b_daemon && b_block && !psz_module )
{
* We prefer the dummy interface if none is specified. */
char *psz_interface = config_GetPsz( p_libvlc, "intf" );
if( !psz_interface || !*psz_interface ) psz_module = "dummy";
- if( psz_interface ) free( psz_interface );
+ free( psz_interface );
}
#endif
return VLC_SUCCESS;
};
-#if defined (__APPLE__) || defined (WIN32)
+#if defined( ENABLE_NLS ) && (defined (__APPLE__) || defined (WIN32)) && \
+ ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
/*****************************************************************************
* SetLanguage: set the interface language.
*****************************************************************************
int i_index;
int i_width = ConsoleWidth() - (PADDING_SPACES+LINE_START+1);
int i_width_description = i_width + PADDING_SPACES - 1;
- vlc_bool_t b_advanced = config_GetInt( p_this, "advanced" );
- vlc_bool_t b_description = config_GetInt( p_this, "help-verbose" );
+ vlc_bool_t b_advanced = config_GetInt( p_this, "advanced" ) > 0;
+ vlc_bool_t b_description = config_GetInt( p_this, "help-verbose" ) > 0;
vlc_bool_t b_description_hack;
- vlc_bool_t b_color = config_GetInt( p_this, "color" );
+ vlc_bool_t b_color = config_GetInt( p_this, "color" ) > 0;
+ vlc_bool_t b_has_advanced = VLC_FALSE;
memset( psz_spaces_text, ' ', PADDING_SPACES+LINE_START );
psz_spaces_text[PADDING_SPACES+LINE_START] = '\0';
memset( psz_spaces_longtext, ' ', LINE_START+2 );
psz_spaces_longtext[LINE_START+2] = '\0';
+#ifdef WIN32
+ b_color = VLC_FALSE; // don't put color control codes in a .txt file
+#endif
if( b_color )
{
/* Skip advanced options if requested */
if( p_item->b_advanced && !b_advanced )
{
+ b_has_advanced = VLC_TRUE;
continue;
}
case CONFIG_ITEM_MODULE_CAT:
case CONFIG_ITEM_MODULE_LIST:
case CONFIG_ITEM_MODULE_LIST_CAT:
+ case CONFIG_ITEM_FONT:
+ case CONFIG_ITEM_PASSWORD:
psz_bra = OPTION_VALUE_SEP "<";
psz_type = _("string");
psz_ket = ">";
}
}
+ if( b_has_advanced )
+ {
+ if( b_color )
+ utf8_fprintf( stdout, "\n" WHITE "%s" GRAY " %s\n", _( "Note:" ),
+ _( "add --advanced to your command line to see advanced options."));
+ else
+ utf8_fprintf( stdout, "\n %s %s\n", _( "Note:" ),
+ _( "add --advanced to your command line to see advanced options."));
+ }
+
/* Release the module list */
vlc_list_release( p_list );
}
char psz_spaces[22];
int i_index;
- vlc_bool_t b_color = config_GetInt( p_this, "color" );
+ vlc_bool_t b_color = config_GetInt( p_this, "color" ) > 0;
memset( psz_spaces, ' ', 22 );
VLC_CompileBy(), VLC_CompileHost(), VLC_CompileDomain() );
utf8_fprintf( stdout, _("Compiler: %s\n"), VLC_Compiler() );
if( strcmp( VLC_Changeset(), "exported" ) )
- utf8_fprintf( stdout, _("Based upon svn changeset [%s]\n"),
+ utf8_fprintf( stdout, _("Based upon Git commit [%s]\n"),
VLC_Changeset() );
utf8_fprintf( stdout, LICENSE_MSG );
if( getenv( "PWD" ) && getenv( "PS1" ) ) return; /* cygwin shell */
AllocConsole();
+ /* Use the ANSI code page (e.g. Windows-1252) as expected by the LibVLC
+ * Unicode/locale subsystem. By default, we have the obsolecent OEM code
+ * page (e.g. CP437 or CP850). */
+ SetConsoleOutputCP (GetACP ());
+ SetConsoleTitle ("VLC media player version "PACKAGE_VERSION);
freopen( "CONOUT$", "w", stderr );
freopen( "CONIN$", "r", stdin );
*****************************************************************************/
static int ConsoleWidth( void )
{
- int i_width = 80;
+ unsigned i_width = 80;
#ifndef WIN32
- char buf[20];
- char *psz_parser = NULL;
- FILE *file = NULL;
- int i_ret;
-
- file = popen( "stty size 2>/dev/null", "r" );
- if( file )
+ FILE *file = popen( "stty size 2>/dev/null", "r" );
+ if (file != NULL)
{
- 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;
- }
- }
- }
-
+ if (fscanf (file, "%*u %u", &i_width) <= 0)
+ i_width = 80;
pclose( file );
}
+#else
+ CONSOLE_SCREEN_BUFFER_INFO buf;
+
+ if (GetConsoleScreenBufferInfo (GetStdHandle (STD_OUTPUT_HANDLE), &buf))
+ i_width = buf.dwSize.X;
#endif
return i_width;
projects / vlc / blobdiff