UI bugfixes

[groove] / splayer.h

diff --git a/splayer.h b/splayer.h
index 9ae0c37..920fa0d 100644 (file)
--- a/splayer.h
+++ b/splayer.h
@@ -6,23 +6,34 @@
 #include <phonon>
 #include "streamio.h"
 #include <QProgressDialog>
+#include "grooveprogressbar.h"
+#include "playlist.h"
 
 class sPlayer : public QObject
 {
     Q_OBJECT
 public:
     explicit sPlayer(QObject *parent = 0);
-    void play(QString StreamKey, QUrl server);
+    void play(int p);
+
+    void play();
     void stop();
+    void pause();
+    void setPlaylist(playlist *playList);
     ~sPlayer();
 
 signals:
     void finishedPlaying();
     void downloadComplete();
 public slots:
-    void start();
-    void putb(qint64,qint64);
+    void start(int p);
+    void playNext();
+    void putb(int p,qint64,qint64);
     void abortDownload();
+    void back();
+private slots:
+    void markComplete();
+    void updatePlayPosition(qint64 time);
 private:
     QNetworkAccessManager *manager;
     Phonon::AudioOutput *audioOutput;
@@ -33,6 +44,8 @@ private:
     bool playing;
     QObject *internal;
     QTime startStreamT;
-    QProgressDialog *pd;
+    grooveProgressBar *pd;
+    playlist *pl;
+
 };
 #endif // SPLAYER_H