X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fplayer%2Fplayer.cpp;h=7eecd0eaffbc4b1697b72007615c5fada576a2d4;hb=e0bce0a80c207c746ef2e5de527d7919e63252f7;hp=4670db3d094b7f93c2c98460e7a634f7c05f65fb;hpb=de6604ba0154d3233889a330b8f229c952614021;p=someplayer

diff --git a/src/player/player.cpp b/src/player/player.cpp
index 4670db3..7eecd0e 100644
--- a/src/player/player.cpp
+++ b/src/player/player.cpp
@@ -7,51 +7,141 @@ using namespace SomePlayer::DataObjects;
 Player::Player(QObject *parent) :
     QObject(parent)
 {
-	_player = NULL;
+	_player = new Phonon::MediaObject(this);
+	_output = new Phonon::AudioOutput(Phonon::MusicCategory, this);
+	_player->setTickInterval(1000);
+	connect(_player, SIGNAL(stateChanged(Phonon::State,Phonon::State)), this, SLOT(_stateChanged(Phonon::State,Phonon::State)));
+	connect(_player, SIGNAL(tick(qint64)), this, SLOT(_tick(qint64)));
+	Phonon::createPath(_player, _output);
+	int seed = reinterpret_cast<int> (_player);
+	qsrand(seed);
+	_random = false;
+	_repeat = false;
 }
 
-void Player::setTrack(Track &track) {
-	_current_track = track;
-	_create_player();
-	emit stateChanged(PLAYER_LOADING);
+void Player::setTrackId(int id) {
+	_current = id;
+	if (!_history.isEmpty() && _history.top() != _current || _history.isEmpty()) {
+		_history.push(_current);
+	}
+	_track = _playlist.tracks().at(_current);
+	_set_source();
+	_state = PLAYER_LOADING;
+	emit stateChanged(_state);
 }
 
-void Player::play() {
-	if (_player) {
-		_player->play();
-		emit stateChanged(PLAYER_PLAYING);
+void Player::toggle() {
+	if (_state == PLAYER_PLAYING) { // pause
+		_player->pause();
+		_state = PLAYER_PAUSED;
+		emit stateChanged(_state);
+	} else { //play
+		play();
 	}
 }
 
 void Player::stop() {
-	if (_player) {
-		_player->stop();
-		emit stateChanged(PLAYER_STOPPED);
-	}
+	_player->stop();
+	_state = PLAYER_STOPPED;
+	emit stateChanged(_state);
 }
 
-void Player::pause() {
-	if (_player) {
-		_player->pause();
-		emit stateChanged(PLAYER_PAUSED);
+void Player::next() {
+	int count = _playlist.tracks().count();
+	if (count == 0) {
+		stop(); // empty playlist
+		return;
+	}
+	_history.push(_current % count);
+	if (!_queue.isEmpty()) {
+		_current = _queue.dequeue();
+	} else {
+		if (_random) {
+			_current = (count + (qrand()  + qrand() + qrand()) % count) % count;
+		} else {
+			_current = _current + 1;
+		}
+	}
+	if (_random && _history.count() >= count && !_repeat ||
+		!_repeat && _current >= count) {
+		_history.clear();
+		stop();
+	} else {
+		_current %= count;
+		_track = _playlist.tracks().at(_current);
+		_set_source();
+		play();
 	}
 }
 
-void Player::_create_player() {
-	if (_player) {
-		disconnect(_player, SIGNAL(stateChanged(Phonon::State,Phonon::State)), this, SLOT(_stateChanged(Phonon::State,Phonon::State)));
-		delete _player;
+void Player::_set_source() {
+	_player->setCurrentSource(Phonon::MediaSource(_track.source()));
+	emit trackChanged(_track);
+}
+
+void Player::prev() {
+	if (_history.count() > 0) {
+		_queue.push_front(_current);
+		_current = _history.pop();
+		_track = _playlist.tracks().at(_current);
 	}
-	_player = Phonon::createPlayer(Phonon::MusicCategory, Phonon::MediaSource(_current_track.source()));
-	_player->setTickInterval(1000);
-	connect(_player, SIGNAL(stateChanged(Phonon::State,Phonon::State)), this, SLOT(_stateChanged(Phonon::State,Phonon::State)));
-	connect(_player, SIGNAL(tick(qint64)), this, SLOT(_tick(qint64)));
-	emit stateChanged(PLAYER_STOPPED);
+	_set_source();
+	play();
 }
 
 void Player::_stateChanged(Phonon::State newState, Phonon::State oldState) {
+	switch (newState) {
+	case Phonon::PlayingState:
+		if (_state == PLAYER_LOADING) {
+			_state = PLAYER_PLAYING;
+			emit stateChanged(_state);
+		}
+		break;
+	case Phonon::StoppedState:
+		break;
+	case Phonon::LoadingState:
+		break;
+	case Phonon::PausedState:
+		if (_state == PLAYER_PLAYING) {
+			next();
+		} else if (_state == PLAYER_ERROR) {
+			play();
+		}
+		break;
+	case Phonon::BufferingState:
+		break;
+	case Phonon::ErrorState:
+		_state = PLAYER_ERROR;
+		qDebug() << _player->errorString();
+		break;
+	}
 }
 
 void Player::_tick(qint64 ticks) {
-	emit tick(ticks/1000, _current_track.metadata().length());
+	int done = ticks/1000;
+	int all = _track.metadata().length();
+	emit tick(done, all);
+	if (done+2 == all) {
+		_track.setCount(_track.count()+1);
+		emit trackDone(_track);
+	}
+}
+
+void Player::setPlaylist(Playlist playlist) {
+	_playlist = playlist;
+	_history.clear();
+}
+
+void Player::seek(int s) {
+	_player->seek(s*1000);
+}
+
+void Player::play() {
+	_player->play();
+	_state = PLAYER_PLAYING;
+	emit stateChanged(_state);
+}
+
+void Player::enqueue(int id) {
+	_queue.enqueue(id);
 }