Ability to add .ape, .asf and .wav files

diff --git a/src/directoryview.cpp b/src/directoryview.cpp
index 761cc3d..e1e56e3 100644 (file)
--- a/src/directoryview.cpp
+++ b/src/directoryview.cpp
@@ -36,7 +36,7 @@ DirectoryView::DirectoryView(QWidget *parent) :
        ui->setupUi(this);
        Config config;
        _icons_theme = config.getValue("ui/iconstheme").toString();
-       REGISTERED_FILE_EXTENSIONS << "mp3" << "flac" << "wma" << "aac" << "ogg";
+       REGISTERED_FILE_EXTENSIONS << "mp3" << "flac" << "wma" << "aac" << "ogg" << "asf" << "ape" << "wav";
        setWindowFlags(windowFlags() | Qt::Window);
        setAttribute(Qt::WA_Maemo5StackedWindow);
        _model = new QStandardItemModel(0, 2, this);

diff --git a/src/mediascanner.cpp b/src/mediascanner.cpp
index 6a6390c..edb76d6 100644 (file)
--- a/src/mediascanner.cpp
+++ b/src/mediascanner.cpp
@@ -27,7 +27,7 @@ using namespace SomePlayer::Storage;
 MediaScanner::MediaScanner(QObject *parent) :
                QThread(parent), _stopped(false), _initialized(false)
 {
-       REGISTERED_FILE_EXTENSIONS << "mp3" << "flac" << "wma" << "aac" << "ogg";
+       REGISTERED_FILE_EXTENSIONS << "mp3" << "flac" << "wma" << "aac" << "ogg" << "asf" << "ape" << "wav";
 }
 
 void MediaScanner::run() {

diff --git a/src/tagresolver.cpp b/src/tagresolver.cpp
index 4b4e967..0464e7e 100644 (file)
--- a/src/tagresolver.cpp
+++ b/src/tagresolver.cpp
@@ -37,17 +37,19 @@ void TagResolver::decode(QStringList files) {
                TagLib::FileRef file_ref(QFile::encodeName(filename).data(), true, TagLib::AudioProperties::Fast);
                if (!file_ref.isNull()) {
                        TagLib::Tag *tag = file_ref.tag();
+                       int length = 0;
                        if (NULL != tag) {
                                TagLib::AudioProperties *properties = file_ref.audioProperties();
                                if (NULL != properties) {
-                                       TrackMetadata meta(QString::fromStdWString(tag->title().toWString()),
-                                                          QString::fromStdWString(tag->artist().toWString()),
-                                                          QString::fromStdWString(tag->album().toWString()),
-                                                          properties->length());
-                                       meta.setYear(tag->year());
-                                       Track track(meta, filename);
-                                       emit decoded(track);
+                                       length = properties->length();
                                }
+                               TrackMetadata meta(QString::fromStdWString(tag->title().toWString()),
+                                                  QString::fromStdWString(tag->artist().toWString()),
+                                                  QString::fromStdWString(tag->album().toWString()),
+                                                  length);
+                               meta.setYear(tag->year());
+                               Track track(meta, filename);
+                               emit decoded(track);
                        }
                } else { // workaround
                        TrackMetadata meta;