From c11c7724ade0aa1306cc6e4737926f8f317852b3 Mon Sep 17 00:00:00 2001 From: stephena Date: Sat, 16 Feb 2013 19:56:09 +0000 Subject: [PATCH] Added ability to specify separate directories for saving and loading snapshot files. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2612 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba --- Changes.txt | 5 +++ docs/graphics/launcher_options_files.png | Bin 7255 -> 8420 bytes docs/index.html | 10 ++++- src/emucore/EventHandler.cxx | 2 +- src/emucore/OSystem.cxx | 3 +- src/emucore/OSystem.hxx | 14 +++--- src/emucore/Settings.cxx | 6 ++- src/gui/FileSnapDialog.cxx | 55 ++++++++++++++++------- src/gui/FileSnapDialog.hxx | 6 ++- src/gui/LauncherDialog.cxx | 6 ++- src/gui/LauncherDialog.hxx | 9 ++-- src/gui/RomInfoWidget.cxx | 2 +- src/gui/VideoDialog.cxx | 2 +- src/macosx/OSystemMACOSX.cxx | 8 +++- src/macosx/OSystemMACOSX.hxx | 5 ++- src/win32/OSystemWin32.cxx | 8 +++- src/win32/OSystemWin32.hxx | 5 ++- 17 files changed, 105 insertions(+), 41 deletions(-) diff --git a/Changes.txt b/Changes.txt index 3dc7425c7..a1fdb873a 100644 --- a/Changes.txt +++ b/Changes.txt @@ -53,6 +53,11 @@ * Fixed regression in RIOT INTIM reads; at least one known ROM (Mr. Roboto Berzerk hack) wasn't working properly. + * Added support for different directories for saving/loading PNG + files. These are set with the 'snapsavedir' and 'snaploaddir' + commandline arguments (which replace the old 'snapdir'), and are + also available within the UI. + * Updated included PNG and ZLIB libraries to latest stable version. -Have fun! diff --git a/docs/graphics/launcher_options_files.png b/docs/graphics/launcher_options_files.png index eee82230a195b4a3ea8f630cd5f2225b1e9a2ba5..217ca0304bdbf7d1f035e26b10f71402e77985ee 100644 GIT binary patch literal 8420 zcmcI~cU)6xyX_7HB1K?;5pbviBGLo|=|wDrP@JH22#TPTfS`bsK$KBOsfN(&C;^e7 zLuf)^lp;kCq(%uNQUb&vgq9Gv8}HmXXTI~@d(J=im)}l#ciwmJoxPstS!+Fce989W zVcw&>0010@Tb@G#00;OMa`q56`0@zw2A=`$Ylw^Ifc=9JHgNaD_Ur#luwXta0W9l#>Q`|2I<>$2g#cW%mF zgxg$lyeA+A0I~r5ocZOuQ?yU5fgc;E+Jhti4B_Kieeiqy%;`W6+4ee-ZQf#o5w42j zNv+Oe{wmDW2-FqkG;`WlAR1_B{uRhKTy>S~yL21W_}?smK*EP`jPu)Gv5q268deN{)EnB79`M8ma%0D)O}&> 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 Xj6b(4d5CZE0c@?$pT_^;edE6X - 
-snapdir <path>
+ 
-snapsavedir <path>
The directory to save snapshot files to. + + 
-snaploaddir <path>
+ The directory to load snapshot files from. + + 
-sssingle <1|0>
Generate single snapshot instead of many, overwriting @@ -2552,7 +2557,8 @@ - + + diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx index 174512dab..4ba7db027 100644 --- a/src/emucore/EventHandler.cxx +++ b/src/emucore/EventHandler.cxx @@ -1948,7 +1948,7 @@ void EventHandler::takeSnapshot(uInt32 number) // Figure out the correct snapshot name string filename; bool showmessage = number == 0; - string sspath = myOSystem->snapshotDir() + + string sspath = myOSystem->snapshotSaveDir() + myOSystem->console().properties().get(Cartridge_Name); // Check whether we want multiple snapshots created diff --git a/src/emucore/OSystem.cxx b/src/emucore/OSystem.cxx index 22f1159db..1d2d0c218 100644 --- a/src/emucore/OSystem.cxx +++ b/src/emucore/OSystem.cxx @@ -348,7 +348,8 @@ void OSystem::setConfigPaths() string s; validatePath(myStateDir, "statedir", myBaseDir + "statedir"); - validatePath(mySnapshotDir, "snapdir", defaultSnapDir()); + validatePath(mySnapshotSaveDir, "snapsavedir", defaultSnapSaveDir()); + validatePath(mySnapshotLoadDir, "snaploaddir", defaultSnapLoadDir()); validatePath(myEEPROMDir, "eepromdir", myBaseDir); validatePath(myCfgDir, "cfgdir", myBaseDir + "cfg"); diff --git a/src/emucore/OSystem.hxx b/src/emucore/OSystem.hxx index 1e41b890f..388e0c904 100644 --- a/src/emucore/OSystem.hxx +++ b/src/emucore/OSystem.hxx @@ -314,9 +314,11 @@ class OSystem const string& stateDir() const { return myStateDir; } /** - Return the full/complete directory name for storing PNG snapshots. + Return the full/complete directory name for saving and loading + PNG snapshots. */ - const string& snapshotDir() const { return mySnapshotDir; } + const string& snapshotSaveDir() const { return mySnapshotSaveDir; } + const string& snapshotLoadDir() const { return mySnapshotLoadDir; } /** Return the full/complete directory name for storing EEPROM files. @@ -505,13 +507,14 @@ class OSystem virtual void stateChanged(EventHandler::State state); /** - Returns the default path for the snapshot directory. + Returns the default save and load paths for the snapshot directory. Since this varies greatly among different systems and is the one directory that most end-users care about (vs. config file stuff that usually isn't user-modifiable), we create a special method for it. */ - virtual string defaultSnapDir() { return "~"; } + virtual string defaultSnapSaveDir() { return "~"; } + virtual string defaultSnapLoadDir() { return "~"; } /** Set the position of the application window, generally using @@ -610,7 +613,8 @@ class OSystem enum { kNumUIPalettes = 2 }; string myBaseDir; string myStateDir; - string mySnapshotDir; + string mySnapshotSaveDir; + string mySnapshotLoadDir; string myEEPROMDir; string myCfgDir; diff --git a/src/emucore/Settings.cxx b/src/emucore/Settings.cxx index 7035c7034..203f43f4c 100644 --- a/src/emucore/Settings.cxx +++ b/src/emucore/Settings.cxx @@ -94,7 +94,8 @@ Settings::Settings(OSystem* osystem) setInternal("ctrlcombo", "true"); // Snapshot options - setInternal("snapdir", ""); + setInternal("snapsavedir", ""); + setInternal("snaploaddir", ""); setInternal("sssingle", "false"); setInternal("ss1x", "false"); setInternal("ssinterval", "2"); @@ -398,7 +399,8 @@ void Settings::usage() << " -autoslot <1|0> Automatically switch to next save slot when state saving\n" << " -stats <1|0> Overlay console info during emulation\n" << " -fastscbios <1|0> Disable Supercharger BIOS progress loading bars\n" - << " -snapdir The directory to save snapshot files to\n" + << " -snapsavedir The directory to save snapshot files to\n" + << " -snaploaddir The directory to load snapshot files from\n" << " -sssingle <1|0> Generate single snapshot instead of many\n" << " -ss1x <1|0> Generate TIA snapshot in 1x mode (ignore scaling/effects)\n" << " -ssinterval getHeight() + 3; b = new ButtonWidget(this, font, xpos, ypos, buttonWidth, buttonHeight, - "Snapshot path:", kChooseSnapDirCmd); + "Snapshot save path:", kChooseSnapSaveDirCmd); wid.push_back(b); xpos += buttonWidth + 10; - mySnapPath = new EditTextWidget(this, font, xpos, ypos + 2, + mySnapSavePath = new EditTextWidget(this, font, xpos, ypos + 2, _w - xpos - 10, lineHeight, ""); - wid.push_back(mySnapPath); + wid.push_back(mySnapSavePath); + + // Snapshot path (load files) + xpos = vBorder; ypos += romButton->getHeight() + 3; + b = new ButtonWidget(this, font, xpos, ypos, buttonWidth, buttonHeight, + "Snapshot load path:", kChooseSnapLoadDirCmd); + wid.push_back(b); + xpos += buttonWidth + 10; + mySnapLoadPath = new EditTextWidget(this, font, xpos, ypos + 2, + _w - xpos - 10, lineHeight, ""); + wid.push_back(mySnapLoadPath); // Cheat file xpos = vBorder; ypos += b->getHeight() + 3; @@ -188,7 +198,8 @@ void FileSnapDialog::loadConfig() { const Settings& settings = instance().settings(); myRomPath->setEditString(settings.getString("romdir")); - mySnapPath->setEditString(settings.getString("snapdir")); + mySnapSavePath->setEditString(settings.getString("snapsavedir")); + mySnapLoadPath->setEditString(settings.getString("snaploaddir")); myCheatFile->setEditString(settings.getString("cheatfile")); myPaletteFile->setEditString(settings.getString("palettefile")); myPropsFile->setEditString(settings.getString("propsfile")); @@ -203,7 +214,8 @@ void FileSnapDialog::loadConfig() void FileSnapDialog::saveConfig() { instance().settings().setString("romdir", myRomPath->getEditString()); - instance().settings().setString("snapdir", mySnapPath->getEditString()); + instance().settings().setString("snapsavedir", mySnapSavePath->getEditString()); + instance().settings().setString("snaploaddir", mySnapLoadPath->getEditString()); instance().settings().setString("cheatfile", myCheatFile->getEditString()); instance().settings().setString("palettefile", myPaletteFile->getEditString()); instance().settings().setString("propsfile", myPropsFile->getEditString()); @@ -227,7 +239,8 @@ void FileSnapDialog::setDefaults() node = FilesystemNode("~"); myRomPath->setEditString(node.getShortPath()); - mySnapPath->setEditString(instance().defaultSnapDir()); + mySnapSavePath->setEditString(instance().defaultSnapSaveDir()); + mySnapLoadPath->setEditString(instance().defaultSnapLoadDir()); const string& cheatfile = basedir + "stella.cht"; node = FilesystemNode(cheatfile); @@ -276,9 +289,14 @@ void FileSnapDialog::handleCommand(CommandSender* sender, int cmd, FilesystemNode::kListDirectoriesOnly, kRomDirChosenCmd); break; - case kChooseSnapDirCmd: - myBrowser->show("Select snapshot directory:", mySnapPath->getEditString(), - FilesystemNode::kListDirectoriesOnly, kSnapDirChosenCmd); + case kChooseSnapSaveDirCmd: + myBrowser->show("Select snapshot save directory:", mySnapSavePath->getEditString(), + FilesystemNode::kListDirectoriesOnly, kSnapSaveDirChosenCmd); + break; + + case kChooseSnapLoadDirCmd: + myBrowser->show("Select snapshot load directory:", mySnapLoadPath->getEditString(), + FilesystemNode::kListDirectoriesOnly, kSnapLoadDirChosenCmd); break; case kChooseCheatFileCmd: @@ -313,10 +331,17 @@ void FileSnapDialog::handleCommand(CommandSender* sender, int cmd, break; } - case kSnapDirChosenCmd: + case kSnapSaveDirChosenCmd: { FilesystemNode dir(myBrowser->getResult()); - mySnapPath->setEditString(dir.getShortPath()); + mySnapSavePath->setEditString(dir.getShortPath()); + break; + } + + case kSnapLoadDirChosenCmd: + { + FilesystemNode dir(myBrowser->getResult()); + mySnapLoadPath->setEditString(dir.getShortPath()); break; } diff --git a/src/gui/FileSnapDialog.hxx b/src/gui/FileSnapDialog.hxx index 2e7ec5c1b..4ac4808ff 100644 --- a/src/gui/FileSnapDialog.hxx +++ b/src/gui/FileSnapDialog.hxx @@ -58,7 +58,8 @@ class FileSnapDialog : public Dialog, public CommandSender kChooseCheatFileCmd = 'LOcf', // cheatfile (stella.cht) kChoosePaletteFileCmd = 'LOpf', // palette file (stella.pal) kChoosePropsFileCmd = 'LOpr', // properties file (stella.pro) - kChooseSnapDirCmd = 'LOsn', // snapshot dir + kChooseSnapSaveDirCmd = 'LOss', // snapshot dir (save files) + kChooseSnapLoadDirCmd = 'LOsl', // snapshot dir (load files) kChooseEEPROMDirCmd = 'LOee', // eeprom dir kStateDirChosenCmd = 'LOsc', // state dir changed kCheatFileChosenCmd = 'LOcc', // cheatfile changed @@ -76,7 +77,8 @@ class FileSnapDialog : public Dialog, public CommandSender EditTextWidget* myCheatFile; EditTextWidget* myPaletteFile; EditTextWidget* myPropsFile; - EditTextWidget* mySnapPath; + EditTextWidget* mySnapSavePath; + EditTextWidget* mySnapLoadPath; // Other snapshot settings CheckboxWidget* mySnapSingle; diff --git a/src/gui/LauncherDialog.cxx b/src/gui/LauncherDialog.cxx index 42a81fd1f..53a36b5e6 100644 --- a/src/gui/LauncherDialog.cxx +++ b/src/gui/LauncherDialog.cxx @@ -603,7 +603,11 @@ void LauncherDialog::handleCommand(CommandSender* sender, int cmd, updateListing(); break; - case kSnapDirChosenCmd: + case kSnapSaveDirChosenCmd: + // Stub just in case we need it + break; + + case kSnapLoadDirChosenCmd: // Stub just in case we need it break; diff --git a/src/gui/LauncherDialog.hxx b/src/gui/LauncherDialog.hxx index 27d640d08..4f4d5ae6e 100644 --- a/src/gui/LauncherDialog.hxx +++ b/src/gui/LauncherDialog.hxx @@ -49,10 +49,11 @@ class StringListWidget; // These must be accessible from dialogs created by this class enum { - kRomDirChosenCmd = 'romc', // rom chosen - kSnapDirChosenCmd = 'snpc', // snap chosen - kReloadRomDirCmd = 'rdrl', // reload the current listing - kReloadFiltersCmd = 'rlfl' // reload filtering options and current listing + kRomDirChosenCmd = 'romc', // rom chosen + kSnapSaveDirChosenCmd = 'snsc', // snap chosen (save files) + kSnapLoadDirChosenCmd = 'snlc', // snap chosen (load files) + kReloadRomDirCmd = 'rdrl', // reload the current listing + kReloadFiltersCmd = 'rlfl' // reload filtering options and current listing }; class LauncherDialog : public Dialog diff --git a/src/gui/RomInfoWidget.cxx b/src/gui/RomInfoWidget.cxx index da0327953..38a09a6a1 100644 --- a/src/gui/RomInfoWidget.cxx +++ b/src/gui/RomInfoWidget.cxx @@ -108,7 +108,7 @@ void RomInfoWidget::parseProperties() myRomInfo.clear(); // Get a valid filename representing a snapshot file for this rom - const string& filename = instance().snapshotDir() + + const string& filename = instance().snapshotLoadDir() + myProperties.get(Cartridge_Name) + ".png"; // Read the PNG file diff --git a/src/gui/VideoDialog.cxx b/src/gui/VideoDialog.cxx index 9fa0697b5..9cfa0d548 100644 --- a/src/gui/VideoDialog.cxx +++ b/src/gui/VideoDialog.cxx @@ -174,7 +174,7 @@ VideoDialog::VideoDialog(OSystem* osystem, DialogContainer* parent, // Add message concerning usage const GUI::Font& infofont = instance().infoFont(); - ypos = myTab->getHeight() - 5 - fontHeight - infofont.getFontHeight()- 10; + ypos = myTab->getHeight() - 5 - fontHeight - infofont.getFontHeight() - 10; new StaticTextWidget(myTab, infofont, 10, ypos, font.getStringWidth("(*) Requires application restart"), fontHeight, "(*) Requires application restart", kTextAlignLeft); diff --git a/src/macosx/OSystemMACOSX.cxx b/src/macosx/OSystemMACOSX.cxx index 49dc64eff..e32bc7ca7 100644 --- a/src/macosx/OSystemMACOSX.cxx +++ b/src/macosx/OSystemMACOSX.cxx @@ -46,8 +46,14 @@ OSystemMACOSX::~OSystemMACOSX() } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -string OSystemMACOSX::defaultSnapDir() +string OSystemMACOSX::defaultSnapSaveDir() { FilesystemNode desktop("~/Desktop"); return desktop.isDirectory() ? desktop.getShortPath() : "~"; } + +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +string OSystemMACOSX::defaultSnapLoadDir() +{ + return defaultSnapSaveDir(); +} diff --git a/src/macosx/OSystemMACOSX.hxx b/src/macosx/OSystemMACOSX.hxx index a2c2c9925..750d9a73b 100644 --- a/src/macosx/OSystemMACOSX.hxx +++ b/src/macosx/OSystemMACOSX.hxx @@ -42,9 +42,10 @@ class OSystemMACOSX : public OSystem virtual ~OSystemMACOSX(); /** - Returns the default path for the snapshot directory. + Returns the default paths for the snapshot directory. */ - string defaultSnapDir(); + string defaultSnapSaveDir(); + string defaultSnapLoadDir(); }; #endif diff --git a/src/win32/OSystemWin32.cxx b/src/win32/OSystemWin32.cxx index dc1dcf9ec..0ca877e85 100644 --- a/src/win32/OSystemWin32.cxx +++ b/src/win32/OSystemWin32.cxx @@ -91,13 +91,19 @@ OSystemWin32::~OSystemWin32() } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -string OSystemWin32::defaultSnapDir() +string OSystemWin32::defaultSnapSaveDir() { HomeFinder homefinder; FilesystemNode desktop(homefinder.getDesktopPath()); return desktop.isDirectory() ? desktop.getShortPath() : "~"; } +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +string OSystemWin32::defaultSnapLoadDir() +{ + return defaultSnapSaveDir(); +} + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void OSystemWin32::setAppWindowPos(int x, int y, int w, int h) { diff --git a/src/win32/OSystemWin32.hxx b/src/win32/OSystemWin32.hxx index 8c1f774b0..b3d28771b 100644 --- a/src/win32/OSystemWin32.hxx +++ b/src/win32/OSystemWin32.hxx @@ -44,9 +44,10 @@ class OSystemWin32 : public OSystem public: /** - Returns the default path for the snapshot directory. + Returns the default paths for the snapshot directory. */ - string defaultSnapDir(); + string defaultSnapSaveDir(); + string defaultSnapLoadDir(); /** Move window to given position. The width and height are also
ItemBrief descriptionFor more information,
see CommandLine
Rom pathspecifies location of ROM files-romdir
Snapshot pathspecifies where to load/save snapshots-snapdir
Snapshot save pathspecifies where to save snapshots-snapsavedir
Snapshot load pathspecifies where to load snapshots-snaploaddir
Cheat filespecifies location of cheatfile database-cheatfile
Palette filespecifies location of user palette-palettefile
Properties file specifies location of external stella.pro database-propsfile