Improved random mode

[someplayer] / src / track.cpp

diff --git a/src/track.cpp b/src/track.cpp
index 4dcd9b9..807f156 100644 (file)
--- a/src/track.cpp
+++ b/src/track.cpp
@@ -1,25 +1,68 @@
+/*
+ * 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 "track.h"
+#include "tagresolver.h"
+#include <QFileInfo>
 
 using namespace SomePlayer::DataObjects;
 
-Track::Track() {
+Track::Track() : QObject() {
 }
 
-Track::Track(int id, TrackMetadata metadata, QString source) {
+Track::Track(int id, TrackMetadata metadata, QString source) : QObject() {
        _id = id;
        _metadata = metadata;
+       if (_metadata.title() == _UNKNOWN_TRACK_) {
+               QFileInfo info(source);
+               _metadata.setTitle(info.baseName());
+       }
        _source = source;
+       _count = 0;
 }
 
-Track::Track(const Track &track) {
+Track::Track(const Track &track) : QObject() {
        this->_metadata = track.metadata();
        this->_source = track.source();
+       this->_id = track._id;
+       this->_count = track._count;
+}
+
+/// deprecated
+Track::Track(QString source) :QObject() {
+       _resolver = new TagResolver(this);
+       connect(_resolver, SIGNAL(decoded(Track)), this, SLOT(decoded(Track)));
+       QStringList foo;
+       foo << source;
+       _resolver->decode(foo);
+       _count = 0;
+       _id = -1;
 }
 
 TrackMetadata Track::metadata() const {
        return _metadata;
 }
 
+void Track::setMetadata(TrackMetadata meta) {
+       _metadata = meta;
+}
+
 QString Track::source() const {
        return _source;
 }
@@ -39,3 +82,24 @@ int Track::count() const{
 void Track::setCount(int count) {
        _count = count;
 }
+
+void Track::decoded(Track track) {
+       _id = track.id();
+       _source = track.source();
+       _metadata = track.metadata();
+       delete _resolver;
+}
+
+Track &Track::operator =(const Track &track) {
+       _id = track.id();
+       _source = track.source();
+       _metadata = track.metadata();
+       _count = track._count;
+       return *this;
+}
+
+Track::~Track() {}
+
+bool Track::operator ==(const Track &track) {
+       return _source == track._source;
+}