From 84faf2f42e496fb29144264e72dc9c371e8330e9 Mon Sep 17 00:00:00 2001 From: Ilari Liusvaara Date: Wed, 3 Jul 2013 04:10:24 +0300 Subject: [PATCH] Rip out remainder of that old unmaintained dump code --- include/interface/romtype.hpp | 7 ------- src/core/rom.cpp | 1 - src/emulation/bsnes-legacy/core.cpp | 3 --- src/emulation/gambatte/core.cpp | 1 - src/emulation/sky/sky.cpp | 1 - src/emulation/test/test.cpp | 1 - src/interface/romtype.cpp | 9 --------- 7 files changed, 23 deletions(-) diff --git a/include/interface/romtype.hpp b/include/interface/romtype.hpp index 78eab8af..3562e990 100644 --- a/include/interface/romtype.hpp +++ b/include/interface/romtype.hpp @@ -292,10 +292,6 @@ struct core_core_params * Note: This value should not be changed while ROM is running, since video dumper may malfunction. */ std::pair (*audio_rate)(); -/** - * Get SNES CPU and SMP rates. If not SNES, this should be NULL. - */ - std::pair (*snes_rate)(); /** * Save all SRAMs. */ @@ -440,7 +436,6 @@ struct core_core bool set_region(core_region& region); std::pair get_video_rate(); std::pair get_audio_rate(); - std::pair get_snes_rate(); //(0,0) for non-SNES. std::string get_core_identifier(); std::map> save_sram() throw(std::bad_alloc); void load_sram(std::map>& sram) throw(std::bad_alloc); @@ -490,7 +485,6 @@ private: bool (*_set_region)(core_region& region); std::pair (*_video_rate)(); std::pair (*_audio_rate)(); - std::pair (*_snes_rate)(); std::map> (*_save_sram)() throw(std::bad_alloc); void (*_load_sram)(std::map>& sram) throw(std::bad_alloc); void (*_serialize)(std::vector& out); @@ -546,7 +540,6 @@ public: bool set_region(core_region& region) { return core->set_region(region); } std::pair get_video_rate() { return core->get_video_rate(); } std::pair get_audio_rate() { return core->get_audio_rate(); } - std::pair get_snes_rate() { return core->get_snes_rate(); } std::string get_core_identifier() { return core->get_core_identifier(); } std::string get_core_shortname() { return core->get_core_shortname(); } std::map> save_sram() throw(std::bad_alloc) { return core->save_sram(); } diff --git a/src/core/rom.cpp b/src/core/rom.cpp index 6c0d3a3c..6450a094 100644 --- a/src/core/rom.cpp +++ b/src/core/rom.cpp @@ -65,7 +65,6 @@ namespace .set_region = [](core_region& reg) -> bool { return true; }, .video_rate = []() -> std::pair { return std::make_pair(60, 1); }, .audio_rate = []() -> std::pair { return std::make_pair(48000, 1); }, - .snes_rate = NULL, .save_sram = []() -> std::map> { std::map> x; return x; diff --git a/src/emulation/bsnes-legacy/core.cpp b/src/emulation/bsnes-legacy/core.cpp index 03bb7370..ecfa1308 100644 --- a/src/emulation/bsnes-legacy/core.cpp +++ b/src/emulation/bsnes-legacy/core.cpp @@ -691,9 +691,6 @@ namespace return std::make_pair(64081, 2); return std::make_pair(SNES::system.apu_frequency(), static_cast(768)); }, - .snes_rate = []() -> std::pair { - return std::make_pair(SNES::system.cpu_frequency(), SNES::system.apu_frequency()); - }, .save_sram = []() -> std::map> { std::map> out; if(!internal_rom) diff --git a/src/emulation/gambatte/core.cpp b/src/emulation/gambatte/core.cpp index 4ce3a3ca..0c7edf18 100644 --- a/src/emulation/gambatte/core.cpp +++ b/src/emulation/gambatte/core.cpp @@ -290,7 +290,6 @@ namespace .set_region = [](core_region& region) -> bool { return (®ion == ®ion_world); }, .video_rate = []() -> std::pair { return std::make_pair(262144, 4389); }, .audio_rate = []() -> std::pair { return std::make_pair(32768, 1); }, - .snes_rate = NULL, .save_sram = []() -> std::map> { std::map> s; if(!internal_rom) diff --git a/src/emulation/sky/sky.cpp b/src/emulation/sky/sky.cpp index aa976c94..bced793c 100644 --- a/src/emulation/sky/sky.cpp +++ b/src/emulation/sky/sky.cpp @@ -243,7 +243,6 @@ namespace sky .set_region = [](core_region& region) -> bool { return (®ion == &world_region); }, .video_rate = []() -> std::pair { return std::make_pair(656250, 18227); }, .audio_rate = []() -> std::pair { return std::make_pair(48000, 1); }, - .snes_rate = []() -> std::pair { return std::make_pair(0, 0); }, .save_sram = []() -> std::map> { std::map> r; std::vector sram; diff --git a/src/emulation/test/test.cpp b/src/emulation/test/test.cpp index e391f8f6..b9ec21af 100644 --- a/src/emulation/test/test.cpp +++ b/src/emulation/test/test.cpp @@ -132,7 +132,6 @@ namespace .set_region = [](core_region& region) -> bool { return (®ion == ®ion_world); }, .video_rate = []() -> std::pair { return std::make_pair(60, 1); }, .audio_rate = []() -> std::pair { return std::make_pair(48000, 1); }, - .snes_rate = NULL, .save_sram = []() -> std::map> { std::map> s; return s; diff --git a/src/interface/romtype.cpp b/src/interface/romtype.cpp index ae53a894..500ad660 100644 --- a/src/interface/romtype.cpp +++ b/src/interface/romtype.cpp @@ -346,7 +346,6 @@ core_core::core_core(const core_core_params& params) _set_region = params.set_region; _video_rate = params.video_rate; _audio_rate = params.audio_rate; - _snes_rate = params.snes_rate; _save_sram = params.save_sram; _load_sram = params.load_sram; _serialize = params.serialize; @@ -403,14 +402,6 @@ std::pair core_core::get_audio_rate() return _audio_rate(); } -std::pair core_core::get_snes_rate() -{ - if(_snes_rate) - return _snes_rate(); - else - return std::make_pair(0, 0); -} - std::string core_core::get_core_identifier() { return _core_identifier();