Fixed minor bug with 'More' button

[someplayer] / src / tagresolver.cpp

diff --git a/src/tagresolver.cpp b/src/tagresolver.cpp
index b100a2f..25f0f65 100644 (file)
--- a/src/tagresolver.cpp
+++ b/src/tagresolver.cpp
@@ -18,6 +18,10 @@
  */
 
 #include "tagresolver.h"
+#include <QFile>
+#include <QFileInfo>
+#include <tag.h>
+#include <fileref.h>
 #include <QDebug>
 
 using namespace SomePlayer::DataObjects;
@@ -25,39 +29,76 @@ using namespace SomePlayer::DataObjects;
 TagResolver::TagResolver(QObject *parent) :
     QObject(parent)
 {
-       _metaObject = new Phonon::MediaObject(this);
-       connect(_metaObject, SIGNAL(stateChanged(Phonon::State,Phonon::State)), this, SLOT(metaStateChanged(Phonon::State,Phonon::State)));
 }
 
 void TagResolver::decode(QStringList files) {
-       _sources.clear();
+       emit started();
        foreach (QString filename, files) {
-               _sources.append(Phonon::MediaSource(filename));
+               TagLib::FileRef file_ref(QFile::encodeName(filename).data(), true, TagLib::AudioProperties::Fast);
+               if (!file_ref.isNull()) {
+                       TagLib::Tag *tag = file_ref.tag();
+                       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);
+                               }
+                       }
+               } else { // workaround
+                       TrackMetadata meta;
+                       meta.setLength(0);
+                       QFileInfo fi(filename);
+                       meta.setArtist(fi.suffix().toUpper());
+                       meta.setTitle(fi.baseName());
+                       Track track(meta, filename);
+                       emit decoded(track);
+               }
        }
-       if (!_sources.isEmpty()) {
-               _metaObject->setCurrentSource(_sources.at(0));
+       emit done();
+}
+
+void TagResolver::updateTags(Track track) {
+       TagLib::FileRef file_ref(QFile::encodeName(track.source()).data());
+       if (!file_ref.isNull()) {
+               TagLib::Tag *tag = file_ref.tag();
+               if (NULL != tag) {
+                       tag->setArtist(TagLib::String(track.metadata().artist().toStdWString()));
+                       tag->setAlbum(TagLib::String(track.metadata().album().toStdWString()));
+                       tag->setTitle(TagLib::String(track.metadata().title().toStdWString()));
+               }
+               file_ref.save();
        }
 }
 
-void TagResolver::metaStateChanged(Phonon::State newState, Phonon::State /*oldState*/) {
-       if (newState == Phonon::StoppedState) {
-               int time = _metaObject->totalTime();
-               Phonon::MediaSource source = _metaObject->currentSource();
-               QMap<QString, QString> meta = _metaObject->metaData();
-               TrackMetadata metadata(meta.value("TITLE"), meta.value("ARTIST"), meta.value("ALBUM"), time/1000);
-               Track track(0, metadata, source.fileName());
-               int index = _sources.indexOf(source)+1;
-               emit decoded(track);
-               if (index != _sources.size()) {
-                       Phonon::MediaSource newSource = _sources.at(index);
-                       _metaObject->clear();
-                       _metaObject->setCurrentSource(newSource);
-               } else {
-                       emit done();
+Track TagResolver::decodeOne(QString filename) {
+       TagLib::FileRef file_ref(QFile::encodeName(filename).data(), true, TagLib::AudioProperties::Fast);
+       if (!file_ref.isNull()) {
+               TagLib::Tag *tag = file_ref.tag();
+               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);
+                               return track;
+                       }
                }
-       } else if (newState == Phonon::ErrorState) {
-               Phonon::MediaSource s = _metaObject->currentSource();
-               _metaObject->clear();
-               _metaObject->setCurrentSource(s);
+       } else { // workaround
+               TrackMetadata meta;
+               meta.setLength(0);
+               QFileInfo fi(filename);
+               meta.setArtist(fi.suffix().toUpper());
+               meta.setTitle(fi.baseName());
+               Track track(meta, filename);
+               return track;
        }
+       return Track();
 }