[amarok] src: Remove options for features that are no longer implemented.

[Mark Kretschmann]

Git commit 81e5809f62aaf0a145a407df2eed62502577012d by Mark Kretschmann.
Committed on 17/06/2013 at 19:01.
Pushed by markey into branch 'master'.

Remove options for features that are no longer implemented.

* Crossfading (code had no effect at all, and there was no GUI option)
* Track delay (no GUI option, unsupported)
* Animate tray icon (feature no longer exists)
* Fade-out on exit (feature no longer exists)

CCMAIL: amarok-devel at kde.org

M  +0    -5    src/EngineController.cpp
M  +0    -30   src/amarokconfig.kcfg

http://commits.kde.org/amarok/81e5809f62aaf0a145a407df2eed62502577012d

diff --git a/src/EngineController.cpp b/src/EngineController.cpp
index f5923b3..8bd464a 100644
--- a/src/EngineController.cpp
+++ b/src/EngineController.cpp
@@ -239,11 +239,6 @@ EngineController::initializePhonon()
     // Read the volume from phonon
     m_volume = qBound<qreal>( 0, qRound(m_audio.data()->volume()*100), 100 );
 
-    if( AmarokConfig::trackDelayLength() > -1 )
-        m_media.data()->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.data()->setTransitionTime( -AmarokConfig::crossfadeLength() );
-
     if( m_currentTrack )
     {
         unsubscribeFrom( m_currentTrack );
diff --git a/src/amarokconfig.kcfg b/src/amarokconfig.kcfg
index f0a5b54..f60d01e 100644
--- a/src/amarokconfig.kcfg
+++ b/src/amarokconfig.kcfg
@@ -74,16 +74,6 @@
         <whatsthis>Enable/Disable context view in Amarok.</whatsthis>
         <default>false</default>
     </entry>
-    <entry key="Animate Tray Icon" type="Bool">
-        <label>Whether to animate the systray icon</label>
-        <whatsthis>Enable/Disable tray icon animation.</whatsthis>
-        <default>false</default>
-    </entry>
-    <entry key="Track Delay Length" type="Int">
-        <label>Delay between tracks, in milliseconds</label>
-        <whatsthis>Delay between tracks, in milliseconds.</whatsthis>
-        <default>0</default>
-    </entry>
     <entry key="Undo Levels" type="Int">
         <label>Number of undo levels in playlist</label>
         <whatsthis>The number of undo levels in the playlist.</whatsthis>
@@ -210,22 +200,6 @@
         <whatsthis>Mute/Unmute sound.</whatsthis>
         <default>false</default>
     </entry>
-    <entry key="Crossfade" type="Bool">
-        <label>Whether to crossfade between tracks</label>
-        <whatsthis>Enable/Disable crossfading between track changes.</whatsthis>
-        <default>false</default>
-    </entry>
-    <entry key="Crossfade Length" type="Int">
-        <label>Length of crossfade, in milliseconds</label>
-        <whatsthis>The length of the crossfade between tracks in milliseconds.</whatsthis>
-        <default>4000</default>
-        <min>400</min>
-    </entry>
-    <entry key="Crossfade Type" type="Int">
-        <label>When to Crossfade</label>
-        <whatsthis>Determines whether to crossfade always, or on automatic/manual track changes only.</whatsthis>
-        <default>0</default>
-    </entry>
     <entry key="Fadeout" type="Bool">
         <label>Whether to fade out tracks when pressing stop.</label>
         <whatsthis>Enable/Disable fadeout.</whatsthis>
@@ -237,10 +211,6 @@
         <default>2500</default>
         <min>400</min>
     </entry>
-    <entry key="FadeoutOnExit" type="Bool">
-        <label>Whether to fade out when exiting the program.</label>
-        <default>true</default>
-    </entry>
     <entry key="EqualizerMode" type="Int">
         <label>Equalizer mode - 0 = off, 1 to n = preset no</label>
         <whatsthis>When enabled, an equalizer plugin filters the audio stream.</whatsthis>