#include "control/libvlc_internal.h"
#include <vlc_input.h>
-#include "misc/modules.h"
-#include "misc/configuration.h"
+#include "modules/modules.h"
+#include "modules/configuration.h"
#include <errno.h> /* ENOMEM */
#include <stdio.h> /* sprintf() */
* The evil global variable. We handle it with care, don't worry.
*****************************************************************************/
static libvlc_global_data_t libvlc_global;
-static libvlc_global_data_t * p_libvlc_global = NULL;
+#define p_libvlc_global (&libvlc_global)
static libvlc_int_t * p_static_vlc = NULL;
static volatile unsigned int i_instances = 0;
static int GetFilenames ( libvlc_int_t *, int, char *[] );
static void Help ( libvlc_int_t *, char const *psz_help_name );
static void Usage ( libvlc_int_t *, char const *psz_module_name );
-static void ListModules ( libvlc_int_t * );
+static void ListModules ( libvlc_int_t *, vlc_bool_t );
static void Version ( void );
#ifdef WIN32
static void InitDeviceValues( libvlc_int_t * );
-/* Refs misc/cpu.c */
-uint32_t CPUCapabilities( void );
+libvlc_global_data_t *vlc_global( void )
+{
+ return &libvlc_global;
+}
/*****************************************************************************
* vlc_current_object: return the current object.
vlc_value_t lockval;
char *psz_env = NULL;
+#if 0
/* &libvlc_global never changes,
* so we can safely call this multiple times. */
p_libvlc_global = &libvlc_global;
+#endif
/* vlc_threads_init *must* be the first internal call! No other call is
* allowed before the thread system has been initialized. */
if( !libvlc_global.b_ready )
{
/* Guess what CPU we have */
- libvlc_global.i_cpu = CPUCapabilities();
+ cpu_flags = CPUCapabilities();
/* The module bank will be initialized later */
libvlc_global.p_module_bank = NULL;
i_instances--;
return NULL;
}
- p_libvlc->thread_id = 0;
p_libvlc->p_playlist = NULL;
p_libvlc->psz_object_name = "libvlc";
vlc_mutex_init( p_libvlc, &p_libvlc->quicktime_lock );
vlc_thread_set_priority( p_libvlc, VLC_THREAD_PRIORITY_LOW );
#endif
- /* Fake attachment */
- p_libvlc->b_attached = VLC_TRUE;
/* Store data for the non-reentrant API */
p_static_vlc = p_libvlc;
module_InitBank( p_libvlc );
/* Hack: insert the help module here */
- p_help_module = vlc_object_create( p_libvlc, VLC_OBJECT_MODULE );
+ p_help_module = vlc_module_create( VLC_OBJECT(p_libvlc) );
if( p_help_module == NULL )
{
module_EndBank( p_libvlc );
}
/* Set the config file stuff */
- p_libvlc->psz_homedir = config_GetHomeDir();
- p_libvlc->psz_userdir = config_GetUserDir();
- if( p_libvlc->psz_userdir == NULL )
- p_libvlc->psz_userdir = strdup(p_libvlc->psz_homedir);
- p_libvlc->psz_configfile = config_GetPsz( p_libvlc, "config" );
- if( (p_libvlc->psz_configfile != NULL) && (p_libvlc->psz_configfile[0] == '~')
- && (p_libvlc->psz_configfile[1] == '/') )
- {
- char *psz = malloc( strlen(p_libvlc->psz_userdir)
- + strlen(p_libvlc->psz_configfile) );
- if( psz )
- {
- /* This is incomplete : we should also support the ~cmassiot/ syntax. */
- sprintf( psz, "%s/%s", p_libvlc->psz_userdir,
- p_libvlc->psz_configfile + 2 );
- free( p_libvlc->psz_configfile );
- p_libvlc->psz_configfile = psz;
- } /* else keep old config stuff */
- }
+ p_libvlc->psz_homedir = config_GetHomeDir();
+ p_libvlc->psz_configdir = config_GetConfigDir( p_libvlc );
+ p_libvlc->psz_datadir = config_GetUserDataDir( p_libvlc );
+ p_libvlc->psz_cachedir = config_GetCacheDir( p_libvlc );
+ p_libvlc->psz_configfile = config_GetCustomConfigFile( p_libvlc );
/* Check for plugins cache options */
if( config_GetInt( p_libvlc, "reset-plugins-cache" ) )
msg_Err( p_libvlc, "Unable to fork vlc to daemon mode" );
b_exit = VLC_TRUE;
}
- p_libvlc->p_libvlc_global->b_daemon = VLC_TRUE;
+ libvlc_global.b_daemon = VLC_TRUE;
/* lets check if we need to write the pidfile */
psz_pidfile = config_GetPsz( p_libvlc, "pidfile" );
close( STDOUT_FILENO );
close( STDERR_FILENO );
- p_libvlc->p_libvlc_global->b_daemon = VLC_TRUE;
+ libvlc_global.b_daemon = VLC_TRUE;
}
#endif
}
/* Check for module list option */
else if( config_GetInt( p_libvlc, "list" ) )
{
- ListModules( p_libvlc );
+ ListModules( p_libvlc, VLC_FALSE );
+ b_exit = VLC_TRUE;
+ i_ret = VLC_EEXITSUCCESS;
+ }
+ else if( config_GetInt( p_libvlc, "list-verbose" ) )
+ {
+ ListModules( p_libvlc, VLC_TRUE );
b_exit = VLC_TRUE;
i_ret = VLC_EEXITSUCCESS;
}
}
else
{
- /* check if a Media Player is available
+ /* check if VLC is available on the bus
* if not: D-Bus control is not enabled on the other
* instance and we can't pass MRLs to it */
DBusMessage *p_test_msg = NULL;
DBusMessage *p_test_reply = NULL;
p_test_msg = dbus_message_new_method_call(
- "org.freedesktop.MediaPlayer", "/",
+ "org.mpris.vlc", "/",
"org.freedesktop.MediaPlayer", "Identity" );
/* block until a reply arrives */
p_test_reply = dbus_connection_send_with_reply_and_block(
ppsz_argv[i_input] );
p_dbus_msg = dbus_message_new_method_call(
- "org.freedesktop.MediaPlayer", "/TrackList",
+ "org.mpris.vlc", "/TrackList",
"org.freedesktop.MediaPlayer", "AddTrack" );
if ( NULL == p_dbus_msg )
/* append MRLs */
dbus_message_iter_init_append( p_dbus_msg, &dbus_args );
- if ( !dbus_message_iter_append_basic( &dbus_args,
+ if ( !dbus_message_iter_append_basic( &dbus_args,
DBUS_TYPE_STRING, &ppsz_argv[i_input] ) )
{
msg_Err( p_libvlc, "Out of memory" );
}
}
/* we unreference the connection when we've finished with it */
- if( p_conn ) dbus_connection_unref( p_conn );
+ if( p_conn ) dbus_connection_unref( p_conn );
}
#endif
msg_Flush( p_libvlc );
if( !config_GetInt( p_libvlc, "fpu" ) )
- libvlc_global.i_cpu &= ~CPU_CAPABILITY_FPU;
+ cpu_flags &= ~CPU_CAPABILITY_FPU;
#if defined( __i386__ ) || defined( __x86_64__ )
if( !config_GetInt( p_libvlc, "mmx" ) )
- libvlc_global.i_cpu &= ~CPU_CAPABILITY_MMX;
+ cpu_flags &= ~CPU_CAPABILITY_MMX;
if( !config_GetInt( p_libvlc, "3dn" ) )
- libvlc_global.i_cpu &= ~CPU_CAPABILITY_3DNOW;
+ cpu_flags &= ~CPU_CAPABILITY_3DNOW;
if( !config_GetInt( p_libvlc, "mmxext" ) )
- libvlc_global.i_cpu &= ~CPU_CAPABILITY_MMXEXT;
+ cpu_flags &= ~CPU_CAPABILITY_MMXEXT;
if( !config_GetInt( p_libvlc, "sse" ) )
- libvlc_global.i_cpu &= ~CPU_CAPABILITY_SSE;
+ cpu_flags &= ~CPU_CAPABILITY_SSE;
if( !config_GetInt( p_libvlc, "sse2" ) )
- libvlc_global.i_cpu &= ~CPU_CAPABILITY_SSE2;
+ cpu_flags &= ~CPU_CAPABILITY_SSE2;
#endif
#if defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc64__ )
if( !config_GetInt( p_libvlc, "altivec" ) )
- libvlc_global.i_cpu &= ~CPU_CAPABILITY_ALTIVEC;
+ cpu_flags &= ~CPU_CAPABILITY_ALTIVEC;
#endif
#define PRINT_CAPABILITY( capability, string ) \
- if( libvlc_global.i_cpu & capability ) \
+ if( vlc_CPU() & capability ) \
{ \
strncat( p_capabilities, string " ", \
sizeof(p_capabilities) - strlen(p_capabilities) ); \
VLC_AddIntf( 0, "netsync,none", VLC_FALSE, VLC_FALSE );
}
+#ifdef WIN32
+ if( config_GetInt( p_libvlc, "prefer-system-codecs") == 1 )
+ {
+ char *psz_codecs = config_GetPsz( p_playlist, "codec" );
+ if( psz_codecs )
+ {
+ char *psz_morecodecs;
+ asprintf(&psz_morecodecs, "%s,dmo,quicktime", psz_codecs);
+ if( psz_morecodecs )
+ {
+ config_PutPsz( p_libvlc, "codec", psz_morecodecs);
+ free(psz_morecodecs);
+ }
+ }
+ else
+ config_PutPsz( p_libvlc, "codec", "dmo,quicktime");
+ free(psz_codecs);
+ }
+#endif
+
/*
* FIXME: kludge to use a p_libvlc-local variable for the Mozilla plugin
*/
#ifndef WIN32
char* psz_pidfile = NULL;
- if( p_libvlc->p_libvlc_global->p_module_bank )
+ if( libvlc_global.p_module_bank )
if( config_GetInt( p_libvlc, "daemon" ) )
{
psz_pidfile = config_GetPsz( p_libvlc, "pidfile" );
module_EndBank( p_libvlc );
FREENULL( p_libvlc->psz_homedir );
- FREENULL( p_libvlc->psz_userdir );
+ FREENULL( p_libvlc->psz_configdir );
+ FREENULL( p_libvlc->psz_datadir );
+ FREENULL( p_libvlc->psz_cachedir );
FREENULL( p_libvlc->psz_configfile );
FREENULL( p_libvlc->p_hotkeys );
p_libvlc = NULL;
/* Stop thread system: last one out please shut the door!
- * The number of initializations of the thread system is counted, we
+ * The number of initializations of the thread system is counted, we
* can call this each time */
vlc_threads_end( p_libvlc_global );
return VLC_EGENERIC;
#ifndef WIN32
- if( p_libvlc->p_libvlc_global->b_daemon && b_block && !psz_module )
+ if( libvlc_global.b_daemon && b_block && !psz_module )
{
/* Daemon mode hack.
* We prefer the dummy interface if none is specified. */
/* List all modules */
p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+ /* Ugly hack to make sure that the help options always come first
+ * (part 1) */
+ if( !psz_module_name )
+ Usage( p_this, "help" );
+
/* Enumerate the config for each module */
for( i_index = 0; i_index < p_list->i_count; i_index++ )
{
if( psz_module_name && strcmp( psz_module_name,
p_parser->psz_object_name ) )
{
- const char **pp_shortcut = p_parser->pp_shortcuts;
+ const char *const *pp_shortcut = p_parser->pp_shortcuts;
while( *pp_shortcut )
{
if( !strcmp( psz_module_name, *pp_shortcut ) )
continue;
}
+ b_help_module = !strcmp( "help", p_parser->psz_object_name );
+ /* Ugly hack to make sure that the help options always come first
+ * (part 2) */
+ if( !psz_module_name && b_help_module )
+ continue;
+
/* Ignore modules with only advanced config options if requested */
if( !b_advanced )
{
utf8_fprintf( stdout, " %s\n", p_parser->psz_help );
}
- b_help_module = !strcmp( "help", p_parser->psz_object_name );
-
/* Print module options */
for( p_item = p_parser->p_config;
p_item < p_end;
* Print a list of all available modules (builtins and plugins) and a short
* description for each one.
*****************************************************************************/
-static void ListModules( libvlc_int_t *p_this )
+static void ListModules( libvlc_int_t *p_this, vlc_bool_t b_verbose )
{
vlc_list_t *p_list = NULL;
module_t *p_parser = NULL;
char psz_spaces[22];
int i_index;
+ vlc_bool_t b_color = config_GetInt( p_this, "color" );
+
memset( psz_spaces, ' ', 22 );
#ifdef WIN32
if( i < 0 ) i = 0;
psz_spaces[i] = 0;
- utf8_fprintf( stdout, " %s%s %s\n", p_parser->psz_object_name,
- psz_spaces, p_parser->psz_longname );
+ if( b_color )
+ utf8_fprintf( stdout, GREEN" %s%s "WHITE"%s\n"GRAY,
+ p_parser->psz_object_name,
+ psz_spaces,
+ p_parser->psz_longname );
+ else
+ utf8_fprintf( stdout, " %s%s %s\n",
+ p_parser->psz_object_name,
+ psz_spaces, p_parser->psz_longname );
+
+ if( b_verbose )
+ {
+ const char *const *pp_shortcut = p_parser->pp_shortcuts;
+ while( *pp_shortcut )
+ {
+ if( strcmp( *pp_shortcut, p_parser->psz_object_name ) )
+ {
+ if( b_color )
+ utf8_fprintf( stdout, CYAN" s %s\n"GRAY,
+ *pp_shortcut );
+ else
+ utf8_fprintf( stdout, " s %s\n",
+ *pp_shortcut );
+ }
+ pp_shortcut++;
+ }
+ if( p_parser->psz_capability )
+ {
+ if( b_color )
+ utf8_fprintf( stdout, MAGENTA" c %s (%d)\n"GRAY,
+ p_parser->psz_capability,
+ p_parser->i_score );
+ else
+ utf8_fprintf( stdout, " c %s (%d)\n",
+ p_parser->psz_capability,
+ p_parser->i_score );
+ }
+ if( p_parser->psz_program )
+ {
+ if( b_color )
+ utf8_fprintf( stdout, YELLOW " p %s\n"GRAY,
+ p_parser->psz_program );
+ else
+ utf8_fprintf( stdout, " p %s\n", p_parser->psz_program );
+ }
+ }
psz_spaces[i] = ' ';
}
utf8_fprintf( stdout, _("Compiled by %s@%s.%s\n"),
VLC_CompileBy(), VLC_CompileHost(), VLC_CompileDomain() );
utf8_fprintf( stdout, _("Compiler: %s\n"), VLC_Compiler() );
-#ifndef HAVE_SHARED_LIBVLC
if( strcmp( VLC_Changeset(), "exported" ) )
utf8_fprintf( stdout, _("Based upon svn changeset [%s]\n"),
VLC_Changeset() );
-#endif
utf8_fprintf( stdout, LICENSE_MSG );
#ifdef WIN32 /* Pause the console because it's destroyed when we exit */
p_connection = dbus_bus_get ( DBUS_BUS_SYSTEM, &error );
if( dbus_error_is_set( &error ) || !p_connection )
{
- libhal_ctx_shutdown( ctx, NULL );
dbus_error_free( &error );
return;
}
projects / vlc / blobdiff