#include <vlc_cpu.h>
#include <vlc_url.h>
#include <vlc_atomic.h>
+#include <vlc_modules.h>
#include "libvlc.h"
* - configuration and commandline parsing
*/
int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
- const char *ppsz_argv[] )
+ const char *ppsz_argv[], const void **builtins_module )
{
libvlc_priv_t *priv = libvlc_priv (p_libvlc);
char * p_tmp = NULL;
}
/* Check for daemon mode */
-#ifndef WIN32
+#if !defined( WIN32 ) && !defined( __SYMBIAN32__ )
if( var_InheritBool( p_libvlc, "daemon" ) )
{
#ifdef HAVE_DAEMON
&& ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
# if defined (WIN32) || defined (__APPLE__)
if( !var_InheritBool( p_libvlc, "ignore-config" ) )
- config_LoadConfigFile( p_libvlc, "main" );
+ config_LoadConfigFile( p_libvlc );
priv->i_verbose = var_InheritInteger( p_libvlc, "verbose" );
/* Check if the user specified a custom language */
* list of configuration options exported by each module and loads their
* default values.
*/
- module_LoadPlugins( p_libvlc );
+ module_LoadPlugins( p_libvlc, builtins_module );
if( p_libvlc->b_die )
{
b_exit = true;
}
}
- if( module_count <= 1)
+ if( module_count <= 1 )
{
- msg_Err( p_libvlc, "No modules were found, refusing to start. Check "
- "that you properly gave a module path with --plugin-path.");
+ msg_Err( p_libvlc, "No plugins found! Check your VLC installation.");
b_exit = true;
i_ret = VLC_ENOITEM;
}
* Override default configuration with config file settings
*/
if( !var_InheritBool( p_libvlc, "ignore-config" ) )
- config_LoadConfigFile( p_libvlc, NULL );
+ config_LoadConfigFile( p_libvlc );
/*
* Override configuration with command line settings
for( i_input = vlc_optind; i_input < i_argc;i_input++ )
{
+ /* Skip input options, we can't pass them through D-Bus */
+ if( ppsz_argv[i_input][0] == ':' )
+ {
+ msg_Warn( p_libvlc, "Ignoring option %s",
+ ppsz_argv[i_input] );
+ continue;
+ }
+
+ /* We need to resolve relative paths in this instance */
+ char *psz_mrl = make_URI( ppsz_argv[i_input], NULL );
+ if( psz_mrl == NULL )
+ continue;
msg_Dbg( p_libvlc, "Adds %s to the running Media Player",
- ppsz_argv[i_input] );
+ psz_mrl );
p_dbus_msg = dbus_message_new_method_call(
"org.mpris.vlc", "/TrackList",
if ( NULL == p_dbus_msg )
{
msg_Err( p_libvlc, "D-Bus problem" );
+ free( psz_mrl );
system_End( p_libvlc );
exit( 1 );
}
/* append MRLs */
dbus_message_iter_init_append( p_dbus_msg, &dbus_args );
if ( !dbus_message_iter_append_basic( &dbus_args,
- DBUS_TYPE_STRING, &ppsz_argv[i_input] ) )
+ DBUS_TYPE_STRING, &psz_mrl ) )
{
dbus_message_unref( p_dbus_msg );
+ free( psz_mrl );
system_End( p_libvlc );
exit( 1 );
}
+ free( psz_mrl );
b_play = TRUE;
if( var_InheritBool( p_libvlc, "playlist-enqueue" ) )
b_play = FALSE;
/*
* Initialize hotkey handling
*/
- vlc_InitActions( p_libvlc );
+ priv->actions = vlc_InitActions( p_libvlc );
/* Create a variable for showing the fullscreen interface */
var_Create( p_libvlc, "intf-show", VLC_VAR_BOOL );
var_Create( p_libvlc, "snapshot-file", VLC_VAR_STRING );
var_Create( p_libvlc, "record-file", VLC_VAR_STRING );
+ /* some default internal settings */
+ var_Create( p_libvlc, "window", VLC_VAR_STRING );
+ var_Create( p_libvlc, "user-agent", VLC_VAR_STRING );
+ var_SetString( p_libvlc, "user-agent", "(LibVLC "VERSION")" );
+
/* Initialize playlist and get commandline files */
p_playlist = playlist_Create( VLC_OBJECT(p_libvlc) );
if( !p_playlist )
#if defined(MEDIA_LIBRARY)
/* Get the ML */
- if( var_GetBool( p_libvlc, "load-media-library-on-startup" ) == true )
+ if( var_GetBool( p_libvlc, "load-media-library-on-startup" ) )
{
priv->p_ml = ml_Create( VLC_OBJECT( p_libvlc ), NULL );
if( !priv->p_ml )
if( psz_codecs )
{
char *psz_morecodecs;
- if( asprintf(&psz_morecodecs, "%s,dmo,quicktime", psz_codecs) != -1 )
+ if( asprintf(&psz_morecodecs, "%s,dmo", psz_codecs) != -1 )
{
var_SetString( p_libvlc, "codec", psz_morecodecs);
free( psz_morecodecs );
free( psz_codecs );
}
else
- var_SetString( p_libvlc, "codec", "dmo,quicktime");
+ var_SetString( p_libvlc, "codec", "dmo");
}
#endif
+#ifdef __APPLE__
var_Create( p_libvlc, "drawable-view-top", VLC_VAR_INTEGER );
var_Create( p_libvlc, "drawable-view-left", VLC_VAR_INTEGER );
var_Create( p_libvlc, "drawable-view-bottom", VLC_VAR_INTEGER );
var_Create( p_libvlc, "drawable-clip-left", VLC_VAR_INTEGER );
var_Create( p_libvlc, "drawable-clip-bottom", VLC_VAR_INTEGER );
var_Create( p_libvlc, "drawable-clip-right", VLC_VAR_INTEGER );
+ var_Create( p_libvlc, "drawable-nsobject", VLC_VAR_ADDRESS );
+#endif
#ifdef WIN32
- var_Create( p_libvlc, "drawable-hwnd", VLC_VAR_ADDRESS );
+ var_Create( p_libvlc, "drawable-hwnd", VLC_VAR_INTEGER );
#endif
/*
}
#endif
- /* Free playlist now, all threads are gone */
- playlist_Destroy( p_playlist );
-
#if defined(MEDIA_LIBRARY)
media_library_t* p_ml = priv->p_ml;
if( p_ml )
}
#endif
+ /* Free playlist now, all threads are gone */
+ playlist_Destroy( p_playlist );
stats_TimersDumpAll( p_libvlc );
stats_TimersCleanAll( p_libvlc );
/* Free module bank. It is refcounted, so we call this each time */
module_EndBank( p_libvlc, true );
- vlc_DeinitActions( p_libvlc );
+ vlc_DeinitActions( p_libvlc, priv->actions );
}
/**
* 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, sizeof(psz_lcall), "LC_ALL=%s", psz_lang );
- putenv( psz_lcall );
+ setenv( "LC_ALL", psz_lang, 1 );
+
#endif
setlocale( LC_ALL, psz_lang );
}
}
- /* TODO: write an internal function of this one, to avoid
- * unnecessary lookups. */
- char *mrl = make_URI( args[n] );
+ char *mrl = make_URI( args[n], NULL );
if( !mrl )
continue;
#ifdef WIN32 /* Pause the console because it's destroyed when we exit */
PauseConsole();
#endif
+ fflush( stdout );
}
/*****************************************************************************
{
utf8_fprintf( stdout, RED" %s:\n"GRAY,
module_gettext( m, p_item->psz_text ) );
- if( b_description && p_item->psz_longtext && *p_item->psz_longtext )
+ if( b_description && p_item->psz_longtext )
utf8_fprintf( stdout, MAGENTA" %s\n"GRAY,
module_gettext( m, p_item->psz_longtext ) );
}
{
utf8_fprintf( stdout, " %s:\n",
module_gettext( m, p_item->psz_text ) );
- if( b_description && p_item->psz_longtext && *p_item->psz_longtext )
+ if( b_description && p_item->psz_longtext )
utf8_fprintf( stdout, " %s\n",
module_gettext(m, p_item->psz_longtext ) );
}
utf8_fprintf( stdout, "\n %s\n",
module_gettext( p_parser, p_item->psz_text ) );
}
- if( b_description && p_item->psz_longtext
- && *p_item->psz_longtext )
+ if( b_description && p_item->psz_longtext )
{
if( b_color )
utf8_fprintf( stdout, CYAN " %s\n" GRAY,
break;
case CONFIG_ITEM_STRING:
- case CONFIG_ITEM_FILE:
+ case CONFIG_ITEM_LOADFILE:
+ case CONFIG_ITEM_SAVEFILE:
case CONFIG_ITEM_DIRECTORY:
+ case CONFIG_ITEM_KEY:
case CONFIG_ITEM_MODULE: /* We could also have "=<" here */
case CONFIG_ITEM_MODULE_CAT:
case CONFIG_ITEM_MODULE_LIST:
}
break;
case CONFIG_ITEM_INTEGER:
- case CONFIG_ITEM_KEY: /* FIXME: do something a bit more clever */
print_help_section( p_parser, p_section, b_color,
b_description );
p_section = NULL;
if( p_item->min.i || p_item->max.i )
{
- sprintf( psz_buffer, "%s [%i .. %i]", psz_type,
- p_item->min.i, p_item->max.i );
+ sprintf( psz_buffer, "%s [%"PRId64" .. %"PRId64"]",
+ psz_type, p_item->min.i, p_item->max.i );
psz_type = psz_buffer;
}
i_cur_width = b_description && !b_description_hack
? i_width_description
: i_width;
+ if( !*psz_text ) strcpy(psz_text, " ");
while( *psz_text )
{
char *psz_parser, *psz_word;
}
}
- if( b_description_hack && p_item->psz_longtext
- && *p_item->psz_longtext )
+ if( b_description_hack && p_item->psz_longtext )
{
sprintf( psz_buffer, "%s%s",
module_gettext( p_parser, p_item->psz_longtext ),
ShowConsole( true );
#endif
- utf8_fprintf( stdout, _("VLC version %s (%s)\n"), VLC_Version(),
+ utf8_fprintf( stdout, _("VLC version %s (%s)\n"), VERSION_MESSAGE,
psz_vlc_changeset );
utf8_fprintf( stdout, _("Compiled by %s on %s (%s)\n"),
VLC_CompileBy(), VLC_CompileHost(), __DATE__" "__TIME__ );
projects / vlc / blobdiff