From d797b6af7c3d86cffd26ff8a1d4844dc5cc730b5 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sun, 10 Apr 2011 20:50:28 +0000 Subject: fixed regression, fixed signals synchronization (Fixes issue 447), fixed mplayer engine bugs git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2152 90c681e8-e032-0410-971d-27865f9a5e38 --- src/qmmpui/mediaplayer.cpp | 42 ------------------------------------------ 1 file changed, 42 deletions(-) (limited to 'src/qmmpui/mediaplayer.cpp') diff --git a/src/qmmpui/mediaplayer.cpp b/src/qmmpui/mediaplayer.cpp index ea45c2b78..21051c7fe 100644 --- a/src/qmmpui/mediaplayer.cpp +++ b/src/qmmpui/mediaplayer.cpp @@ -103,45 +103,6 @@ void MediaPlayer::play(qint64 offset) m_nextUrl.clear(); return; } - - /*if (!m_core->play(s, false, offset)) - { - //find out the reason why playback failed - switch ((int) m_core->state()) - { - case Qmmp::FatalError: - { - stop(); - return; //unrecovable error in output, so abort playing - } - case Qmmp::NormalError: - { - //error in decoder, so we should try to play next song - m_skips++; - if (m_skips > MAX_SKIPS) - { - stop(); - qWarning("MediaPlayer: skip limit exceeded"); - break; - } - qApp->processEvents(); - if (!m_pl_manager->currentPlayList()->isEmptyQueue()) - { - m_pl_manager->currentPlayList()->setCurrentToQueued(); - } - else if (!m_pl_manager->currentPlayList()->next()) - { - stop(); - return; - } - play(); - break; - } - } - } - else - m_skips = 0;*/ - m_core->play(s, false, offset); m_skips = 0; } @@ -256,11 +217,8 @@ void MediaPlayer::processState(Qmmp::State state) { case Qmmp::NormalError: stop(); - //playNext(); if (m_skips < MAX_SKIPS) { - //stop(); - //qWarning("MediaPlayer: skip limit exceeded"); playNext(); m_skips++; } -- cgit v1.2.3-13-gbd6f