- removed directsound8 as a selectable option in ini or UI
This commit is contained in:
parent
19937c7512
commit
19db401c83
|
@ -75,9 +75,10 @@ MenuStateOptions::MenuStateOptions(Program *program, MainMenu *mainMenu):
|
|||
listBoxSoundFactory.init(currentColumnStart, currentLine, 100);
|
||||
listBoxSoundFactory.pushBackItem("None");
|
||||
listBoxSoundFactory.pushBackItem("OpenAL");
|
||||
#ifdef WIN32
|
||||
listBoxSoundFactory.pushBackItem("DirectSound8");
|
||||
#endif
|
||||
// deprecated as of 3.6.1
|
||||
//#ifdef WIN32
|
||||
//listBoxSoundFactory.pushBackItem("DirectSound8");
|
||||
//#endif
|
||||
|
||||
listBoxSoundFactory.setSelectedItem(config.getString("FactorySound"));
|
||||
currentLine-=lineOffset;
|
||||
|
@ -600,9 +601,10 @@ void MenuStateOptions::reloadUI() {
|
|||
std::vector<string> listboxData;
|
||||
listboxData.push_back("None");
|
||||
listboxData.push_back("OpenAL");
|
||||
#ifdef WIN32
|
||||
listboxData.push_back("DirectSound8");
|
||||
#endif
|
||||
// deprecated as of 3.6.1
|
||||
//#ifdef WIN32
|
||||
// listboxData.push_back("DirectSound8");
|
||||
//#endif
|
||||
|
||||
listBoxSoundFactory.setItems(listboxData);
|
||||
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
#include "randomgen.h"
|
||||
#include "vec.h"
|
||||
#include <vector>
|
||||
#include <string>
|
||||
|
||||
using Shared::Platform::int8;
|
||||
using Shared::Platform::int32;
|
||||
|
|
|
@ -32,21 +32,22 @@ GraphicsFactory *FactoryRepository::getGraphicsFactory(const string &name){
|
|||
return &graphicsFactoryGl2;
|
||||
}
|
||||
|
||||
throw megaglest_runtime_error("Unknown graphics factory: " + name);
|
||||
throw megaglest_runtime_error("Unknown graphics factory: [" + name + "]");
|
||||
}
|
||||
|
||||
SoundFactory *FactoryRepository::getSoundFactory(const string &name){
|
||||
if(name == "DirectSound8"){
|
||||
return &soundFactoryDs8;
|
||||
}
|
||||
else if(name == "OpenAL") {
|
||||
// deprecated as of 3.6.1
|
||||
//if(name == "DirectSound8"){
|
||||
// return &soundFactoryDs8;
|
||||
//}
|
||||
if(name == "OpenAL") {
|
||||
return &soundFactoryOpenAL;
|
||||
}
|
||||
else if(name == "" || name == "None") {
|
||||
return &soundFactoryNone;
|
||||
}
|
||||
|
||||
throw megaglest_runtime_error("Unknown sound factory: " + name);
|
||||
throw megaglest_runtime_error("Unknown sound factory: [" + name + "]");
|
||||
}
|
||||
|
||||
}}//end namespace
|
||||
|
|
Loading…
Reference in New Issue
Block a user