assert (refs != (uintptr_t)(-1)); /* reference underflow?! */
if (refs == 0)
{
-#ifdef USE_SYNC
+#if defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)
#elif defined (WIN32) && defined (__GNUC__)
#elif defined(__APPLE__)
#else
priv->p_playlist = NULL;
priv->p_dialog_provider = NULL;
priv->p_vlm = NULL;
- p_libvlc->psz_object_name = strdup( "libvlc" );
/* Initialize message queue */
msg_Create( p_libvlc );
{
msg_Err( p_libvlc, "D-Bus problem" );
system_End( p_libvlc );
- exit( VLC_ETIMEOUT );
+ exit( 1 );
}
/* append MRLs */
{
dbus_message_unref( p_dbus_msg );
system_End( p_libvlc );
- exit( VLC_ENOMEM );
+ exit( 1 );
}
b_play = TRUE;
if( config_GetInt( p_libvlc, "playlist-enqueue" ) > 0 )
{
dbus_message_unref( p_dbus_msg );
system_End( p_libvlc );
- exit( VLC_ENOMEM );
+ exit( 1 );
}
/* send message and get a handle for a reply */
msg_Err( p_libvlc, "D-Bus problem" );
dbus_message_unref( p_dbus_msg );
system_End( p_libvlc );
- exit( VLC_ETIMEOUT );
+ exit( 1 );
}
if ( NULL == p_dbus_pending )
msg_Err( p_libvlc, "D-Bus problem" );
dbus_message_unref( p_dbus_msg );
system_End( p_libvlc );
- exit( VLC_ETIMEOUT );
+ exit( 1 );
}
dbus_connection_flush( p_conn );
dbus_message_unref( p_dbus_msg );
/* bye bye */
system_End( p_libvlc );
- exit( VLC_SUCCESS );
+ exit( 0 );
}
}
/* we unreference the connection when we've finished with it */
var_SetInteger( p_libvlc, "verbose", -1 );
priv->i_verbose = -1;
}
+ vlc_threads_setup( p_libvlc );
if( priv->b_color )
priv->b_color = config_GetInt( p_libvlc, "color" ) > 0;
p_capabilities[0] = '\0';
PRINT_CAPABILITY( CPU_CAPABILITY_486, "486" );
PRINT_CAPABILITY( CPU_CAPABILITY_586, "586" );
- PRINT_CAPABILITY( CPU_CAPABILITY_PPRO, "Pentium Pro" );
PRINT_CAPABILITY( CPU_CAPABILITY_MMX, "MMX" );
PRINT_CAPABILITY( CPU_CAPABILITY_3DNOW, "3DNow!" );
PRINT_CAPABILITY( CPU_CAPABILITY_MMXEXT, "MMXEXT" );
* Choose the best memcpy module
*/
priv->p_memcpy_module = module_need( p_libvlc, "memcpy", "$memcpy", false );
+ /* Avoid being called "memcpy":*/
+ vlc_object_set_name( p_libvlc, "main" );
priv->b_stats = config_GetInt( p_libvlc, "stats" ) > 0;
priv->i_timers = 0;
p_keys );
}
+ /* variables for signalling creation of new files */
+ var_Create( p_libvlc, "snapshot-file", VLC_VAR_STRING );
+ var_Create( p_libvlc, "record-file", VLC_VAR_STRING );
+
/* Initialize playlist and get commandline files */
p_playlist = playlist_Create( VLC_OBJECT(p_libvlc) );
if( !p_playlist )
/*
* Load background interfaces
*/
+ /* Create volume callback system. (this variable must be created before
+ all interfaces as they can use it) */
+ var_Create( p_libvlc, "volume-change", VLC_VAR_BOOL );
+
psz_modules = config_GetPsz( p_libvlc, "extraintf" );
psz_control = config_GetPsz( p_libvlc, "control" );
}
#endif
- if( config_GetInt( p_libvlc, "show-intf" ) > 0 )
- {
- intf_Create( p_libvlc, "showintf,none" );
- }
-
if( config_GetInt( p_libvlc, "network-synchronisation") > 0 )
{
intf_Create( p_libvlc, "netsync,none" );
var_Create( p_libvlc, "drawable-clip-bottom", VLC_VAR_INTEGER );
var_Create( p_libvlc, "drawable-clip-right", VLC_VAR_INTEGER );
- /* Create volume callback system. */
- var_Create( p_libvlc, "volume-change", VLC_VAR_BOOL );
- /* Create a variable for showing the interface (moved from playlist). */
+ /* Create a variable for showing the fullscreen interface from hotkeys */
var_Create( p_libvlc, "intf-show", VLC_VAR_BOOL );
var_SetBool( p_libvlc, "intf-show", true );
+ /* Create a variable for showing the right click menu */
var_Create( p_libvlc, "intf-popupmenu", VLC_VAR_BOOL );
/*
if( intf_Create( p_libvlc, psz_module ? psz_module : "$intf" ) )
{
msg_Err( p_libvlc, "interface \"%s\" initialization failed",
- psz_module );
+ psz_module ? psz_module : "default" );
return VLC_EGENERIC;
}
return VLC_SUCCESS;
utf8_fprintf( stdout, "%s\n", _("To get exhaustive help, use '-H'.") );
}
+static const char vlc_usage[] = N_(
+ "Usage: %s [options] [stream] ..."
+ "\nYou can specify multiple streams on the commandline. They will be enqueued in the playlist."
+ "\nThe first item specified will be played first."
+ "\n"
+ "\nOptions-styles:"
+ "\n --option A global option that is set for the duration of the program."
+ "\n -option A single letter version of a global --option."
+ "\n :option An option that only applies to the stream directly before it"
+ "\n and that overrides previous settings."
+ "\n"
+ "\nStream MRL syntax:"
+ "\n [[access][/demux]://]URL[@[title][:chapter][-[title][:chapter]]] [:option=value ...]"
+ "\n"
+ "\n Many of the global --options can also be used as MRL specific :options."
+ "\n Multiple :option=value pairs can be specified."
+ "\n"
+ "\nURL syntax:"
+ "\n [file://]filename Plain media file"
+ "\n http://ip:port/file HTTP URL"
+ "\n ftp://ip:port/file FTP URL"
+ "\n mms://ip:port/file MMS URL"
+ "\n screen:// Screen capture"
+ "\n [dvd://][device][@raw_device] DVD device"
+ "\n [vcd://][device] VCD device"
+ "\n [cdda://][device] Audio CD device"
+ "\n udp://[[<source address>]@[<bind address>][:<bind port>]]"
+ "\n UDP stream sent by a streaming server"
+ "\n vlc://pause:<seconds> Special item to pause the playlist for a certain time"
+ "\n vlc://quit Special item to quit VLC"
+ "\n");
+
static void Help( libvlc_int_t *p_this, char const *psz_help_name )
{
#ifdef WIN32
{
if( b_color )
utf8_fprintf( stdout, "\n" WHITE "%s" GRAY "\n",
- _( "No matching module found. Use --list or" \
+ _( "No matching module found. Use --list or " \
"--list-verbose to list available modules." ) );
else
utf8_fprintf( stdout, "\n%s\n",
- _( "No matching module found. Use --list or" \
+ _( "No matching module found. Use --list or " \
"--list-verbose to list available modules." ) );
}
*****************************************************************************/
static void Version( void )
{
+ extern const char psz_vlc_changeset[];
#ifdef WIN32
ShowConsole( true );
#endif
- utf8_fprintf( stdout, _("VLC version %s\n"), VLC_Version() );
+ utf8_fprintf( stdout, _("VLC version %s (%s)\n"), VLC_Version(),
+ psz_vlc_changeset );
utf8_fprintf( stdout, _("Compiled by %s@%s.%s\n"),
VLC_CompileBy(), VLC_CompileHost(), VLC_CompileDomain() );
utf8_fprintf( stdout, _("Compiler: %s\n"), VLC_Compiler() );
projects / vlc / blobdiff