From: <au...@us...> - 2009-04-20 18:37:08
|
Revision: 3412 http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=3412&view=rev Author: auria Date: 2009-04-20 18:36:53 +0000 (Mon, 20 Apr 2009) Log Message: ----------- SFX volume is now saved to config file, and read from it Modified Paths: -------------- main/branches/irrlicht/src/audio/sfx_manager.cpp main/branches/irrlicht/src/gui/state_manager.cpp Modified: main/branches/irrlicht/src/audio/sfx_manager.cpp =================================================================== --- main/branches/irrlicht/src/audio/sfx_manager.cpp 2009-04-20 18:20:01 UTC (rev 3411) +++ main/branches/irrlicht/src/audio/sfx_manager.cpp 2009-04-20 18:36:53 UTC (rev 3412) @@ -50,7 +50,10 @@ m_sfx_rolloff.resize(NUM_SOUNDS); m_sfx_gain.resize(NUM_SOUNDS); if(!m_initialized) return; + loadSfx(); + setMasterSFXVolume( user_config->m_sfx_volume ); + } // SoundManager //----------------------------------------------------------------------------- Modified: main/branches/irrlicht/src/gui/state_manager.cpp =================================================================== --- main/branches/irrlicht/src/gui/state_manager.cpp 2009-04-20 18:20:01 UTC (rev 3411) +++ main/branches/irrlicht/src/gui/state_manager.cpp 2009-04-20 18:36:53 UTC (rev 3412) @@ -347,37 +347,21 @@ } else if(name == "sfx_volume") { + static SFXBase* sample_sound = NULL; + GUIEngine::GaugeWidget* w = dynamic_cast<GUIEngine::GaugeWidget*>(widget); // GUIEngine::getCurrentScreen()->getWidget("sfx_volume") assert(w != NULL); - - /* - SFXBase *m_engine_sound; - - m_skid_sound = sfx_manager->newSFX( SFXManager::SOUND_SKID ); - - - m_engine_sound->position ( getXYZ() ); - - m_engine_sound->loop(); - m_engine_sound->play(); - - - m_engine_sound->stop(); - sfx_manager->deleteSFX(m_engine_sound ); - */ + if(sample_sound == NULL) + sample_sound = sfx_manager->newSFX( SFXManager::SOUND_SKID ); + sample_sound->volume(1); - // TODO - save value to file, load value from file sfx_manager->setMasterSFXVolume( w->getValue() ); + user_config->m_sfx_volume = w->getValue(); + std::cout << "w->getValue()=" << w->getValue() << std::endl; // play a sample sound to show the user what this volume is like - static SFXBase* sample_sound = NULL; - - if(sample_sound == NULL) - { - sample_sound = sfx_manager->newSFX( SFXManager::SOUND_SKID ); - } sample_sound->position ( Vec3(0,0,0) ); if(sample_sound->getStatus() != SFXManager::SFX_PLAYING) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |