Dasko/snes9x
Dasko/snes9x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix GTK+ version compilation with latest removals.

Browse Source
This commit is contained in:
Brandon Wright 2010-11-28 16:28:55 -06:00
parent caf474e710
commit 8ae75f9391
3 changed files with 2309 additions and 2330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/src/gtk_config.cpp
View File

@ -200,9 +200,7 @@ Snes9xConfig::load_defaults (void)
Settings.Stereo = TRUE; Settings.Stereo = TRUE;
Settings.ReverseStereo = FALSE; Settings.ReverseStereo = FALSE;
Settings.SoundPlaybackRate = 32000; Settings.SoundPlaybackRate = 32000;
Settings.DisableHDMA = 0;
Settings.StopEmulation = TRUE; Settings.StopEmulation = TRUE;
Settings.DisableIRQ = FALSE;
Settings.FrameTimeNTSC = 16667; Settings.FrameTimeNTSC = 16667;
Settings.FrameTimePAL = 20000; Settings.FrameTimePAL = 20000;
Settings.SupportHiRes = true; Settings.SupportHiRes = true;
@ -363,7 +361,6 @@ Snes9xConfig::save_config_file (void)
xml_out_int (xml, "stereo", Settings.Stereo); xml_out_int (xml, "stereo", Settings.Stereo);
xml_out_int (xml, "reverse_stereo", Settings.ReverseStereo); xml_out_int (xml, "reverse_stereo", Settings.ReverseStereo);
xml_out_int (xml, "playback_rate", gui_config->sound_playback_rate); xml_out_int (xml, "playback_rate", gui_config->sound_playback_rate);
xml_out_int (xml, "hdma", !(Settings.DisableHDMA));
xml_out_int (xml, "block_invalid_vram_access", Settings.BlockInvalidVRAMAccessMaster); xml_out_int (xml, "block_invalid_vram_access", Settings.BlockInvalidVRAMAccessMaster);
xml_out_int (xml, "upanddown", Settings.UpAndDown); xml_out_int (xml, "upanddown", Settings.UpAndDown);
@ -621,7 +618,7 @@ Snes9xConfig::set_option (const char *name, const char *value)
} }
else if (!strcasecmp (name, "hdma")) else if (!strcasecmp (name, "hdma"))
{ {
Settings.DisableHDMA = !(atoi (value)); /* Deprecated */
} }
else if (!strcasecmp (name, "speedhacks")) else if (!strcasecmp (name, "speedhacks"))
{ {

2
gtk/src/gtk_preferences.cpp
View File

@ -662,7 +662,6 @@ Snes9xPreferences::move_settings_to_dialog (void)
set_combo ("default_esc_behavior", config->default_esc_behavior); set_combo ("default_esc_behavior", config->default_esc_behavior);
set_check ("prevent_screensaver", config->prevent_screensaver); set_check ("prevent_screensaver", config->prevent_screensaver);
set_check ("force_inverted_byte_order", config->force_inverted_byte_order); set_check ("force_inverted_byte_order", config->force_inverted_byte_order);
set_check ("hdma_check", !(Settings.DisableHDMA));
set_check ("stereo_check", Settings.Stereo); set_check ("stereo_check", Settings.Stereo);
set_combo ("playback_combo", 7 - config->sound_playback_rate); set_combo ("playback_combo", 7 - config->sound_playback_rate);
set_combo ("hw_accel", combo_value (config->hw_accel)); set_combo ("hw_accel", combo_value (config->hw_accel));
@ -815,7 +814,6 @@ Snes9xPreferences::get_settings_from_dialog (void)
config->multithreading = get_check ("multithreading"); config->multithreading = get_check ("multithreading");
config->pause_emulation_on_switch = get_check ("pause_emulation_on_switch"); config->pause_emulation_on_switch = get_check ("pause_emulation_on_switch");
Settings.SkipFrames = get_combo ("frameskip_combo"); Settings.SkipFrames = get_combo ("frameskip_combo");
Settings.DisableHDMA = !(get_check ("hdma_check"));
Settings.BlockInvalidVRAMAccessMaster = get_check ("block_invalid_vram_access"); Settings.BlockInvalidVRAMAccessMaster = get_check ("block_invalid_vram_access");
Settings.UpAndDown = get_check ("upanddown"); Settings.UpAndDown = get_check ("upanddown");
config->sound_driver = get_combo ("sound_driver"); config->sound_driver = get_combo ("sound_driver");

4632
gtk/src/snes9x.ui
View File

File diff suppressed because it is too large Load Diff