# include <dbus/dbus.h>
#endif
+
+#include <vlc_media_library.h>
#include <vlc_playlist.h>
#include <vlc_interface.h>
#include <vlc_fs.h>
#include <vlc_cpu.h>
#include <vlc_url.h>
+#include <vlc_atomic.h>
+#include <vlc_modules.h>
#include "libvlc.h"
assert (pf_destruct);
p_gc->pf_destructor = pf_destruct;
- p_gc->refs = 1;
-#if defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)
- __sync_synchronize ();
-#elif defined (WIN32) && defined (__GNUC__)
-#elif defined(__APPLE__)
- OSMemoryBarrier ();
-#else
- /* Nobody else can possibly lock the spin - it's there as a barrier */
- vlc_spin_init (&p_gc->spin);
- vlc_spin_lock (&p_gc->spin);
- vlc_spin_unlock (&p_gc->spin);
-#endif
+ vlc_atomic_set (&p_gc->refs, 1);
return p_gc;
}
void *vlc_hold (gc_object_t * p_gc)
{
uintptr_t refs;
+
assert( p_gc );
- assert ((((uintptr_t)&p_gc->refs) & (sizeof (void *) - 1)) == 0); /* alignment */
-
-#if defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)
- refs = __sync_add_and_fetch (&p_gc->refs, 1);
-#elif defined (WIN64)
- refs = InterlockedIncrement64 (&p_gc->refs);
-#elif defined (WIN32)
- refs = InterlockedIncrement (&p_gc->refs);
-#elif defined(__APPLE__)
- refs = OSAtomicIncrement32Barrier((int*)&p_gc->refs);
-#else
- vlc_spin_lock (&p_gc->spin);
- refs = ++p_gc->refs;
- vlc_spin_unlock (&p_gc->spin);
-#endif
+ refs = vlc_atomic_inc (&p_gc->refs);
assert (refs != 1); /* there had to be a reference already */
return p_gc;
}
unsigned refs;
assert( p_gc );
- assert ((((uintptr_t)&p_gc->refs) & (sizeof (void *) - 1)) == 0); /* alignment */
-
-#if defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)
- refs = __sync_sub_and_fetch (&p_gc->refs, 1);
-#elif defined (WIN64)
- refs = InterlockedDecrement64 (&p_gc->refs);
-#elif defined (WIN32)
- refs = InterlockedDecrement (&p_gc->refs);
-#elif defined(__APPLE__)
- refs = OSAtomicDecrement32Barrier((int*)&p_gc->refs);
-#else
- vlc_spin_lock (&p_gc->spin);
- refs = --p_gc->refs;
- vlc_spin_unlock (&p_gc->spin);
-#endif
-
+ refs = vlc_atomic_dec (&p_gc->refs);
assert (refs != (uintptr_t)(-1)); /* reference underflow?! */
if (refs == 0)
- {
-#if defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)
-#elif defined (WIN32) && defined (__GNUC__)
-#elif defined(__APPLE__)
-#else
- vlc_spin_destroy (&p_gc->spin);
-#endif
p_gc->pf_destructor (p_gc);
- }
}
/*****************************************************************************
priv = libvlc_priv (p_libvlc);
priv->p_playlist = NULL;
+ priv->p_ml = NULL;
priv->p_dialog_provider = NULL;
priv->p_vlm = NULL;
#endif
/* Initialize mutexes */
+ vlc_mutex_init( &priv->ml_lock );
vlc_mutex_init( &priv->timer_lock );
vlc_ExitInit( &priv->exit );
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 )
/* 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" ) == true )
+ {
+ 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 )
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 );
+#endif
#ifdef WIN32
var_Create( p_libvlc, "drawable-hwnd", VLC_VAR_ADDRESS );
#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 )
+ {
+ ml_Destroy( VLC_OBJECT( p_ml ) );
+ vlc_object_release( p_ml );
+ libvlc_priv(p_playlist->p_libvlc)->p_ml = NULL;
+ }
+#endif
+
stats_TimersDumpAll( p_libvlc );
stats_TimersCleanAll( p_libvlc );
/* Destroy mutexes */
vlc_ExitDestroy( &priv->exit );
vlc_mutex_destroy( &priv->timer_lock );
+ vlc_mutex_destroy( &priv->ml_lock );
#ifndef NDEBUG /* Hack to dump leaked objects tree */
if( vlc_internals( p_libvlc )->i_refcount > 1 )
}
}
- /* 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,
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;
}
}
}
- 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 ),
return i_width;
}
-
-#include <vlc_avcodec.h>
-
-void vlc_avcodec_mutex (bool acquire)
-{
- static vlc_mutex_t lock = VLC_STATIC_MUTEX;
-
- if (acquire)
- vlc_mutex_lock (&lock);
- else
- vlc_mutex_unlock (&lock);
-}
projects / vlc / blobdiff