X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Ffilestorage.h;h=79311d661e0a595b46384ff8f61f380da513b989;hb=9171ce8d32ef99f598ec1c1eefed07e13616e54c;hp=376af3639454bdc70e9770098cb61d3d3ac989c5;hpb=f9685f48a0d412250d81fa0ed67054d8978f4a21;p=someplayer

diff --git a/src/filestorage.h b/src/filestorage.h
index 376af36..79311d6 100644
--- a/src/filestorage.h
+++ b/src/filestorage.h
@@ -23,24 +23,19 @@
 #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)
@@ -65,8 +60,6 @@ namespace SomePlayer {
 			void saveCurrentPlaylist(Playlist playlist);
 		private:
 			QString _path_prefix;
-			QRegExp _meta_regexp;
-			QRegExp _path_regexp;
 		};
 
 	};