* pda.c : PDA Gtk2 plugin for vlc
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: pda.c,v 1.11 2003/11/25 20:41:35 jpsaman Exp $
+ * $Id: pda.c,v 1.20 2004/02/10 20:28:37 jpsaman Exp $
*
* Authors: Jean-Paul Saman <jpsaman@wxs.nl>
* Marc Ariberti <marcari@videolan.org>
void GtkAutoPlayFile ( vlc_object_t * );
static int Manage ( intf_thread_t *p_intf );
-void E_(GtkDisplayDate) ( GtkAdjustment *p_adj );
+void E_(GtkDisplayDate) ( GtkAdjustment *p_adj, gpointer userdata );
gint E_(GtkModeManage) ( intf_thread_t * p_intf );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
vlc_module_begin();
- add_category_hint( N_("Miscellaneous"), NULL, VLC_TRUE );
-// add_bool( "pda-autoplayfile", 1, GtkAutoPlayFile, AUTOPLAYFILE_TEXT, AUTOPLAYFILE_LONGTEXT, VLC_TRUE );
set_description( _("PDA Linux Gtk2+ interface") );
+// add_bool( "pda-autoplayfile", 1, GtkAutoPlayFile, AUTOPLAYFILE_TEXT, AUTOPLAYFILE_LONGTEXT, VLC_TRUE );
set_capability( "interface", 70 );
set_callbacks( Open, Close );
add_shortcut( "pda" );
int i_args = 1;
int i_dummy;
#endif
- GtkCellRenderer *renderer = NULL;
- GtkTreeViewColumn *column = NULL;
- GtkListStore *filelist = NULL;
- GtkListStore *playlist = NULL;
+ playlist_t *p_playlist;
+ GtkCellRenderer *p_renderer = NULL;
+ GtkTreeViewColumn *p_column = NULL;
+ GtkListStore *p_filelist = NULL;
+ GtkListStore *p_playlist_store = NULL;
#ifndef NEED_GTK2_MAIN
gtk_set_locale ();
#endif
/* Create some useful widgets that will certainly be used */
-// FIXME: magic path
+/* 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");
}
/* Store p_intf to keep an eye on it */
- msg_Dbg( p_intf, "trying to store p_intf pointer ... " );
gtk_object_set_data( GTK_OBJECT(p_intf->p_sys->p_window),
"p_intf", p_intf );
- msg_Dbg( p_intf, "trying to store p_intf pointer ... done" );
/* Set the title of the main window */
gtk_window_set_title( GTK_WINDOW(p_intf->p_sys->p_window),
/* Get the notebook object */
p_intf->p_sys->p_notebook = GTK_NOTEBOOK( gtk_object_get_data(
GTK_OBJECT( p_intf->p_sys->p_window ), "notebook" ) );
-
+
/* Get the slider object */
- p_intf->p_sys->p_slider = GTK_HSCALE( gtk_object_get_data(
- GTK_OBJECT( p_intf->p_sys->p_window ), "slider" ) );
- p_intf->p_sys->p_slider_label = GTK_LABEL( gtk_object_get_data(
- GTK_OBJECT( p_intf->p_sys->p_window ), "slider_label" ) );
+ p_intf->p_sys->p_slider = (GtkHScale*) lookup_widget( p_intf->p_sys->p_window, "timeSlider" );
+ p_intf->p_sys->p_slider_label = (GtkLabel*) lookup_widget( p_intf->p_sys->p_window, "timeLabel" );
+ if (p_intf->p_sys->p_slider == NULL)
+ msg_Err( p_intf, "Time slider widget not found." );
+ if (p_intf->p_sys->p_slider_label == NULL)
+ msg_Err( p_intf, "Time label widget not found." );
-#if 0
/* Connect the date display to the slider */
- msg_Dbg( p_intf, "setting slider adjustment ... " );
-#define P_SLIDER GTK_RANGE( gtk_object_get_data( \
- GTK_OBJECT( p_intf->p_sys->p_window ), "slider" ) )
- p_intf->p_sys->p_adj = gtk_range_get_adjustment( P_SLIDER );
-
- gtk_signal_connect ( GTK_OBJECT( p_intf->p_sys->p_adj ), "value_changed",
- GTK_SIGNAL_FUNC( E_(GtkDisplayDate) ), NULL );
+ p_intf->p_sys->p_adj = gtk_range_get_adjustment( GTK_RANGE(p_intf->p_sys->p_slider) );
+ if (p_intf->p_sys->p_adj == NULL)
+ msg_Err( p_intf, "Adjustment range not found." );
+ g_signal_connect( GTK_OBJECT( p_intf->p_sys->p_adj ), "value_changed",
+ G_CALLBACK( E_(GtkDisplayDate) ), p_intf );
p_intf->p_sys->f_adj_oldvalue = 0;
p_intf->p_sys->i_adj_oldvalue = 0;
-#undef P_SLIDER
- msg_Dbg( p_intf, "setting slider adjustment ... done" );
-#endif
/* BEGIN OF FILEVIEW GTK_TREE_VIEW */
- msg_Dbg(p_intf, "Getting GtkTreeView FileList" );
p_intf->p_sys->p_tvfile = NULL;
p_intf->p_sys->p_tvfile = (GtkTreeView *) lookup_widget( p_intf->p_sys->p_window,
"tvFileList");
msg_Err(p_intf, "Error obtaining pointer to File List");
/* Insert columns 0 */
- renderer = gtk_cell_renderer_text_new ();
- gtk_tree_view_insert_column_with_attributes(p_intf->p_sys->p_tvfile, 0, _("Filename"), renderer, NULL);
- column = gtk_tree_view_get_column(p_intf->p_sys->p_tvfile, 0 );
- gtk_tree_view_column_add_attribute(column, renderer, "text", 0 );
- gtk_tree_view_column_set_sort_column_id(column, 0);
+ p_renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes(p_intf->p_sys->p_tvfile, 0, _("Filename"), p_renderer, NULL);
+ p_column = gtk_tree_view_get_column(p_intf->p_sys->p_tvfile, 0 );
+ gtk_tree_view_column_add_attribute(p_column, p_renderer, "text", 0 );
+ gtk_tree_view_column_set_sort_column_id(p_column, 0);
/* Insert columns 1 */
- renderer = gtk_cell_renderer_text_new ();
- gtk_tree_view_insert_column_with_attributes(p_intf->p_sys->p_tvfile, 1, _("Permissions"), renderer, NULL);
- column = gtk_tree_view_get_column(p_intf->p_sys->p_tvfile, 1 );
- gtk_tree_view_column_add_attribute(column, renderer, "text", 1 );
- gtk_tree_view_column_set_sort_column_id(column, 1);
+ p_renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes(p_intf->p_sys->p_tvfile, 1, _("Permissions"), p_renderer, NULL);
+ p_column = gtk_tree_view_get_column(p_intf->p_sys->p_tvfile, 1 );
+ gtk_tree_view_column_add_attribute(p_column, p_renderer, "text", 1 );
+ gtk_tree_view_column_set_sort_column_id(p_column, 1);
/* Insert columns 2 */
- renderer = gtk_cell_renderer_text_new ();
- gtk_tree_view_insert_column_with_attributes(p_intf->p_sys->p_tvfile, 2, _("Size"), renderer, NULL);
- column = gtk_tree_view_get_column(p_intf->p_sys->p_tvfile, 2 );
- gtk_tree_view_column_add_attribute(column, renderer, "text", 2 );
- gtk_tree_view_column_set_sort_column_id(column, 2);
+ p_renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes(p_intf->p_sys->p_tvfile, 2, _("Size"), p_renderer, NULL);
+ p_column = gtk_tree_view_get_column(p_intf->p_sys->p_tvfile, 2 );
+ gtk_tree_view_column_add_attribute(p_column, p_renderer, "text", 2 );
+ gtk_tree_view_column_set_sort_column_id(p_column, 2);
/* Insert columns 3 */
- renderer = gtk_cell_renderer_text_new ();
- gtk_tree_view_insert_column_with_attributes(p_intf->p_sys->p_tvfile, 3, _("Owner"), renderer, NULL);
- column = gtk_tree_view_get_column(p_intf->p_sys->p_tvfile, 3 );
- gtk_tree_view_column_add_attribute(column, renderer, "text", 3 );
- gtk_tree_view_column_set_sort_column_id(column, 3);
+ p_renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes(p_intf->p_sys->p_tvfile, 3, _("Owner"), p_renderer, NULL);
+ p_column = gtk_tree_view_get_column(p_intf->p_sys->p_tvfile, 3 );
+ gtk_tree_view_column_add_attribute(p_column, p_renderer, "text", 3 );
+ gtk_tree_view_column_set_sort_column_id(p_column, 3);
/* Insert columns 4 */
- renderer = gtk_cell_renderer_text_new ();
- gtk_tree_view_insert_column_with_attributes(p_intf->p_sys->p_tvfile, 4, _("Group"), renderer, NULL);
- column = gtk_tree_view_get_column(p_intf->p_sys->p_tvfile, 4 );
- gtk_tree_view_column_add_attribute(column, renderer, "text", 4 );
- gtk_tree_view_column_set_sort_column_id(column, 4);
+ p_renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes(p_intf->p_sys->p_tvfile, 4, _("Group"), p_renderer, NULL);
+ p_column = gtk_tree_view_get_column(p_intf->p_sys->p_tvfile, 4 );
+ gtk_tree_view_column_add_attribute(p_column, p_renderer, "text", 4 );
+ gtk_tree_view_column_set_sort_column_id(p_column, 4);
/* Get new directory listing */
- msg_Dbg(p_intf, "Populating GtkTreeView FileList" );
- filelist = gtk_list_store_new (5,
+ p_filelist = gtk_list_store_new (5,
G_TYPE_STRING, /* Filename */
G_TYPE_STRING, /* permissions */
G_TYPE_UINT64, /* File size */
G_TYPE_STRING, /* Owner */
G_TYPE_STRING);/* Group */
- ReadDirectory(p_intf, filelist, ".");
- msg_Dbg(p_intf, "Showing GtkTreeView FileList" );
- gtk_tree_view_set_model(GTK_TREE_VIEW(p_intf->p_sys->p_tvfile), GTK_TREE_MODEL(filelist));
- g_object_unref(filelist); /* Model will be released by GtkTreeView */
+ ReadDirectory(p_intf, p_filelist, ".");
+ 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);
/* Column properties */
/* END OF FILEVIEW GTK_TREE_VIEW */
/* BEGIN OF PLAYLIST GTK_TREE_VIEW */
- msg_Dbg(p_intf, "Getting GtkTreeView PlayList" );
p_intf->p_sys->p_tvplaylist = NULL;
- p_intf->p_sys->p_tvplaylist = (GtkTreeView *) lookup_widget( p_intf->p_sys->p_window, "tvPlaylist");
+ p_intf->p_sys->p_tvplaylist = (GtkTreeView *) lookup_widget( p_intf->p_sys->p_window, "tvPlaylist");
if (NULL == p_intf->p_sys->p_tvplaylist)
msg_Err(p_intf, "Error obtaining pointer to Play List");
/* Columns 1 */
- renderer = gtk_cell_renderer_text_new ();
- gtk_tree_view_insert_column_with_attributes(p_intf->p_sys->p_tvplaylist, 0, _("Filename"), renderer, NULL);
- column = gtk_tree_view_get_column(p_intf->p_sys->p_tvplaylist, 0 );
- gtk_tree_view_column_add_attribute(column, renderer, "text", 0 );
- gtk_tree_view_column_set_sort_column_id(column, 0);
+ p_renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes(p_intf->p_sys->p_tvplaylist, 0, _("Filename"), p_renderer, NULL);
+ p_column = gtk_tree_view_get_column(p_intf->p_sys->p_tvplaylist, 0 );
+ gtk_tree_view_column_add_attribute(p_column, p_renderer, "text", 0 );
+ gtk_tree_view_column_set_sort_column_id(p_column, 0);
/* Column 2 */
- renderer = gtk_cell_renderer_text_new ();
- gtk_tree_view_insert_column_with_attributes(p_intf->p_sys->p_tvplaylist, 1, _("Time"), renderer, NULL);
- column = gtk_tree_view_get_column(p_intf->p_sys->p_tvplaylist, 1 );
- gtk_tree_view_column_add_attribute(column, renderer, "text", 1 );
- gtk_tree_view_column_set_sort_column_id(column, 1);
-
+ p_renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes(p_intf->p_sys->p_tvplaylist, 1, _("Time"), p_renderer, NULL);
+ p_column = gtk_tree_view_get_column(p_intf->p_sys->p_tvplaylist, 1 );
+ gtk_tree_view_column_add_attribute(p_column, p_renderer, "text", 1 );
+ gtk_tree_view_column_set_sort_column_id(p_column, 1);
+#if 0
+ /* Column 3 - is a hidden column used for reliable deleting items from the underlying playlist */
+ p_renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes(p_intf->p_sys->p_tvplaylist, 2, _("Index"), p_renderer, NULL);
+ p_column = gtk_tree_view_get_column(p_intf->p_sys->p_tvplaylist, 2 );
+ gtk_tree_view_column_add_attribute(p_column, p_renderer, "text", 2 );
+ gtk_tree_view_column_set_sort_column_id(p_column, 2);
+#endif
/* update the playlist */
- msg_Dbg(p_intf, "Populating GtkTreeView Playlist" );
- playlist = gtk_list_store_new (2,
+ p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+ p_playlist_store = gtk_list_store_new (3,
G_TYPE_STRING, /* Filename */
- G_TYPE_STRING);/* Time */
- PlaylistRebuildListStore( playlist, vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ));
- msg_Dbg(p_intf, "Showing GtkTreeView Playlist" );
- gtk_tree_view_set_model(GTK_TREE_VIEW(p_intf->p_sys->p_tvplaylist), GTK_TREE_MODEL(playlist));
- g_object_unref(playlist);
+ G_TYPE_STRING, /* Time */
+ G_TYPE_UINT); /* Hidden index */
+ PlaylistRebuildListStore(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 */
gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(p_intf->p_sys->p_tvplaylist)),GTK_SELECTION_MULTIPLE);
/* Column properties */
gtk_tree_view_set_headers_clickable(p_intf->p_sys->p_tvplaylist, TRUE);
/* END OF PLAYLIST GTK_TREE_VIEW */
+ /* Hide the Preference TAB for now. */
+
/* Show the control window */
gtk_widget_show( p_intf->p_sys->p_window );
p_intf->p_sys->b_playing = 1;
/* update playlist interface */
- p_playlist = (playlist_t *) vlc_object_find(
+ p_playlist = (playlist_t *) vlc_object_find(
p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if (p_playlist != NULL)
{
- msg_Dbg(p_intf, "Manage: Populating GtkTreeView Playlist" );
- p_liststore = gtk_list_store_new (2,
+ p_liststore = gtk_list_store_new (3,
+ G_TYPE_STRING,
G_TYPE_STRING,
- G_TYPE_STRING);
+ G_TYPE_UINT); /* Hidden index */
PlaylistRebuildListStore(p_liststore, p_playlist);
- msg_Dbg(p_intf, "Manage: Updating GtkTreeView 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 );
}
}
/* Manage the slider */
+#define p_area p_input->stream.p_selected_area
if (p_intf->p_libvlc->i_cpu & CPU_CAPABILITY_FPU)
{
- /* Manage the slider for CPU_CAPABILITY_FPU hardware */
+ /* Manage the slider for CPU_CAPABILITY_FPU hardware */
if( p_input->stream.b_seekable && p_intf->p_sys->b_playing )
{
float newvalue = p_intf->p_sys->p_adj->value;
-#define p_area p_input->stream.p_selected_area
/* If the user hasn't touched the slider since the last time,
* then the input can safely change it */
if( newvalue == p_intf->p_sys->f_adj_oldvalue )
p_intf->p_sys->p_adj->value =
p_intf->p_sys->f_adj_oldvalue =
( 100. * p_area->i_tell ) / p_area->i_size;
- gtk_signal_emit_by_name( GTK_OBJECT( p_intf->p_sys->p_adj ),
+ g_signal_emit_by_name( GTK_OBJECT( p_intf->p_sys->p_adj ),
"value_changed" );
}
/* Otherwise, send message to the input if the user has
/* Update the old value */
p_intf->p_sys->f_adj_oldvalue = newvalue;
}
-#undef p_area
}
}
else
{
off_t newvalue = p_intf->p_sys->p_adj->value;
-#define p_area p_input->stream.p_selected_area
/* If the user hasn't touched the slider since the last time,
* then the input can safely change it */
if( newvalue == p_intf->p_sys->i_adj_oldvalue )
p_intf->p_sys->p_adj->value =
p_intf->p_sys->i_adj_oldvalue =
( 100 * p_area->i_tell ) / p_area->i_size;
- gtk_signal_emit_by_name( GTK_OBJECT( p_intf->p_sys->p_adj ),
+ g_signal_emit_by_name( GTK_OBJECT( p_intf->p_sys->p_adj ),
"value_changed" );
}
/* Otherwise, send message to the input if the user has
/* Update the old value */
p_intf->p_sys->i_adj_oldvalue = newvalue;
}
-#undef p_area
}
}
+#undef p_area
}
vlc_mutex_unlock( &p_input->stream.stream_lock );
}
* the stream. It is called whenever the slider changes its value.
* The lock has to be taken before you call the function.
*****************************************************************************/
-void E_(GtkDisplayDate)( GtkAdjustment *p_adj )
+void E_(GtkDisplayDate)( GtkAdjustment *p_adj, gpointer userdata )
{
intf_thread_t *p_intf;
- p_intf = gtk_object_get_data( GTK_OBJECT( p_adj ), "p_intf" );
+ p_intf = (intf_thread_t*) userdata;
+ if (p_intf == NULL)
+ return;
if( p_intf->p_sys->p_input )
{
#define p_area p_intf->p_sys->p_input->stream.p_selected_area
- char psz_time[ OFFSETTOTIME_MAX_SIZE ];
+ char psz_time[ MSTRTIME_MAX_SIZE ];
gtk_label_set_text( GTK_LABEL( p_intf->p_sys->p_slider_label ),
input_OffsetToTime( p_intf->p_sys->p_input, psz_time,
*****************************************************************************/
gint E_(GtkModeManage)( intf_thread_t * p_intf )
{
- GtkWidget * p_slider;
+ GtkWidget * p_slider = NULL;
vlc_bool_t b_control;
-#define GETWIDGET( ptr, name ) GTK_WIDGET( gtk_object_get_data( GTK_OBJECT( \
- p_intf->p_sys->ptr ) , ( name ) ) )
- /* hide slider */
- p_slider = GTK_WIDGET( gtk_object_get_data( GTK_OBJECT(
- p_intf->p_sys->p_window ), "slider" ) );
- gtk_widget_hide( GTK_WIDGET( p_slider ) );
+ if ( p_intf->p_sys->p_window == NULL )
+ msg_Err( p_intf, "Main widget not found" );
+
+ p_slider = lookup_widget( p_intf->p_sys->p_window, "timeSlider");
+ if (p_slider == NULL)
+ msg_Err( p_intf, "Slider widget not found" );
/* controls unavailable */
b_control = 0;
/* initialize and show slider for seekable streams */
if( p_intf->p_sys->p_input->stream.b_seekable )
{
- if (p_intf->p_libvlc->i_cpu & CPU_CAPABILITY_FPU)
- p_intf->p_sys->p_adj->value = p_intf->p_sys->f_adj_oldvalue = 0;
- else
- p_intf->p_sys->p_adj->value = p_intf->p_sys->i_adj_oldvalue = 0;
- gtk_signal_emit_by_name( GTK_OBJECT( p_intf->p_sys->p_adj ),
- "value_changed" );
gtk_widget_show( GTK_WIDGET( p_slider ) );
}
+ else
+ {
+ /* hide slider */
+ gtk_widget_hide( GTK_WIDGET( p_slider ) );
+ }
/* control buttons for free pace streams */
b_control = p_intf->p_sys->p_input->stream.b_pace_control;
}
/* set control items */
- gtk_widget_set_sensitive( GETWIDGET(p_window, "tbRewind"), b_control );
- gtk_widget_set_sensitive( GETWIDGET(p_window, "tbPause"), b_control );
- gtk_widget_set_sensitive( GETWIDGET(p_window, "tbForward"), b_control );
-
-#undef GETWIDGET
+ gtk_widget_set_sensitive( lookup_widget( p_intf->p_sys->p_window, "tbRewind"), b_control );
+ gtk_widget_set_sensitive( lookup_widget( p_intf->p_sys->p_window, "tbPause"), b_control );
+ gtk_widget_set_sensitive( lookup_widget( p_intf->p_sys->p_window, "tbForward"), b_control );
return TRUE;
}