Context Navigation

sound

Timestamp:

Dec 21, 2009, 1:18:36 PM (15 years ago)

Author:

rgrieder

Message:

Found some non empty new lines.

Location:

code/branches/presentation2/src/orxonox/sound

Files:

r6382	r6387
61	61	}
62	62	}
63
	63
64	64	void AmbientSound::registerVariables()
65	65	{
…	…
101	101	SoundManager::getInstance().pauseAmbientSound(this);
102	102	}
103
	103
104	104	float AmbientSound::getRealVolume()
105	105	{

r6383	r6387
150	150	this->updateVolume();
151	151	}
152
	152
153	153	void BaseSound::updateVolume()
154	154	{
…	…
252	252	}
253	253	}
254
	254
255	255	void BaseSound::stateChanged()
256	256	{

-                      r6383
+                      r6387
         else
             COUT(2) << "Sound Warning: MIME Type retrieval failed: " << alutGetErrorString(alutGetError()) << std::endl;
         this->mute_[SoundType::All]     = 1.0f;
         this->mute_[SoundType::Music]   = 1.0f;
 …
     void SoundManager::processCrossFading(float dt)
+    {
         // Hacky solution to the fade delay while loading a level.
         if(dt > 0.2)
 …
             return;
+        }
         // FADE IN
         for (std::list<SmartPtr<AmbientSound> >::iterator it= this->fadeInList_.begin(); it != this->fadeInList_.end(); )

r6383	r6387
75	75	void preUpdate(const Clock& time);
76	76	void setConfigValues();
77
	77
78	78	// tolua_begin
79	79	static SoundManager& getInstance() { return Singleton<SoundManager>::getInstance(); }

r6382	r6387
51	51	this->registerVariables();
52	52	}
53
	53
54	54	void WorldSound::registerVariables()
55	55	{

Note: See TracChangeset for help on using the changeset viewer.