From: Nikolay Tischenko <niktischenko@gmail.com>
Date: Thu, 23 Sep 2010 17:57:40 +0000 (+0700)
Subject: Now track without tags has title from file basename
X-Git-Tag: 1.2.0~2
X-Git-Url: http://git.maemo.org/git/?p=someplayer;a=commitdiff_plain;h=85c7e6ee597bcfe34b40ba8b47786ce8f93e30a0

Now track without tags has title from file basename
Added license info to new files
Named playlists dialog
---

diff --git a/src/playlistdialog.cpp b/src/playlistdialog.cpp
index a4fd908..893aee2 100644
--- a/src/playlistdialog.cpp
+++ b/src/playlistdialog.cpp
@@ -1,3 +1,23 @@
+/*
+ * 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 "playlistdialog.h"
 #include "ui_playlistdialog.h"
 #include <QStandardItemModel>
@@ -12,6 +32,7 @@ PlaylistDialog::PlaylistDialog(QList<QString> playlistNames, QWidget *parent) :
 	    model->appendRow(new QStandardItem(str));
     }
     ui->listView->setModel(model);
+    setWindowTitle("Playlists");
 }
 
 PlaylistDialog::~PlaylistDialog()
diff --git a/src/playlistdialog.h b/src/playlistdialog.h
index 89758e0..49e8e9f 100644
--- a/src/playlistdialog.h
+++ b/src/playlistdialog.h
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
 #ifndef PLAYLISTDIALOG_H
 #define PLAYLISTDIALOG_H
 
diff --git a/src/track.cpp b/src/track.cpp
index 363e9a4..66bde60 100644
--- a/src/track.cpp
+++ b/src/track.cpp
@@ -19,6 +19,7 @@
 
 #include "track.h"
 #include "tagresolver.h"
+#include <QFileInfo>
 
 using namespace SomePlayer::DataObjects;
 
@@ -28,6 +29,10 @@ Track::Track() : QObject() {
 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;
 }
@@ -39,6 +44,7 @@ Track::Track(const Track &track) : QObject() {
 	this->_count = track._count;
 }
 
+/// deprecated
 Track::Track(QString source) :QObject() {
 	_resolver = new TagResolver(this);
 	connect(_resolver, SIGNAL(decoded(Track)), this, SLOT(decoded(Track)));
diff --git a/src/trackmetainformation.cpp b/src/trackmetainformation.cpp
index 385653c..0f9f1b8 100644
--- a/src/trackmetainformation.cpp
+++ b/src/trackmetainformation.cpp
@@ -25,9 +25,9 @@ TrackMetadata::TrackMetadata() {
 }
 
 TrackMetadata::TrackMetadata(QString title = "", QString artist = "", QString album = "", int length = 0) {
-	_metadata["TITLE"] = title == "" ? "Unknown title" : title.trimmed();
-	_metadata["ARTIST"] = artist == "" ? "Unknown artist" : artist.trimmed();
-	_metadata["ALBUM"] = album == "" ? "Unknown album" : album.trimmed();
+	_metadata["TITLE"] = title == "" ? _UNKNOWN_TRACK_ : title.trimmed();
+	_metadata["ARTIST"] = artist == "" ? _UNKNOWN_ARTIST_ : artist.trimmed();
+	_metadata["ALBUM"] = album == "" ? _UNKNOWN_ALBUM_ : album.trimmed();
 	_length = length;
 }
 
@@ -40,7 +40,7 @@ QString TrackMetadata::title() {
 	if (_metadata.contains("TITLE")) {
 		return _metadata["TITLE"];
 	} else {
-		return "Unknown title";
+		return _UNKNOWN_TRACK_;
 	}
 }
 
@@ -48,7 +48,7 @@ QString TrackMetadata::artist() {
 	if (_metadata.contains("ARTIST")) {
 		return _metadata["ARTIST"];
 	} else {
-		return "Unknown artist";
+		return _UNKNOWN_ARTIST_;
 	}
 }
 
@@ -56,7 +56,7 @@ QString TrackMetadata::album() {
 	if (_metadata.contains("ALBUM")) {
 		return _metadata["ALBUM"];
 	} else {
-		return "Unknown album";
+		return _UNKNOWN_ALBUM_;
 	}
 }
 
diff --git a/src/trackmetainformation.h b/src/trackmetainformation.h
index 3148790..3842cf9 100644
--- a/src/trackmetainformation.h
+++ b/src/trackmetainformation.h
@@ -25,6 +25,10 @@
 // represents track metainformation only.
 // now it contains TITLE, ARTIST, ALBUM, GENRE
 
+#define _UNKNOWN_ARTIST_ "Unknown artist"
+#define _UNKNOWN_ALBUM_  "Unknown album"
+#define _UNKNOWN_TRACK_  "Unknown track"
+
 namespace SomePlayer {
 	namespace DataObjects {
 		class TrackMetadata {