empathicqubit/lsnes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up window-fileupload.cpp

Browse source
This commit is contained in:
Ilari Liusvaara 2014-06-09 18:24:00 +03:00
parent 99356caf71
commit b13e9ef12c
3 changed files with 61 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
include/core/ui-services.hpp
View file

@ -6,6 +6,7 @@
#include <functional>
#include <list>
#include <string>
#include <sstream>
/*********************************************************************************************************************
UI services.
@ -115,5 +116,17 @@ void UI_end_dump(emulator_instance& inst, dumper_factory_base& factory);
*/
void UI_do_keypress(emulator_instance& inst, const keyboard::modifier_set& mods, keyboard::key_key& key,
bool polarity);
/**
* Is there a valid movie?
*/
bool UI_has_movie(emulator_instance& inst);
/**
* Save a movie into buffer.
*/
void UI_save_movie(emulator_instance& inst, std::ostringstream& buffer);
/**
* Look up (platform,game) pair.
*/
std::pair<std::string, std::string> UI_lookup_platform_and_game(emulator_instance& inst);
#endif

39
src/core/ui-services.cpp
View file

@ -5,6 +5,7 @@
#include "core/moviedata.hpp"
#include "core/project.hpp"
#include "core/queue.hpp"
#include "core/rom.hpp"
#include "core/ui-services.hpp"
#include "library/keyboard.hpp"
@ -213,3 +214,41 @@ void UI_do_keypress(emulator_instance& inst, const keyboard::modifier_set& mods,
_key->set_state(mods, polarity ? 1 : 0);
}, [](std::exception& e) {});
}
bool UI_has_movie(emulator_instance& inst)
{
bool ret = false;
lsnes_instance.iqueue->run([&inst, &ret]() {
ret = !!*inst.mlogic && !inst.rom->isnull();
});
return ret;
}
void UI_save_movie(emulator_instance& inst, std::ostringstream& stream)
{
lsnes_instance.iqueue->run([&inst, &stream]() {
inst.mlogic->get_mfile().is_savestate = false;
auto prj = inst.project->get();
if(prj) {
inst.mlogic->get_mfile().gamename = prj->gamename;
inst.mlogic->get_mfile().authors = prj->authors;
}
inst.mlogic->get_mfile().active_macros.clear();
inst.mlogic->get_mfile().save(stream, inst.mlogic->get_rrdata());
});
}
std::pair<std::string, std::string> UI_lookup_platform_and_game(emulator_instance& inst)
{
std::string plat;
std::string game;
lsnes_instance.iqueue->run([&inst, &plat, &game]() {
auto prj = inst.project->get();
if(prj)
game = prj->gamename;
else
game = inst.mlogic->get_mfile().gamename;
plat = lookup_sysregion_mapping(inst.mlogic->get_mfile().gametype->get_name());
});
return std::make_pair(plat, game);
}

29
src/platform/wxwidgets/window-fileupload.cpp
View file

@ -7,6 +7,7 @@
#include "core/rom.hpp"
#include "core/project.hpp"
#include "core/moviedata.hpp"
#include "core/ui-services.hpp"
#include "library/directory.hpp"
#include "library/skein.hpp"
#include "library/zip.hpp"
@ -638,7 +639,7 @@ wxeditor_uploaddialog::wxeditor_uploaddialog(wxWindow* parent, emulator_instance
wxCommandEventHandler(wxeditor_uploaddialog::on_source_sel), NULL, this);
file->Connect(wxEVT_COMMAND_RADIOBUTTON_SELECTED,
wxCommandEventHandler(wxeditor_uploaddialog::on_source_sel), NULL, this);
if(!inst.mlogic || inst.rom->isnull()) {
if(!UI_has_movie(inst)) {
current->Enable(false);
file->SetValue(true);
}
@ -751,15 +752,8 @@ void wxeditor_uploaddialog::on_ok(wxCommandEvent& e)
} else {
if(fn.length() < 6 || fn.substr(fn.length() - 5) != ".lsmv")
filename->SetValue(towxstring(fn + ".lsmv"));
inst.mlogic->get_mfile().is_savestate = false;
auto prj = inst.project->get();
if(prj) {
inst.mlogic->get_mfile().gamename = prj->gamename;
inst.mlogic->get_mfile().authors = prj->authors;
}
inst.mlogic->get_mfile().active_macros.clear();
std::ostringstream stream;
inst.mlogic->get_mfile().save(stream, inst.mlogic->get_rrdata());
UI_save_movie(inst, stream);
std::string _stream = stream.str();
content = std::vector<char>(_stream.begin(), _stream.end());
}
@ -781,15 +775,9 @@ void wxeditor_uploaddialog::on_source_sel(wxCommandEvent& e)
file_select->Enable(file->GetValue());
if(!games_req) {
if(current->GetValue()) {
std::string curgame;
auto prj = inst.project->get();
if(prj)
curgame = prj->gamename;
else
curgame = inst.mlogic->get_mfile().gamename;
std::string plat = lookup_sysregion_mapping(
inst.mlogic->get_mfile().gametype->get_name()) + " ";
auto g = UI_lookup_platform_and_game(inst);
std::string plat = g.first + " ";
std::string curgame = g.second;
size_t platlen = plat.length();
std::string c = tostdstring(game->GetLabel());
std::string fullname = plat + curgame;
@ -830,8 +818,9 @@ void wxeditor_uploaddialog::on_game_sel(wxCommandEvent& e)
{
auto pos = game_sel_button->GetScreenPosition();
std::string system;
if(current->GetValue())
system = lookup_sysregion_mapping(inst.mlogic->get_mfile().gametype->get_name());
if(current->GetValue()) {
system = UI_lookup_platform_and_game(inst).first;
}
wxwin_gameselect* gs = new wxwin_gameselect(this, games_list, tostdstring(game->GetLabel()), system,
pos.x, pos.y);
if(gs->ShowModal() != wxID_OK) {