PDA intf: clean up

[vlc] / modules / gui / pda / pda.c

diff --git a/modules/gui/pda/pda.c b/modules/gui/pda/pda.c
index 70d046b4be6ee6c4cbe31f4ffbb5440b9d989328..269675656e465bb9318e16b54b6f81ed108ee2d5 100644 (file)
--- a/modules/gui/pda/pda.c
+++ b/modules/gui/pda/pda.c
@@ -32,6 +32,7 @@
 #endif
 
 #include <vlc/vlc.h>
+#include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>
@@ -52,8 +53,8 @@ static void Run          ( intf_thread_t * );
 
 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
@@ -66,7 +67,7 @@ gint E_(GtkModeManage)   ( intf_thread_t * p_intf );
  * 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, true );
@@ -167,14 +168,7 @@ static void Run( intf_thread_t *p_intf )
 #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)
@@ -207,7 +201,7 @@ static void Run( intf_thread_t *p_intf )
     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;
 
@@ -256,7 +250,7 @@ static void Run( intf_thread_t *p_intf )
                 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);
@@ -428,7 +422,7 @@ static int Manage( intf_thread_t *p_intf )
         {
             playlist_t *p_playlist;
 
-            E_(GtkModeManage)( p_intf );
+            GtkModeManage( p_intf );
             p_intf->p_sys->b_playing = 1;
 
             /* update playlist interface */
@@ -523,7 +517,7 @@ static int Manage( intf_thread_t *p_intf )
     }
     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;
     }
 
@@ -551,8 +545,10 @@ static int Manage( intf_thread_t *p_intf )
  * 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;
@@ -578,7 +574,7 @@ void E_(GtkDisplayDate)( GtkAdjustment *p_adj, gpointer userdata )
  *****************************************************************************
  * 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;
     bool      b_control;