Fixes in desktop file

[someplayer] / src / tagresolver.cpp

diff --git a/src/tagresolver.cpp b/src/tagresolver.cpp
index 8be3b86..85634d7 100644 (file)
--- a/src/tagresolver.cpp
+++ b/src/tagresolver.cpp
@@ -1,4 +1,24 @@
+/*
+ * SomePlayer - An alternate music player for Maemo 5
+ * Copyright (C) 2010 Nikolay (somebody) Tischenko <niktischenko@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
 #include "tagresolver.h"
+#include <QDebug>
 
 using namespace SomePlayer::DataObjects;
 
@@ -21,17 +41,24 @@ void TagResolver::decode(QStringList files) {
 
 void TagResolver::metaStateChanged(Phonon::State newState, Phonon::State /*oldState*/) {
        if (newState == Phonon::StoppedState) {
+               int time = _metaObject->totalTime();
                Phonon::MediaSource source = _metaObject->currentSource();
-               if (source.type() != Phonon::MediaSource::Invalid) {
-                       QMap<QString, QString> meta = _metaObject->metaData();
-                       TrackMetadata metadata(meta.value("TITLE"), meta.value("ARTIST"), meta.value("ALBUM"));
-                       Track track(0, metadata, source.fileName());
-                       emit decoded(track);
-                       int index = _sources.indexOf(source)+1;
-                       if (index != _sources.size()) {
-                               Phonon::MediaSource newSource = _sources.at(index);
-                               _metaObject->setCurrentSource(newSource);
-                       }
+               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);
+               _metaObject->stop();
+               if (index != _sources.size()) {
+                       Phonon::MediaSource newSource = _sources.at(index);
+                       _metaObject->clear();
+                       _metaObject->setCurrentSource(newSource);
+               } else {
+                       emit done();
                }
+       } else if (newState == Phonon::ErrorState) {
+               Phonon::MediaSource s = _metaObject->currentSource();
+               _metaObject->clear();
+               _metaObject->setCurrentSource(s);
        }
 }