Fix some buid issues on maemo, Also add some simple usability fixes

[groove] / playlist.h

diff --git a/playlist.h b/playlist.h
index 829707f..7d3c215 100644 (file)
--- a/playlist.h
+++ b/playlist.h
@@ -12,58 +12,70 @@ class playlist : public QObject
 {
     Q_OBJECT
 public:
+    enum elementType
+    {
+        EStream = 1,
+        EFile = 2,
+    };
     enum failType
     {
         none = 0,
         Aborted = 1,
         Other =2
     };
+    struct songElement
+    {
+        QString *songId;
+        QString *streamkey;
+        QUrl *server;
+        QBuffer *buffer;
+        QIODevice *data;
+        elementType type;
+        bool downloaded;
+        bool played;
+        bool bufferready;
+    };
+    QList<songElement *>* getList();
     explicit playlist(QObject *parent = 0);
-    void addSong(QStandardItem item);
-    void addSong(QString songid);
-    void addsong(QString streamkey, QUrl server);
+    int addSong(QStandardItem *item);
     QList<QStandardItem *> getPlaylist();
     void removeSong(int position);
     void getSong(int position);
     QIODevice * getBuffer(int position);
     bool isStream(int position);
-    void markComplete(int position);
+    void markPlayed(int position);
     void deleteSong(int position);
     void setGscom(gscom *comm);
+    void freeMemory(int position);
+    int currentplaying();
+    void setCurrentPlaying(int position);
+    bool bReady(int b);
+    int findFirstNotPlayed();
+    void beginDownload(int position);
+    bool existAt(int position);
 
 signals:
     void downloadProgress(int position, qint64 d, qint64 t);
     void bufferReady(int position);
     void sFailure(int position,failType);
     void downloadComplete(int position);
-    void freeze();
-    void unfreeze();
+    void freeze(bool);
 
 public slots:
 private slots:
     void downloadSlot(qint64 d, qint64 t);
+    void networkReplyFinish();
     void downloadDone(int position);
     void skeyFound();
+    void setBufferRdy(int b);
+    void getNError(QNetworkReply::NetworkError);
 private:
-    void beginDownload(int position);
-    enum elementType
-    {
-        EStream = 1,
-        EFile = 2,
-    };
 
-    struct songElement
-    {
-        QString *songId;
-        QString *streamkey;
-        QUrl *server;
-        QBuffer *buffer;
-        QIODevice *data;
-        elementType type;
-        bool downloaded;
-        bool played;
-        bool bufferready;
-    };
+
+
+
+
+    int currentplayingitem;
     int currentSkeyItem;
     QList<songElement *> *pList;
     QSignalMapper *mapper;