[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/multimedia/amarok/src/engine/phonon
From:       Mark Kretschmann <kretschmann () kde ! org>
Date:       2008-03-20 13:59:52
Message-ID: 1206021592.765517.4886.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 788042 by markey:

Fade-out on stop is back :)


 M  +11 -8     phonon-engine.cpp  
 M  +1 -1      phonon-engine.h  


--- trunk/extragear/multimedia/amarok/src/engine/phonon/phonon-engine.cpp #788041:788042
@@ -1,7 +1,7 @@
 /***************************************************************************
  *   Copyright (C) 2007  Dan Meltzer <hydrogen@notyetimplemented.com>      *
  *   Copyright (C) 2007  Seb Ruiz <ruiz@kde.org>                           *
- *   Copyright (C) 2007  Mark Kretschmann <markey@web.de>                  *
+ *   Copyright (C) 2007-2008  Mark Kretschmann <kretschmann@kde.org>       *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -90,6 +90,8 @@
     DEBUG_BLOCK
 
     delete m_fader;
+    m_fader = 0;
+
     m_mediaObject->pause();
     seek( offset );
     m_mediaObject->play();
@@ -103,7 +105,8 @@
 {
     DEBUG_BLOCK
 
-    m_mediaObject->stop();
+    //m_mediaObject->stop();
+    beginFadeOut();
     emit stateChanged( Engine::Empty );
 }
 
@@ -128,17 +131,17 @@
 void
 PhononEngine::beginFadeOut()
 {
+    DEBUG_BLOCK
+
     if( m_fader )
     {
-        return;
+        m_fader->deleteLater();
+        m_fader = 0;
     }
-    //this code causes a crash in phonon code in insertEffect
-    //i haven't had time to ask the phonon guys about it yet
-    //but the code *seems* to be right - max
-    /*m_fader = new Phonon::VolumeFaderEffect( this );
+    m_fader = new Phonon::VolumeFaderEffect( this );
     m_path.insertEffect( m_fader );
     m_fader->setFadeCurve( Phonon::VolumeFaderEffect::Fade9Decibel );
-    m_fader->fadeOut( AmarokConfig::fadeoutLength() );*/
+    m_fader->fadeOut( AmarokConfig::fadeoutLength() );
 }
 
 Engine::State
--- trunk/extragear/multimedia/amarok/src/engine/phonon/phonon-engine.h #788041:788042
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2007 Dan Meltzer <hydrogen@notyetimplemented.com>       *
- *   Copyright (C) 2007 Mark Kretschmann <markey@web.de>                   *
+ *   Copyright (C) 2007-2008 Mark Kretschmann <kretschmann@kde.org>        *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
[prev in list] [next in list] [prev in thread] [next in thread]