Minor bugfixes

[someplayer] / src / filestorage.h

diff --git a/src/filestorage.h b/src/filestorage.h
index dcc0edc..f6dad99 100644 (file)
--- a/src/filestorage.h
+++ b/src/filestorage.h
@@ -1,32 +1,47 @@
+/*
+ * 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 FILE_STORAGE
 #define FILE_STORAGE
 
 #include "someplayer.h"
 #include "storage.h"
 #include "playlist.h"
-#include <QRegExp>
 
 #define _CURRENT_PLAYLIST_NAME_ "___current"
 #define _CURRENT_PLAYLIST_SUBST_ "Now playing"
-#define _PLAYLIST_FILE_EXTENSION_ "spls"
-#define _PLAYLIST_SIGNATURE_ "#SOMEPLAYLIST"
-#define _PLAYLIST_META_KEYWORD_ "#META"
-#define _PLAYLIST_PATH_KEYWORD_ "#PATH"
+#define _PLAYLIST_FILE_EXTENSION_ "xspf"
+// legacy _start_
+#define _PLAYLIST_FILE_EXTENSION_OLD_ "spls"
+// legacy _end_
 
-// format:
-/*
- #SOMEPLAYLIST
- #META [ID][seconds],::artist::,::album::,::title::
- #PATH file_path
- #META [ID][seconds],::artist::,::album::,::title::
- #PATH file_path
- ...
- */
+// format: XSPF (http://xspf.org)
+// required elements:
+// <extension application="http://example.com">
+// <cl:clip title="TITLE" artist="ARTIST" album="ALBUM"/>
+// </extension>
 
 // represents file-level storage
 // it store data into separate files (e.g. playlist)
 
 using SomePlayer::DataObjects::Playlist;
+using SomePlayer::DataObjects::LastPlayed;
 
 namespace SomePlayer {
        namespace Storage {
@@ -44,10 +59,10 @@ namespace SomePlayer {
 
                        Playlist getCurrentPlaylist();
                        void saveCurrentPlaylist(Playlist playlist);
+                       LastPlayed getLastPlayedForCurPlaylist();
+                       void saveLastPlayedForCurPlaylist(LastPlayed);
                private:
                        QString _path_prefix;
-                       QRegExp _meta_regexp;
-                       QRegExp _path_regexp;
                };
 
        };