Changeset 37c3eadcd507bc123f74379fcc28035691436b4b

Timestamp:

26/11/03 11:45:21 (5 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

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

git-parent:

[380edbae4061b349232364c7d7989c4ef8e8931f]

git-author:

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

Message:

* Merged sort functions
* Added a randomize playlist function

Files:

• include/vlc_playlist.h (modified) (3 diffs)
• modules/gui/wxwindows/playlist.cpp (modified) (5 diffs)
• src/playlist/sort.c (modified) (5 diffs)

include/vlc_playlist.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
-6 2003/11/12 08:10
+7 2003/11/26 10:45
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -97 +97 @@
-};
-
+#define SORT_TITLE 0
+#define SORT_AUTHOR 1
+#define SORT_GROUP 2
+#define SORT_RANDOM 3
+
-#define SORT_NORMAL 0
-#define SORT_REVERSE 1
@@ -133 +138 @@
-VLC_EXPORT( int, playlist_GroupToId, (playlist_t *, char * ) );
-
-
-
-
+
+
+
+
+
-
-VLC_EXPORT( int,  playlist_Move, ( playlist_t *, int, int ) );

modules/gui/wxwindows/playlist.cpp

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN
-6 2003/11/21 18:55:40 gbazin
+7 2003/11/26 10:45:21 zorglub
- *
- * Authors: Olivier Teuli� <ipkiss@via.ecp.fr>
@@ -60 +60 @@
-    SortGroup_Event,
-    RSortGroup_Event,
+    Randomize_Event,
-
-    EnableSelection_Event,
@@ -99 +100 @@
-    EVT_MENU(SortGroup_Event, Playlist::OnSort)
-    EVT_MENU(RSortGroup_Event, Playlist::OnSort)
+
+    EVT_MENU(Randomize_Event, Playlist::OnSort)
-
-    EVT_MENU(EnableSelection_Event, Playlist::OnEnableSelection)
@@ -181 +184 @@
-    /* Create our "Sort" menu */
-    wxMenu *sort_menu = new wxMenu;
-&Sort by 
+Sort by &
-    sort_menu->Append( RSortTitle_Event, wxU(_("&Reverse sort by title")) );
-    sort_menu->AppendSeparator();
-&Sort by 
+Sort by &
-    sort_menu->Append( RSortAuthor_Event, wxU(_("&Reverse sort by author")) );
-    sort_menu->AppendSeparator();
-&Sort by 
+Sort by &
-    sort_menu->Append( RSortGroup_Event, wxU(_("&Reverse sort by group")) );
+    sort_menu->AppendSeparator();
+    sort_menu->Append( Randomize_Event, wxU(_("&Randomize Playlist")) );
-
-    /* Create our "Selection" menu */
@@ -661 +666 @@
-        case RSortGroup_Event:
-           playlist_SortGroup( p_playlist , 1 );
+           break;
+        case Randomize_Event:
+           playlist_Sort( p_playlist , SORT_RANDOM, SORT_NORMAL );
-           break;
-    }

src/playlist/sort.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-1 2003/10/29 18:00:46
+2 2003/11/26 10:45:21
- *
- * Authors: Cl�nt Stenac <zorglub@videolan.org>
@@ -32 +32 @@
-
-/**
- by title
+
- * \param p_playlist the playlist
+ * \param i_mode: SORT_TITLE, SORT_GROUP, SORT_AUTHOR, SORT_RANDOM
- * \param i_type: SORT_NORMAL or SORT_REVERSE (reversed order)
- * \return 0 on success
- */
-Title( playlist_t * p_playlist 
+( playlist_t * p_playlist , int i_mode
-{
-    int i , i_small , i_position;
@@ -44 +45 @@
-    vlc_mutex_lock( &p_playlist->object_lock );
-
+    if( i_mode == SORT_RANDOM )
+    {
+        for( i_position = 0; i_position < p_playlist->i_size ; i_position ++ )
+        {
+            int i_new  = rand() % (p_playlist->i_size - 1);
+
+            /* Keep the correct current index */
+            if( i_new == p_playlist->i_index )
+                p_playlist->i_index = i_position;
+            else if( i_position == p_playlist->i_index )
+                p_playlist->i_index = i_new;
+
+            p_temp = p_playlist->pp_items[i_position];
+            p_playlist->pp_items[i_position] = p_playlist->pp_items[i_new];
+            p_playlist->pp_items[i_new] = p_temp;
+        }
+        vlc_mutex_unlock( &p_playlist->object_lock );
+
+        return 0;
+    }
+
-    for( i_position = 0; i_position < p_playlist->i_size -1 ; i_position ++ )
-    {
@@ -49 +71 @@
-        for( i = i_position + 1 ; i<  p_playlist->i_size ; i++)
-        {
-
+ = 0
-
-
+
+
+
-                                 p_playlist->pp_items[i_small]->psz_name );
+            }
+            else if( i_mode == SORT_GROUP )
+            {
+                i_test = p_playlist->pp_items[i]->i_group -
+                                 p_playlist->pp_items[i_small]->i_group;
+            }
+            else if( i_mode == SORT_AUTHOR )
+            {
+                 i_test = strcasecmp( p_playlist->pp_items[i]->psz_author,
+                                 p_playlist->pp_items[i_small]->psz_author );
+            }
-
-            if( ( i_type == SORT_NORMAL  && i_test < 0 ) ||
@@ -74 +109 @@
-    return 0;
-}
-
-/**
- * Sort the playlist by author
- * \param p_playlist the playlist
- * \param i_type: SORT_NORMAL or SORT_REVERSE (reversed order)
- * \return 0 on success
- */
-int playlist_SortAuthor( playlist_t * p_playlist , int i_type )
-{
-    int i , i_small , i_position;
-    playlist_item_t *p_temp;
-
-    vlc_mutex_lock( &p_playlist->object_lock );
-
-    for( i_position = 0; i_position < p_playlist->i_size -1 ; i_position ++ )
-    {
-        i_small  = i_position;
-        for( i = i_position + 1 ; i<  p_playlist->i_size ; i++)
-        {
-            int i_test;
-
-            i_test = strcasecmp( p_playlist->pp_items[i]->psz_author,
-                                 p_playlist->pp_items[i_small]->psz_author );
-
-            if( ( i_type == SORT_NORMAL  && i_test < 0 ) ||
-                ( i_type == SORT_REVERSE && i_test > 0 ) )
-            {
-                i_small = i;
-            }
-        }
-        /* Keep the correct current index */
-        if( i_small == p_playlist->i_index )
-            p_playlist->i_index = i_position;
-        else if( i_position == p_playlist->i_index )
-            p_playlist->i_index = i_small;
-
-        p_temp = p_playlist->pp_items[i_position];
-        p_playlist->pp_items[i_position] = p_playlist->pp_items[i_small];
-        p_playlist->pp_items[i_small] = p_temp;
-    }
-    vlc_mutex_unlock( &p_playlist->object_lock );
-
-    return 0;
-}
-
-int playlist_SortGroup( playlist_t * p_playlist , int i_type )
-{
-    int i , i_small , i_position;
-    playlist_item_t *p_temp;
-
-    vlc_mutex_lock( &p_playlist->object_lock );
-
-    for( i_position = 0; i_position < p_playlist->i_size -1 ; i_position ++ )
-    {
-        i_small  = i_position;
-        for( i = i_position + 1 ; i<  p_playlist->i_size ; i++)
-        {
-            int i_test;
-
-            i_test = p_playlist->pp_items[i]->i_group -
-                                 p_playlist->pp_items[i_small]->i_group;
-
-            if( ( i_type == SORT_NORMAL  && i_test < 0 ) ||
-                ( i_type == SORT_REVERSE && i_test > 0 ) )
-            {
-                i_small = i;
-            }
-        }
-        /* Keep the correct current index */
-        if( i_small == p_playlist->i_index )
-            p_playlist->i_index = i_position;
-        else if( i_position == p_playlist->i_index )
-            p_playlist->i_index = i_small;
-
-        p_temp = p_playlist->pp_items[i_position];
-        p_playlist->pp_items[i_position] = p_playlist->pp_items[i_small];
-        p_playlist->pp_items[i_small] = p_temp;
-    }
-    vlc_mutex_unlock( &p_playlist->object_lock );
-
-    return 0;
-}