From amarok Sun Mar 28 09:42:06 2010 From: Mark Kretschmann Date: Sun, 28 Mar 2010 09:42:06 +0000 To: amarok Subject: [Amarok] 2d474ee Revert "Make Amarok work correctly with Phonon-VLC Message-Id: <201003280942.o2S9g6os009195 () kore ! kollide ! net> X-MARC-Message: https://marc.info/?l=amarok&m=126977000622254 commit 2d474eef13f6eed9e79703f64eed3ca367478496 Author: Mark Kretschmann Date: Sun Mar 28 11:44:31 2010 +0200 Revert "Make Amarok work correctly with Phonon-VLC." This reverts commit ee9792e774e2d0fd968819dc2719922ba8cf1b2b. Turns out that this commit broke Amarok with Phonon-xine, which is not acceptable. I'll try to find a proper solution. CCMAIL: amarok-devel@kde.org CCMAIL: amarok@kde.org diff --git a/src/EngineController.cpp b/src/EngineController.cpp index 521e570..3d57dad 100644 --- a/src/EngineController.cpp +++ b/src/EngineController.cpp @@ -175,10 +175,14 @@ EngineController::initializePhonon() connect( m_controller, SIGNAL( titleChanged( int ) ), SLOT( slotTitleChanged( int ) ) ); + // Gapless Playback is temporarily disabled. Reason: Trying to find a bug in this code that makes + // the EngineController stop after each track, with all Phonon backends except the xine backend. +#if 0 if( AmarokConfig::trackDelayLength() > -1 ) m_media->setTransitionTime( AmarokConfig::trackDelayLength() ); // Also Handles gapless. else if( AmarokConfig::crossfadeLength() > 0 ) // TODO: Handle the possible options on when to crossfade.. the values are not documented anywhere however m_media->setTransitionTime( -AmarokConfig::crossfadeLength() ); +#endif } @@ -721,8 +725,10 @@ EngineController::setNextTrack( Meta::TrackPtr track ) m_nextTrack = track; m_nextUrl = track->playableUrl(); } - - play( track ); + else + { + play( track ); + } } Phonon::State _______________________________________________ Amarok mailing list Amarok@kde.org https://mail.kde.org/mailman/listinfo/amarok