_settings->setValue("ui/gradient", "yes");
if (_settings->value("ui/language").toString() == "")
_settings->setValue("ui/language", "en");
+ if (_settings->value("playback/player").isNull())
+ _settings->setValue("playback/player", "inner");
if (_settings->value("ui/trackcolor").toString() == "")
_settings->setValue("ui/trackcolor", "blue");
_equalizer_settings = new QSettings("/etc/skel/.someplayer/equalizer.ini", QSettings::IniFormat);
#include <QtCore/QVariant>
#include <QDebug>
#include "config.h"
-#include "player/player.h"
/*
* Implementation of adaptor class DBusAdaptop
#include <QtDBus/QtDBus>
#include <QTimer>
#include <QTime>
-#include "player/player.h"
#define MM_KEY_UP (73)
#define MM_KEY_DOWN (74)
#include <QTranslator>
#include <QKeyEvent>
-#include "player/player.h"
-
#include "library.h"
#include "timerdialog.h"
#include "equalizerdialog.h"
--- /dev/null
+/*
+ * SomePlayer - An alternate music player for Maemo 5
+ * Copyright (C) 2010 Nikolay (somebody) Tischenko <niktischenko@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "abstractplayer.h"
+
+using namespace SomePlayer::Playback;
+
+AbstractPlayer::AbstractPlayer(QObject *parent) :
+ QObject(parent)
+{
+}
--- /dev/null
+/*
+ * SomePlayer - An alternate music player for Maemo 5
+ * Copyright (C) 2010 Nikolay (somebody) Tischenko <niktischenko@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef ABSTRACTPLAYER_H
+#define ABSTRACTPLAYER_H
+
+#include <QObject>
+#include "../someplayer.h"
+#include "../track.h"
+#include "../trackmetainformation.h"
+#include "../playlist.h"
+
+using SomePlayer::DataObjects::Track;
+using SomePlayer::DataObjects::Playlist;
+using SomePlayer::DataObjects::LastPlayed;
+
+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 AbstractPlayer : public QObject
+ {
+
+ Q_OBJECT
+ public:
+ explicit AbstractPlayer(QObject *parent = 0);
+ virtual bool random() = 0;
+ virtual RepeatRule repeat() = 0;
+ virtual bool equalizerEnabled() = 0;
+ virtual bool equalizerAvailable() = 0;
+ virtual Track current() = 0;
+ virtual void setAwaitingSeek(int pos) = 0;
+
+ signals:
+ void stateChanged (PlayerState);
+ void trackChanged (Track);
+ void tick (int, int); // played | all (seconds)
+ void trackDone(Track);
+ void saveLastPlayed(LastPlayed);
+ void startPlaylist();
+
+ public slots:
+ virtual void setTrackId(int id) = 0;
+ virtual void enqueue(int id) = 0;
+ virtual void toggle() = 0;
+ virtual void play() = 0;
+ virtual void pause() = 0;
+ virtual void playIfPaused() = 0;
+ virtual void stop() = 0;
+ virtual void next() = 0;
+ virtual void prev() = 0;
+ virtual void setPlaylist(Playlist) = 0;
+ virtual void toggleRandom() = 0;
+ virtual void toggleRepeat() = 0;
+ virtual void seek(int) = 0;
+ virtual void enableEqualizer() = 0;
+ virtual void disableEqualizer() = 0;
+ virtual void setEqualizerValue(int band, double value) = 0;
+ virtual void equalizerValue(int band, double *) = 0;
+ virtual QString artist() = 0;
+ virtual QString album() = 0;
+ virtual QString title() = 0;
+ virtual PlayerState state() = 0;
+ virtual QString stateText() = 0;
+ virtual QString albumart() = 0;
+ virtual void setAlbumart(QString albumart) = 0;
+ };
+ };
+};
+
+#endif // ABSTRACTPLAYER_H
}
Player::Player(QObject *parent) :
- QObject(parent)
+ AbstractPlayer(parent)
{
_awaiting_seek = false;
_player = new Phonon::MediaObject(this);
#include "../track.h"
#include "../trackmetainformation.h"
#include "../playlist.h"
+#include "abstractplayer.h"
#include <phonon/MediaObject>
#include <phonon/AudioOutput>
#include <phonon/Effect>
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>);
+ int next();
+ void removeId(int);
+ private:
+ QList<int> _playlist;
+ QList<int> _rand;
+ void _shuffle();
+ 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;}
- Track current();
- void setAwaitingSeek(int pos) {_awaiting_seek = true; _awaiting_seek_pos = pos;}
- signals:
- void stateChanged (PlayerState);
- void trackChanged (Track);
- void tick (int, int); // played | all (seconds)
- void trackDone(Track);
- void startPlaylist();
- void saveLastPlayed(LastPlayed);
+
+ 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);
--- /dev/null
+#include "playerfactory.h"
+#include "player.h"
+
+using namespace SomePlayer::Playback;
+using namespace SomePlayer::Storage;
+
+
+AbstractPlayer *SomePlayer::Playback::Factory::constructPlayer(QObject *parent) {
+ AbstractPlayer *player = NULL;
+ Config config;
+ QString player_type = config.getValue("playback/player").toString();
+ if (player_type == "inner") {
+ player = new Player(parent);
+ }
+ return player;
+}
--- /dev/null
+#ifndef PLAYERFACTORY_H
+#define PLAYERFACTORY_H
+
+#include <QObject>
+#include "../someplayer.h"
+#include "abstractplayer.h"
+
+namespace SomePlayer {
+ namespace Playback {
+ namespace Factory {
+ AbstractPlayer *constructPlayer(QObject *parent);
+ };
+ };
+};
+
+
+#endif // PLAYERFACTORY_H
#include "playerform.h"
#include "ui_playerform.h"
#include "library.h"
-#include "player/player.h"
+#include "player/abstractplayer.h"
#include <QTime>
#include <QSlider>
#include "trackrenderer.h"
_lib = lib;
Config config;
_icons_theme = config.getValue("ui/iconstheme").toString();
- _player = new Player(this);
+ _player = SomePlayer::Playback::Factory::constructPlayer(this);
_time = new QTime();
ui->setupUi(this);
if (_player->random()) {
#include "someplayer.h"
#include "playlist.h"
#include <QStandardItemModel>
-#include "player/player.h"
+#include "player/abstractplayer.h"
+#include "player/playerfactory.h"
#include <QSlider>
#include <QMenu>
#include <QTime>
using SomePlayer::DataObjects::Library;
using SomePlayer::DataObjects::Playlist;
using SomePlayer::DataObjects::Track;
-using SomePlayer::Playback::Player;
+using SomePlayer::Playback::AbstractPlayer;
using SomePlayer::Playback::PlayerState;
using SomePlayer::DataObjects::TagResolver;
QTime *_time;
QStandardItemModel *_model;
CoverFinder *_coverfinder;
- Player *_player;
+ AbstractPlayer *_player;
QSlider *_seek_slider;
QMenu *_context_menu;
QString _search_pattern;
dbusclient.cpp \
fmtxsettingsdialog.cpp \
aboutform.cpp \
- playlistsortform.cpp
+ playlistsortform.cpp \
+ player/abstractplayer.cpp \
+ player/playerfactory.cpp
HEADERS += mainwindow.h \
player/player.h \
dbusclient.h \
fmtxsettingsdialog.h \
aboutform.h \
- playlistsortform.h
+ playlistsortform.h \
+ player/abstractplayer.h \
+ player/playerfactory.h
FORMS += ui/mainwindow.ui \
ui/playerform.ui \
projects / someplayer / commitdiff