#include "config/vlc_getopt.h"
-#ifdef HAVE_UNISTD_H
-# include <unistd.h> /* isatty() */
-#endif
-
#ifdef HAVE_DBUS
/* used for one-instance mode */
# include <dbus/dbus.h>
#endif
-#include <vlc_media_library.h>
#include <vlc_playlist.h>
#include <vlc_interface.h>
* The evil global variables. We handle them with care, don't worry.
*****************************************************************************/
-#if !defined(WIN32) && !defined(__OS2__)
+#if !defined(_WIN32) && !defined(__OS2__)
static bool b_daemon = false;
#endif
priv = libvlc_priv (p_libvlc);
priv->p_playlist = NULL;
- priv->p_ml = NULL;
priv->p_dialog_provider = NULL;
priv->p_vlm = NULL;
- priv->i_verbose = 3; /* initial value until config is loaded */
-#if defined( HAVE_ISATTY ) && !defined( WIN32 )
- priv->b_color = isatty( STDERR_FILENO ); /* 2 is for stderr */
-#else
- priv->b_color = false;
-#endif
- /* Initialize mutexes */
- vlc_mutex_init( &priv->ml_lock );
vlc_ExitInit( &priv->exit );
return p_libvlc;
module_EndBank (false);
return VLC_EGENERIC;
}
- priv->i_verbose = var_InheritInteger( p_libvlc, "verbose" );
- /* Find verbosity from VLC_VERBOSE environment variable */
- {
- char *env = getenv( "VLC_VERBOSE" );
- if( env != NULL )
- priv->i_verbose = atoi( env );
- }
-
- /* Announce who we are (TODO: only first instance?) */
- msg_Dbg( p_libvlc, "VLC media player - %s", VERSION_MESSAGE );
- msg_Dbg( p_libvlc, "%s", COPYRIGHT_MESSAGE );
- msg_Dbg( p_libvlc, "revision %s", psz_vlc_changeset );
- msg_Dbg( p_libvlc, "configured with %s", CONFIGURE_LINE );
+ vlc_LogInit (p_libvlc);
vlc_threads_setup (p_libvlc);
/* Load the builtins and plugins into the module_bank.
int vlc_optind;
if( config_LoadCmdLine( p_libvlc, i_argc, ppsz_argv, &vlc_optind ) )
{
-#ifdef WIN32
- MessageBox (NULL, TEXT("The command line options could not be parsed.\n"
- "Make sure they are valid."), TEXT("VLC media player"),
- MB_OK|MB_ICONERROR);
-#endif
module_EndBank (true);
+ vlc_LogDeinit (p_libvlc);
return VLC_EGENERIC;
}
- priv->i_verbose = var_InheritInteger( p_libvlc, "verbose" );
/*
* Support for gettext
if (config_PrintHelp (VLC_OBJECT(p_libvlc)))
{
module_EndBank (true);
- return VLC_EEXITSUCCESS;
+ exit(0);
}
if( module_count <= 1 )
{
msg_Err( p_libvlc, "No plugins found! Check your VLC installation.");
module_EndBank (true);
- return VLC_ENOITEM;
+ vlc_LogDeinit (p_libvlc);
+ return VLC_ENOMOD;
}
#ifdef HAVE_DAEMON
{
msg_Err( p_libvlc, "Unable to fork vlc to daemon mode" );
module_EndBank (true);
- return VLC_EEXIT;
+ vlc_LogDeinit (p_libvlc);
+ return VLC_ENOMEM;
}
b_daemon = true;
/* append MRLs */
if( !dbus_message_append_args( msg, DBUS_TYPE_STRING, &mrl,
- DBUS_TYPE_STRING, &after_track,
+ DBUS_TYPE_OBJECT_PATH, &after_track,
DBUS_TYPE_BOOLEAN, &play,
DBUS_TYPE_INVALID ) )
{
dbus_out:
#endif // HAVE_DBUS
- /*
- * Message queue options
- */
- /* Last chance to set the verbosity. Once we start interfaces and other
- * threads, verbosity becomes read-only. */
- var_Create( p_libvlc, "verbose", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- if( var_InheritBool( p_libvlc, "quiet" ) )
- {
- var_SetInteger( p_libvlc, "verbose", -1 );
- priv->i_verbose = -1;
- }
- if( priv->b_color )
- priv->b_color = var_InheritBool( p_libvlc, "color" );
-
vlc_CPU_dump( VLC_OBJECT(p_libvlc) );
- vlc_object_set_name( p_libvlc, "main" );
priv->b_stats = var_InheritBool( p_libvlc, "stats" );
/* some default internal settings */
var_Create( p_libvlc, "window", VLC_VAR_STRING );
+ /* NOTE: Because the playlist and interfaces start before this function
+ * returns control to the application (DESIGN BUG!), all these variables
+ * must be created (in place of libvlc_new()) and set to VLC defaults
+ * (in place of VLC main()) *here*. */
var_Create( p_libvlc, "user-agent", VLC_VAR_STRING );
- var_SetString( p_libvlc, "user-agent", "(LibVLC "VERSION")" );
+ var_SetString( p_libvlc, "user-agent",
+ "VLC media player (LibVLC "VERSION")" );
+ var_Create( p_libvlc, "http-user-agent", VLC_VAR_STRING );
+ var_SetString( p_libvlc, "http-user-agent",
+ "VLC/"PACKAGE_VERSION" LibVLC/"PACKAGE_VERSION );
+ var_Create( p_libvlc, "app-icon-name", VLC_VAR_STRING );
+ var_SetString( p_libvlc, "app-icon-name", PACKAGE_NAME );
+ var_Create( p_libvlc, "app-id", VLC_VAR_STRING );
+ var_SetString( p_libvlc, "app-id", "org.VideoLAN.VLC" );
+ var_Create( p_libvlc, "app-version", VLC_VAR_STRING );
+ var_SetString( p_libvlc, "app-version", PACKAGE_VERSION );
/* System specific configuration */
system_Configure( p_libvlc, i_argc - vlc_optind, ppsz_argv + vlc_optind );
-#if defined(MEDIA_LIBRARY)
- /* Get the ML */
- if( var_GetBool( p_libvlc, "load-media-library-on-startup" ) )
- {
- priv->p_ml = ml_Create( VLC_OBJECT( p_libvlc ), NULL );
- if( !priv->p_ml )
- {
- msg_Err( p_libvlc, "ML initialization failed" );
- return VLC_EGENERIC;
- }
- }
- else
- {
- priv->p_ml = NULL;
- }
-#endif
-
- /* Add service discovery modules */
- psz_modules = var_InheritString( p_libvlc, "services-discovery" );
- if( psz_modules )
- {
- char *p = psz_modules, *m;
- while( ( m = strsep( &p, " :," ) ) != NULL )
- playlist_ServicesDiscoveryAdd( pl_Get(p_libvlc), m );
- free( psz_modules );
- }
-
#ifdef ENABLE_VLM
/* Initialize VLM if vlm-conf is specified */
psz_parser = var_CreateGetNonEmptyString( p_libvlc, "vlm-conf" );
var_Create( p_libvlc, "drawable-clip-right", VLC_VAR_INTEGER );
var_Create( p_libvlc, "drawable-nsobject", VLC_VAR_ADDRESS );
#endif
-#if defined (WIN32) || defined (__OS2__)
+#if defined (_WIN32) || defined (__OS2__)
var_Create( p_libvlc, "drawable-hwnd", VLC_VAR_INTEGER );
#endif
void libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
{
libvlc_priv_t *priv = libvlc_priv (p_libvlc);
- playlist_t *p_playlist = libvlc_priv (p_libvlc)->p_playlist;
-
- /* Remove all services discovery */
- if( p_playlist != NULL )
- {
- msg_Dbg( p_libvlc, "removing all services discovery tasks" );
- playlist_ServicesDiscoveryKillAll( p_playlist );
- }
/* Ask the interfaces to stop and destroy them */
msg_Dbg( p_libvlc, "removing all interfaces" );
}
#endif
-#if defined(MEDIA_LIBRARY)
- media_library_t* p_ml = priv->p_ml;
- if( p_ml )
- {
- ml_Destroy( VLC_OBJECT( p_ml ) );
- vlc_object_release( p_ml );
- libvlc_priv(p_playlist->p_libvlc)->p_ml = NULL;
- }
-#endif
-
/* Free playlist now, all threads are gone */
+ playlist_t *p_playlist = libvlc_priv (p_libvlc)->p_playlist;
if( p_playlist != NULL )
playlist_Destroy( p_playlist );
msg_Dbg( p_libvlc, "removing stats" );
-#if !defined( WIN32 ) && !defined( __OS2__ )
+#if !defined( _WIN32 ) && !defined( __OS2__ )
char* psz_pidfile = NULL;
if( b_daemon )
}
#endif
+ vlc_DeinitActions( p_libvlc, priv->actions );
+
/* Save the configuration */
if( !var_InheritBool( p_libvlc, "ignore-config" ) )
config_AutoSaveConfigFile( VLC_OBJECT(p_libvlc) );
/* Free module bank. It is refcounted, so we call this each time */
module_EndBank (true);
-
- vlc_DeinitActions( p_libvlc, priv->actions );
-#if defined(WIN32) || defined(__OS2__)
+ vlc_LogDeinit (p_libvlc);
+#if defined(_WIN32) || defined(__OS2__)
system_End( );
#endif
}
{
libvlc_priv_t *priv = libvlc_priv( p_libvlc );
- /* Destroy mutexes */
vlc_ExitDestroy( &priv->exit );
- vlc_mutex_destroy( &priv->ml_lock );
assert( atomic_load(&(vlc_internals(p_libvlc)->refs)) == 1 );
vlc_object_release( p_libvlc );
char *psz_interface = var_CreateGetNonEmptyString( p_libvlc, "intf" );
if( !psz_interface ) /* "intf" has not been set */
{
-#if !defined( WIN32 ) && !defined( __OS2__ )
+#if !defined( _WIN32 ) && !defined( __OS2__ )
if( b_daemon )
/* Daemon mode hack.
* We prefer the dummy interface if none is specified. */
projects / vlc / blobdiff