Player factory

[someplayer] / src / player / player.h

diff --git a/src/player/player.h b/src/player/player.h
index 2ecc032..3f780b5 100644 (file)
--- a/src/player/player.h
+++ b/src/player/player.h
@@ -25,6 +25,7 @@
 #include "../track.h"
 #include "../trackmetainformation.h"
 #include "../playlist.h"
+#include "abstractplayer.h"
 #include <phonon/MediaObject>
 #include <phonon/AudioOutput>
 #include <phonon/Effect>
@@ -37,14 +38,12 @@
 using SomePlayer::DataObjects::Track;
 using SomePlayer::DataObjects::TrackMetadata;
 using SomePlayer::DataObjects::Playlist;
+using SomePlayer::DataObjects::LastPlayed;
 using SomePlayer::Storage::Config;
 
 namespace SomePlayer {
        namespace Playback {
 
-               enum PlayerState { PLAYER_STOPPED, PLAYER_PLAYING, PLAYER_PAUSED, PLAYER_LOADING, PLAYER_DONE, PLAYER_ERROR };
-               enum RepeatRule {REPEAT_NO, REPEAT_ALL, REPEAT_ONE};
-
                class Randomizer {
                public:
                        void setPlaylist(QList<int>);
@@ -57,31 +56,27 @@ namespace SomePlayer {
                        int _last;
                };
 
-               class Player : public QObject
+               class Player : public AbstractPlayer
                {
                        Q_OBJECT
                public:
                        explicit Player(QObject *parent = 0);
+                       ~Player();
 
-                       bool random() {return _random;}
-                       RepeatRule repeat() {return _repeat;}
-                       Phonon::MediaObject* mediaObject() {return _player;}
-                       bool equalizerEnabled() {return _equalizer_enabled;}
-                       bool equalizerAvailable() {return _equalizer != NULL;}
-                       PlayerState state() {return _state;}
-                       Track current();
-
-               signals:
-                       void stateChanged (PlayerState);
-                       void trackChanged (Track);
-                       void tick (int, int); // played | all (seconds)
-                       void trackDone(Track);
+                       virtual bool random() {return _random;}
+                       virtual RepeatRule repeat() {return _repeat;}
+                       virtual bool equalizerEnabled() {return _equalizer_enabled;}
+                       virtual bool equalizerAvailable() {return _equalizer != NULL;}
+                       virtual Track current();
+                       virtual void setAwaitingSeek(int pos) {_awaiting_seek_pos = pos; _awaiting_seek = true;}
 
                public slots:
                        void setTrackId(int id);
-                       void enqueue(int id);
+                       void enqueue(int id); // refactor
                        void toggle();
                        void play();
+                       void pause();
+                       void playIfPaused();
                        void stop();
                        void next();
                        void prev();
@@ -96,19 +91,20 @@ namespace SomePlayer {
                        QString artist();
                        QString album();
                        QString title();
+                       PlayerState state() {return _state;}
+                       QString stateText();
+                       QString albumart() {return _albumart;}
+                       void setAlbumart(QString albumart) {_albumart = albumart;}
                private slots:
                        void _stateChanged(Phonon::State, Phonon::State);
                        void _tick(qint64);
                private:
-                       Randomizer _randomizer;
-                       int _current;
-                       Track _track; // current track (workaround)
+                       Track _track; // current track
                        bool _random;
                        RepeatRule _repeat;
                        bool _equalizer_enabled;
-                       QStack<int> _history;
-                       QQueue<int> _queue;
-                       QStack<int> _prev_history;
+                       QList<Track> _history;
+                       QList<Track> _queue;
                        Playlist _playlist;
                        Phonon::MediaObject *_player;
                        Phonon::AudioOutput *_output;
@@ -116,9 +112,12 @@ namespace SomePlayer {
                        Phonon::Effect *_equalizer;
                        PlayerState _state;
                        Config _config;
-
                        void _set_source();
-
+                       void _to_history(Track t);
+                       void _truncate_history();
+                       int _awaiting_seek_pos;
+                       bool _awaiting_seek;
+                       QString _albumart;
                };
        };
 };