ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SDL: moved sound config options to SDL.Sound.*

This commit is contained in:
punkrockguy318 2010-03-08 01:56:26 +00:00
parent f21d1f20a1
commit 8d3328c177
4 changed files with 55 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/drivers/sdl/config.cpp
View File

@ -120,20 +120,19 @@ InitConfig()
// sound options // sound options
config->addOption('s', "sound", "SDL.Sound", 1); config->addOption('s', "sound", "SDL.Sound", 1);
config->addOption("volume", "SDL.SoundVolume", 256); config->addOption("volume", "SDL.Sound.Volume", 150);
config->addOption("trianglevol", "SDL.TriangleVolume", 256); config->addOption("trianglevol", "SDL.Sound.TriangleVolume", 256);
config->addOption("square1vol", "SDL.Square1Volume", 256); config->addOption("square1vol", "SDL.Sound.Square1Volume", 256);
config->addOption("square2vol", "SDL.Square2Volume", 256); config->addOption("square2vol", "SDL.Sound.Square2Volume", 256);
config->addOption("noisevol", "SDL.NoiseVolume", 256); config->addOption("noisevol", "SDL.Sound.NoiseVolume", 256);
config->addOption("pcmvol", "SDL.PCMVolume", 256); config->addOption("pcmvol", "SDL.Sound.PCMVolume", 256);
config->addOption("soundrate", "SDL.SoundRate", 44100); config->addOption("soundrate", "SDL.Sound.Rate", 44100);
config->addOption("soundq", "SDL.SoundQuality", 1); config->addOption("soundq", "SDL.Sound.Quality", 1);
config->addOption("soundrecord", "SDL.SoundRecordFile", ""); config->addOption("soundrecord", "SDL.Sound.RecordFile", "");
config->addOption("soundbufsize", "SDL.SoundBufSize", 128); config->addOption("soundbufsize", "SDL.Sound.BufSize", 128);
config->addOption("lowpass", "SDL.Sound.LowPass", 0);
// old EOptions
config->addOption('g', "gamegenie", "SDL.GameGenie", 0); config->addOption('g', "gamegenie", "SDL.GameGenie", 0);
config->addOption("lowpass", "SDL.LowPass", 0);
config->addOption("pal", "SDL.PAL", 0); config->addOption("pal", "SDL.PAL", 0);
config->addOption("frameskip", "SDL.Frameskip", 0); config->addOption("frameskip", "SDL.Frameskip", 0);
config->addOption("clipsides", "SDL.ClipSides", 0); config->addOption("clipsides", "SDL.ClipSides", 0);
@ -143,7 +142,7 @@ InitConfig()
config->addOption('p', "palette", "SDL.Palette", ""); config->addOption('p', "palette", "SDL.Palette", "");
config->addOption("tint", "SDL.Tint", 56); config->addOption("tint", "SDL.Tint", 56);
config->addOption("hue", "SDL.Hue", 72); config->addOption("hue", "SDL.Hue", 72);
config->addOption("ntsccolor", "SDL.Color", 0); config->addOption("ntsccolor", "SDL.NTSCpalette", 0);
// scanline settings // scanline settings
config->addOption("slstart", "SDL.ScanLineStart", 0); config->addOption("slstart", "SDL.ScanLineStart", 0);
@ -383,7 +382,7 @@ UpdateEMUCore(Config *config)
int ntsccol, ntsctint, ntschue, flag, start, end; int ntsccol, ntsctint, ntschue, flag, start, end;
std::string cpalette; std::string cpalette;
config->getOption("SDL.Color", &ntsccol); config->getOption("SDL.NTSCpalette", &ntsccol);
config->getOption("SDL.Tint", &ntsctint); config->getOption("SDL.Tint", &ntsctint);
config->getOption("SDL.Hue", &ntschue); config->getOption("SDL.Hue", &ntschue);
FCEUI_SetNTSCTH(ntsccol, ntsctint, ntschue); FCEUI_SetNTSCTH(ntsccol, ntsctint, ntschue);
@ -399,7 +398,7 @@ UpdateEMUCore(Config *config)
config->getOption("SDL.GameGenie", &flag); config->getOption("SDL.GameGenie", &flag);
FCEUI_SetGameGenie(flag ? 1 : 0); FCEUI_SetGameGenie(flag ? 1 : 0);
config->getOption("SDL.LowPass", &flag); config->getOption("SDL.Sound.LowPass", &flag);
FCEUI_SetLowPass(flag ? 1 : 0); FCEUI_SetLowPass(flag ? 1 : 0);
config->getOption("SDL.DisableSpriteLimit", &flag); config->getOption("SDL.DisableSpriteLimit", &flag);

56
src/drivers/sdl/gui.cpp
View File

@ -81,12 +81,12 @@ void toggleLowPass(GtkWidget* w, gpointer p)
{ {
if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))) if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)))
{ {
g_config->setOption("SDL.LowPass", 1); g_config->setOption("SDL.Sound.LowPass", 1);
FCEUI_SetLowPass(1); FCEUI_SetLowPass(1);
} }
else else
{ {
g_config->setOption("SDL.LowPass", 0); g_config->setOption("SDL.Sound.LowPass", 0);
FCEUI_SetLowPass(0); FCEUI_SetLowPass(0);
} }
g_config->save(); g_config->save();
@ -111,7 +111,7 @@ int setTint(GtkWidget* w, gpointer p)
g_config->setOption("SDL.Tint", v); g_config->setOption("SDL.Tint", v);
g_config->save(); g_config->save();
int c, h; int c, h;
g_config->getOption("SDL.Color", &c); g_config->getOption("SDL.NTSCpalette", &c);
g_config->getOption("SDL.Hue", &h); g_config->getOption("SDL.Hue", &h);
FCEUI_SetNTSCTH(c, v, h); FCEUI_SetNTSCTH(c, v, h);
@ -124,7 +124,7 @@ int setHue(GtkWidget* w, gpointer p)
g_config->save(); g_config->save();
int c, t; int c, t;
g_config->getOption("SDL.Tint", &t); g_config->getOption("SDL.Tint", &t);
g_config->getOption("SDL.Color", &c); g_config->getOption("SDL.SDL.NTSCpalette", &c);
FCEUI_SetNTSCTH(c, t, v); FCEUI_SetNTSCTH(c, t, v);
return 0; return 0;
@ -143,7 +143,7 @@ void loadPalette (GtkWidget* w, gpointer p)
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (fileChooser)); filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (fileChooser));
g_config->setOption("SDL.Palette", filename); g_config->setOption("SDL.Palette", filename);
g_config->setOption("SDL.Color", 0); g_config->setOption("SDL.SDL.NTSCpalette", 0);
if(LoadCPalette(filename) == 0) if(LoadCPalette(filename) == 0)
{ {
GtkWidget* msgbox; GtkWidget* msgbox;
@ -219,11 +219,11 @@ void openPaletteConfig()
ntscColorChk = gtk_check_button_new_with_label("Use NTSC palette"); ntscColorChk = gtk_check_button_new_with_label("Use NTSC palette");
g_signal_connect(ntscColorChk, "clicked", G_CALLBACK(toggleOption), (gpointer)"SDL.Color"); g_signal_connect(ntscColorChk, "clicked", G_CALLBACK(toggleOption), (gpointer)"SDL.NTSCpalette");
int b; int b;
// sync with config // sync with config
g_config->getOption("SDL.Color", &b); g_config->getOption("SDL.NTSCpalette", &b);
if(b) if(b)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ntscColorChk), 1); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ntscColorChk), 1);
else else
@ -505,7 +505,7 @@ void openGamepadConfig()
int setBufSize(GtkWidget* w, gpointer p) int setBufSize(GtkWidget* w, gpointer p)
{ {
int x = gtk_range_get_value(GTK_RANGE(w)); int x = gtk_range_get_value(GTK_RANGE(w));
g_config->setOption("SDL.SoundBufSize", x); g_config->setOption("SDL.Sound.BufSize", x);
// reset sound subsystem for changes to take effect // reset sound subsystem for changes to take effect
KillSound(); KillSound();
InitSound(); InitSound();
@ -516,7 +516,7 @@ int setBufSize(GtkWidget* w, gpointer p)
void setRate(GtkWidget* w, gpointer p) void setRate(GtkWidget* w, gpointer p)
{ {
char* str = gtk_combo_box_get_active_text(GTK_COMBO_BOX(w)); char* str = gtk_combo_box_get_active_text(GTK_COMBO_BOX(w));
g_config->setOption("SDL.SoundRate", atoi(str)); g_config->setOption("SDL.Sound.Rate", atoi(str));
// reset sound subsystem for changes to take effect // reset sound subsystem for changes to take effect
KillSound(); KillSound();
InitSound(); InitSound();
@ -528,11 +528,11 @@ void setQuality(GtkWidget* w, gpointer p)
{ {
char* str = gtk_combo_box_get_active_text(GTK_COMBO_BOX(w)); char* str = gtk_combo_box_get_active_text(GTK_COMBO_BOX(w));
if(!strcmp(str, "Very High")) if(!strcmp(str, "Very High"))
g_config->setOption("SDL.SoundQuality", 2); g_config->setOption("SDL.Sound.Quality", 2);
if(!strcmp(str, "High")) if(!strcmp(str, "High"))
g_config->setOption("SDL.SoundQuality", 1); g_config->setOption("SDL.Sound.Quality", 1);
if(!strcmp(str, "Low")) if(!strcmp(str, "Low"))
g_config->setOption("SDL.SoundQuality", 0); g_config->setOption("SDL.Sound.Quality", 0);
// reset sound subsystem for changes to take effect // reset sound subsystem for changes to take effect
KillSound(); KillSound();
InitSound(); InitSound();
@ -705,32 +705,32 @@ int mixerChanged(GtkWidget* w, gpointer p)
char* lbl = (char*)gtk_frame_get_label(GTK_FRAME(parent)); char* lbl = (char*)gtk_frame_get_label(GTK_FRAME(parent));
if(strcmp(lbl, "Volume") == 0) if(strcmp(lbl, "Volume") == 0)
{ {
g_config->setOption("SDL.SoundVolume", v); g_config->setOption("SDL.Sound.Volume", v);
FCEUI_SetSoundVolume(v); FCEUI_SetSoundVolume(v);
} }
if(strcmp(lbl, "Triangle") == 0) if(strcmp(lbl, "Triangle") == 0)
{ {
g_config->setOption("SDL.TriangleVolume", v); g_config->setOption("SDL.Sound.TriangleVolume", v);
FCEUI_SetTriangleVolume(v); FCEUI_SetTriangleVolume(v);
} }
if(strcmp(lbl, "Square1") == 0) if(strcmp(lbl, "Square1") == 0)
{ {
g_config->setOption("SDL.Square1Volume", v); g_config->setOption("SDL.Sound.Square1Volume", v);
FCEUI_SetSquare1Volume(v); FCEUI_SetSquare1Volume(v);
} }
if(strcmp(lbl, "Square2") == 0) if(strcmp(lbl, "Square2") == 0)
{ {
g_config->setOption("SDL.Square2Volume", v); g_config->setOption("SDL.Sound.Square2Volume", v);
FCEUI_SetSquare2Volume(v); FCEUI_SetSquare2Volume(v);
} }
if(strcmp(lbl, "Noise") == 0) if(strcmp(lbl, "Noise") == 0)
{ {
g_config->setOption("SDL.NoiseVolume", v); g_config->setOption("SDL.Sound.NoiseVolume", v);
FCEUI_SetNoiseVolume(v); FCEUI_SetNoiseVolume(v);
} }
if(strcmp(lbl, "PCM") == 0) if(strcmp(lbl, "PCM") == 0)
{ {
g_config->setOption("SDL.PCMVolume", v); g_config->setOption("SDL.Sound.PCMVolume", v);
FCEUI_SetPCMVolume(v); FCEUI_SetPCMVolume(v);
} }
@ -786,7 +786,7 @@ void openSoundConfig()
lowpassChk = gtk_check_button_new_with_label("Enable low pass filter"); lowpassChk = gtk_check_button_new_with_label("Enable low pass filter");
// sync with cfg // sync with cfg
g_config->getOption("SDL.LowPass", &cfgBuf); g_config->getOption("SDL.Sound.LowPass", &cfgBuf);
if(cfgBuf) if(cfgBuf)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lowpassChk), TRUE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lowpassChk), TRUE);
else else
@ -802,7 +802,7 @@ void openSoundConfig()
gtk_combo_box_append_text(GTK_COMBO_BOX(qualityCombo), "Very High"); gtk_combo_box_append_text(GTK_COMBO_BOX(qualityCombo), "Very High");
// sync widget with cfg // sync widget with cfg
g_config->getOption("SDL.SoundQuality", &cfgBuf); g_config->getOption("SDL.Sound.Quality", &cfgBuf);
if(cfgBuf == 2) if(cfgBuf == 2)
gtk_combo_box_set_active(GTK_COMBO_BOX(qualityCombo), 2); gtk_combo_box_set_active(GTK_COMBO_BOX(qualityCombo), 2);
else if(cfgBuf == 1) else if(cfgBuf == 1)
@ -831,7 +831,7 @@ void openSoundConfig()
} }
// sync widget with cfg // sync widget with cfg
g_config->getOption("SDL.SoundRate", &cfgBuf); g_config->getOption("SDL.Sound.Rate", &cfgBuf);
for(int i=0; i<5; i++) for(int i=0; i<5; i++)
if(cfgBuf == rates[i]) if(cfgBuf == rates[i])
gtk_combo_box_set_active(GTK_COMBO_BOX(rateCombo), i); gtk_combo_box_set_active(GTK_COMBO_BOX(rateCombo), i);
@ -850,7 +850,7 @@ void openSoundConfig()
bufferLbl = gtk_label_new("Buffer size (in ms)"); bufferLbl = gtk_label_new("Buffer size (in ms)");
// sync widget with cfg // sync widget with cfg
g_config->getOption("SDL.SoundBufSize", &cfgBuf); g_config->getOption("SDL.Sound.BufSize", &cfgBuf);
gtk_range_set_value(GTK_RANGE(bufferHscale), cfgBuf); gtk_range_set_value(GTK_RANGE(bufferHscale), cfgBuf);
g_signal_connect(bufferHscale, "button-release-event", G_CALLBACK(setBufSize), NULL); g_signal_connect(bufferHscale, "button-release-event", G_CALLBACK(setBufSize), NULL);
@ -871,17 +871,17 @@ void openSoundConfig()
// sync with cfg // sync with cfg
int v; int v;
g_config->getOption("SDL.SoundVolume", &v); g_config->getOption("SDL.Sound.Volume", &v);
gtk_range_set_value(GTK_RANGE(mixers[0]), v); gtk_range_set_value(GTK_RANGE(mixers[0]), v);
g_config->getOption("SDL.TriangleVolume", &v); g_config->getOption("SDL.Sound.TriangleVolume", &v);
gtk_range_set_value(GTK_RANGE(mixers[1]), v); gtk_range_set_value(GTK_RANGE(mixers[1]), v);
g_config->getOption("SDL.Square1Volume", &v); g_config->getOption("SDL.Sound.Square1Volume", &v);
gtk_range_set_value(GTK_RANGE(mixers[2]), v); gtk_range_set_value(GTK_RANGE(mixers[2]), v);
g_config->getOption("SDL.Square2Volume", &v); g_config->getOption("SDL.Sound.Square2Volume", &v);
gtk_range_set_value(GTK_RANGE(mixers[3]), v); gtk_range_set_value(GTK_RANGE(mixers[3]), v);
g_config->getOption("SDL.NoiseVolume", &v); g_config->getOption("SDL.Sound.NoiseVolume", &v);
gtk_range_set_value(GTK_RANGE(mixers[4]), v); gtk_range_set_value(GTK_RANGE(mixers[4]), v);
g_config->getOption("SDL.PCMVolume", &v); g_config->getOption("SDL.Sound.PCMVolume", &v);
gtk_range_set_value(GTK_RANGE(mixers[5]), v); gtk_range_set_value(GTK_RANGE(mixers[5]), v);

18
src/drivers/sdl/sdl-sound.cpp
View File

@ -99,15 +99,15 @@ InitSound()
fprintf(stderr, "Loading SDL sound with %s driver...\n", driverName); fprintf(stderr, "Loading SDL sound with %s driver...\n", driverName);
// load configuration variables // load configuration variables
g_config->getOption("SDL.SoundRate", &soundrate); g_config->getOption("SDL.Sound.Rate", &soundrate);
g_config->getOption("SDL.SoundBufSize", &soundbufsize); g_config->getOption("SDL.Sound.BufSize", &soundbufsize);
g_config->getOption("SDL.SoundVolume", &soundvolume); g_config->getOption("SDL.Sound.Volume", &soundvolume);
g_config->getOption("SDL.SoundQuality", &soundq); g_config->getOption("SDL.Sound.Quality", &soundq);
g_config->getOption("SDL.TriangleVolume", &soundtrianglevolume); g_config->getOption("SDL.Sound.TriangleVolume", &soundtrianglevolume);
g_config->getOption("SDL.Square1Volume", &soundsquare1volume); g_config->getOption("SDL.Sound.Square1Volume", &soundsquare1volume);
g_config->getOption("SDL.Square2Volume", &soundsquare2volume); g_config->getOption("SDL.Sound.Square2Volume", &soundsquare2volume);
g_config->getOption("SDL.NoiseVolume", &soundnoisevolume); g_config->getOption("SDL.Sound.NoiseVolume", &soundnoisevolume);
g_config->getOption("SDL.PCMVolume", &soundpcmvolume); g_config->getOption("SDL.Sound.PCMVolume", &soundpcmvolume);
spec.freq = soundrate; spec.freq = soundrate;
spec.format = AUDIO_S16SYS; spec.format = AUDIO_S16SYS;

6
src/drivers/sdl/sdl.cpp
View File

@ -204,10 +204,10 @@ int LoadGame(const char *path)
FCEUI_SetVidSystem(0); FCEUI_SetVidSystem(0);
std::string filename; std::string filename;
g_config->getOption("SDL.SoundRecordFile", &filename); g_config->getOption("SDL.Sound.RecordFile", &filename);
if(filename.size()) { if(filename.size()) {
if(!FCEUI_BeginWaveRecord(filename.c_str())) { if(!FCEUI_BeginWaveRecord(filename.c_str())) {
g_config->setOption("SDL.SoundRecordFile", ""); g_config->setOption("SDL.Sound.RecordFile", "");
} }
} }
isloaded = 1; isloaded = 1;
@ -232,7 +232,7 @@ CloseGame()
isloaded = 0; isloaded = 0;
GameInfo = 0; GameInfo = 0;
g_config->getOption("SDL.SoundRecordFile", &filename); g_config->getOption("SDL.Sound.RecordFile", &filename);
if(filename.size()) { if(filename.size()) {
FCEUI_EndWaveRecord(); FCEUI_EndWaveRecord();
} }