Changeset 26264

Timestamp:

07/05/08 15:21:38 (5 months ago)

Author:

stippi

Message:

* Added "Randomize" feature to Playlist window (Edit menu). It randomizes

either the selected items, or the entire list if nothing is selected.

* Small cleanups here and there.

Location:

haiku/trunk/src/apps/mediaplayer

Files:

• Jamfile (modified) (1 diff)
• MainApp.cpp (modified) (2 diffs)
• playlist/MovePLItemsCommand.cpp (modified) (2 diffs)
• playlist/Playlist.h (modified) (1 diff)
• playlist/PlaylistListView.cpp (modified) (2 diffs)
• playlist/PlaylistListView.h (modified) (1 diff)
• playlist/PlaylistWindow.cpp (modified) (3 diffs)
• playlist/RandomizePLItemsCommand.cpp (added)
• playlist/RandomizePLItemsCommand.h (added)

haiku/trunk/src/apps/mediaplayer/Jamfile

@@ -62 +62 @@
         PlaylistObserver.cpp
         PlaylistWindow.cpp
+        RandomizePLItemsCommand.cpp
         RemovePLItemsCommand.cpp
 

haiku/trunk/src/apps/mediaplayer/MainApp.cpp

@@ -29 +29 @@
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 
@@ -226 +227 @@
         EventQueue::CreateDefault();
 
+        srand(system_time());
+
         gMainApp = new MainApp;
         gMainApp->Run();

haiku/trunk/src/apps/mediaplayer/playlist/MovePLItemsCommand.cpp

@@ -44 +44 @@
         for (int32 i = 0; i < fCount; i++) {
                 if (fPlaylist->GetRefAt(fIndices[i], &fRefs[i]) < B_OK) {
+                        // indicate a bad object state
                         delete[] fRefs;
                         fRefs = NULL;
@@ -65 +66 @@
 MovePLItemsCommand::InitCheck()
 {
-        if (!fPlaylist || !fRefs || !fIndices)
+        if (!fRefs)
                 return B_NO_INIT;
 

haiku/trunk/src/apps/mediaplayer/playlist/Playlist.h

@@ -53 +53 @@
                         void                            MakeEmpty();
                         int32                           CountItems() const;
-                        
+
                         void                            Sort();
                 

haiku/trunk/src/apps/mediaplayer/playlist/PlaylistListView.cpp

@@ -27 +27 @@
 #include "Playlist.h"
 #include "PlaylistObserver.h"
+#include "RandomizePLItemsCommand.h"
 #include "RemovePLItemsCommand.h"
 
@@ -376 +377 @@
 
 
+void
+PlaylistListView::Randomize()
+{
+        int32 count = CountItems();
+        if (count == 0)
+                return;
+
+        BList indices;
+
+        // add current selection
+        count = 0;
+        while (true) {
+                int32 index = CurrentSelection(count);
+                if (index < 0)
+                        break;
+                if (!indices.AddItem((void*)index))
+                        return;
+                count++;
+        }
+
+        // was anything selected?
+        if (count == 0) {
+                // no selection, simply add all items
+                count = CountItems();
+                for (int32 i = 0; i < count; i++) {
+                        if (!indices.AddItem((void*)i))
+                                return;
+                }
+        }
+
+        fCommandStack->Perform(new (nothrow) RandomizePLItemsCommand(fPlaylist,
+                (int32*)indices.Items(), indices.CountItems()));
+}
+
+
 // #pragma mark -
 

haiku/trunk/src/apps/mediaplayer/playlist/PlaylistListView.h

@@ -45 +45 @@
                                                                         int32 appendIndex);
 
+                        void                            Randomize();
+
  private:
                         void                            _FullSync();

haiku/trunk/src/apps/mediaplayer/playlist/PlaylistWindow.cpp

@@ -32 +32 @@
 
 enum {
-        M_PLAYLIST_OPEN         = 'open',
-        M_PLAYLIST_SAVE         = 'save',
-        M_PLAYLIST_EMPTY        = 'emty'
+        // file
+        M_PLAYLIST_OPEN                 = 'open',
+        M_PLAYLIST_SAVE                 = 'save',
+
+        // edit
+        M_PLAYLIST_EMPTY                = 'emty',
+        M_PLAYLIST_RANDOMIZE    = 'rand'
 };
 
@@ -145 +149 @@
                         fOpenPanel->Show();
                         break;                                          
+
                 case M_PLAYLIST_EMPTY:
                         fListView->RemoveAll();
-                        break;                                          
+                        break;
+                case M_PLAYLIST_RANDOMIZE:
+                        fListView->Randomize();
+                        break;
+
                 default:
                         BWindow::MessageReceived(message);
@@ -181 +190 @@
         editMenu->AddItem(new BMenuItem("Make Empty",
                 new BMessage(M_PLAYLIST_EMPTY), 'N'));
+        editMenu->AddItem(new BMenuItem("Randomize",
+                new BMessage(M_PLAYLIST_RANDOMIZE), 'R'));
         menuBar->AddItem(editMenu);