/*****************************************************************************
* libvlc.c: main libvlc source
- * Includes the main() function for vlc. Parses command line, starts playlist
- * and spawns threads.
*****************************************************************************
- * Copyright (C) 1998-2001 VideoLAN
- * $Id: libvlc.c,v 1.18 2002/07/21 18:57:02 sigmunau Exp $
+ * Copyright (C) 1998-2004 VideoLAN
+ * $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
- * Gildas Bazin <gbazin@netcourrier.com>
+ * Gildas Bazin <gbazin@videolan.org>
+ * Derk-Jan Hartman <hartman at videolan dot org>
*
* 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
* Pretend we are a builtin module
*****************************************************************************/
#define MODULE_NAME main
+#define MODULE_PATH main
#define __BUILTIN__
/*****************************************************************************
* Preamble
*****************************************************************************/
+#include <vlc/vlc.h>
+#include <vlc/input.h>
+
#include <errno.h> /* ENOMEM */
#include <stdio.h> /* sprintf() */
#include <string.h> /* strerror() */
#include <stdlib.h> /* free() */
-#include <signal.h> /* SIGHUP, SIGINT, SIGKILL */
-
-#include <vlc/vlc.h>
-
-#ifdef HAVE_GETOPT_LONG
-# ifdef HAVE_GETOPT_H
-# include <getopt.h> /* getopt() */
-# endif
-#else
-# include "GNUgetopt/getopt.h"
-#endif
#ifndef WIN32
# include <netinet/in.h> /* BSD: struct in_addr */
#ifdef HAVE_UNISTD_H
# include <unistd.h>
-#elif defined( _MSC_VER ) && defined( _WIN32 )
+#elif defined( WIN32 ) && !defined( UNDER_CE )
# include <io.h>
#endif
+#ifdef WIN32 /* optind, getopt(), included in unistd.h */
+# include "extras/getopt.h"
+#endif
+
#ifdef HAVE_LOCALE_H
# include <locale.h>
#endif
+#ifdef HAVE_HAL
+# include <hal/libhal.h>
+#endif
+
#include "vlc_cpu.h" /* CPU detection */
#include "os_specific.h"
-#include "netutils.h" /* network_ChannelJoin */
-
-#include "stream_control.h"
-#include "input_ext-intf.h"
+#include "vlc_error.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 "stream_output.h"
+
#include "libvlc.h"
/*****************************************************************************
- * The evil global variables. We handle them with care, don't worry.
+ * The evil global variable. We handle it with care, don't worry.
*****************************************************************************/
-
-/* This global lock is used for critical sections - don't abuse it! */
-static vlc_mutex_t global_lock;
-void * p_global_data;
-
-/* A list of all the currently allocated vlc objects */
-static int volatile i_vlc = 0;
-static int volatile i_unique = 0;
-static vlc_t ** volatile pp_vlc = NULL;
+static libvlc_t libvlc;
+static libvlc_t * p_libvlc;
+static vlc_t * p_static_vlc;
/*****************************************************************************
* Local prototypes
*****************************************************************************/
+static void SetLanguage ( char const * );
static int GetFilenames ( vlc_t *, int, char *[] );
-static void Usage ( vlc_t *, const char *psz_module_name );
+static void Help ( vlc_t *, char const *psz_help_name );
+static void Usage ( vlc_t *, char const *psz_module_name );
static void ListModules ( vlc_t * );
static void Version ( void );
-static void Build ( void );
-
-#ifndef WIN32
-static void InitSignalHandler ( void );
-static void SimpleSignalHandler ( int i_signal );
-static void FatalSignalHandler ( int i_signal );
-#endif
#ifdef WIN32
static void ShowConsole ( void );
+static void PauseConsole ( void );
#endif
+static int ConsoleWidth ( void );
+
+static int VerboseCallback( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
+
+static void InitDeviceValues( vlc_t * );
+
+/*****************************************************************************
+ * vlc_current_object: return the current object.
+ *****************************************************************************
+ * If i_object is non-zero, return the corresponding object. Otherwise,
+ * return the statically allocated p_vlc object.
+ *****************************************************************************/
+vlc_t * vlc_current_object( int i_object )
+{
+ if( i_object )
+ {
+ return vlc_object_get( p_libvlc, i_object );
+ }
+
+ return p_static_vlc;
+}
+
+/*****************************************************************************
+ * VLC_Version: return the libvlc version.
+ *****************************************************************************
+ * This function returns full version string (numeric version and codename).
+ *****************************************************************************/
+char const * VLC_Version( void )
+{
+ return VERSION_MESSAGE;
+}
/*****************************************************************************
- * vlc_create: allocate a vlc_t structure, and initialize libvlc if needed.
+ * VLC_Error: strerror() equivalent
*****************************************************************************
- * This function allocates a vlc_t structure and returns NULL in case of
- * failure. Also, the thread system and the signal handlers are initialized.
+ * This function returns full version string (numeric version and codename).
*****************************************************************************/
-vlc_error_t vlc_create( void )
+char const * VLC_Error( int i_err )
{
- vlc_t * p_vlc = vlc_create_r();
- return p_vlc ? VLC_SUCCESS : VLC_EGENERIC;
+ return vlc_error( i_err );
}
-vlc_t * vlc_create_r( void )
+/*****************************************************************************
+ * VLC_Create: allocate a vlc_t structure, and initialize libvlc if needed.
+ *****************************************************************************
+ * This function allocates a vlc_t structure and returns a negative value
+ * in case of failure. Also, the thread system is initialized.
+ *****************************************************************************/
+int VLC_Create( void )
{
+ int i_ret;
vlc_t * p_vlc = NULL;
+ vlc_value_t lockval;
- /* Allocate the main structure */
- p_vlc = vlc_object_create( p_vlc, VLC_OBJECT_ROOT );
- if( p_vlc == NULL )
+ /* &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( p_libvlc );
+ if( i_ret < 0 )
{
- return NULL;
+ return i_ret;
}
- p_vlc->psz_object_name = "root";
+ /* Now that the thread system is initialized, we don't have much, but
+ * at least we have var_Create */
+ var_Create( p_libvlc, "libvlc", VLC_VAR_MUTEX );
+ var_Get( p_libvlc, "libvlc", &lockval );
+ vlc_mutex_lock( lockval.p_address );
+ if( !libvlc.b_ready )
+ {
+ char *psz_env;
+
+ /* Guess what CPU we have */
+ libvlc.i_cpu = CPUCapabilities();
+
+ /* Find verbosity from VLC_VERBOSE environment variable */
+ psz_env = getenv( "VLC_VERBOSE" );
+ libvlc.i_verbose = psz_env ? atoi( psz_env ) : -1;
+
+#if defined( HAVE_ISATTY ) && !defined( WIN32 )
+ libvlc.b_color = isatty( 2 ); /* 2 is for stderr */
+#else
+ libvlc.b_color = VLC_FALSE;
+#endif
- p_vlc->p_global_lock = &global_lock;
- p_vlc->pp_global_data = &p_global_data;
+ /* Initialize message queue */
+ msg_Create( p_libvlc );
- p_vlc->b_verbose = VLC_FALSE;
- p_vlc->b_quiet = VLC_FALSE; /* FIXME: delay message queue output! */
+ /* Announce who we are */
+ msg_Dbg( p_libvlc, COPYRIGHT_MESSAGE );
+ msg_Dbg( p_libvlc, "libvlc was configured with %s", CONFIGURE_LINE );
- /* Initialize the threads system */
- vlc_threads_init( p_vlc );
+ /* 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( p_libvlc, "libvlc" );
+
+ /* Allocate a vlc object */
+ p_vlc = vlc_object_create( p_libvlc, VLC_OBJECT_VLC );
+ if( p_vlc == NULL )
+ {
+ return VLC_EGENERIC;
+ }
+ p_vlc->thread_id = 0;
+
+ p_vlc->psz_object_name = "root";
/* Initialize mutexes */
vlc_mutex_init( p_vlc, &p_vlc->config_lock );
- vlc_mutex_init( p_vlc, &p_vlc->structure_lock );
-
- /* Set signal handling policy for all threads */
-#ifndef WIN32
- InitSignalHandler( );
+#ifdef SYS_DARWIN
+ vlc_mutex_init( p_vlc, &p_vlc->quicktime_lock );
+ vlc_thread_set_priority( p_vlc, VLC_THREAD_PRIORITY_LOW );
#endif
/* Store our newly allocated structure in the global list */
- vlc_mutex_lock( p_vlc->p_global_lock );
- pp_vlc = realloc( pp_vlc, (i_vlc+1) * sizeof( vlc_t * ) );
- pp_vlc[ i_vlc ] = p_vlc;
- i_vlc++;
- p_vlc->i_unique = i_unique;
- i_unique++;
- vlc_mutex_unlock( p_vlc->p_global_lock );
-
- /* Update the handle status */
- p_vlc->i_status = VLC_STATUS_CREATED;
-
- return p_vlc;
+ vlc_object_attach( p_vlc, p_libvlc );
+
+ /* Store data for the non-reentrant API */
+ p_static_vlc = p_vlc;
+
+ return p_vlc->i_object_id;
}
/*****************************************************************************
- * vlc_init: initialize a vlc_t structure.
+ * VLC_Init: initialize a vlc_t structure.
*****************************************************************************
* This function initializes a previously allocated vlc_t structure:
* - CPU detection
* - message queue, module bank and playlist initialization
* - configuration and commandline parsing
*****************************************************************************/
-vlc_error_t vlc_init( int i_argc, char *ppsz_argv[] )
-{
- return vlc_init_r( ( i_vlc == 1 ) ? *pp_vlc : NULL, i_argc, ppsz_argv );
-}
-
-vlc_error_t vlc_init_r( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] )
+int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] )
{
- char p_capabilities[200];
- char *psz_module;
- char *p_tmp;
- module_t *p_help_module;
- playlist_t *p_playlist;
+ char p_capabilities[200];
+ char * p_tmp;
+ char * psz_modules;
+ char * psz_parser;
+ char * psz_control;
+ char * psz_language;
+ vlc_bool_t b_exit = VLC_FALSE;
+ vlc_t * p_vlc = vlc_current_object( i_object );
+ module_t *p_help_module;
+ playlist_t *p_playlist;
- /* Check that the handle is valid */
- if( !p_vlc || p_vlc->i_status != VLC_STATUS_CREATED )
- {
- fprintf( stderr, "error: invalid status (!CREATED)\n" );
- return VLC_ESTATUS;
- }
-
- fprintf( stderr, COPYRIGHT_MESSAGE "\n" );
-
- /* Guess what CPU we have */
- p_vlc->i_cpu_capabilities = CPUCapabilities( p_vlc );
-
- /*
- * 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 ) )
+ if( !p_vlc )
{
- fprintf( stderr, "warning: no domain %s in directory %s\n",
- PACKAGE, LOCALEDIR );
+ return VLC_ENOOBJ;
}
- textdomain( PACKAGE );
-#endif
-
/*
* System specific initialization code
*/
system_Init( p_vlc, &i_argc, ppsz_argv );
- /*
- * Initialize message queue
- */
- msg_Create( p_vlc );
-
/* Get the executable name (similar to the basename command) */
if( i_argc > 0 )
{
p_vlc->psz_object_name = "vlc";
}
- /* Announce who we are */
- msg_Dbg( p_vlc, COPYRIGHT_MESSAGE );
- msg_Dbg( p_vlc, "libvlc was configured with %s", CONFIGURE_LINE );
-
/*
- * Initialize the module bank and 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)
+ * Support for gettext
*/
+ SetLanguage( "" );
+
+ /* 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) */
module_InitBank( p_vlc );
- module_LoadMain( p_vlc );
/* 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 );
- msg_Destroy( p_vlc );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
p_help_module->psz_object_name = "help";
+ p_help_module->psz_longname = N_("Help options");
config_Duplicate( p_help_module, p_help_config );
- p_help_module->next = p_vlc->module_bank.first;
- p_vlc->module_bank.first = p_help_module;
+ vlc_object_attach( p_help_module, libvlc.p_module_bank );
/* End hack */
if( config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_TRUE ) )
{
- p_vlc->module_bank.first = p_help_module->next;
+ vlc_object_detach( p_help_module );
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
module_EndBank( p_vlc );
- msg_Destroy( 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] [parameters] [file]...\n"),
- p_vlc->psz_object_name );
-
- Usage( p_vlc, "help" );
- Usage( p_vlc, "main" );
- p_vlc->module_bank.first = p_help_module->next;
- config_Free( p_help_module );
- vlc_object_destroy( p_help_module );
- module_EndBank( p_vlc );
- msg_Destroy( p_vlc );
- return VLC_EEXIT;
+ Help( p_vlc, "help" );
+ b_exit = VLC_TRUE;
}
-
/* Check for version option */
- if( config_GetInt( p_vlc, "version" ) )
+ else if( config_GetInt( p_vlc, "version" ) )
{
Version();
- p_vlc->module_bank.first = p_help_module->next;
- config_Free( p_help_module );
- vlc_object_destroy( p_help_module );
- module_EndBank( p_vlc );
- msg_Destroy( p_vlc );
- return VLC_EEXIT;
+ b_exit = VLC_TRUE;
+ }
+
+ /* Set the config file stuff */
+ p_vlc->psz_homedir = config_GetHomeDir();
+ p_vlc->psz_configfile = config_GetPsz( p_vlc, "config" );
+
+ /* Check for plugins cache options */
+ if( config_GetInt( p_vlc, "reset-plugins-cache" ) )
+ {
+ libvlc.p_module_bank->b_cache_delete = VLC_TRUE;
+ }
+
+ /* Hack: remove the help module here */
+ vlc_object_detach( p_help_module );
+ /* End hack */
+
+ /* Will be re-done properly later on */
+ p_vlc->p_libvlc->i_verbose = config_GetInt( p_vlc, "verbose" );
+
+ /* Check for daemon mode */
+#ifndef WIN32
+ if( config_GetInt( p_vlc, "daemon" ) )
+ {
+#if HAVE_DAEMON
+ if( daemon( 0, 0) != 0 )
+ {
+ msg_Err( p_vlc, "Unable to fork vlc to daemon mode" );
+ b_exit = VLC_TRUE;
+ }
+
+ p_vlc->p_libvlc->b_daemon = VLC_TRUE;
+
+#else
+ pid_t i_pid;
+
+ if( ( i_pid = fork() ) < 0 )
+ {
+ msg_Err( p_vlc, "Unable to fork vlc to daemon mode" );
+ b_exit = VLC_TRUE;
+ }
+ else if( i_pid )
+ {
+ /* This is the parent, exit right now */
+ msg_Dbg( p_vlc, "closing parent process" );
+ b_exit = VLC_TRUE;
+ }
+ else
+ {
+ /* We are the child */
+ msg_Dbg( p_vlc, "daemon spawned" );
+ close( STDIN_FILENO );
+ close( STDOUT_FILENO );
+ close( STDERR_FILENO );
+
+ p_vlc->p_libvlc->b_daemon = VLC_TRUE;
+ }
+#endif
}
+#endif
- /* Check for build option */
- if( config_GetInt( p_vlc, "build" ) )
+ if( b_exit )
{
- Build();
- p_vlc->module_bank.first = p_help_module->next;
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
module_EndBank( p_vlc );
- msg_Destroy( p_vlc );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_EEXIT;
}
- /* Hack: remove the help module here */
- p_vlc->module_bank.first = p_help_module->next;
- /* End hack */
+ /* 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. */
+ 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" ) )
+ {
+ vlc_bool_t b_cache_delete = libvlc.p_module_bank->b_cache_delete;
+
+ /* 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_NAME );
+
+#if defined( ENABLE_UTF8 )
+ bind_textdomain_codeset( PACKAGE_NAME, "UTF-8" );
+#endif
+
+ module_EndBank( p_vlc );
+ module_InitBank( p_vlc );
+ config_LoadConfigFile( p_vlc, "main" );
+ config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_TRUE );
+ libvlc.p_module_bank->b_cache_delete = b_cache_delete;
+ }
+ if( psz_language ) free( psz_language );
+#endif
/*
* Load the builtins and plugins into the module_bank.
*/
module_LoadBuiltins( p_vlc );
module_LoadPlugins( p_vlc );
+ if( p_vlc->b_die )
+ {
+ b_exit = VLC_TRUE;
+ }
+
msg_Dbg( p_vlc, "module bank initialized, found %i modules",
- p_vlc->module_bank.i_count );
+ libvlc.p_module_bank->i_children );
/* Hack: insert the help module here */
- p_help_module->next = p_vlc->module_bank.first;
- p_vlc->module_bank.first = p_help_module;
+ vlc_object_attach( p_help_module, libvlc.p_module_bank );
/* End hack */
/* Check for help on modules */
if( (p_tmp = config_GetPsz( p_vlc, "module" )) )
{
- Usage( p_vlc, p_tmp );
+ Help( p_vlc, p_tmp );
free( p_tmp );
- p_vlc->module_bank.first = p_help_module->next;
- config_Free( p_help_module );
- vlc_object_destroy( p_help_module );
- module_EndBank( p_vlc );
- msg_Destroy( p_vlc );
- return VLC_EGENERIC;
+ b_exit = VLC_TRUE;
}
-
/* Check for long help option */
- if( config_GetInt( p_vlc, "longhelp" ) )
+ else if( config_GetInt( p_vlc, "longhelp" ) )
{
- Usage( p_vlc, NULL );
- p_vlc->module_bank.first = p_help_module->next;
- config_Free( p_help_module );
- vlc_object_destroy( p_help_module );
- module_EndBank( p_vlc );
- msg_Destroy( p_vlc );
- return VLC_EEXIT;
+ Help( p_vlc, "longhelp" );
+ b_exit = VLC_TRUE;
}
-
/* Check for module list option */
- if( config_GetInt( p_vlc, "list" ) )
+ else if( config_GetInt( p_vlc, "list" ) )
{
ListModules( p_vlc );
- p_vlc->module_bank.first = p_help_module->next;
+ b_exit = VLC_TRUE;
+ }
+
+ /* Check for config file options */
+ if( config_GetInt( p_vlc, "reset-config" ) )
+ {
+ vlc_object_detach( p_help_module );
+ config_ResetAll( p_vlc );
+ config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_TRUE );
+ config_SaveConfigFile( p_vlc, NULL );
+ vlc_object_attach( p_help_module, libvlc.p_module_bank );
+ }
+ if( config_GetInt( p_vlc, "save-config" ) )
+ {
+ vlc_object_detach( p_help_module );
+ config_LoadConfigFile( p_vlc, NULL );
+ config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_TRUE );
+ config_SaveConfigFile( p_vlc, NULL );
+ vlc_object_attach( p_help_module, libvlc.p_module_bank );
+ }
+
+ /* Hack: remove the help module here */
+ vlc_object_detach( p_help_module );
+ /* End hack */
+
+ if( b_exit )
+ {
config_Free( p_help_module );
vlc_object_destroy( p_help_module );
module_EndBank( p_vlc );
- msg_Destroy( p_vlc );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_EEXIT;
}
- /* Hack: remove the help module here */
- p_vlc->module_bank.first = p_help_module->next;
- config_Free( p_help_module );
- vlc_object_destroy( p_help_module );
- /* End hack */
+ /*
+ * Init device values
+ */
+ InitDeviceValues( p_vlc );
/*
* Override default configuration with config file settings
*/
- p_vlc->psz_homedir = config_GetHomeDir();
config_LoadConfigFile( p_vlc, NULL );
+ /* Hack: insert the help module here */
+ vlc_object_attach( p_help_module, libvlc.p_module_bank );
+ /* End hack */
+
/*
* Override configuration with command line settings
*/
ShowConsole();
/* Pause the console because it's destroyed when we exit */
fprintf( stderr, "The command line options couldn't be loaded, check "
- "that they are valid.\nPress the RETURN key to continue..." );
- getchar();
+ "that they are valid.\n" );
+ PauseConsole();
#endif
+ vlc_object_detach( p_help_module );
+ config_Free( p_help_module );
+ vlc_object_destroy( p_help_module );
module_EndBank( p_vlc );
- msg_Destroy( p_vlc );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
+ /* Hack: remove the help module here */
+ vlc_object_detach( p_help_module );
+ config_Free( p_help_module );
+ vlc_object_destroy( p_help_module );
+ /* End hack */
+
/*
* System specific configuration
*/
- system_Configure( p_vlc );
+ system_Configure( p_vlc, &i_argc, ppsz_argv );
+
+ /*
+ * Message queue options
+ */
+
+ var_Create( p_vlc, "verbose", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ if( config_GetInt( p_vlc, "quiet" ) )
+ {
+ vlc_value_t val;
+ val.i_int = -1;
+ var_Set( p_vlc, "verbose", val );
+ }
+ var_AddCallback( p_vlc, "verbose", VerboseCallback, NULL );
+ var_Change( p_vlc, "verbose", VLC_VAR_TRIGGER_CALLBACKS, NULL, NULL );
+
+ libvlc.b_color = libvlc.b_color && config_GetInt( p_vlc, "color" );
/*
* Output messages that may still be in the queue
*/
- p_vlc->b_verbose = config_GetInt( p_vlc, "verbose" );
- p_vlc->b_quiet = config_GetInt( p_vlc, "quiet" );
- p_vlc->b_color = config_GetInt( p_vlc, "color" );
msg_Flush( p_vlc );
- /* p_vlc inititalization. FIXME ? */
- p_vlc->i_desync = config_GetInt( p_vlc, "desync" ) * (mtime_t)1000;
+ /* p_vlc initialization. FIXME ? */
+
+ if( !config_GetInt( p_vlc, "fpu" ) )
+ libvlc.i_cpu &= ~CPU_CAPABILITY_FPU;
+
+#if defined( __i386__ ) || defined( __x86_64__ )
if( !config_GetInt( p_vlc, "mmx" ) )
- p_vlc->i_cpu_capabilities &= ~CPU_CAPABILITY_MMX;
+ libvlc.i_cpu &= ~CPU_CAPABILITY_MMX;
if( !config_GetInt( p_vlc, "3dn" ) )
- p_vlc->i_cpu_capabilities &= ~CPU_CAPABILITY_3DNOW;
+ libvlc.i_cpu &= ~CPU_CAPABILITY_3DNOW;
if( !config_GetInt( p_vlc, "mmxext" ) )
- p_vlc->i_cpu_capabilities &= ~CPU_CAPABILITY_MMXEXT;
+ libvlc.i_cpu &= ~CPU_CAPABILITY_MMXEXT;
if( !config_GetInt( p_vlc, "sse" ) )
- p_vlc->i_cpu_capabilities &= ~CPU_CAPABILITY_SSE;
+ libvlc.i_cpu &= ~CPU_CAPABILITY_SSE;
+ if( !config_GetInt( p_vlc, "sse2" ) )
+ libvlc.i_cpu &= ~CPU_CAPABILITY_SSE2;
+#endif
+#if defined( __powerpc__ ) || defined( SYS_DARWIN )
if( !config_GetInt( p_vlc, "altivec" ) )
- p_vlc->i_cpu_capabilities &= ~CPU_CAPABILITY_ALTIVEC;
+ libvlc.i_cpu &= ~CPU_CAPABILITY_ALTIVEC;
+#endif
#define PRINT_CAPABILITY( capability, string ) \
- if( p_vlc->i_cpu_capabilities & capability ) \
+ if( libvlc.i_cpu & capability ) \
{ \
strncat( p_capabilities, string " ", \
sizeof(p_capabilities) - strlen(p_capabilities) ); \
PRINT_CAPABILITY( CPU_CAPABILITY_3DNOW, "3DNow!" );
PRINT_CAPABILITY( CPU_CAPABILITY_MMXEXT, "MMXEXT" );
PRINT_CAPABILITY( CPU_CAPABILITY_SSE, "SSE" );
+ PRINT_CAPABILITY( CPU_CAPABILITY_SSE2, "SSE2" );
PRINT_CAPABILITY( CPU_CAPABILITY_ALTIVEC, "AltiVec" );
PRINT_CAPABILITY( CPU_CAPABILITY_FPU, "FPU" );
msg_Dbg( p_vlc, "CPU has capabilities %s", p_capabilities );
/*
* Choose the best memcpy module
*/
- psz_module = config_GetPsz( p_vlc, "memcpy" );
- p_vlc->p_memcpy_module =
- module_Need( p_vlc, MODULE_CAPABILITY_MEMCPY, psz_module, NULL );
- if( psz_module ) free( psz_module );
- if( p_vlc->p_memcpy_module == NULL )
+ p_vlc->p_memcpy_module = module_Need( p_vlc, "memcpy", "$memcpy", 0 );
+
+ if( p_vlc->pf_memcpy == NULL )
{
- msg_Err( p_vlc, "no suitable memcpy module, using libc default" );
p_vlc->pf_memcpy = memcpy;
}
- else
+
+ if( p_vlc->pf_memset == NULL )
{
- p_vlc->pf_memcpy = p_vlc->p_memcpy_module->p_functions
- ->memcpy.functions.memcpy.pf_memcpy;
+ p_vlc->pf_memset = memset;
}
/*
- * Initialize shared resources and libraries
+ * Initialize hotkey handling
*/
- if( config_GetInt( p_vlc, "network-channel" )
- && network_ChannelCreate( p_vlc ) )
- {
- /* On error during Channels initialization, switch off channels */
- msg_Err( p_vlc,
- "channels initialization failed, deactivating channels" );
- config_PutInt( p_vlc, "network-channel", VLC_FALSE );
- }
+ var_Create( p_vlc, "key-pressed", VLC_VAR_INTEGER );
+ p_vlc->p_hotkeys = malloc( sizeof(p_hotkeys) );
+ /* Do a copy (we don't need to modify the strings) */
+ memcpy( p_vlc->p_hotkeys, p_hotkeys, sizeof(p_hotkeys) );
/*
* Initialize playlist and get commandline files
msg_Err( p_vlc, "playlist initialization failed" );
if( p_vlc->p_memcpy_module != NULL )
{
- module_Unneed( p_vlc->p_memcpy_module );
+ module_Unneed( p_vlc, p_vlc->p_memcpy_module );
}
module_EndBank( p_vlc );
- msg_Destroy( p_vlc );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_EGENERIC;
}
- /* Update the handle status */
- p_vlc->i_status = VLC_STATUS_STOPPED;
+ psz_modules = config_GetPsz( p_playlist, "services-discovery" );
+ if( psz_modules && *psz_modules )
+ {
+ /* Add service discovery modules */
+ playlist_AddSDModules( p_playlist, psz_modules );
+ }
+ if( psz_modules ) free( psz_modules );
/*
- * Get input filenames given as commandline arguments
+ * Load background interfaces
*/
- GetFilenames( p_vlc, i_argc, ppsz_argv );
-
- return VLC_SUCCESS;
-}
+ psz_modules = config_GetPsz( p_vlc, "extraintf" );
+ psz_control = config_GetPsz( p_vlc, "control" );
-/*****************************************************************************
- * vlc_run: run vlc
- *****************************************************************************
- * XXX: This function opens an interface plugin and runs it. If b_block is set
- * to 0, vlc_add_intf will return immediately and let the interface run in a
- * separate thread. If b_block is set to 1, vlc_add_intf will continue until
- * user requests to quit.
- *****************************************************************************/
-vlc_error_t vlc_run( void )
-{
- return vlc_run_r( ( i_vlc == 1 ) ? *pp_vlc : NULL );
-}
+ if( psz_modules && *psz_modules && psz_control && *psz_control )
+ {
+ psz_modules = (char *)realloc( psz_modules, strlen( psz_modules ) +
+ strlen( psz_control ) + 1 );
+ sprintf( psz_modules, "%s:%s", psz_modules, psz_control );
+ }
+ else if( psz_control && *psz_control )
+ {
+ if( psz_modules ) free( psz_modules );
+ psz_modules = strdup( psz_control );
+ }
-vlc_error_t vlc_run_r( vlc_t *p_vlc )
-{
- /* Check that the handle is valid */
- if( !p_vlc || p_vlc->i_status != VLC_STATUS_STOPPED )
+ psz_parser = psz_modules;
+ if( psz_parser && *psz_parser &&
+ strstr( psz_parser, ",") && !strstr(psz_parser, ":" ) )
+ {
+ msg_Info( p_vlc, "Warning: you are using a deprecated syntax for "
+ "extraintf / control." );
+ msg_Info( p_vlc, "You must now use ':' as separator instead of ','." );
+ }
+ while ( psz_parser && *psz_parser )
+ {
+ char *psz_module, *psz_temp;
+ psz_module = psz_parser;
+ psz_parser = strchr( psz_module, ':' );
+ if( !psz_parser ) psz_parser = strchr( psz_module, ',' );
+ if ( psz_parser )
+ {
+ *psz_parser = '\0';
+ psz_parser++;
+ }
+ 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, VLC_FALSE );
+ free( psz_temp );
+ }
+ }
+ if ( psz_modules )
{
- fprintf( stderr, "error: invalid status (!STOPPED)\n" );
- return VLC_ESTATUS;
+ free( psz_modules );
}
- /* Update the handle status */
- p_vlc->i_status = VLC_STATUS_RUNNING;
+ /*
+ * Allways load the hotkeys interface if it exists
+ */
+ VLC_AddIntf( 0, "hotkeys,none", VLC_FALSE, VLC_FALSE );
+
+ /*
+ * FIXME: kludge to use a p_vlc-local variable for the Mozilla plugin
+ */
+ var_Create( p_vlc, "drawable", VLC_VAR_INTEGER );
+ var_Create( p_vlc, "drawableredraw", VLC_VAR_INTEGER );
+ var_Create( p_vlc, "drawablet", VLC_VAR_INTEGER );
+ var_Create( p_vlc, "drawablel", VLC_VAR_INTEGER );
+ var_Create( p_vlc, "drawableb", VLC_VAR_INTEGER );
+ var_Create( p_vlc, "drawabler", VLC_VAR_INTEGER );
+ var_Create( p_vlc, "drawablex", VLC_VAR_INTEGER );
+ var_Create( p_vlc, "drawabley", VLC_VAR_INTEGER );
+ var_Create( p_vlc, "drawablew", VLC_VAR_INTEGER );
+ var_Create( p_vlc, "drawableh", VLC_VAR_INTEGER );
+ var_Create( p_vlc, "drawableportx", VLC_VAR_INTEGER );
+ var_Create( p_vlc, "drawableporty", VLC_VAR_INTEGER );
+
+ /*
+ * Get input filenames given as commandline arguments
+ */
+ GetFilenames( p_vlc, i_argc, ppsz_argv );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_SUCCESS;
}
/*****************************************************************************
- * vlc_add_intf: add an interface
+ * VLC_AddIntf: add an interface
*****************************************************************************
* This function opens an interface plugin and runs it. If b_block is set
- * to 0, vlc_add_intf will return immediately and let the interface run in a
- * separate thread. If b_block is set to 1, vlc_add_intf will continue until
- * user requests to quit.
+ * to 0, VLC_AddIntf will return immediately and let the interface run in a
+ * separate thread. If b_block is set to 1, VLC_AddIntf will continue until
+ * user requests to quit. If b_play is set to 1, VLC_AddIntf will start playing
+ * the playlist when it is completely initialised.
*****************************************************************************/
-vlc_error_t vlc_add_intf( const char *psz_module, vlc_bool_t b_block )
-{
- return vlc_add_intf_r( ( i_vlc == 1 ) ? *pp_vlc : NULL,
- psz_module, b_block );
-}
-
-vlc_error_t vlc_add_intf_r( vlc_t *p_vlc, const char *psz_module,
- vlc_bool_t b_block )
+int VLC_AddIntf( int i_object, char const *psz_module,
+ vlc_bool_t b_block, vlc_bool_t b_play )
{
- vlc_error_t err;
+ int i_err;
intf_thread_t *p_intf;
- char *psz_oldmodule = NULL;
+ vlc_t *p_vlc = vlc_current_object( i_object );
- /* Check that the handle is valid */
- if( !p_vlc || p_vlc->i_status != VLC_STATUS_RUNNING )
+ if( !p_vlc )
{
- fprintf( stderr, "error: invalid status (!RUNNING)\n" );
- return VLC_ESTATUS;
+ return VLC_ENOOBJ;
}
- if( psz_module )
+#ifndef WIN32
+ if( p_vlc->p_libvlc->b_daemon && b_block && !psz_module )
{
- psz_oldmodule = config_GetPsz( p_vlc, "intf" );
- config_PutPsz( p_vlc, "intf", psz_module );
+ /* Daemon mode hack.
+ * We prefer the dummy interface if none is specified. */
+ char *psz_interface = config_GetPsz( p_vlc, "intf" );
+ if( !psz_interface || !*psz_interface ) psz_module = "dummy";
+ if( psz_interface ) free( psz_interface );
}
+#endif
/* 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;
}
+ /* Interface doesn't handle play on start so do it ourselves */
+ if( !p_intf->b_play && b_play ) VLC_Play( i_object );
+
/* Try to run the interface */
+ p_intf->b_play = b_play;
p_intf->b_block = b_block;
- err = intf_RunThread( p_intf );
- if( err )
+ i_err = intf_RunThread( p_intf );
+ if( i_err )
{
- vlc_object_detach_all( p_intf );
+ vlc_object_detach( p_intf );
intf_Destroy( p_intf );
- return err;
+ if( i_object ) vlc_object_release( p_vlc );
+ return i_err;
}
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_SUCCESS;
}
/*****************************************************************************
- * vlc_stop: stop playing.
+ * VLC_Die: ask vlc to die.
*****************************************************************************
- * This function requests the interface threads to finish, waits for their
- * termination, and destroys their structure.
+ * This function sets p_vlc->b_die to VLC_TRUE, but does not do any other
+ * task. It is your duty to call VLC_CleanUp and VLC_Destroy afterwards.
*****************************************************************************/
-vlc_error_t vlc_stop( void )
+int VLC_Die( int i_object )
{
- return vlc_stop_r( ( i_vlc == 1 ) ? *pp_vlc : NULL );
-}
-
-vlc_error_t vlc_stop_r( vlc_t *p_vlc )
-{
- intf_thread_t *p_intf;
- playlist_t *p_playlist;
- vout_thread_t *p_vout;
- aout_thread_t *p_aout;
+ vlc_t *p_vlc = vlc_current_object( i_object );
- /* Check that the handle is valid */
- if( !p_vlc || p_vlc->i_status != VLC_STATUS_RUNNING )
+ if( !p_vlc )
{
- fprintf( stderr, "error: invalid status (!RUNNING)\n" );
- return VLC_ESTATUS;
+ return VLC_ENOOBJ;
}
- /*
+ p_vlc->b_die = VLC_TRUE;
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * VLC_CleanUp: CleanUp all the intf, playlist, vout, aout
+ *****************************************************************************/
+int VLC_CleanUp( int i_object )
+{
+ intf_thread_t * p_intf;
+ playlist_t * p_playlist;
+ vout_thread_t * p_vout;
+ aout_instance_t * p_aout;
+ announce_handler_t * p_announce;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ /*
* Ask the interfaces to stop and destroy them
*/
msg_Dbg( p_vlc, "removing all interfaces" );
while( (p_intf = vlc_object_find( p_vlc, VLC_OBJECT_INTF, FIND_CHILD )) )
{
intf_StopThread( p_intf );
- vlc_object_detach_all( p_intf );
+ vlc_object_detach( p_intf );
vlc_object_release( p_intf );
intf_Destroy( p_intf );
}
while( (p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST,
FIND_CHILD )) )
{
- vlc_object_detach_all( p_playlist );
+ vlc_object_detach( p_playlist );
vlc_object_release( p_playlist );
playlist_Destroy( p_playlist );
}
msg_Dbg( p_vlc, "removing all video outputs" );
while( (p_vout = vlc_object_find( p_vlc, VLC_OBJECT_VOUT, FIND_CHILD )) )
{
- vlc_object_detach_all( p_vout );
+ vlc_object_detach( p_vout );
vlc_object_release( p_vout );
- vout_DestroyThread( p_vout );
+ vout_Destroy( p_vout );
}
/*
msg_Dbg( p_vlc, "removing all audio outputs" );
while( (p_aout = vlc_object_find( p_vlc, VLC_OBJECT_AOUT, FIND_CHILD )) )
{
- vlc_object_detach_all( p_aout );
- vlc_object_release( p_aout );
- aout_DestroyThread( p_aout );
+ vlc_object_detach( (vlc_object_t *)p_aout );
+ vlc_object_release( (vlc_object_t *)p_aout );
+ aout_Delete( p_aout );
}
- /* Update the handle status */
- p_vlc->i_status = VLC_STATUS_STOPPED;
-
+ /*
+ * Free announce handler(s?)
+ */
+ msg_Dbg( p_vlc, "removing announce handler" );
+ while( (p_announce = vlc_object_find( p_vlc, VLC_OBJECT_ANNOUNCE,
+ FIND_CHILD ) ) )
+ {
+ vlc_object_detach( p_announce );
+ vlc_object_release( p_announce );
+ announce_HandlerDestroy( p_announce );
+ }
+
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_SUCCESS;
}
/*****************************************************************************
- * vlc_end: uninitialize everything.
+ * VLC_Destroy: Destroy everything.
*****************************************************************************
- * This function uninitializes every vlc component that was activated in
- * vlc_init: audio and video outputs, playlist, module bank and message queue.
+ * This function requests the running threads to finish, waits for their
+ * termination, and destroys their structure.
*****************************************************************************/
-vlc_error_t vlc_end( void )
+int VLC_Destroy( int i_object )
{
- return vlc_end_r( ( i_vlc == 1 ) ? *pp_vlc : NULL );
-}
+ vlc_t *p_vlc = vlc_current_object( i_object );
-vlc_error_t vlc_end_r( vlc_t *p_vlc )
-{
- /* Check that the handle is valid */
- if( !p_vlc || p_vlc->i_status != VLC_STATUS_STOPPED )
+ if( !p_vlc )
{
- fprintf( stderr, "error: invalid status (!STOPPED)\n" );
- return VLC_ESTATUS;
+ return VLC_ENOOBJ;
}
/*
- * Go back into channel 0 which is the network
+ * Free allocated memory
*/
- if( config_GetInt( p_vlc, "network-channel" ) && p_vlc->p_channel )
+ if( p_vlc->p_memcpy_module )
{
- network_ChannelJoin( p_vlc, COMMON_CHANNEL );
+ module_Unneed( p_vlc, p_vlc->p_memcpy_module );
+ p_vlc->p_memcpy_module = NULL;
}
/*
- * Free allocated memory
+ * Free module bank !
*/
- if( p_vlc->p_memcpy_module != NULL )
+ module_EndBank( p_vlc );
+
+ if( p_vlc->psz_homedir )
{
- module_Unneed( p_vlc->p_memcpy_module );
+ free( p_vlc->psz_homedir );
+ p_vlc->psz_homedir = NULL;
}
- free( p_vlc->psz_homedir );
+ if( p_vlc->psz_configfile )
+ {
+ free( p_vlc->psz_configfile );
+ p_vlc->psz_configfile = NULL;
+ }
- /*
- * Free module bank
- */
- module_EndBank( p_vlc );
+ if( p_vlc->p_hotkeys )
+ {
+ free( p_vlc->p_hotkeys );
+ p_vlc->p_hotkeys = NULL;
+ }
/*
* System specific cleaning code
*/
system_End( p_vlc );
- /*
- * Terminate messages interface and program
- */
- msg_Destroy( 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( p_libvlc );
+
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * VLC_VariableSet: set a vlc variable
+ *****************************************************************************/
+int VLC_VariableSet( int i_object, char const *psz_var, vlc_value_t value )
+{
+ vlc_t *p_vlc = vlc_current_object( i_object );
+ int i_ret;
+
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ /* FIXME: Temporary hack for Mozilla, if variable starts with conf:: then
+ * we handle it as a configuration variable. Don't tell Gildas :) -- sam */
+ if( !strncmp( psz_var, "conf::", 6 ) )
+ {
+ module_config_t *p_item;
+ char const *psz_newvar = psz_var + 6;
+
+ p_item = config_FindConfig( VLC_OBJECT(p_vlc), psz_newvar );
+
+ if( p_item )
+ {
+ switch( p_item->i_type )
+ {
+ case CONFIG_ITEM_BOOL:
+ config_PutInt( p_vlc, psz_newvar, value.b_bool );
+ break;
+ case CONFIG_ITEM_INTEGER:
+ config_PutInt( p_vlc, psz_newvar, value.i_int );
+ break;
+ case CONFIG_ITEM_FLOAT:
+ config_PutFloat( p_vlc, psz_newvar, value.f_float );
+ break;
+ default:
+ config_PutPsz( p_vlc, psz_newvar, value.psz_string );
+ break;
+ }
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_SUCCESS;
+ }
+ }
+
+ i_ret = var_Set( p_vlc, psz_var, value );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return i_ret;
+}
+
+/*****************************************************************************
+ * VLC_VariableGet: get a vlc variable
+ *****************************************************************************/
+int VLC_VariableGet( int i_object, char const *psz_var, vlc_value_t *p_value )
+{
+ vlc_t *p_vlc = vlc_current_object( i_object );
+ int i_ret;
+
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ i_ret = var_Get( p_vlc , psz_var, p_value );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return i_ret;
+}
+
+/*****************************************************************************
+ * VLC_VariableType: get a vlc variable type
+ *****************************************************************************/
+int VLC_VariableType( int i_object, char const *psz_var, int *pi_type )
+{
+ int i_type;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ /* FIXME: Temporary hack for Mozilla, if variable starts with conf:: then
+ * we handle it as a configuration variable. Don't tell Gildas :) -- sam */
+ if( !strncmp( psz_var, "conf::", 6 ) )
+ {
+ module_config_t *p_item;
+ char const *psz_newvar = psz_var + 6;
+
+ p_item = config_FindConfig( VLC_OBJECT(p_vlc), psz_newvar );
+
+ if( p_item )
+ {
+ switch( p_item->i_type )
+ {
+ case CONFIG_ITEM_BOOL:
+ i_type = VLC_VAR_BOOL;
+ break;
+ case CONFIG_ITEM_INTEGER:
+ i_type = VLC_VAR_INTEGER;
+ break;
+ case CONFIG_ITEM_FLOAT:
+ i_type = VLC_VAR_FLOAT;
+ break;
+ default:
+ i_type = VLC_VAR_STRING;
+ break;
+ }
+ }
+ else
+ i_type = 0;
+ }
+ else
+ i_type = VLC_VAR_TYPE & var_Type( p_vlc , psz_var );
+
+ if( i_object ) vlc_object_release( p_vlc );
+
+ if( i_type > 0 )
+ {
+ *pi_type = i_type;
+ return VLC_SUCCESS;
+ }
+ return VLC_ENOVAR;
+}
+
+/*****************************************************************************
+ * VLC_AddTarget: adds a target for playing.
+ *****************************************************************************
+ * This function adds psz_target to the current playlist. If a playlist does
+ * not exist, it will create one.
+ *****************************************************************************/
+int VLC_AddTarget( int i_object, char const *psz_target,
+ char const **ppsz_options, int i_options,
+ int i_mode, int i_pos )
+{
+ int i_err;
+ playlist_t *p_playlist;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+
+ if( p_playlist == NULL )
+ {
+ msg_Dbg( p_vlc, "no playlist present, creating one" );
+ p_playlist = playlist_Create( p_vlc );
+
+ if( p_playlist == NULL )
+ {
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_EGENERIC;
+ }
+
+ vlc_object_yield( p_playlist );
+ }
+
+ i_err = playlist_AddExt( p_playlist, psz_target, psz_target,
+ i_mode, i_pos, -1, ppsz_options, i_options);
+
+ vlc_object_release( p_playlist );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return i_err;
+}
+
+/*****************************************************************************
+ * VLC_Play: play
+ *****************************************************************************/
+int VLC_Play( int i_object )
+{
+ playlist_t * p_playlist;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ 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;
+ }
+
+ playlist_Play( p_playlist );
+ vlc_object_release( p_playlist );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * VLC_Pause: toggle pause
+ *****************************************************************************/
+int VLC_Pause( int i_object )
+{
+ playlist_t * p_playlist;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ 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;
+ }
+
+ playlist_Pause( p_playlist );
+ vlc_object_release( p_playlist );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * VLC_Pause: toggle pause
+ *****************************************************************************/
+int VLC_Stop( int i_object )
+{
+ playlist_t * p_playlist;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ 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;
+ }
+
+ playlist_Stop( p_playlist );
+ vlc_object_release( p_playlist );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * VLC_IsPlaying: Query for Playlist Status
+ *****************************************************************************/
+vlc_bool_t VLC_IsPlaying( int i_object )
+{
+ playlist_t * p_playlist;
+ vlc_bool_t b_playing;
+
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ 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;
+ }
+
+ b_playing = playlist_IsPlaying( p_playlist );
+ vlc_object_release( p_playlist );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return b_playing;
+}
+
+/**
+ * Get the current position in a input
+ *
+ * Return the current position as a float
+ * \note For some inputs, this will be unknown.
+ *
+ * \param i_object a vlc object id
+ * \return a float in the range of 0.0 - 1.0
+ */
+float VLC_PositionGet( int i_object )
+{
+ input_thread_t *p_input;
+ vlc_value_t val;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ p_input = vlc_object_find( p_vlc, VLC_OBJECT_INPUT, FIND_CHILD );
+
+ if( !p_input )
+ {
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_ENOOBJ;
+ }
+
+ var_Get( p_input, "position", &val );
+ vlc_object_release( p_input );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return val.f_float;
+}
+
+/**
+ * Set the current position in a input
+ *
+ * Set the current position in a input and then return
+ * the current position as a float.
+ * \note For some inputs, this will be unknown.
+ *
+ * \param i_object a vlc object id
+ * \param i_position a float in the range of 0.0 - 1.0
+ * \return a float in the range of 0.0 - 1.0
+ */
+float VLC_PositionSet( int i_object, float i_position )
+{
+ input_thread_t *p_input;
+ vlc_value_t val;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ p_input = vlc_object_find( p_vlc, VLC_OBJECT_INPUT, FIND_CHILD );
+
+ if( !p_input )
+ {
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_ENOOBJ;
+ }
+
+ val.f_float = i_position;
+ var_Set( p_input, "position", val );
+ var_Get( p_input, "position", &val );
+ vlc_object_release( p_input );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return val.f_float;
+}
+
+/**
+ * Get the current position in a input
+ *
+ * Return the current position in seconds from the start.
+ * \note For some inputs, this will be unknown.
+ *
+ * \param i_object a vlc object id
+ * \return the offset from 0:00 in seconds
+ */
+int VLC_TimeGet( int i_object )
+{
+ input_thread_t *p_input;
+ vlc_value_t val;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ p_input = vlc_object_find( p_vlc, VLC_OBJECT_INPUT, FIND_CHILD );
+
+ if( !p_input )
+ {
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_ENOOBJ;
+ }
+
+ var_Get( p_input, "time", &val );
+ vlc_object_release( p_input );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return val.i_time / 1000000;
+}
+
+/**
+ * Seek to a position in the current input
+ *
+ * Seek i_seconds in the current input. If b_relative is set,
+ * then the seek will be relative to the current position, otherwise
+ * it will seek to i_seconds from the beginning of the input.
+ * \note For some inputs, this will be unknown.
+ *
+ * \param i_object a vlc object id
+ * \param i_seconds seconds from current position or from beginning of input
+ * \param b_relative seek relative from current position
+ * \return VLC_SUCCESS on success
+ */
+int VLC_TimeSet( int i_object, int i_seconds, vlc_bool_t b_relative )
+{
+ input_thread_t *p_input;
+ vlc_value_t val;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ p_input = vlc_object_find( p_vlc, VLC_OBJECT_INPUT, FIND_CHILD );
+
+ if( !p_input )
+ {
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_ENOOBJ;
+ }
+
+ if( b_relative )
+ {
+ val.i_time = i_seconds;
+ val.i_time = val.i_time * 1000000L;
+ var_Set( p_input, "time-offset", val );
+ }
+ else
+ {
+ val.i_time = i_seconds;
+ val.i_time = val.i_time * 1000000L;
+ var_Set( p_input, "time", val );
+ }
+ vlc_object_release( p_input );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_SUCCESS;
+}
+
+/**
+ * Get the total length of a input
+ *
+ * Return the total length in seconds from the current input.
+ * \note For some inputs, this will be unknown.
+ *
+ * \param i_object a vlc object id
+ * \return the length in seconds
+ */
+int VLC_LengthGet( int i_object )
+{
+ input_thread_t *p_input;
+ vlc_value_t val;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ p_input = vlc_object_find( p_vlc, VLC_OBJECT_INPUT, FIND_CHILD );
+
+ if( !p_input )
+ {
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_ENOOBJ;
+ }
+
+ var_Get( p_input, "length", &val );
+ vlc_object_release( p_input );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return val.i_time / 1000000L;
+}
+
+/**
+ * Play the input faster than realtime
+ *
+ * 2x, 4x, 8x faster than realtime
+ * \note For some inputs, this will be impossible.
+ *
+ * \param i_object a vlc object id
+ * \return the current speedrate
+ */
+float VLC_SpeedFaster( int i_object )
+{
+ input_thread_t *p_input;
+ vlc_value_t val;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ p_input = vlc_object_find( p_vlc, VLC_OBJECT_INPUT, FIND_CHILD );
+
+ if( !p_input )
+ {
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_ENOOBJ;
+ }
+
+ val.b_bool = VLC_TRUE;
+ var_Set( p_input, "rate-faster", val );
+ var_Get( p_input, "rate", &val );
+ vlc_object_release( p_input );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return val.f_float / INPUT_RATE_DEFAULT;
+}
+
+/**
+ * Play the input slower than realtime
+ *
+ * 1/2x, 1/4x, 1/8x slower than realtime
+ * \note For some inputs, this will be impossible.
+ *
+ * \param i_object a vlc object id
+ * \return the current speedrate
+ */
+float VLC_SpeedSlower( int i_object )
+{
+ input_thread_t *p_input;
+ vlc_value_t val;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ p_input = vlc_object_find( p_vlc, VLC_OBJECT_INPUT, FIND_CHILD );
+
+ if( !p_input )
+ {
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_ENOOBJ;
+ }
+
+ val.b_bool = VLC_TRUE;
+ var_Set( p_input, "rate-slower", val );
+ var_Get( p_input, "rate", &val );
+ vlc_object_release( p_input );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return val.f_float / INPUT_RATE_DEFAULT;
+}
+
+/**
+ * Return the current playlist item
+ *
+ * Returns the index of the playlistitem that is currently selected for play.
+ * This is valid even if nothing is currently playing.
+ *
+ * \param i_object a vlc object id
+ * \return the current index
+ */
+int VLC_PlaylistIndex( int i_object )
+{
+ int i_index;
+ playlist_t * p_playlist;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ 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;
+ }
+
+ i_index = p_playlist->i_index;
+ vlc_object_release( p_playlist );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return i_index;
+}
+
+/**
+ * Total amount of items in the playlist
+ *
+ * \param i_object a vlc object id
+ * \return amount of playlist items
+ */
+int VLC_PlaylistNumberOfItems( int i_object )
+{
+ int i_size;
+ playlist_t * p_playlist;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ 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;
+ }
+
+ i_size = p_playlist->i_size;
+ vlc_object_release( p_playlist );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return i_size;
+}
+
+/**
+ * Next playlist item
+ *
+ * Skip to the next playlistitem and play it.
+ *
+ * \param i_object a vlc object id
+ * \return VLC_SUCCESS on success
+ */
+int VLC_PlaylistNext( int i_object )
+{
+ playlist_t * p_playlist;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ 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;
+ }
+
+ playlist_Next( p_playlist );
+ vlc_object_release( p_playlist );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_SUCCESS;
+}
+
+/**
+ * Previous playlist item
+ *
+ * Skip to the previous playlistitem and play it.
+ *
+ * \param i_object a vlc object id
+ * \return VLC_SUCCESS on success
+ */
+int VLC_PlaylistPrev( int i_object )
+{
+ playlist_t * p_playlist;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+
+ 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;
+ }
- /* Update the handle status */
- p_vlc->i_status = VLC_STATUS_CREATED;
+ playlist_Prev( p_playlist );
+ vlc_object_release( p_playlist );
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_SUCCESS;
}
+
/*****************************************************************************
- * vlc_destroy: free allocated resources.
- *****************************************************************************
- * This function frees the previously allocated vlc_t structure.
+ * VLC_PlaylistClear: Empty the playlist
*****************************************************************************/
-vlc_error_t vlc_destroy( void )
-{
- return vlc_destroy_r( ( i_vlc == 1 ) ? *pp_vlc : NULL );
-}
-
-vlc_error_t vlc_destroy_r( vlc_t *p_vlc )
+int VLC_PlaylistClear( int i_object )
{
- int i_index;
+ int i_err;
+ playlist_t * p_playlist;
+ vlc_t *p_vlc = vlc_current_object( i_object );
/* Check that the handle is valid */
- if( !p_vlc || p_vlc->i_status != VLC_STATUS_CREATED )
+ if( !p_vlc )
{
- fprintf( stderr, "error: invalid status (!CREATED)\n" );
- return VLC_ESTATUS;
+ return VLC_ENOOBJ;
}
- /* Update the handle status, just in case */
- p_vlc->i_status = VLC_STATUS_NONE;
+ p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_CHILD );
- /* Remove our structure from the global list */
- vlc_mutex_lock( p_vlc->p_global_lock );
- for( i_index = 0 ; i_index < i_vlc ; i_index++ )
+ if( !p_playlist )
{
- if( pp_vlc[ i_index ] == p_vlc )
- {
- break;
- }
+ if( i_object ) vlc_object_release( p_vlc );
+ return VLC_ENOOBJ;
}
- if( i_index == i_vlc )
- {
- fprintf( stderr, "error: trying to unregister %p which is not in "
- "the list\n", p_vlc );
- vlc_mutex_unlock( p_vlc->p_global_lock );
- vlc_object_destroy( p_vlc );
- return VLC_EGENERIC;
- }
+ i_err = playlist_Clear( p_playlist );
+
+ vlc_object_release( p_playlist );
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return i_err;
+}
+
+/**
+ * Change the volume
+ *
+ * \param i_object a vlc object id
+ * \param i_volume something in a range from 0-200
+ * \return the new volume (range 0-200 %)
+ */
+int VLC_VolumeSet( int i_object, int i_volume )
+{
+ audio_volume_t i_vol = 0;
+ vlc_t *p_vlc = vlc_current_object( i_object );
- for( i_index++ ; i_index < i_vlc ; i_index++ )
+ /* Check that the handle is valid */
+ if( !p_vlc )
{
- pp_vlc[ i_index - 1 ] = pp_vlc[ i_index ];
+ return VLC_ENOOBJ;
}
- i_vlc--;
- if( i_vlc )
+ if( i_volume >= 0 && i_volume <= 200 )
{
- pp_vlc = realloc( pp_vlc, i_vlc * sizeof( vlc_t * ) );
+ i_vol = i_volume * AOUT_VOLUME_MAX / 200;
+ aout_VolumeSet( p_vlc, i_vol );
}
- else
+
+ if( i_object ) vlc_object_release( p_vlc );
+ return i_vol * 200 / AOUT_VOLUME_MAX;
+}
+
+/**
+ * Get the current volume
+ *
+ * Retrieve the current volume.
+ *
+ * \param i_object a vlc object id
+ * \return the current volume (range 0-200 %)
+ */
+int VLC_VolumeGet( int i_object )
+{
+ audio_volume_t i_volume;
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
{
- free( pp_vlc );
- pp_vlc = NULL;
+ return VLC_ENOOBJ;
}
- vlc_mutex_unlock( p_vlc->p_global_lock );
- /* Stop thread system: last one out please shut the door! */
- vlc_threads_end( p_vlc );
+ aout_VolumeGet( p_vlc, &i_volume );
- /* Destroy mutexes */
- vlc_mutex_destroy( &p_vlc->structure_lock );
- vlc_mutex_destroy( &p_vlc->config_lock );
+ if( i_object ) vlc_object_release( p_vlc );
+ return i_volume*200/AOUT_VOLUME_MAX;
+}
- vlc_object_destroy( p_vlc );
+/**
+ * Mute/Unmute the volume
+ *
+ * \param i_object a vlc object id
+ * \return VLC_SUCCESS on success
+ */
+int VLC_VolumeMute( int i_object )
+{
+ vlc_t *p_vlc = vlc_current_object( i_object );
+
+ /* Check that the handle is valid */
+ if( !p_vlc )
+ {
+ return VLC_ENOOBJ;
+ }
+ aout_VolumeMute( p_vlc, NULL );
+
+ if( i_object ) vlc_object_release( p_vlc );
return VLC_SUCCESS;
}
-vlc_status_t vlc_status( void )
+/*****************************************************************************
+ * VLC_FullScreen: toggle fullscreen mode
+ *****************************************************************************/
+int VLC_FullScreen( int i_object )
{
- return vlc_status_r( ( i_vlc == 1 ) ? *pp_vlc : NULL );
-}
+ vout_thread_t *p_vout;
+ vlc_t *p_vlc = vlc_current_object( i_object );
-vlc_status_t vlc_status_r( vlc_t *p_vlc )
-{
if( !p_vlc )
{
- return VLC_STATUS_NONE;
+ return VLC_ENOOBJ;
}
- return p_vlc->i_status;
-}
+ p_vout = vlc_object_find( p_vlc, VLC_OBJECT_VOUT, FIND_CHILD );
-vlc_error_t vlc_add_target( const char *psz_target, int i_mode, int i_pos )
-{
- return vlc_add_target_r( ( i_vlc == 1 ) ? *pp_vlc : NULL,
- psz_target, i_mode, i_pos );
+ 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;
}
-vlc_error_t vlc_add_target_r( vlc_t *p_vlc, const char *psz_target,
- int i_mode, int i_pos )
+/* 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 )
{
- vlc_error_t err;
- playlist_t *p_playlist;
+#if defined( ENABLE_NLS ) \
+ && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
+
+ char * psz_path;
+#if defined( SYS_DARWIN ) || defined ( WIN32 ) || defined( SYS_BEOS )
+ char psz_tmp[1024];
+#endif
- if( !p_vlc || ( p_vlc->i_status != VLC_STATUS_STOPPED
- && p_vlc->i_status != VLC_STATUS_RUNNING ) )
+ if( psz_lang && !*psz_lang )
{
- fprintf( stderr, "error: invalid status (!STOPPED&&!RUNNING)\n" );
- return VLC_ESTATUS;
+# if defined( HAVE_LC_MESSAGES )
+ setlocale( LC_MESSAGES, psz_lang );
+# endif
+ setlocale( LC_CTYPE, psz_lang );
}
-
- p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
-
- if( p_playlist == NULL )
+ else if( psz_lang )
{
- msg_Dbg( p_vlc, "no playlist present, creating one" );
- p_playlist = playlist_Create( p_vlc );
+#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
+ * 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( p_playlist == NULL )
- {
- return VLC_EGENERIC;
- }
+ setlocale( LC_ALL, psz_lang );
+ }
- vlc_object_yield( p_playlist );
+ /* Specify where to find the locales for current domain */
+#if !defined( SYS_DARWIN ) && !defined( WIN32 ) && !defined( SYS_BEOS )
+ psz_path = LOCALEDIR;
+#else
+ snprintf( psz_tmp, sizeof(psz_tmp), "%s/%s", libvlc.psz_vlcpath,
+ "locale" );
+ psz_path = psz_tmp;
+#endif
+ if( !bindtextdomain( PACKAGE_NAME, psz_path ) )
+ {
+ fprintf( stderr, "warning: no domain %s in directory %s\n",
+ PACKAGE_NAME, psz_path );
}
- err = playlist_Add( p_playlist, psz_target, i_mode, i_pos );
+ /* Set the default domain */
+ textdomain( PACKAGE_NAME );
- vlc_object_release( p_playlist );
+#if defined( ENABLE_UTF8 )
+ bind_textdomain_codeset( PACKAGE_NAME, "UTF-8" );
+#endif
- return err;
+#endif
}
-/* following functions are local */
-
/*****************************************************************************
* GetFilenames: parse command line options which are not flags
*****************************************************************************
- * Parse command line for input files.
+ * Parse command line for input files as well as their associated options.
+ * An option always follows its associated input and begins with a ":".
*****************************************************************************/
static int GetFilenames( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] )
{
- int i_opt;
+ int i_opt, i_options;
- /* We assume that the remaining parameters are filenames */
- for( i_opt = optind; i_opt < i_argc; i_opt++ )
+ /* We assume that the remaining parameters are filenames
+ * and their input options */
+ for( i_opt = i_argc - 1; i_opt >= optind; i_opt-- )
{
- vlc_add_target_r( p_vlc, ppsz_argv[ i_opt ],
- PLAYLIST_APPEND, PLAYLIST_END );
+ i_options = 0;
+
+ /* Count the input options */
+ while( *ppsz_argv[ i_opt ] == ':' && i_opt > optind )
+ {
+ i_options++;
+ 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 ],
+ (char const **)( i_options ? &ppsz_argv[i_opt + 1] :
+ NULL ), i_options,
+ PLAYLIST_INSERT, 0 );
}
return VLC_SUCCESS;
}
/*****************************************************************************
- * Usage: print program usage
+ * Help: print program help
+ *****************************************************************************
+ * Print a short inline help. Message interface is initialized at this stage.
+ *****************************************************************************/
+static void Help( vlc_t *p_this, char const *psz_help_name )
+{
+#ifdef WIN32
+ ShowConsole();
+#endif
+
+ if( psz_help_name && !strcmp( psz_help_name, "help" ) )
+ {
+ fprintf( stdout, VLC_USAGE, p_this->psz_object_name );
+ Usage( p_this, "help" );
+ Usage( p_this, "main" );
+ }
+ else if( psz_help_name && !strcmp( psz_help_name, "longhelp" ) )
+ {
+ fprintf( stdout, VLC_USAGE, p_this->psz_object_name );
+ Usage( p_this, NULL );
+ }
+ else if( psz_help_name )
+ {
+ Usage( p_this, psz_help_name );
+ }
+
+#ifdef WIN32 /* Pause the console because it's destroyed when we exit */
+ PauseConsole();
+#endif
+}
+
+/*****************************************************************************
+ * Usage: print module usage
*****************************************************************************
* Print a short inline help. Message interface is initialized at this stage.
*****************************************************************************/
-static void Usage( vlc_t *p_this, const char *psz_module_name )
+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
- module_t *p_module;
+ vlc_list_t *p_list;
+ module_t *p_parser;
module_config_t *p_item;
- char psz_spaces[PADDING_SPACES+LINE_START+1];
+ char psz_spaces_text[PADDING_SPACES+LINE_START+1];
+ char psz_spaces_longtext[LINE_START+3];
char psz_format[sizeof(FORMAT_STRING)];
+ char psz_buffer[10000];
+ char psz_short[4];
+ int i_index;
+ int i_width = ConsoleWidth() - (PADDING_SPACES+LINE_START+1);
+ vlc_bool_t b_advanced = config_GetInt( p_this, "advanced" );
+ vlc_bool_t b_description;
- memset( psz_spaces, ' ', PADDING_SPACES+LINE_START );
- psz_spaces[PADDING_SPACES+LINE_START] = '\0';
+ 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';
strcpy( psz_format, FORMAT_STRING );
-#ifdef WIN32
- ShowConsole();
-#endif
+ /* List all modules */
+ p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
/* Enumerate the config for each module */
- for( p_module = p_this->p_vlc->module_bank.first ;
- p_module != NULL ;
- p_module = p_module->next )
+ for( i_index = 0; i_index < p_list->i_count; i_index++ )
{
- vlc_bool_t b_help_module = !strcmp( "help", p_module->psz_object_name );
+ vlc_bool_t b_help_module;
+
+ p_parser = (module_t *)p_list->p_values[i_index].p_object ;
if( psz_module_name && strcmp( psz_module_name,
- p_module->psz_object_name ) )
+ p_parser->psz_object_name ) )
{
continue;
}
/* Ignore modules without config options */
- if( !p_module->i_config_items )
+ if( !p_parser->i_config_items )
{
continue;
}
- /* Print module name */
- fprintf( stderr, _("%s module options:\n\n"),
- p_module->psz_object_name );
+ /* Ignore modules with only advanced config options if requested */
+ if( !b_advanced )
+ {
+ for( p_item = p_parser->p_config;
+ p_item->i_type != CONFIG_HINT_END;
+ p_item++ )
+ {
+ if( (p_item->i_type & CONFIG_ITEM) &&
+ !p_item->b_advanced ) break;
+ }
+ if( p_item->i_type == CONFIG_HINT_END ) continue;
+ }
+
+ /* Print name of module */
+ if( strcmp( "main", p_parser->psz_object_name ) )
+ fprintf( stdout, "\n %s\n", p_parser->psz_longname );
- for( p_item = p_module->p_config;
+ b_help_module = !strcmp( "help", p_parser->psz_object_name );
+
+ /* Print module options */
+ for( p_item = p_parser->p_config;
p_item->i_type != CONFIG_HINT_END;
p_item++ )
{
+ char *psz_text, *psz_spaces = psz_spaces_text;
char *psz_bra = NULL, *psz_type = NULL, *psz_ket = NULL;
char *psz_suf = "", *psz_prefix = NULL;
int i;
+ /* Skip advanced options if requested */
+ if( p_item->b_advanced && !b_advanced )
+ {
+ continue;
+ }
+
switch( p_item->i_type )
{
case CONFIG_HINT_CATEGORY:
case CONFIG_HINT_USAGE:
- fprintf( stderr, " %s\n", p_item->psz_text );
+ if( !strcmp( "main", p_parser->psz_object_name ) )
+ fprintf( stdout, "\n %s\n", p_item->psz_text );
break;
case CONFIG_ITEM_STRING:
case CONFIG_ITEM_FILE:
+ case CONFIG_ITEM_DIRECTORY:
case CONFIG_ITEM_MODULE: /* We could also have "=<" here */
- if( !p_item->ppsz_list )
- {
- psz_bra = " <"; psz_type = _("string"); psz_ket = ">";
- break;
- }
- else
+ case CONFIG_ITEM_MODULE_CAT:
+ case CONFIG_ITEM_MODULE_LIST:
+ case CONFIG_ITEM_MODULE_LIST_CAT:
+ psz_bra = " <"; psz_type = _("string"); psz_ket = ">";
+
+ if( p_item->ppsz_list )
{
- 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 = "]";
- break;
+ psz_ket = "}";
}
+ break;
case CONFIG_ITEM_INTEGER:
+ case CONFIG_ITEM_KEY: /* FIXME: do something a bit more clever */
psz_bra = " <"; psz_type = _("integer"); psz_ket = ">";
+
+ if( p_item->i_list )
+ {
+ psz_bra = " {";
+ psz_type = psz_buffer;
+ psz_type[0] = '\0';
+ for( i = 0; p_item->ppsz_list_text[i]; i++ )
+ {
+ if( i ) strcat( psz_type, ", " );
+ sprintf( psz_type + strlen(psz_type), "%i (%s)",
+ p_item->pi_list[i],
+ p_item->ppsz_list_text[i] );
+ }
+ psz_ket = "}";
+ }
break;
case CONFIG_ITEM_FLOAT:
psz_bra = " <"; psz_type = _("float"); psz_ket = ">";
break;
}
- /* Add short option */
+ 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
{
- psz_format[2] = ' ';
- psz_format[3] = ' ';
- psz_format[4] = ' ';
+ strcpy( psz_short, " " );
}
- if( psz_type )
+ 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 )
{
- 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 )
- {
- vlc_bool_t b_dash = VLC_FALSE;
- psz_prefix = p_item->psz_name;
- while( *psz_prefix )
- {
- if( *psz_prefix++ == '-' )
- {
- b_dash = VLC_TRUE;
- break;
- }
- }
+ /* 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( 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" );
- }
- }
+ if( i < 0 )
+ {
+ psz_spaces[0] = '\n';
+ i = 0;
+ }
+ else
+ {
+ psz_spaces[i] = '\0';
+ }
- if( i < 0 )
- {
- i = 0;
- psz_spaces[i] = '\n';
- }
- else
+ if( p_item->i_type == CONFIG_ITEM_BOOL && !b_help_module )
+ {
+ 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 );
+ }
+
+ psz_spaces[i] = ' ';
+
+ /* We wrap the rest of the output */
+ sprintf( psz_buffer, "%s%s", p_item->psz_text, psz_suf );
+ b_description = config_GetInt( p_this, "help-verbose" );
+
+ description:
+ 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( stderr, 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( stderr, 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;
}
}
- }
-
- fprintf( stderr, "\n" );
+ if( b_description && p_item->psz_longtext )
+ {
+ sprintf( psz_buffer, "%s%s", p_item->psz_longtext, psz_suf );
+ b_description = VLC_FALSE;
+ psz_spaces = psz_spaces_longtext;
+ fprintf( stdout, "%s", psz_spaces );
+ goto description;
+ }
+ }
}
-#ifdef WIN32 /* Pause the console because it's destroyed when we exit */
- fprintf( stderr, _("\nPress the RETURN key to continue...\n") );
- getchar();
-#endif
+ /* Release the module list */
+ vlc_list_release( p_list );
}
/*****************************************************************************
*****************************************************************************/
static void ListModules( vlc_t *p_this )
{
- module_t *p_module;
+ vlc_list_t *p_list;
+ module_t *p_parser;
char psz_spaces[22];
+ int i_index;
memset( psz_spaces, ' ', 22 );
ShowConsole();
#endif
- /* Usage */
- fprintf( stderr, _("Usage: %s [options] [parameters] [file]...\n\n"),
- p_this->p_vlc->psz_object_name );
-
- fprintf( stderr, _("[module] [description]\n") );
+ /* List all modules */
+ p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
/* Enumerate each module */
- for( p_module = p_this->p_vlc->module_bank.first ;
- p_module != NULL ;
- p_module = p_module->next )
+ for( i_index = 0; i_index < p_list->i_count; i_index++ )
{
int i;
+ 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 */
- i = 22 - strlen( p_module->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", p_module->psz_object_name, psz_spaces,
- p_module->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 );
+
#ifdef WIN32 /* Pause the console because it's destroyed when we exit */
- fprintf( stderr, _("\nPress the RETURN key to continue...\n") );
- getchar();
+ PauseConsole();
#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") );
- getchar();
-#endif
-}
-
-/*****************************************************************************
- * Build: print information about the vlc build
- *****************************************************************************
- * Print the ./configure command line and other information.
- *****************************************************************************/
-static void Build( void )
-{
-#ifdef WIN32
- ShowConsole();
-#endif
-
- fprintf( stderr, "configured with %s\n", CONFIGURE_LINE );
+ "Written by the VideoLAN team; see the AUTHORS file.\n") );
#ifdef WIN32 /* Pause the console because it's destroyed when we exit */
- fprintf( stderr, _("\nPress the RETURN key to continue...\n") );
- getchar();
+ PauseConsole();
#endif
}
#ifdef WIN32 /* */
static void ShowConsole( void )
{
+# ifndef UNDER_CE
+
+ if( getenv( "PWD" ) && getenv( "PS1" ) ) return; /* cygwin shell */
+
AllocConsole();
freopen( "CONOUT$", "w", stdout );
freopen( "CONOUT$", "w", stderr );
freopen( "CONIN$", "r", stdin );
- return;
+
+# endif
}
#endif
-#ifndef WIN32
/*****************************************************************************
- * InitSignalHandler: system signal handler initialization
+ * PauseConsole: On Win32, wait for a key press before closing the console
*****************************************************************************
- * Set the signal handlers. SIGTERM is not intercepted, because we need at
- * at least a method to kill the program when all other methods failed, and
- * when we don't want to use SIGKILL.
+ * This function is useful only on Win32.
*****************************************************************************/
-static void InitSignalHandler( void )
+#ifdef WIN32 /* */
+static void PauseConsole( void )
{
- /* Termination signals */
- signal( SIGINT, FatalSignalHandler );
- signal( SIGHUP, FatalSignalHandler );
- signal( SIGQUIT, FatalSignalHandler );
-
- /* Other signals */
- signal( SIGALRM, SimpleSignalHandler );
- signal( SIGPIPE, SimpleSignalHandler );
+# ifndef UNDER_CE
+
+ if( getenv( "PWD" ) && getenv( "PS1" ) ) return; /* cygwin shell */
+ fprintf( stdout, _("\nPress the RETURN key to continue...\n") );
+ getchar();
+
+# endif
}
+#endif
/*****************************************************************************
- * SimpleSignalHandler: system signal handler
+ * ConsoleWidth: Return the console width in characters
*****************************************************************************
- * This function is called when a non fatal signal is received by the program.
+ * 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 void SimpleSignalHandler( int i_signal )
+static int ConsoleWidth( void )
{
- int i_index;
+ 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;
+}
- /* Acknowledge the signal received and warn all the p_vlc structures */
- vlc_mutex_lock( &global_lock );
- for( i_index = 0 ; i_index < i_vlc ; i_index++ )
+static int VerboseCallback( vlc_object_t *p_this, const char *psz_variable,
+ vlc_value_t old_val, vlc_value_t new_val, void *param)
+{
+ vlc_t *p_vlc = (vlc_t *)p_this;
+
+ if( new_val.i_int >= -1 )
{
- msg_Warn( pp_vlc[ i_index ], "ignoring signal %d", i_signal );
+ p_vlc->p_libvlc->i_verbose = __MIN( new_val.i_int, 2 );
}
- vlc_mutex_unlock( &global_lock );
+ return VLC_SUCCESS;
}
/*****************************************************************************
- * FatalSignalHandler: system signal handler
+ * InitDeviceValues: initialize device values
*****************************************************************************
- * This function is called when a fatal signal is received by the program.
- * It tries to end the program in a clean way.
+ * This function inits the dvd, vcd and cd-audio values
*****************************************************************************/
-static void FatalSignalHandler( int i_signal )
+static void InitDeviceValues( vlc_t *p_vlc )
{
- static mtime_t abort_time = 0;
- static volatile vlc_bool_t b_die = VLC_FALSE;
- int i_index;
+#ifdef HAVE_HAL
+ LibHalContext * ctx;
+ int i, i_devices;
+ char **devices;
+ char *block_dev;
+ dbus_bool_t b_dvd;
+
+ if( ( ctx = hal_initialize( NULL, FALSE ) ) )
+ {
+ if( ( devices = hal_get_all_devices( ctx, &i_devices ) ) )
+ {
+ for( i = 0; i < i_devices; i++ )
+ {
+ if( !hal_device_property_exists( ctx, devices[ i ],
+ "storage.cdrom.dvd" ) )
+ {
+ continue;
+ }
- /* Once a signal has been trapped, the termination sequence will be
- * armed and following signals will be ignored to avoid sending messages
- * to an interface having been destroyed */
+ b_dvd = hal_device_get_property_bool( ctx, devices[ i ],
+ "storage.cdrom.dvd" );
+ block_dev = hal_device_get_property_string( ctx, devices[ i ],
+ "block.device" );
- if( !b_die )
- {
- b_die = VLC_TRUE;
- abort_time = mdate();
+ if( b_dvd )
+ {
+ config_PutPsz( p_vlc, "dvd", block_dev );
+ }
- fprintf( stderr, "signal %d received, terminating libvlc - do it "
- "again in case your process gets stuck\n", i_signal );
+ config_PutPsz( p_vlc, "vcd", block_dev );
+ config_PutPsz( p_vlc, "cd-audio", block_dev );
- /* Try to terminate everything - this is done by requesting the end of
- * all the p_vlc structures */
- for( i_index = 0 ; i_index < i_vlc ; i_index++ )
- {
- /* Acknowledge the signal received */
- pp_vlc[ i_index ]->b_die = VLC_TRUE;
+ hal_free_string( block_dev );
+ }
+ hal_free_string_array( devices );
}
- }
- else if( mdate() > abort_time + 1000000 )
- {
- /* If user asks again 1 second later, die badly */
- signal( SIGINT, SIG_IGN );
- signal( SIGHUP, SIG_IGN );
- signal( SIGQUIT, SIG_IGN );
- fprintf( stderr, "user insisted too much, dying badly\n" );
-
- exit( 1 );
+ hal_shutdown( ctx );
}
-}
#endif
-
+}
projects / vlc / blobdiff