#include "playlist/playlist_internal.h"
#include <vlc_vlm.h>
-#include <vlc_input.h>
#include <assert.h>
{
assert( p_gc->i_gc_refcount > 0 );
- char * name = input_item_GetName((input_item_t *)p_gc);
- printf("--- %s++ (%d)\n", name, p_gc->i_gc_refcount+1);
- free(name);
/* FIXME: atomic version needed! */
p_gc->i_gc_refcount ++;
}
{
assert( p_gc );
assert( p_gc->i_gc_refcount > 0 );
- char * name = input_item_GetName((input_item_t *)p_gc);
- printf("--- %s-- (%d)\n", name, p_gc->i_gc_refcount-1);
- free(name);
/* FIXME: atomic version needed! */
p_gc->i_gc_refcount -- ;
return VLC_EGENERIC;
}
-#ifdef __APPLE__
- /* vlc_thread_set_priority needs to query the config,
- * so this is the earliest moment where we can set this */
- vlc_thread_set_priority( p_libvlc, VLC_THREAD_PRIORITY_LOW );
-#endif
-
/* Check for short help option */
if( config_GetInt( p_libvlc, "help" ) > 0 )
{
}
free( psz_modules );
-#ifdef ENABLE_SOUT
+#ifdef ENABLE_VLM
/* Initialize VLM if vlm-conf is specified */
psz_parser = config_GetPsz( p_libvlc, "vlm-conf" );
if( psz_parser && *psz_parser )
{
playlist_t *p_playlist = pl_Yield( p_libvlc );
playlist_AddExt( p_playlist, val.psz_string, NULL, PLAYLIST_INSERT, 0,
- -1, NULL, 0, true, false );
+ -1, NULL, 0, true, pl_Unlocked );
pl_Release( p_libvlc );
}
free( val.psz_string );
vlc_object_release( p_intf ); /* for vlc_object_find() */
}
-#ifdef ENABLE_SOUT
+#ifdef ENABLE_VLM
/* Destroy VLM if created in libvlc_InternalInit */
if( priv->p_vlm )
{
FOREACH_ARRAY( input_item_t *p_del, priv->input_items )
msg_Err( p_libvlc, "input item %p has not been deleted properly: refcount %d, name %s",
p_del, p_del->i_gc_refcount, p_del->psz_name ? p_del->psz_name : "(null)" );
- //b_clean = false;
+ b_clean = false;
FOREACH_END();
assert( b_clean );
ARRAY_RESET( priv->input_items );
static const char psz_path[] = LOCALEDIR;
#else
char psz_path[1024];
- if (snprintf (psz_path, sizeof (psz_path), "%s/%s",
- vlc_global()->psz_vlcpath, "locale")
+ if (snprintf (psz_path, sizeof (psz_path), "%s" DIR_SEP "%s",
+ config_GetDataDir(), "locale")
>= (int)sizeof (psz_path))
return -1;
playlist_t *p_playlist = pl_Yield( p_vlc );
playlist_AddExt( p_playlist, ppsz_argv[i_opt], NULL, PLAYLIST_INSERT,
0, -1, ( i_options ? &ppsz_argv[i_opt + 1] : NULL ),
- i_options, true, false );
+ i_options, true, pl_Unlocked );
pl_Release( p_vlc );
}