From: tmarki <tmarki@gmail.com>
Date: Fri, 20 Aug 2010 17:00:47 +0000 (+0200)
Subject: lots of new allowed extensions, small fixes
X-Git-Url: https://vcs.maemo.org/git/?p=tomamp;a=commitdiff_plain;h=0006d9da1cff90b69338d13f7e2d6f50340b02c9

lots of new allowed extensions, small fixes
---

diff --git a/tomamp/mainwindow.cpp b/tomamp/mainwindow.cpp
index d95c2d6..15bf4e0 100644
--- a/tomamp/mainwindow.cpp
+++ b/tomamp/mainwindow.cpp
@@ -32,10 +32,22 @@ MainWindow::MainWindow()
     qsrand (time (NULL));
     repeat = settings.value("repeat", false).toBool();
     shuffle = settings.value("shuffle", false).toBool();
-    headers = settings.value ("headers", QStringList()).toStringList();
+    QStringList allowedHeaders;
+    allowedHeaders << "Artist" << "Title" << "Album" << "Controls";
+    foreach (QString h, settings.value ("headers", QStringList()).toStringList())
+    {
+        if (allowedHeaders.indexOf(h) >= 0)
+            headers << h;
+    }
+    if (!headers.size())
+        headers << "Artist" << "Title" << "Album";
+    
     setupShuffleList();
     setupActions();
     setupMenus();
+/*    foreach (QString s, Phonon::BackendCapabilities::availableMimeTypes())
+        qDebug () << s;*/
+    
 /*    if (settings.value("uiflipped", false).toBool())
         setupUiFlipped();
     else*/
@@ -91,8 +103,10 @@ void MainWindow::addFiles()
     QString folder = settings.value("LastFolder").toString();
     if (folder.isEmpty())
         folder = QDesktopServices::storageLocation(QDesktopServices::MusicLocation);
+    QString ext = "*." + plman.allowedExt().join(" *.");
+    ext = "Music files (" + ext + ");;Playlists (*.m3u *.pls)";
     QStringList files = QFileDialog::getOpenFileNames(this, tr("Select Files To Add"),
-                    folder, "Music files (*.mp3 *.ogg *.wav *.flac);;Playlists (*.m3u *.pls)");
+                                                      folder, ext, 0, QFileDialog::DontUseNativeDialog);
 
     if (files.isEmpty())
         return;
@@ -654,8 +668,12 @@ void MainWindow::setupUi()
     if (flip)
     {
         volumeSlider->setOrientation(Qt::Vertical);
+        volumeSlider->setMinimumHeight(150);
+    }
+    else
+    {
+        volumeSlider->setMinimumWidth(150);
     }
-    volumeSlider->setMinimumWidth(150);
     volumeSlider->setMuteVisible(false);
     bar->addAction(playAction);
     bar->addAction(pauseAction);
diff --git a/tomamp/playlistmanager.cpp b/tomamp/playlistmanager.cpp
index 5809d94..9fab797 100644
--- a/tomamp/playlistmanager.cpp
+++ b/tomamp/playlistmanager.cpp
@@ -3,13 +3,20 @@
 #include <QUrl>
 #include <QMap>
 
-QStringList allowedExtensions;
+QStringList PlaylistManager::allowedExtensions;
 
 
 PlaylistManager::PlaylistManager(QWidget* parent)
     : parentWidget (parent), lastMetaRead (-1)
 {
-    allowedExtensions << "mp3" << "ogg" << "wav" << "wmv" << "wma" << "flac";
+    if (!allowedExtensions.size ())
+    {
+        allowedExtensions << "mp3" << "ogg" << "wav" << "mlp" << "wma" << "flac" << "amr";
+        allowedExtensions << "midi" << "mid" << "mpeg" << "qcp" << "ac3" << "aiff" << "act";
+        allowedExtensions << "alac" << "alaw" << "au" << "eac3" << "aac" << "ape" << "gsm";
+        allowedExtensions << "mod" << "mp2" << "sbc" << "spx" << "tta" << "ra" << "riff";
+        allowedExtensions << "m4a" << "mp4" << "m4p" << "pcm" << "amr";
+    }
     metaInformationResolver = new Phonon::MediaObject(parent);
     connect(metaInformationResolver, SIGNAL(stateChanged(Phonon::State,Phonon::State)),
         this, SLOT(metaStateChanged(Phonon::State,Phonon::State)));
diff --git a/tomamp/playlistmanager.h b/tomamp/playlistmanager.h
index 0f6385b..705c600 100644
--- a/tomamp/playlistmanager.h
+++ b/tomamp/playlistmanager.h
@@ -33,6 +33,7 @@ public:
     void removeItem (int i);
 
     QStringList playlistStrings () const;
+    QStringList allowedExt () const { return allowedExtensions; }
     int size () const { return items.size (); }
     int indexOf (const Phonon::MediaSource& s) const;
     const Phonon::MediaSource& at (int i) { return items[i].source; }
@@ -58,6 +59,7 @@ private:
     Phonon::MediaObject *metaInformationResolver;
     QList<PlaylistItem> items;
     QWidget* parentWidget;
+    static QStringList allowedExtensions;
     int lastMetaRead;
 };