* Preamble
*****************************************************************************/
#include <errno.h> /* ENOMEM */
-#include <string.h> /* strerror() */
-#include <stdio.h>
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_input.h>
#include <vlc_interface.h>
+#include <vlc_playlist.h>
#include <gtk/gtk.h>
void GtkAutoPlayFile ( vlc_object_t * );
static int Manage ( intf_thread_t *p_intf );
-void E_(GtkDisplayDate) ( GtkAdjustment *p_adj, gpointer userdata );
-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();
- set_description( _("PDA Linux Gtk2+ interface") );
+ 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, VLC_TRUE );
- set_capability( "interface", 70 );
+// 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();
#ifdef NEED_GTK2_MAIN
msg_Dbg( p_intf, "Using gui-helper" );
p_intf->p_sys->p_gtk_main =
- module_Need( p_this, "gui-helper", "gtk2", VLC_TRUE );
+ module_Need( p_this, "gui-helper", "gtk2", true );
if( p_intf->p_sys->p_gtk_main == NULL )
{
free( p_intf->p_sys );
#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)
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 );
+ G_CALLBACK( GtkDisplayDate ), p_intf );
p_intf->p_sys->f_adj_oldvalue = 0;
p_intf->p_sys->i_adj_oldvalue = 0;
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 */
G_TYPE_UINT); /* Hidden index */
- PlaylistRebuildListStore(p_playlist_store, p_playlist);
+ 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 */
{
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 );
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;
- E_(GtkModeManage)( p_intf );
+ 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 );
+ 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_liststore, p_playlist);
+ 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 ) )
{
- E_(GtkModeManage)( p_intf );
+ GtkModeManage( p_intf );
p_intf->p_sys->b_playing = 0;
}
* 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, gpointer userdata )
+void GtkDisplayDate( GtkAdjustment *p_adj, gpointer userdata )
{
+ (void)p_adj;
+
intf_thread_t *p_intf;
p_intf = (intf_thread_t*) userdata;
char psz_time[ MSTRTIME_MAX_SIZE ];
int64_t i_seconds;
- i_seconds = var_GetTime( p_intf->p_sys->p_input, "time" ) / I64C(1000000 );
+ 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 ),
*****************************************************************************
* 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 = NULL;
- vlc_bool_t b_control;
+ bool b_control;
if ( p_intf->p_sys->p_window == NULL )
msg_Err( p_intf, "Main widget not found" );
gtk_widget_set_sensitive( lookup_widget( p_intf->p_sys->p_window, "tbForward"), b_control );
return TRUE;
}
-
projects / vlc / blobdiff