/*****************************************************************************
* pda.c : PDA Gtk2 plugin for vlc
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: pda.c,v 1.1 2003/07/23 22:02:56 jpsaman Exp $
+ * Copyright (C) 2002 the VideoLAN team
+ * $Id$
*
- * Authors: Jean-Paul Saman <jpsaman@wxs.nl>
+ * Authors: Jean-Paul Saman <jpsaman _at_ videolan _dot_ org>
* Marc Ariberti <marcari@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
#include <errno.h> /* ENOMEM */
-#include <string.h> /* strerror() */
-#include <stdio.h>
-#include <vlc/vlc.h>
-#include <vlc/intf.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#include <gtk/gtk.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_input.h>
+#include <vlc_interface.h>
+#include <vlc_playlist.h>
-#ifdef HAVE_GPE_INIT_H
-#include <gpe/init.h>
-#endif
+#include <gtk/gtk.h>
-#include "callbacks.h"
-#include "interface.h"
-#include "support.h"
+#include "pda_callbacks.h"
+#include "pda_interface.h"
+#include "pda_support.h"
#include "pda.h"
/*****************************************************************************
void GtkAutoPlayFile ( vlc_object_t * );
static int Manage ( intf_thread_t *p_intf );
-void E_(GtkDisplayDate) ( GtkAdjustment *p_adj );
-gint E_(GtkModeManage) ( intf_thread_t * p_intf );
+void GtkDisplayDate ( GtkAdjustment *p_adj, gpointer userdata );
+gint GtkModeManage ( intf_thread_t * p_intf );
/*****************************************************************************
* Module descriptor
* 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") );
- set_capability( "interface", 70 );
+ set_description( N_("PDA Linux Gtk2+ interface") );
+ set_category( CAT_INTERFACE );
+ set_subcategory( SUBCAT_INTERFACE_MAIN );
+// add_bool( "pda-autoplayfile", 1, GtkAutoPlayFile, AUTOPLAYFILE_TEXT, AUTOPLAYFILE_LONGTEXT, true );
+ set_capability( "interface", 0 );
set_callbacks( Open, Close );
add_shortcut( "pda" );
vlc_module_end();
return VLC_ENOMEM;
}
-#ifdef NEED_GTK_MAIN
+#ifdef NEED_GTK2_MAIN
msg_Dbg( p_intf, "Using gui-helper" );
- p_intf->p_sys->p_gtk_main = module_Need( p_this, "gui-helper", "gtk" );
+ p_intf->p_sys->p_gtk_main =
+ module_Need( p_this, "gui-helper", "gtk2", true );
if( p_intf->p_sys->p_gtk_main == NULL )
{
free( p_intf->p_sys );
vlc_object_release( p_intf->p_sys->p_input );
}
-#ifdef NEED_GTK_MAIN
+#ifdef NEED_GTK2_MAIN
msg_Dbg( p_intf, "Releasing gui-helper" );
module_Unneed( p_intf, p_intf->p_sys->p_gtk_main );
#endif
*****************************************************************************/
static void Run( intf_thread_t *p_intf )
{
-#ifndef NEED_GTK_MAIN
+#ifndef NEED_GTK2_MAIN
/* gtk_init needs to know the command line. We don't care, so we
* give it an empty one */
char *p_args[] = { "", NULL };
int i_args = 1;
int i_dummy;
#endif
+ playlist_t *p_playlist;
+ GtkCellRenderer *p_renderer = NULL;
+ GtkTreeViewColumn *p_column = NULL;
+ GtkListStore *p_filelist = NULL;
+ GtkListStore *p_playlist_store = NULL;
-#ifdef HAVE_GPE_INIT_H
- /* Initialize GPE interface */
- msg_Dbg( p_intf, "Starting pda GPE interface" );
- if (gpe_application_init(&i_args, &pp_args) == FALSE)
- exit (1);
-#else
+#ifndef NEED_GTK2_MAIN
gtk_set_locale ();
-# ifndef NEED_GTK_MAIN
msg_Dbg( p_intf, "Starting pda GTK2+ interface" );
gtk_init( &i_args, &pp_args );
-# else
+#else
/* Initialize Gtk+ */
- msg_Dbg( p_intf, "Starting pda GTK+ interface thread" );
+ msg_Dbg( p_intf, "Starting pda GTK2+ interface thread" );
gdk_threads_enter();
-# endif
#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)
{
msg_Err( p_intf, "unable to create pda interface" );
}
- gtk_widget_set_usize(p_intf->p_sys->p_window,
- gdk_screen_width() , gdk_screen_height() - 30 );
+
+ /* Store p_intf to keep an eye on it */
+ gtk_object_set_data( GTK_OBJECT(p_intf->p_sys->p_window),
+ "p_intf", p_intf );
/* Set the title of the main window */
gtk_window_set_title( GTK_WINDOW(p_intf->p_sys->p_window),
- VOUT_TITLE " (pda Linux interface)");
+ VOUT_TITLE " (PDA Linux interface)");
+ /* 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" ) );
- p_intf->p_sys->p_mediabook = GTK_NOTEBOOK( gtk_object_get_data(
- GTK_OBJECT( p_intf->p_sys->p_window ), "mediabook" ) );
/* 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." );
/* Connect the date display to the slider */
-#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( GtkDisplayDate ), p_intf );
p_intf->p_sys->f_adj_oldvalue = 0;
p_intf->p_sys->i_adj_oldvalue = 0;
-#undef P_SLIDER
-
- p_intf->p_sys->p_clist = GTK_CLIST( gtk_object_get_data(
- GTK_OBJECT( p_intf->p_sys->p_window ), "clistmedia" ) );
- gtk_clist_set_column_visibility (GTK_CLIST (p_intf->p_sys->p_clist), 2, FALSE);
- gtk_clist_set_column_visibility (GTK_CLIST (p_intf->p_sys->p_clist), 3, FALSE);
- gtk_clist_set_column_visibility (GTK_CLIST (p_intf->p_sys->p_clist), 4, FALSE);
- gtk_clist_column_titles_show (GTK_CLIST (p_intf->p_sys->p_clist));
-
- /* the playlist object */
- p_intf->p_sys->p_clistplaylist = GTK_CLIST( gtk_object_get_data(
- GTK_OBJECT( p_intf->p_sys->p_window ), "clistplaylist" ) );
-
- p_intf->p_sys->p_mrlentry = GTK_ENTRY( gtk_object_get_data(
- GTK_OBJECT( p_intf->p_sys->p_window ), "mrl_entry" ) );
- /* Store p_intf to keep an eye on it */
- gtk_object_set_data( GTK_OBJECT(p_intf->p_sys->p_window),
- "p_intf", p_intf );
- gtk_object_set_data( GTK_OBJECT(p_intf->p_sys->p_adj),
- "p_intf", p_intf );
-
+ /* BEGIN OF FILEVIEW GTK_TREE_VIEW */
+ p_intf->p_sys->p_tvfile = NULL;
+ p_intf->p_sys->p_tvfile = (GtkTreeView *) lookup_widget( p_intf->p_sys->p_window,
+ "tvFileList");
+ if (NULL == p_intf->p_sys->p_tvfile)
+ msg_Err(p_intf, "Error obtaining pointer to File List");
+
+ /* Insert columns 0 */
+ p_renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes(p_intf->p_sys->p_tvfile, 0, (gchar *) N_("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 */
+ p_renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes(p_intf->p_sys->p_tvfile, 1, (gchar *) N_("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 */
+ p_renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes(p_intf->p_sys->p_tvfile, 2, (gchar *) N_("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 */
+ p_renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes(p_intf->p_sys->p_tvfile, 3, (gchar *) N_("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 */
+ p_renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes(p_intf->p_sys->p_tvfile, 4, (gchar *) N_("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 */
+ 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, 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);
+
+ /* Column properties */
+ gtk_tree_view_set_headers_visible(p_intf->p_sys->p_tvfile, TRUE);
+ gtk_tree_view_columns_autosize(p_intf->p_sys->p_tvfile);
+ gtk_tree_view_set_headers_clickable(GTK_TREE_VIEW(p_intf->p_sys->p_tvfile),TRUE);
+ /* END OF FILEVIEW GTK_TREE_VIEW */
+
+ /* BEGIN OF PLAYLIST GTK_TREE_VIEW */
+ p_intf->p_sys->p_tvplaylist = NULL;
+ 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 */
+ p_renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes(p_intf->p_sys->p_tvplaylist, 0, (gchar *) N_("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 */
+ p_renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes(p_intf->p_sys->p_tvplaylist, 1, (gchar *) N_("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, (gchar *) N_("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 */
+ p_playlist = pl_Yield( p_intf );
+ p_playlist_store = gtk_list_store_new (3,
+ G_TYPE_STRING, /* Filename */
+ G_TYPE_STRING, /* Time */
+ G_TYPE_UINT); /* Hidden index */
+ 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);
+ 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 */
+ gtk_tree_view_set_headers_visible(p_intf->p_sys->p_tvplaylist, TRUE);
+ gtk_tree_view_columns_autosize(p_intf->p_sys->p_tvplaylist);
+ 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. */
+ GtkWidget *p_preference_tab = NULL;
+ p_preference_tab = gtk_notebook_get_nth_page(p_intf->p_sys->p_notebook,5);
+ if (p_preference_tab != NULL)
+ gtk_widget_hide(p_preference_tab);
+
/* Show the control window */
gtk_widget_show( p_intf->p_sys->p_window );
- ReadDirectory(p_intf->p_sys->p_clist, ".");
- /* update the playlist */
- PDARebuildCList( p_intf->p_sys->p_clistplaylist,
- vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ));
-
-#ifdef NEED_GTK_MAIN
+#ifdef NEED_GTK2_MAIN
msg_Dbg( p_intf, "Manage GTK keyboard events using threads" );
- while( !p_intf->b_die )
+ while( !intf_ShouldDie( p_intf ) )
{
Manage( p_intf );
/* Sleep to avoid using all CPU - since some interfaces need to
* access keyboard events, a 100ms delay is a good compromise */
gdk_threads_leave();
- if (p_intf->p_libvlc->i_cpu & CPU_CAPABILITY_FPU)
+ if (vlc_CPU() & CPU_CAPABILITY_FPU)
msleep( INTF_IDLE_SLEEP );
else
msleep( 1000 );
msg_Dbg( p_intf, "Manage GTK keyboard events using timeouts" );
/* Sleep to avoid using all CPU - since some interfaces needs to access
* keyboard events, a 1000ms delay is a good compromise */
- if (p_intf->p_libvlc->i_cpu & CPU_CAPABILITY_FPU)
+ if (vlc_CPU() & CPU_CAPABILITY_FPU)
i_dummy = gtk_timeout_add( INTF_IDLE_SLEEP / 1000, (GtkFunction)Manage, p_intf );
else
i_dummy = gtk_timeout_add( 1000, (GtkFunction)Manage, p_intf );
#endif
gtk_object_destroy( GTK_OBJECT(p_intf->p_sys->p_window) );
-#ifdef NEED_GTK_MAIN
+#ifdef NEED_GTK2_MAIN
gdk_threads_leave();
#endif
}
{
p_intf = (intf_thread_t *)p_list->p_values[i_index].p_object ;
- if( strcmp( MODULE_STRING, p_intf->p_module->psz_object_name ) )
+ if( strcmp( MODULE_STRING, module_GetObjName(p_intf->p_module) ) )
{
continue;
}
if( !config_GetInt( p_this, "pda-autoplayfile" ) )
{
- p_intf->p_sys->b_autoplayfile = VLC_FALSE;
+ p_intf->p_sys->b_autoplayfile = false;
}
else
{
- p_intf->p_sys->b_autoplayfile = VLC_TRUE;
+ p_intf->p_sys->b_autoplayfile = true;
}
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( cbautoplay ),
p_intf->p_sys->b_autoplayfile );
*****************************************************************************/
static int Manage( intf_thread_t *p_intf )
{
+ GtkListStore *p_liststore;
vlc_mutex_lock( &p_intf->change_lock );
/* Update the input */
if( p_intf->p_sys->p_input )
{
input_thread_t *p_input = p_intf->p_sys->p_input;
+ int64_t i_time = 0, i_length = 0;
- vlc_mutex_lock( &p_input->stream.stream_lock );
- if( !p_input->b_die )
+ vlc_object_lock( p_input );
+ if( vlc_object_alive (p_input) )
{
- /* New input or stream map change */
- if( p_input->stream.b_changed )
- {
- playlist_t *p_playlist;
+ playlist_t *p_playlist;
- E_(GtkModeManage)( p_intf );
- p_intf->p_sys->b_playing = 1;
+ GtkModeManage( p_intf );
+ p_intf->p_sys->b_playing = 1;
- /* update playlist interface */
- p_playlist = (playlist_t *) vlc_object_find(
- p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
- if (p_playlist != NULL)
- {
- PDARebuildCList( p_intf->p_sys->p_clistplaylist,
- p_playlist );
- }
+ /* update playlist interface */
+ p_playlist = pl_Yield( p_intf );
+ if (p_playlist != NULL)
+ {
+ p_liststore = gtk_list_store_new (3,
+ G_TYPE_STRING,
+ G_TYPE_STRING,
+ G_TYPE_UINT); /* Hidden index */
+ 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);
+ pl_Release( p_intf );
}
/* Manage the slider */
- if (p_intf->p_libvlc->i_cpu & CPU_CAPABILITY_FPU)
+ i_time = var_GetTime( p_intf->p_sys->p_input, "time" );
+ i_length = var_GetTime( p_intf->p_sys->p_input, "length" );
+
+ if (vlc_CPU() & CPU_CAPABILITY_FPU)
{
- /* Manage the slider for CPU_CAPABILITY_FPU hardware */
- if( p_input->stream.b_seekable && p_intf->p_sys->b_playing )
+ /* Manage the slider for CPU_CAPABILITY_FPU hardware */
+ if( 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 )
/* Update the value */
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 ),
+ ( 100 * i_time ) / i_length;
+ 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
* finished dragging the slider */
else if( p_intf->p_sys->b_slider_free )
{
- off_t i_seek = ( newvalue * p_area->i_size ) / 100;
+ double f_pos = (double)newvalue / 100.0;
/* release the lock to be able to seek */
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- input_Seek( p_input, i_seek, INPUT_SEEK_SET );
- vlc_mutex_lock( &p_input->stream.stream_lock );
+ vlc_object_unlock( p_input );
+ var_SetFloat( p_input, "position", f_pos );
+ vlc_object_lock( p_input );
/* Update the old value */
p_intf->p_sys->f_adj_oldvalue = newvalue;
}
-#undef p_area
}
}
else
{
/* Manage the slider without CPU_CAPABILITY_FPU hardware */
- if( p_input->stream.b_seekable && p_intf->p_sys->b_playing )
+ if( p_intf->p_sys->b_playing )
{
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 )
/* Update the value */
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 ),
+ ( 100 * i_time ) / i_length;
+ 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
* finished dragging the slider */
else if( p_intf->p_sys->b_slider_free )
{
- off_t i_seek = ( newvalue * p_area->i_size ) / 100;
+ double f_pos = (double)newvalue / 100.0;
/* release the lock to be able to seek */
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- input_Seek( p_input, i_seek, INPUT_SEEK_SET );
- vlc_mutex_lock( &p_input->stream.stream_lock );
+ vlc_object_unlock( p_input );
+ var_SetFloat( p_input, "position", f_pos );
+ vlc_object_lock( p_input );
/* Update the old value */
p_intf->p_sys->i_adj_oldvalue = newvalue;
}
-#undef p_area
}
}
}
- vlc_mutex_unlock( &p_input->stream.stream_lock );
+ vlc_object_unlock( p_input );
}
- else if( p_intf->p_sys->b_playing && !p_intf->b_die )
+ else if( p_intf->p_sys->b_playing && !intf_ShouldDie( p_intf ) )
{
- E_(GtkModeManage)( p_intf );
+ GtkModeManage( p_intf );
p_intf->p_sys->b_playing = 0;
}
-#ifndef NEED_GTK_MAIN
- if( p_intf->b_die )
+#ifndef NEED_GTK2_MAIN
+ if( intf_ShouldDie( p_intf ) )
{
vlc_mutex_unlock( &p_intf->change_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 GtkDisplayDate( GtkAdjustment *p_adj, gpointer userdata )
{
+ (void)p_adj;
+
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 ];
+ int64_t i_seconds;
+
+ i_seconds = var_GetTime( p_intf->p_sys->p_input, "time" ) / INT64_C(1000000 );
+ secstotimestr( psz_time, i_seconds );
gtk_label_set_text( GTK_LABEL( p_intf->p_sys->p_slider_label ),
- input_OffsetToTime( p_intf->p_sys->p_input, psz_time,
- ( p_area->i_size * p_adj->value ) / 100 ) );
-#undef p_area
+ psz_time );
}
}
*****************************************************************************
* The lock has to be taken before you call the function.
*****************************************************************************/
-gint E_(GtkModeManage)( intf_thread_t * p_intf )
+gint GtkModeManage( intf_thread_t * p_intf )
{
- GtkWidget * p_slider;
- vlc_bool_t b_control;
+ GtkWidget * p_slider = NULL;
+ bool 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;
if( p_intf->p_sys->p_input )
{
/* 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 ) );
}
/* control buttons for free pace streams */
- b_control = p_intf->p_sys->p_input->stream.b_pace_control;
+ b_control = p_intf->p_sys->p_input->b_can_pace_control;
- p_intf->p_sys->p_input->stream.b_changed = 0;
msg_Dbg( p_intf, "stream has changed, refreshing interface" );
}
/* set control items */
- gtk_widget_set_sensitive( GETWIDGET(p_window, "toolbar_rewind"), b_control );
- gtk_widget_set_sensitive( GETWIDGET(p_window, "toolbar_pause"), b_control );
- gtk_widget_set_sensitive( GETWIDGET(p_window, "toolbar_forward"), 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;
}
-
projects / vlc / blobdiff