Fixed bug with order of queued tracks and prev-historied tracks

diff --git a/src/player/player.cpp b/src/player/player.cpp
index 577a4dc..0f11f9d 100644 (file)
--- a/src/player/player.cpp
+++ b/src/player/player.cpp
@@ -56,6 +56,8 @@ void Player::next() {
        _history.push(_current % count);
        if (!_queue.isEmpty()) {
                _current = _queue.dequeue();
        _history.push(_current % count);
        if (!_queue.isEmpty()) {
                _current = _queue.dequeue();

+       } else if (!_prev_history.isEmpty()) {
+               _current = _prev_history.pop();

        } else {
                if (_random) {
                        _current = (count + (qrand()  + qrand() + qrand()) % count) % count;
        } else {
                if (_random) {
                        _current = (count + (qrand()  + qrand() + qrand()) % count) % count;

@@ -82,7 +84,7 @@ void Player::_set_source() {
 
 void Player::prev() {
        if (_history.count() > 0) {
 
 void Player::prev() {
        if (_history.count() > 0) {

-               _queue.push_front(_current);
+               _prev_history.push(_current);

                _current = _history.pop();
                _track = _playlist.tracks().at(_current);
        }
                _current = _history.pop();
                _track = _playlist.tracks().at(_current);
        }

diff --git a/src/player/player.h b/src/player/player.h
index e381838..a2fdbf7 100644 (file)
--- a/src/player/player.h
+++ b/src/player/player.h
@@ -60,6 +60,7 @@ namespace SomePlayer {
                        bool _repeat;
                        QStack<int> _history;
                        QQueue<int> _queue;
                        bool _repeat;
                        QStack<int> _history;
                        QQueue<int> _queue;

+                       QStack<int> _prev_history;

                        Playlist _playlist;
                        Phonon::MediaObject *_player;
                        Phonon::AudioOutput *_output;
                        Playlist _playlist;
                        Phonon::MediaObject *_player;
                        Phonon::AudioOutput *_output;