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

List:       kde-commits
Subject:    kdeextragear-1/amarok/src
From:       Max Howell <max.howell () methylblue ! com>
Date:       2004-06-01 2:10:03
Message-ID: 20040601021003.42C65990A () office ! kde ! org
[Download RAW message or body]

CVS commit by mhowell: 

Change of tact, try to keep AmarokConfig::masterVolume() and engine()->volume() in sync.


  M +1 -1      actionclasses.cpp   1.37
  M +3 -12     app.cpp   1.340
  M +2 -0      enginecontroller.cpp   1.19
  M +1 -1      playerwindow.cpp   1.152


--- kdeextragear-1/amarok/src/actionclasses.cpp  #1.36:1.37
@@ -242,5 +242,5 @@ VolumeAction::plug( QWidget *w, int inde
         m_slider->setFixedHeight( 35 );
         m_slider->setMaxValue( amaroK::VOLUME_MAX );
-        m_slider->setValue( amaroK::VOLUME_MAX - EngineController::engine()->volume() );
+        m_slider->setValue( amaroK::VOLUME_MAX - AmarokConfig::masterVolume() );
         connect( m_slider, SIGNAL( valueChanged( int ) ),
                  this,       SLOT( sliderMoved( int ) ) );

--- kdeextragear-1/amarok/src/app.cpp  #1.339:1.340
@@ -132,5 +132,4 @@ App::~App()
 
     AmarokConfig::setVersion( APP_VERSION );
-    AmarokConfig::setMasterVolume( engine->volume() );
     AmarokConfig::writeConfig();
 
@@ -317,8 +316,5 @@ void App::restoreSession()
 
         EngineController::instance()->play( bundle );
-
-        //did we  save the time?
-        const int seconds = AmarokConfig::resumeTime();
-        if( seconds > 0 ) EngineController::engine()->seek( seconds * 1000 );
+        EngineController::engine()->seek( AmarokConfig::resumeTime() * 1000 );
     }
 }
@@ -367,5 +363,5 @@ void App::applySettings()
 
         m_pPlaylistWindow->setCaption( "amaroK" );
-        m_pPlaylistWindow->show(); //must be shown
+        //m_pPlaylistWindow->show(); //must be shown
     }
 
@@ -409,9 +405,5 @@ void App::applySettings()
         if( b || AmarokConfig::soundSystem() != PluginManager::getService( engine )->name() )
         {
-            if( !b )
-            {
-                AmarokConfig::setMasterVolume( engine->volume() );
-                PluginManager::unload( engine );
-            }
+            if( !b ) PluginManager::unload( engine );
 
             initEngine();

--- kdeextragear-1/amarok/src/enginecontroller.cpp  #1.18:1.19
@@ -195,4 +195,6 @@ int EngineController::setVolume( int per
     if( percent != m_pEngine->volume() )
     {
+        AmarokConfig::setMasterVolume( percent );
+
         m_pEngine->setVolume( percent );
 

--- kdeextragear-1/amarok/src/playerwindow.cpp  #1.151:1.152
@@ -127,5 +127,5 @@ PlayerWidget::PlayerWidget( QWidget *par
 
         m_pVolSlider->setMaxValue( amaroK::VOLUME_MAX );
-        m_pVolSlider->setValue( engine->volume() );
+        m_pVolSlider->setValue( AmarokConfig::masterVolume() );
 
         connect( m_pSlider, SIGNAL(sliderReleased()), SLOT(slotSliderReleased()) );


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