PDA Interface:

- some cleanup
- reinstated automatic lowering of interface when play button was pressed.
- double click in playlist window play selected items.

diff --git a/modules/gui/pda/pda_callbacks.c b/modules/gui/pda/pda_callbacks.c
index fb01a1fafccae900807c45a0559707a3181f3985..9d61383529d544eee6537eb2ee3a1aef5bd34a7d 100644 (file)
--- a/modules/gui/pda/pda_callbacks.c
+++ b/modules/gui/pda/pda_callbacks.c
@@ -2,7 +2,7 @@
  * pda_callbacks.c : Callbacks for the pda Linux Gtk+ plugin.
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: pda_callbacks.c,v 1.22 2003/12/06 22:41:40 jpsaman Exp $
+ * $Id: pda_callbacks.c,v 1.23 2003/12/07 18:58:38 jpsaman Exp $
  *
  * Authors: Jean-Paul Saman <jpsaman@wxs.nl>
  *
@@ -380,6 +380,7 @@ void onPlay(GtkButton *button, gpointer user_data)
         {
             vlc_mutex_unlock( &p_playlist->object_lock );
             playlist_Play( p_playlist );
+            gdk_window_lower( p_intf->p_sys->p_window->window );
         }
         else
         {
@@ -399,6 +400,7 @@ void onStop(GtkButton *button, gpointer user_data)
     {
         playlist_Stop( p_playlist );
         vlc_object_release( p_playlist );
+        gdk_window_raise( p_intf->p_sys->p_window->window );
     }
 }
 
@@ -518,16 +520,8 @@ void onFileListRow(GtkTreeView *treeview, GtkTreePath *path,
                     g_object_unref(p_store);
                 }
             }
-            else
-            {
-                gtk_tree_selection_selected_foreach(p_selection, (GtkTreeSelectionForeachFunc) &addSelectedToPlaylist, (gpointer) treeview);
-            }
         }
     }
-    else
-    {
-        gtk_tree_selection_selected_foreach(p_selection, (GtkTreeSelectionForeachFunc) &addSelectedToPlaylist, (gpointer) treeview);
-    }
 }
 
 void onAddFileToPlaylist(GtkButton *button, gpointer user_data)
@@ -749,6 +743,39 @@ gboolean onPlaylistRowSelected(GtkTreeView *treeview, gboolean start_editing, gp
 void onPlaylistRow(GtkTreeView *treeview, GtkTreePath *path,
                    GtkTreeViewColumn *column, gpointer user_data)
 {
+    intf_thread_t *p_intf = GtkGetIntf( GTK_WIDGET(treeview) );
+    GtkTreeSelection *p_selection = gtk_tree_view_get_selection(treeview);
+    playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+                                                       FIND_ANYWHERE );
+
+    if( p_playlist == NULL )
+    {
+        return; // FALSE;
+    }
+
+    if (gtk_tree_selection_count_selected_rows(p_selection) == 1)
+    {
+        GtkTreeModel *p_model;
+        GtkTreeIter   iter;
+        int           i_row;
+
+        /* This might be a directory selection */
+        p_model = gtk_tree_view_get_model(treeview);
+        if (!p_model)
+        {
+            msg_Err(p_intf, "PDA: Playlist model contains a NULL pointer\n" );
+            return;
+        }
+        if (!gtk_tree_model_get_iter(p_model, &iter, path))
+        {
+            msg_Err( p_intf, "PDA: Playlist could not get iter from model" );
+            return;
+        }
+
+        gtk_tree_model_get(p_model, &iter, 2, &i_row, -1);
+        playlist_Goto( p_playlist, i_row );
+    }
+    vlc_object_release( p_playlist );
 }
 
 

diff --git a/modules/gui/pda/pda_callbacks.h b/modules/gui/pda/pda_callbacks.h
index f58160e704513661924f24019752d52ec6960e73..c80b32dc7b4d18173e067dfb9db1f3b27d5788eb 100644 (file)
--- a/modules/gui/pda/pda_callbacks.h
+++ b/modules/gui/pda/pda_callbacks.h
@@ -2,7 +2,7 @@
  * callbacks.h : pda plugin for vlc
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: pda_callbacks.h,v 1.11 2003/12/06 22:41:40 jpsaman Exp $
+ * $Id: pda_callbacks.h,v 1.12 2003/12/07 18:58:38 jpsaman Exp $
  *
  * Authors: Jean-Paul Saman <jpsaman@wxs.nl>
  *
@@ -27,9 +27,6 @@
 #include <vlc/intf.h>
 
 void ReadDirectory( intf_thread_t *p_intf, GtkListStore *p_list, char *psz_dir );
-#if 0
-void MediaURLOpenChanged( GtkWidget *widget, gchar *psz_url );
-#endif
 void PlaylistRebuildListStore( GtkListStore *p_list, playlist_t * p_playlist );