int i_id , i_pos=0;
GtkTreeView *p_tvplaylist = NULL;
- p_playlist = pl_Yield( p_intf );
+ p_playlist = pl_Hold( p_intf );
if( p_playlist == NULL)
{ /* Bail out when VLC's playlist object is not found. */
(const char*)name,
PLAYLIST_APPEND, PLAYLIST_END,
(mtime_t) 0,
- (const char **) ppsz_options, i_pos,
+ i_options, (const char **) ppsz_options, VLC_INPUT_OPTION_TRUSTED,
true, pl_Unlocked );
}
free(ppsz_options);
}
}
- pl_Release( p_playlist );
+ pl_Release( p_intf );
}
void PlaylistRebuildListStore( intf_thread_t *p_intf,
red.blue = 0;
red.green = 0;
#endif
- vlc_object_lock( p_playlist );
+ PL_LOCK;
for( i_dummy = 0; i_dummy < playlist_CurrentSize(p_playlist) ; i_dummy++ )
{
- playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_dummy, pl_Locked );
+ playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_dummy );
if( p_item )
{
ppsz_text[0] = p_item->p_input->psz_name;
-1);
}
}
- vlc_object_unlock( p_playlist );
+ PL_UNLOCK;
}
/*****************************************************************
{
char *psz_perm;
- psz_perm = (char *) malloc(sizeof(char)*10);
+ psz_perm = (char *) malloc(10);
strncpy( psz_perm, "----------", sizeof("----------"));
/* determine permission modes */
{
intf_thread_t *p_intf = GtkGetIntf( widget );
- vlc_mutex_lock( &p_intf->change_lock );
- vlc_object_kill( p_intf->p_libvlc );
- vlc_mutex_unlock( &p_intf->change_lock );
+ libvlc_Quit( p_intf->p_libvlc );
msg_Dbg( p_intf, "about to exit vlc ... signaled" );
return TRUE;
void onPlay(GtkButton *button, gpointer user_data)
{
intf_thread_t *p_intf = GtkGetIntf( GTK_WIDGET( button ) );
- playlist_t *p_playlist = pl_Yield( p_intf );
+ playlist_t *p_playlist = pl_Hold( p_intf );
if (p_playlist)
{
- vlc_object_lock( p_playlist );
- if (playlist_CurrentSize(p_playlist))
+ int s;
+
+ PL_LOCK;
+ s = playlist_CurrentSize(p_playlist);
+ PL_UNLOCK;
+ /* FIXME: This is racy... */
+ if (s)
{
- vlc_object_unlock( p_playlist );
playlist_Play( p_playlist );
gdk_window_lower( p_intf->p_sys->p_window->window );
}
- else
- {
- vlc_object_unlock( p_playlist );
- }
- pl_Release( p_playlist );
+ pl_Release( p_intf );
}
}
void onStop(GtkButton *button, gpointer user_data)
{
intf_thread_t *p_intf = GtkGetIntf( GTK_WIDGET( button ) );
- playlist_t *p_playlist = pl_Yield( p_intf );
+ playlist_t *p_playlist = pl_Hold( p_intf );
if (p_playlist)
{
playlist_Stop( p_playlist );
- pl_Release( p_playlist );
+ pl_Release( p_intf );
gdk_window_raise( p_intf->p_sys->p_window->window );
}
}
intf_thread_t *p_intf = GtkGetIntf( widget );
msg_Dbg( p_intf, "SliderButton Release" );
- vlc_mutex_lock( &p_intf->change_lock );
p_intf->p_sys->b_slider_free = 1;
- vlc_mutex_unlock( &p_intf->change_lock );
return TRUE;
}
intf_thread_t *p_intf = GtkGetIntf( widget );
msg_Dbg( p_intf, "SliderButton Press" );
- vlc_mutex_lock( &p_intf->change_lock );
p_intf->p_sys->b_slider_free = 0;
- vlc_mutex_unlock( &p_intf->change_lock );
return FALSE;
}
p_model = gtk_tree_view_get_model(treeview);
if (!p_model)
{
- msg_Err(p_intf, "PDA: Filelist model contains a NULL pointer\n" );
+ msg_Err(p_intf, "PDA: Filelist model contains a NULL pointer" );
return;
}
if (!gtk_tree_model_get_iter(p_model, &iter, path))
ppsz_options = (char **) malloc(11 *sizeof(char*));
if (ppsz_options == NULL)
- {
- msg_Err(p_intf, "No memory to allocate for v4l options.");
return;
- }
for (i=0; i<11; i++)
{
- ppsz_options[i] = (char *) malloc(VLC_MAX_MRL * sizeof(char));
+ ppsz_options[i] = (char *) malloc(VLC_MAX_MRL);
if (ppsz_options[i] == NULL)
{
- msg_Err(p_intf, "No memory to allocate for v4l options string %i.", i);
for (i-=1; i>=0; i--)
free(ppsz_options[i]);
free(ppsz_options);
{
intf_thread_t *p_intf = GtkGetIntf( GTK_WIDGET(treeview) );
GtkTreeSelection *p_selection = gtk_tree_view_get_selection(treeview);
- playlist_t * p_playlist = pl_Yield( p_intf );
+ playlist_t * p_playlist = pl_Hold( p_intf );
if( p_playlist == NULL )
{
p_model = gtk_tree_view_get_model(treeview);
if (!p_model)
{
- msg_Err(p_intf, "PDA: Playlist model contains a NULL pointer\n" );
+ msg_Err(p_intf, "PDA: Playlist model contains a NULL pointer" );
return;
}
if (!gtk_tree_model_get_iter(p_model, &iter, path))
i_skip = i_row - p_playlist->i_current_index;
playlist_Skip( p_playlist, i_skip );
}
- pl_Release( p_playlist );
+ pl_Release( p_intf );
}
void onUpdatePlaylist(GtkButton *button, gpointer user_data)
{
intf_thread_t * p_intf = GtkGetIntf( button );
- playlist_t * p_playlist = pl_Yield( p_intf );
+ playlist_t * p_playlist = pl_Hold( p_intf );
GtkTreeView *p_tvplaylist = NULL;
if( p_playlist == NULL )
g_object_unref(p_model);
}
}
- pl_Release( p_playlist );
+ pl_Release( p_intf );
}
static void deleteItemFromPlaylist(gpointer data, gpointer user_data)
void onDeletePlaylist(GtkButton *button, gpointer user_data)
{
intf_thread_t *p_intf = GtkGetIntf( button );
- playlist_t * p_playlist = pl_Yield( p_intf );
+ playlist_t * p_playlist = pl_Hold( p_intf );
GtkTreeView *p_tvplaylist;
/* Delete an arbitrary item from the playlist */
g_object_unref(p_store);
}
}
- pl_Release( p_playlist );
+ pl_Release( p_intf );
}
void onClearPlaylist(GtkButton *button, gpointer user_data)
{
intf_thread_t *p_intf = GtkGetIntf( button );
- playlist_t * p_playlist = pl_Yield( p_intf );
+ playlist_t * p_playlist = pl_Hold( p_intf );
GtkTreeView *p_tvplaylist;
int item;
{
msg_Err( p_playlist, "fix pda delete" );
}
- pl_Release( p_playlist );
+ pl_Release( p_intf );
// Remove all entries from the Playlist widget.
p_tvplaylist = (GtkTreeView*) lookup_widget( GTK_WIDGET(button), "tvPlaylist");
ppsz_options = (char **) malloc(3 *sizeof(char*));
if (ppsz_options == NULL)
- {
- msg_Err(p_intf, "No memory to allocate for v4l options.");
return;
- }
for (i=0; i<3; i++)
{
- ppsz_options[i] = (char *) malloc(VLC_MAX_MRL * sizeof(char));
+ ppsz_options[i] = (char *) malloc(VLC_MAX_MRL);
if (ppsz_options[i] == NULL)
{
- msg_Err(p_intf, "No memory to allocate for v4l options string %i.", i);
for (i-=1; i>=0; i--)
free(ppsz_options[i]);
free(ppsz_options);
}
/* Update the playlist */
- playlist_t *p_playlist = pl_Yield( p_intf );
+ playlist_t *p_playlist = pl_Hold( p_intf );
if( p_playlist == NULL ) return;
/* Get all the options. */