Changeset 119 for smplayer/trunk/src/playlist.cpp

Timestamp:

Dec 27, 2011, 5:44:12 PM (14 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: latest svn update

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/playlist.cpp (modified) (16 diffs)

smplayer/trunk/src/playlist.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2010 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
 
     This program is free software; you can redistribute it and/or modify
@@ -52 +52 @@
 #include "extensions.h"
 #include "guiconfig.h"
-#include "playlistpreferences.h"
 
 #include <stdlib.h>
@@ -74 +73 @@
         save_playlist_in_config = true;
         recursive_add_directory = false;
-#ifdef Q_OS_WIN
         automatically_get_info = false;
-#else
-        automatically_get_info = true;
-#endif
         play_files_from_start = true;
 
@@ -176 +171 @@
         connect( listView, SIGNAL(cellActivated(int,int)),
              this, SLOT(itemDoubleClicked(int)) );
+
+        // EDIT BY NEO -->
+        connect( listView->horizontalHeader(), SIGNAL(sectionClicked(int)), this, SLOT(sortBy(int)));
+        // <--
 }
 
@@ -205 +204 @@
         shuffleAct = new MyAction(this, "pl_shuffle", false);
         shuffleAct->setCheckable(true);
-
-        preferencesAct = new MyAction(this, "pl_preferences", false);
-        connect( preferencesAct, SIGNAL(triggered()), this, SLOT(editPreferences()) );
 
         // Add actions
@@ -270 +266 @@
         toolbar->addAction(moveUpAct);
         toolbar->addAction(moveDownAct);
-        toolbar->addSeparator();
-        toolbar->addAction(preferencesAct);
 
         // Popup menu
@@ -311 +305 @@
         shuffleAct->change( Images::icon("shuffle"), tr("S&huffle") );
 
-        preferencesAct->change( Images::icon("prefs"), tr("Preferences") );
-
         // Add actions
         addCurrentAct->change( tr("Add &current file") );
@@ -345 +337 @@
                (*it).duration() );
         }
+}
+
+
+QString Playlist::print(QString seperator){
+        qDebug("Playlist::print");
+        QString output = "";
+
+        PlaylistItemList::iterator it;
+        for ( it = pl.begin(); it != pl.end(); ++it ) {
+                output += it->filename() + seperator + it->name() + seperator + QString::number(it->duration()) + "\r\n";
+        }
+
+        return output;
 }
 
@@ -421 +426 @@
 
         setModified( false );
+}
+
+void Playlist::remove(int i){
+        if(i > -1 && i < pl.count()){
+                pl.removeAt(i);
+                if(current_item == i && i == (pl.count() - 1))
+                        setCurrentItem(i - 1);
+                setModified(false);
+                updateView();
+        } //end if
 }
 
@@ -473 +488 @@
         }
 }
+
+// EDIT BY NEO -->
+void Playlist::sortBy(int section) {
+        qDebug("Playlist::sortBy");
+
+        sortBy(section, false, 0);
+}
+
+void Playlist::sortBy(int section, bool revert, int count) {
+    // Bubble sort
+    bool swaped = false;
+
+    for ( int n = 0; n < (pl.count() - count); n++) {
+
+      int last = n - 1;
+      int current = n;
+
+      // Revert the sort
+      if (revert) {
+          last = n;
+          current = n - 1;
+      }
+
+      if (n > 0) {
+          int compare = 0;
+
+          if (section == 0) {
+              // Sort by played
+              bool lastItem = pl[last].played();
+              bool currentItem = pl[current].played();
+
+              if (!lastItem && currentItem) {
+                  compare = 1;
+              } else if (lastItem && currentItem) {
+                  if (last == current_item) {
+                     compare = 1;
+                 } else {
+                     compare = -1;
+                 }
+              } else {
+                  compare = -1;
+              }
+          }
+          else if (section == 1) {
+              // Sort alphabetically
+              QString lastItem = pl[last].name();
+              QString currentItem = pl[current].name();
+              compare = lastItem.compare(currentItem);
+          } else if (section == 2) {
+              // Sort by duration
+              double lastItem = pl[last].duration();
+              double currentItem = pl[current].duration();
+
+              if (lastItem == currentItem) {
+                  compare = 0;
+              } else if (lastItem > currentItem) {
+                  compare = 1;
+              } else {
+                  compare = -1;
+              }
+          }
+
+          // Swap items
+          if(compare > 0) {
+              swapItems(n, n - 1);
+
+              if (current_item == (n - 1)) {
+                  current_item = n;
+              } else if (current_item == n) {
+                  current_item = n - 1;
+              }
+
+              listView->clearSelection();
+              listView->setCurrentCell(n - 1, 0);
+
+              swaped = true;
+          }
+      }
+    }
+
+    if ((count == 0) && !swaped && !revert) {
+        // Revert sort
+        sortBy(section, true, 0);
+    }else if(swaped) {
+        // Sort until there is nothing to sort
+        sortBy(section, revert, ++count);
+    } else {
+        updateView();
+    }
+}
+// <--
 
 void Playlist::load_m3u(QString file) {
@@ -908 +1014 @@
 
 void Playlist::addFiles() {
+        Extensions e;
         QStringList files = MyFileDialog::getOpenFileNames(
                             this, tr("Select one or more files to open"), 
                             lastDir(),
+                            tr("Multimedia") + e.multimedia().forFilter() + ";;" +
                             tr("All files") +" (*.*)" );
 
@@ -1113 +1221 @@
         qDebug(" currentRow: %d", current );
 
+        moveItemUp(current);
+
+}
+
+void Playlist::downItem() {
+        qDebug("Playlist::downItem");
+
+        int current = listView->currentRow();
+        qDebug(" currentRow: %d", current );
+
+        moveItemDown(current);
+}
+
+void Playlist::moveItemUp(int current){
+        qDebug("Playlist::moveItemUp");
+
         if (current >= 1) {
                 swapItems( current, current-1 );
@@ -1123 +1247 @@
         }
 }
-
-void Playlist::downItem() {
-        qDebug("Playlist::downItem");
-
-        int current = listView->currentRow();
-        qDebug(" currentRow: %d", current );
+void Playlist::moveItemDown(int current ){
+        qDebug("Playlist::moveItemDown");
 
         if ( (current > -1) && (current < (pl.count()-1)) ) {
@@ -1166 +1286 @@
                 setModified( true );
     } 
-}
-
-void Playlist::editPreferences() {
-        PlaylistPreferences d(this);
-
-        d.setDirectoryRecursion(recursive_add_directory);
-        d.setAutoGetInfo(automatically_get_info);
-        d.setSavePlaylistOnExit(save_playlist_in_config);
-        d.setPlayFilesFromStart(play_files_from_start);
-
-        if (d.exec() == QDialog::Accepted) {
-                recursive_add_directory = d.directoryRecursion();
-                automatically_get_info = d.autoGetInfo();
-                save_playlist_in_config = d.savePlaylistOnExit();
-                play_files_from_start = d.playFilesFromStart();
-        }
 }
 
@@ -1218 +1322 @@
         }
 
+
         QStringList only_files;
         for (int n = 0; n < files.count(); n++) {
@@ -1228 +1333 @@
         addFiles( only_files );
 }
+
 
 void Playlist::hideEvent( QHideEvent * ) {