Fixed empty label in library after start

[someplayer] / src / player / player.cpp

diff --git a/src/player/player.cpp b/src/player/player.cpp
index 2191198..51071b1 100644 (file)
--- a/src/player/player.cpp
+++ b/src/player/player.cpp
@@ -64,7 +64,9 @@ void Randomizer::_shuffle() {
                _rand.removeAt(0);
                _rand.insert(qrand() % (cnt-1) + 1, _last);
        }
-       _last = _rand.last();
+       if (!_rand.isEmpty())
+               _last = _rand.last();
+       else _last = -1;
 }
 
 void Randomizer::removeId(int id) {
@@ -88,16 +90,12 @@ Player::Player(QObject *parent) :
                if (desc.name() == "equalizer-10bands") {
                        _equalizer = new Phonon::Effect(desc, this);
                        Config config;
-                       if (config.getValue("equalizer/equalizer").toString() == "enabled") {
+                       if (config.equalizerEnabled()) {
                                for (int i = 0; i < 10; i++) {
-                                       QVariant var = config.getValue(QString("equalizer/band%1").arg(i));
+                                       QVariant var = config.getEqualizerValue(QString("band%1").arg(i));
                                        setEqualizerValue(i, var.toDouble());
                                }
                                enableEqualizer();
-                       } else if (config.getValue("equalizer/equalizer") == "") {
-                               for (int i = 0; i < 10; i++) {
-                                       config.setValue(QString("equalizer/band%1").arg(i), 0);
-                               }
                        }
                }
        }
@@ -233,7 +231,6 @@ void Player::seek(int s) {
 }
 
 void Player::play() {
-       qWarning() << _current;
        if (_playlist.tracks().isEmpty())
                return;
        _state = PLAYER_PLAYING;
@@ -288,7 +285,7 @@ void Player::enableEqualizer() {
        _equalizer_enabled = true;
        _path.insertEffect(_equalizer);
        Config config;
-       config.setValue("equalizer/equalizer", "enabled");
+       config.setEqualizerEnabled(true);
 }
 
 void Player::disableEqualizer() {
@@ -297,7 +294,7 @@ void Player::disableEqualizer() {
        _equalizer_enabled = false;
        _path.removeEffect(_equalizer);
        Config config;
-       config.setValue("equalizer/equalizer", "disabled");
+       config.setEqualizerEnabled(false);
 }
 
 void Player::setEqualizerValue(int band, double value) {
@@ -309,7 +306,7 @@ void Player::setEqualizerValue(int band, double value) {
        QList<Phonon::EffectParameter> plist = _equalizer->parameters();
        _equalizer->setParameterValue(plist[band], QVariant::fromValue(value));
        Config config;
-       config.setValue(QString("equalizer/band%1").arg(band), value);
+       config.setEqualizerValue(QString("band%1").arg(band), value);
 }
 
 QString Player::artist() {
@@ -329,3 +326,25 @@ QString Player::title() {
                return "";
        return _playlist.tracks().at(_current).metadata().title();
 }
+
+Track Player::current() {
+       if (_current >= 0 && _current < _playlist.tracks().count()) {
+               return _playlist.tracks().at(_current);
+       } else {
+               return Track();
+       }
+}
+
+void Player::pause() {
+       if (_state == PLAYER_PLAYING) {
+               _player->pause();
+               _state = PLAYER_PAUSED;
+               emit stateChanged(_state);
+       }
+}
+
+void Player::playIfPaused() {
+       if (_state == PLAYER_PAUSED) {
+               play();
+       }
+}