Revision: 2506
          http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2506&view=rev
Author:   rorthomas
Date:     2012-05-06 03:14:49 +0000 (Sun, 06 May 2012)
Log Message:
-----------
minor fixes

Modified Paths:
--------------
    trunk/source/main/audio/SoundManager.cpp

Modified: trunk/source/main/audio/SoundManager.cpp
===================================================================
--- trunk/source/main/audio/SoundManager.cpp    2012-05-06 03:10:12 UTC (rev 
2505)
+++ trunk/source/main/audio/SoundManager.cpp    2012-05-06 03:14:49 UTC (rev 
2506)
@@ -42,18 +42,13 @@
        , m_sound_context(NULL)
        , m_sound_device(NULL)
 {
-       String sound_renderer = SSETTING("AudioDevice", "");
+       String sound_renderer = SSETTING("AudioDevice", "Default");
 
        if (sound_renderer == "No sound") return;
 
-       LOG("Opening Device: '" + SSETTING("AudioDevice", "Default") + "'");
+       LOG("Opening Device: '" + sound_renderer + "'");
+       m_sound_device = alcOpenDevice(sound_renderer.c_str());
 
-       // we loop alcOpenDevice() because there is a potential race condition 
with the asynchronous DSound enumeration callback
-       for (int i=0; i < 100  && !m_sound_device; i++)
-       {
-               m_sound_device = alcOpenDevice(sound_renderer.c_str());
-       }
-
        if (!m_sound_device)
        {
                ALint error = alGetError();

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Rigsofrods-devel mailing list
Rigsofrods-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel

Reply via email to