X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Ftrack.cpp;h=0f3635321c0b7330fa9a2669e3999d1b5b715e54;hb=cf3aef6b80b71f870aa872d5d1bc906254d9b8e6;hp=66bde6085741c18c7418a70dc523759edbda923c;hpb=85c7e6ee597bcfe34b40ba8b47786ce8f93e30a0;p=someplayer

diff --git a/src/track.cpp b/src/track.cpp
index 66bde60..0f36353 100644
--- a/src/track.cpp
+++ b/src/track.cpp
@@ -26,8 +26,7 @@ using namespace SomePlayer::DataObjects;
 Track::Track() : QObject() {
 }
 
-Track::Track(int id, TrackMetadata metadata, QString source) : QObject() {
-	_id = id;
+Track::Track(TrackMetadata metadata, QString source) : QObject() {
 	_metadata = metadata;
 	if (_metadata.title() == _UNKNOWN_TRACK_) {
 		QFileInfo info(source);
@@ -40,7 +39,6 @@ Track::Track(int id, TrackMetadata metadata, QString source) : QObject() {
 Track::Track(const Track &track) : QObject() {
 	this->_metadata = track.metadata();
 	this->_source = track.source();
-	this->_id = track._id;
 	this->_count = track._count;
 }
 
@@ -52,19 +50,18 @@ Track::Track(QString source) :QObject() {
 	foo << source;
 	_resolver->decode(foo);
 	_count = 0;
-	_id = -1;
 }
 
 TrackMetadata Track::metadata() const {
 	return _metadata;
 }
 
-QString Track::source() const {
-	return _source;
+void Track::setMetadata(TrackMetadata meta) {
+	_metadata = meta;
 }
 
-int Track::id() const {
-	return _id;
+QString Track::source() const {
+	return _source;
 }
 
 void Track::setSource(QString source) {
@@ -80,14 +77,12 @@ void Track::setCount(int 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;
@@ -96,6 +91,14 @@ Track &Track::operator =(const Track &track) {
 
 Track::~Track() {}
 
-bool Track::operator ==(const Track &track) {
+bool Track::operator ==(const Track &track) const {
 	return _source == track._source;
 }
+
+bool Track::operator >= (const Track &track) const {
+	return (metadata().title().compare(track.metadata().title()) >= 0);
+}
+
+bool Track::operator < (const Track &track) const {
+	return (metadata().title().compare(track.metadata().title()) < 0);
+}