Revision: 2503
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2503&view=rev
Author: rorthomas
Date: 2012-05-06 02:43:08 +0000 (Sun, 06 May 2012)
Log Message:
-----------
renamed config setting to AudioDevice
Modified Paths:
--------------
trunk/source/configurator/configurator.cpp
trunk/source/main/audio/SoundManager.cpp
trunk/source/main/audio/SoundScriptManager.cpp
trunk/source/main/framework/ContentManager.cpp
Modified: trunk/source/configurator/configurator.cpp
===================================================================
--- trunk/source/configurator/configurator.cpp 2012-05-06 02:35:29 UTC (rev
2502)
+++ trunk/source/configurator/configurator.cpp 2012-05-06 02:43:08 UTC (rev
2503)
@@ -1488,7 +1488,7 @@
y+=30;
#ifdef USE_OPENAL
- dText = new wxStaticText(advancedPanel, -1, _("Sound device:"),
wxPoint(10,y+3));
+ dText = new wxStaticText(advancedPanel, -1, _("Audio device:"),
wxPoint(10,y+3));
sound=new wxValueChoice(advancedPanel, -1, wxPoint(x_row1, y),
wxSize(280, -1), 0);
sound->AppendValueItem(wxT("No sound"), _("No sound"));
sound->AppendValueItem(wxT("Default"), _("Default"));
@@ -1497,7 +1497,7 @@
// get sound devices
- wxLogStatus(wxT("Sound Devices: "));
+ wxLogStatus(wxT("known Audio Devices: "));
char *devices = (char *)alcGetString(NULL, ALC_ALL_DEVICES_SPECIFIER);
while(devices && *devices !=NULL)
{
@@ -2212,7 +2212,7 @@
settings["Envmap"] = (envmap->GetValue()) ? "Yes" : "No";
#ifdef USE_OPENAL
settings["Creak Sound"] = (creaksound->GetValue()) ? "No" : "Yes";
- settings["3D Sound renderer"] = sound->getSelectedValueAsSTDString();
+ settings["AudioDevice"] = sound->getSelectedValueAsSTDString();
sprintf(tmp, "%d", soundVolume->GetValue());
settings["Sound Volume"] = tmp;
#endif //USE_OPENAL
@@ -2296,7 +2296,7 @@
soundVolume->SetValue(volume);
}
st = settings["Creak Sound"]; if (st.length()>0)
creaksound->SetValue(st=="No");
- sound->setSelectedValue(settings["3D Sound renderer"]);
+ sound->setSelectedValue(settings["AudioDevice"]);
#endif //USE_OPENAL
st = settings["Shadow optimizations"]; if (st.length()>0)
shadowOptimizations->SetValue(st=="Yes");
Modified: trunk/source/main/audio/SoundManager.cpp
===================================================================
--- trunk/source/main/audio/SoundManager.cpp 2012-05-06 02:35:29 UTC (rev
2502)
+++ trunk/source/main/audio/SoundManager.cpp 2012-05-06 02:43:08 UTC (rev
2503)
@@ -42,7 +42,7 @@
, m_sound_context(NULL)
, m_sound_device(NULL)
{
- String sound_renderer = SSETTING("3D Sound renderer", "Default");
+ String sound_renderer = SSETTING("AudioDevice", "Default");
master_volume = FSETTING("Sound Volume", 100.0f) / 100.0f;
if (sound_renderer == "No sound") return;
Modified: trunk/source/main/audio/SoundScriptManager.cpp
===================================================================
--- trunk/source/main/audio/SoundScriptManager.cpp 2012-05-06 02:35:29 UTC
(rev 2502)
+++ trunk/source/main/audio/SoundScriptManager.cpp 2012-05-06 02:43:08 UTC
(rev 2503)
@@ -75,7 +75,7 @@
mScriptPatterns.push_back("*.soundscript");
ResourceGroupManager::getSingleton()._registerScriptLoader(this);
- soundsDisabled = (SSETTING("3D Sound renderer", "Default") == "No
sound");
+ soundsDisabled = (SSETTING("AudioDevice", "Default") == "No sound");
}
void SoundScriptManager::trigOnce(Beam *truck, int trig, int linkType, int
linkItemID)
Modified: trunk/source/main/framework/ContentManager.cpp
===================================================================
--- trunk/source/main/framework/ContentManager.cpp 2012-05-06 02:35:29 UTC
(rev 2502)
+++ trunk/source/main/framework/ContentManager.cpp 2012-05-06 02:43:08 UTC
(rev 2503)
@@ -155,7 +155,7 @@
SoundScriptManager::getSingleton().setLoadingBaseSounds(true);
#endif // USE_OPENAL
- if (SSETTING("3D Sound renderer", "") != "No sound")
+ if (SSETTING("AudioDevice", "Default") != "No sound")
loadMainResource("sounds");
if (SSETTING("Sky effects", "Caelum (best looking, slower)") == "Caelum
(best looking, slower)")
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
