Changeset e0d08374cf0261657843261e1b295fa3704051e5

Timestamp:

21/11/04 18:45:09 (4 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1101059109 +0000

git-parent:

[0b62ce6ddea078551980803454777fed033c2ba4]

git-author:

Clément Stenac <zorglub@videolan.org> 1101059109 +0000

Message:

Sort a node (alphabetically, all sub-nodes come first)

Files:

• include/vlc_playlist.h (modified) (2 diffs)
• modules/gui/wxwindows/playlist.cpp (modified) (4 diffs)
• modules/gui/wxwindows/wxwindows.h (modified) (1 diff)
• src/playlist/sort.c (modified) (1 diff)

include/vlc_playlist.h

@@ -209 +209 @@
-#define SORT_ID 0
-#define SORT_TITLE 1
-
+
+
-#define SORT_RANDOM 4
-#define SORT_DURATION 5
@@ -332 +333 @@
-VLC_EXPORT( int,  playlist_Move, ( playlist_t *, int, int ) );
-VLC_EXPORT( int,  playlist_NodeGroup, ( playlist_t *, int,playlist_item_t *,playlist_item_t **,int, int, int ) );
+VLC_EXPORT( int,  playlist_NodeSort, ( playlist_t *, playlist_item_t *,int, int ) );
-
-/* Load/Save */

modules/gui/wxwindows/playlist.cpp

@@ -94 +94 @@
-    PopupPlay_Event,
-    PopupPlayThis_Event,
+    PopupSort_Event,
-    PopupDel_Event,
-    PopupEna_Event,
@@ -155 +156 @@
-    EVT_MENU( PopupPlay_Event, Playlist::OnPopupPlay)
-    EVT_MENU( PopupPlayThis_Event, Playlist::OnPopupPlay)
+    EVT_MENU( PopupSort_Event, Playlist::OnPopupSort)
-    EVT_MENU( PopupDel_Event, Playlist::OnPopupDel)
-    EVT_MENU( PopupEna_Event, Playlist::OnPopupEna)
@@ -277 +279 @@
-    popup_menu->Append( PopupPlay_Event, wxU(_("Play")) );
-    popup_menu->Append( PopupPlayThis_Event, wxU(_("Play this branch")) );
+    popup_menu->Append( PopupSort_Event, wxU(_("Sort this branch")) );
-    popup_menu->Append( PopupDel_Event, wxU(_("Delete")) );
-    popup_menu->Append( PopupEna_Event, wxU(_("Enable/Disable")) );
@@ -1453 +1456 @@
-}
-
+void Playlist::OnPopupSort( wxMenuEvent& event )
+{
+    PlaylistItem *p_wxitem;
+
+    p_wxitem = (PlaylistItem *)treectrl->GetItemData( i_popup_item );
+
+    if( p_wxitem->p_item->i_children >= 0 )
+    {
+        playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_intf,
+                                        VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+
+        if( p_playlist )
+        {
+            playlist_NodeSort( p_playlist, p_wxitem->p_item,
+                               SORT_TITLE_NODES_FIRST, ORDER_NORMAL );
+            vlc_object_release( p_playlist );
+        }
+    }
+}
+
-void Playlist::OnPopupEna( wxMenuEvent& event )
-{

modules/gui/wxwindows/wxwindows.h

@@ -830 +830 @@
-    void OnPopup( wxContextMenuEvent& event );
-    void OnPopupPlay( wxMenuEvent& event );
+    void OnPopupSort( wxMenuEvent& event );
-    void OnPopupDel( wxMenuEvent& event );
-    void OnPopupEna( wxMenuEvent& event );

src/playlist/sort.c

@@ -154 +154 @@
-                msg_Err( p_playlist,"META SORT not implemented" );
-            }
+            else if( i_mode == SORT_TITLE_NODES_FIRST )
+            {
+                /* Alphabetic sort, all nodes first */
+
+                if( pp_items[i]->i_children == -1 &&
+                    pp_items[i_small]->i_children >= 0 )
+                {
+                    i_test = 1;
+                }
+                else if( pp_items[i]->i_children >= 0 &&
+                         pp_items[i_small]->i_children == -1 )
+                {
+                    i_test = -1;
+                }
+                else
+                {
+                    i_test = strcasecmp( pp_items[i]->input.psz_name,
+                                         pp_items[i_small]->input.psz_name );
+                }
+            }
-
-            if( ( i_type == ORDER_NORMAL  && i_test < 0 ) ||