Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Codereview comment from r1000

Browse Source
This commit is contained in:
David Sansome 2010-05-31 20:24:05 +00:00
parent 3365c7c217
commit 5d272a89ee
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/player.cpp
View File

@ -77,13 +77,13 @@ Player::Player(PlaylistManager* playlists, LastFMService* lastfm,
lastfm_(lastfm), lastfm_(lastfm),
stream_change_type_(Engine::First) stream_change_type_(Engine::First)
{ {
engine_ = createEngine(engine); engine_.reset(createEngine(engine));
settings_.beginGroup("Player"); settings_.beginGroup("Player");
SetVolume(settings_.value("volume", 50).toInt()); SetVolume(settings_.value("volume", 50).toInt());
connect(engine_, SIGNAL(Error(QString)), SIGNAL(Error(QString))); connect(engine_.get(), SIGNAL(Error(QString)), SIGNAL(Error(QString)));
// MPRIS DBus interface. // MPRIS DBus interface.
#ifdef Q_WS_X11 #ifdef Q_WS_X11
@ -97,7 +97,6 @@ Player::Player(PlaylistManager* playlists, LastFMService* lastfm,
} }
Player::~Player() { Player::~Player() {
delete engine_;
} }
EngineBase* Player::createEngine(Engine::Type engine) { EngineBase* Player::createEngine(Engine::Type engine) {
@ -135,10 +134,10 @@ void Player::Init() {
if (!engine_->Init()) if (!engine_->Init())
qFatal("Error initialising audio engine"); qFatal("Error initialising audio engine");
connect(engine_, SIGNAL(StateChanged(Engine::State)), SLOT(EngineStateChanged(Engine::State))); connect(engine_.get(), SIGNAL(StateChanged(Engine::State)), SLOT(EngineStateChanged(Engine::State)));
connect(engine_, SIGNAL(TrackAboutToEnd()), SLOT(TrackAboutToEnd())); connect(engine_.get(), SIGNAL(TrackAboutToEnd()), SLOT(TrackAboutToEnd()));
connect(engine_, SIGNAL(TrackEnded()), SLOT(TrackEnded())); connect(engine_.get(), SIGNAL(TrackEnded()), SLOT(TrackEnded()));
connect(engine_, SIGNAL(MetaData(Engine::SimpleMetaBundle)), connect(engine_.get(), SIGNAL(MetaData(Engine::SimpleMetaBundle)),
SLOT(EngineMetadataReceived(Engine::SimpleMetaBundle))); SLOT(EngineMetadataReceived(Engine::SimpleMetaBundle)));
engine_->SetVolume(settings_.value("volume", 50).toInt()); engine_->SetVolume(settings_.value("volume", 50).toInt());

6
src/core/player.h
View File

@ -20,6 +20,8 @@
#include <QObject> #include <QObject>
#include <QSettings> #include <QSettings>
#include <boost/scoped_ptr.hpp>
#include "core/song.h" #include "core/song.h"
#include "engines/engine_fwd.h" #include "engines/engine_fwd.h"
#include "playlist/playlistitem.h" #include "playlist/playlistitem.h"
@ -59,7 +61,7 @@ class Player : public QObject {
EngineBase* createEngine(Engine::Type engine); EngineBase* createEngine(Engine::Type engine);
void Init(); void Init();
EngineBase* GetEngine() { return engine_; } EngineBase* GetEngine() { return engine_.get(); }
Engine::State GetState() const; Engine::State GetState() const;
int GetVolume() const; int GetVolume() const;
@ -172,7 +174,7 @@ class Player : public QObject {
boost::shared_ptr<PlaylistItem> current_item_; boost::shared_ptr<PlaylistItem> current_item_;
EngineBase* engine_; boost::scoped_ptr<EngineBase> engine_;
Engine::TrackChangeType stream_change_type_; Engine::TrackChangeType stream_change_type_;
QUrl loading_async_; QUrl loading_async_;