projects
/
groove
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Multiple download fix, Added pause button, Added next button
[groove]
/
splayer.h
diff --git
a/splayer.h
b/splayer.h
index
9ae0c37
..
6d41fd6
100644
(file)
--- a/
splayer.h
+++ b/
splayer.h
@@
-6,23
+6,32
@@
#include <phonon>
#include "streamio.h"
#include <QProgressDialog>
#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);
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 stop();
+ void pause();
+ void setPlaylist(playlist *playList);
~sPlayer();
signals:
void finishedPlaying();
void downloadComplete();
public slots:
~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 abortDownload();
+private slots:
+ void markComplete();
private:
QNetworkAccessManager *manager;
Phonon::AudioOutput *audioOutput;
private:
QNetworkAccessManager *manager;
Phonon::AudioOutput *audioOutput;
@@
-33,6
+42,7
@@
private:
bool playing;
QObject *internal;
QTime startStreamT;
bool playing;
QObject *internal;
QTime startStreamT;
- QProgressDialog *pd;
+ grooveProgressBar *pd;
+ playlist *pl;
};
#endif // SPLAYER_H
};
#endif // SPLAYER_H