* Preamble
*****************************************************************************/
#include <sys/types.h> /* off_t */
-#include <vlc/vlc.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_input.h>
#include <vlc_interface.h>
#include <vlc_playlist.h>
#include <vlc_vout.h>
#include <pwd.h>
#include <grp.h>
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
#include <gtk/gtk.h>
#include "pda_callbacks.h"
/*****************************************************************************
* Useful function to retrieve p_intf
****************************************************************************/
-void * E_(__GtkGetIntf)( GtkWidget * widget )
+void * __GtkGetIntf( GtkWidget * widget )
{
void *p_data;
return p_data;
}
-void PlaylistAddItem(GtkWidget *widget, gchar *name, char **ppsz_options, int i_size)
+static void PlaylistAddItem(GtkWidget *widget, gchar *name, char **ppsz_options, int i_size)
{
intf_thread_t *p_intf = GtkGetIntf( widget );
playlist_t *p_playlist;
int i_id , i_pos=0;
GtkTreeView *p_tvplaylist = NULL;
- p_playlist = (playlist_t *)
- vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+ p_playlist = pl_Hold( p_intf );
if( p_playlist == NULL)
{ /* Bail out when VLC's playlist object is not found. */
gtk_list_store_set (GTK_LIST_STORE(p_play_model), &p_play_iter,
0, name, /* Add path to it !!! */
1, "no info",
- 2, p_playlist->i_size, /* Hidden index. */
+ 2, playlist_CurrentSize(p_playlist), /* Hidden index. */
-1 );
/* Add to VLC's playlist */
(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 );
}
/* Cleanup memory */
free(ppsz_options);
}
}
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
}
-void PlaylistRebuildListStore( GtkListStore * p_list, playlist_t * p_playlist )
+void PlaylistRebuildListStore( intf_thread_t *p_intf,
+ GtkListStore * p_list, playlist_t * p_playlist )
{
GtkTreeIter iter;
int i_dummy;
red.blue = 0;
red.green = 0;
#endif
- vlc_mutex_lock( &p_playlist->object_lock );
- for( i_dummy = 0; i_dummy < p_playlist->i_size ; i_dummy++ )
+ PL_LOCK;
+ for( i_dummy = 0; i_dummy < playlist_CurrentSize(p_playlist) ; i_dummy++ )
{
- ppsz_text[0] = p_playlist->pp_items[i_dummy]->input.psz_name;
- ppsz_text[1] = "no info";
- gtk_list_store_append (p_list, &iter);
- gtk_list_store_set (p_list, &iter,
- 0, ppsz_text[0],
- 1, ppsz_text[1],
- 2, i_dummy, /* Hidden index */
- -1);
+ playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_dummy );
+ if( p_item )
+ {
+ ppsz_text[0] = p_item->p_input->psz_name;
+ ppsz_text[1] = "no info";
+ gtk_list_store_append (p_list, &iter);
+ gtk_list_store_set (p_list, &iter,
+ 0, ppsz_text[0],
+ 1, ppsz_text[1],
+ 2, i_dummy, /* Hidden index */
+ -1);
+ }
}
- vlc_mutex_unlock( &p_playlist->object_lock );
+ PL_UNLOCK;
}
/*****************************************************************
4, ppsz_text[3],
-1);
- if (ppsz_text[1]) free(ppsz_text[1]);
+ free(ppsz_text[1]);
}
/* kludge */
for (i=0; i<n; i++)
4, ppsz_text[3],
-1);
- if (ppsz_text[1]) free(ppsz_text[1]);
+ free(ppsz_text[1]);
}
}
free(pp_namelist);
{
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 );
+ libvlc_Quit( p_intf->p_libvlc );
vlc_mutex_unlock( &p_intf->change_lock );
msg_Dbg( p_intf, "about to exit vlc ... signaled" );
void onPlay(GtkButton *button, gpointer user_data)
{
intf_thread_t *p_intf = GtkGetIntf( GTK_WIDGET( button ) );
- playlist_t *p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+ playlist_t *p_playlist = pl_Hold( p_intf );
if (p_playlist)
{
- vlc_mutex_lock( &p_playlist->object_lock );
- if (p_playlist->i_size)
+ int s;
+
+ PL_LOCK;
+ s = playlist_CurrentSize(p_playlist);
+ PL_UNLOCK;
+ /* FIXME: This is racy... */
+ if (s)
{
- vlc_mutex_unlock( &p_playlist->object_lock );
playlist_Play( p_playlist );
gdk_window_lower( p_intf->p_sys->p_window->window );
}
- else
- {
- vlc_mutex_unlock( &p_playlist->object_lock );
- }
- vlc_object_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 = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+ playlist_t *p_playlist = pl_Hold( p_intf );
if (p_playlist)
{
playlist_Stop( p_playlist );
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
gdk_window_raise( p_intf->p_sys->p_window->window );
}
}
}
-void addSelectedToPlaylist(GtkTreeModel *model, GtkTreePath *path,
+static void addSelectedToPlaylist(GtkTreeModel *model, GtkTreePath *path,
GtkTreeIter *iter, gpointer *userdata)
{
gchar *psz_filename;
struct stat st;
GtkTreeModel *p_model;
GtkTreeIter iter;
- gchar *psz_filename;
+ char *psz_filename;
/* This might be a directory selection */
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))
if (b_network_transcode)
{
msg_Dbg( p_intf, "Network transcode option selected." );
- onAddTranscodeToPlaylist(GTK_WIDGET(button), (gchar *)psz_mrl_name);
+ onAddTranscodeToPlaylist(button, (gchar *)psz_mrl_name);
}
else
{
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);
if (b_v4l_transcode)
{
msg_Dbg( p_intf, "Camera transcode option selected." );
- onAddTranscodeToPlaylist(GTK_WIDGET(button), (gchar *)v4l_mrl);
+ onAddTranscodeToPlaylist(button, (gchar *)v4l_mrl);
}
else
{
{
intf_thread_t *p_intf = GtkGetIntf( GTK_WIDGET(treeview) );
GtkTreeSelection *p_selection = gtk_tree_view_get_selection(treeview);
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+ playlist_t * p_playlist = pl_Hold( p_intf );
if( p_playlist == NULL )
{
GtkTreeModel *p_model;
GtkTreeIter iter;
int i_row;
+ int i_skip;
/* This might be a directory selection */
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))
}
gtk_tree_model_get(p_model, &iter, 2, &i_row, -1);
- playlist_Goto( p_playlist, i_row );
+ i_skip = i_row - p_playlist->i_current_index;
+ playlist_Skip( p_playlist, i_skip );
}
- vlc_object_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 = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+ playlist_t * p_playlist = pl_Hold( p_intf );
GtkTreeView *p_tvplaylist = NULL;
if( p_playlist == NULL )
G_TYPE_UINT); /* Hidden field */
if (p_model)
{
- PlaylistRebuildListStore(p_model, p_playlist);
+ PlaylistRebuildListStore(p_intf, p_model, p_playlist);
gtk_tree_view_set_model(GTK_TREE_VIEW(p_tvplaylist), GTK_TREE_MODEL(p_model));
g_object_unref(p_model);
}
}
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
}
-void deleteItemFromPlaylist(gpointer data, gpointer user_data)
+static void deleteItemFromPlaylist(gpointer data, gpointer user_data)
{
gtk_tree_path_free((GtkTreePath*) data); // removing an item.
}
void onDeletePlaylist(GtkButton *button, gpointer user_data)
{
intf_thread_t *p_intf = GtkGetIntf( button );
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+ playlist_t * p_playlist = pl_Hold( p_intf );
GtkTreeView *p_tvplaylist;
/* Delete an arbitrary item from the playlist */
G_TYPE_UINT); /* Hidden field */
if (p_store)
{
- PlaylistRebuildListStore(p_store, p_playlist);
+ PlaylistRebuildListStore(p_intf, p_store, p_playlist);
gtk_tree_view_set_model(GTK_TREE_VIEW(p_tvplaylist), GTK_TREE_MODEL(p_store));
g_object_unref(p_store);
}
}
- vlc_object_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 = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+ playlist_t * p_playlist = pl_Hold( p_intf );
GtkTreeView *p_tvplaylist;
int item;
return;
}
- for(item = p_playlist->i_size - 1; item >= 0 ;item-- )
+ for(item = playlist_CurrentSize(p_playlist) - 1; item >= 0 ;item-- )
{
- msg_Err( p_playlist "fix pda delete");
+ msg_Err( p_playlist, "fix pda delete" );
}
- vlc_object_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 = (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+ playlist_t *p_playlist = pl_Hold( p_intf );
if( p_playlist == NULL ) return;
/* Get all the options. */
projects / vlc / blobdiff