# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_input.h>
#include <vlc_interface.h>
#endif
/* Create some useful widgets that will certainly be used */
-/* FIXME: magic path */
- add_pixmap_directory("share");
- add_pixmap_directory("/usr/share/vlc");
-
- /* Path for pixmaps under linupy 1.4 */
- add_pixmap_directory("/usr/local/share/pixmaps/vlc");
- /* Path for pixmaps under linupy 2.0 */
- add_pixmap_directory("/usr/share/pixmaps/vlc");
+ add_pixmap_directory(config_GetDataDir());
p_intf->p_sys->p_window = create_pda();
if (p_intf->p_sys->p_window == NULL)
G_TYPE_UINT64, /* File size */
G_TYPE_STRING, /* Owner */
G_TYPE_STRING);/* Group */
- ReadDirectory(p_intf, p_filelist, ".");
+ ReadDirectory(p_intf, p_filelist, (char*)".");
gtk_tree_view_set_model(GTK_TREE_VIEW(p_intf->p_sys->p_tvfile), GTK_TREE_MODEL(p_filelist));
g_object_unref(p_filelist); /* Model will be released by GtkTreeView */
gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(p_intf->p_sys->p_tvfile)),GTK_SELECTION_MULTIPLE);
gtk_tree_view_column_set_sort_column_id(p_column, 2);
#endif
/* update the playlist */
- p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+ p_playlist = pl_Yield( p_intf );
p_playlist_store = gtk_list_store_new (3,
G_TYPE_STRING, /* Filename */
G_TYPE_STRING, /* Time */
PlaylistRebuildListStore(p_intf,p_playlist_store, p_playlist);
gtk_tree_view_set_model(GTK_TREE_VIEW(p_intf->p_sys->p_tvplaylist), GTK_TREE_MODEL(p_playlist_store));
g_object_unref(p_playlist_store);
- vlc_object_release(p_playlist); /* Free the playlist */
+ pl_Release( p_intf ); /* Free the playlist */
gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(p_intf->p_sys->p_tvplaylist)),GTK_SELECTION_MULTIPLE);
/* Column properties */
input_thread_t *p_input = p_intf->p_sys->p_input;
int64_t i_time = 0, i_length = 0;
- vlc_mutex_lock( &p_input->object_lock );
- if( !p_input->b_die )
+ vlc_object_lock( p_input );
+ if( vlc_object_alive (p_input) )
{
playlist_t *p_playlist;
p_intf->p_sys->b_playing = 1;
/* update playlist interface */
- p_playlist = (playlist_t *) vlc_object_find(
- p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+ p_playlist = pl_Yield( p_intf );
if (p_playlist != NULL)
{
p_liststore = gtk_list_store_new (3,
PlaylistRebuildListStore(p_intf, p_liststore, p_playlist);
gtk_tree_view_set_model(p_intf->p_sys->p_tvplaylist, (GtkTreeModel*) p_liststore);
g_object_unref(p_liststore);
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
}
/* Manage the slider */
double f_pos = (double)newvalue / 100.0;
/* release the lock to be able to seek */
- vlc_mutex_unlock( &p_input->object_lock );
+ vlc_object_unlock( p_input );
var_SetFloat( p_input, "position", f_pos );
- vlc_mutex_lock( &p_input->object_lock );
+ vlc_object_lock( p_input );
/* Update the old value */
p_intf->p_sys->f_adj_oldvalue = newvalue;
double f_pos = (double)newvalue / 100.0;
/* release the lock to be able to seek */
- vlc_mutex_unlock( &p_input->object_lock );
+ vlc_object_unlock( p_input );
var_SetFloat( p_input, "position", f_pos );
- vlc_mutex_lock( &p_input->object_lock );
+ vlc_object_lock( p_input );
/* Update the old value */
p_intf->p_sys->i_adj_oldvalue = newvalue;
}
}
}
- vlc_mutex_unlock( &p_input->object_lock );
+ vlc_object_unlock( p_input );
}
else if( p_intf->p_sys->b_playing && !intf_ShouldDie( p_intf ) )
{
*****************************************************************************/
void GtkDisplayDate( GtkAdjustment *p_adj, gpointer userdata )
{
+ (void)p_adj;
+
intf_thread_t *p_intf;
p_intf = (intf_thread_t*) userdata;