mirror of https://github.com/stella-emu/stella.git
enabled messages in continuous snapshots mode (fixes #714)
changed hotkey for continuous snapshots mode
This commit is contained in:
parent
61de76e9f0
commit
72c6f30b52
|
@ -1806,13 +1806,13 @@
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Save continuous PNG snapshots</br>(per interval defined in <a href="#Snapshots"><b>Snapshot Settings</b></a>)</td>
|
<td>Save continuous PNG snapshots</br>(per interval defined in <a href="#Snapshots"><b>Snapshot Settings</b></a>)</td>
|
||||||
<td>Alt + s</td>
|
<td>Control-Alt + s</td>
|
||||||
<td>Cmd + s</td>
|
<td>Control-Cmd + s</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Save continuous PNG snapshots (every frame)</td>
|
<td>Save continuous PNG snapshots (every frame)</td>
|
||||||
<td>Shift-Alt + s</td>
|
<td>Shift-Control-Alt + s</td>
|
||||||
<td>Shift-Cmd + s</td>
|
<td>Shift-Control-Cmd + s</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
|
|
|
@ -534,8 +534,8 @@ PhysicalKeyboardHandler::EventMappingArray PhysicalKeyboardHandler::DefaultCommo
|
||||||
{Event::ToggleTimeMachine, KBDK_T, MOD3},
|
{Event::ToggleTimeMachine, KBDK_T, MOD3},
|
||||||
|
|
||||||
#ifdef PNG_SUPPORT
|
#ifdef PNG_SUPPORT
|
||||||
{Event::ToggleContSnapshots, KBDK_S, MOD3},
|
{Event::ToggleContSnapshots, KBDK_S, MOD3 | KBDM_CTRL},
|
||||||
{Event::ToggleContSnapshotsFrame, KBDK_S, KBDM_SHIFT | MOD3},
|
{Event::ToggleContSnapshotsFrame, KBDK_S, KBDM_SHIFT | MOD3 | KBDM_CTRL},
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
{Event::DecreaseAutoFire, KBDK_A, KBDM_SHIFT | KBDM_CTRL},
|
{Event::DecreaseAutoFire, KBDK_A, KBDM_SHIFT | KBDM_CTRL},
|
||||||
|
|
|
@ -296,7 +296,6 @@ void PNGLibrary::takeSnapshot(uInt32 number)
|
||||||
|
|
||||||
// Figure out the correct snapshot name
|
// Figure out the correct snapshot name
|
||||||
string filename;
|
string filename;
|
||||||
bool showmessage = number == 0;
|
|
||||||
string sspath = myOSystem.snapshotSaveDir().getPath() +
|
string sspath = myOSystem.snapshotSaveDir().getPath() +
|
||||||
(myOSystem.settings().getString("snapname") != "int" ?
|
(myOSystem.settings().getString("snapname") != "int" ?
|
||||||
myOSystem.romFile().getNameWithExt("")
|
myOSystem.romFile().getNameWithExt("")
|
||||||
|
@ -347,9 +346,9 @@ void PNGLibrary::takeSnapshot(uInt32 number)
|
||||||
VarList::push_back(comments, "TV Effects", myOSystem.frameBuffer().tiaSurface().effectsInfo());
|
VarList::push_back(comments, "TV Effects", myOSystem.frameBuffer().tiaSurface().effectsInfo());
|
||||||
|
|
||||||
// Now create a PNG snapshot
|
// Now create a PNG snapshot
|
||||||
|
string message = "Snapshot saved";
|
||||||
if(myOSystem.settings().getBool("ss1x"))
|
if(myOSystem.settings().getBool("ss1x"))
|
||||||
{
|
{
|
||||||
string message = "Snapshot saved";
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
Common::Rect rect;
|
Common::Rect rect;
|
||||||
|
@ -360,8 +359,6 @@ void PNGLibrary::takeSnapshot(uInt32 number)
|
||||||
{
|
{
|
||||||
message = e.what();
|
message = e.what();
|
||||||
}
|
}
|
||||||
if(showmessage)
|
|
||||||
myOSystem.frameBuffer().showMessage(message);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -369,7 +366,6 @@ void PNGLibrary::takeSnapshot(uInt32 number)
|
||||||
myOSystem.frameBuffer().enableMessages(false);
|
myOSystem.frameBuffer().enableMessages(false);
|
||||||
myOSystem.frameBuffer().tiaSurface().renderForSnapshot();
|
myOSystem.frameBuffer().tiaSurface().renderForSnapshot();
|
||||||
|
|
||||||
string message = "Snapshot saved";
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
myOSystem.png().saveImage(filename, comments);
|
myOSystem.png().saveImage(filename, comments);
|
||||||
|
@ -381,9 +377,8 @@ void PNGLibrary::takeSnapshot(uInt32 number)
|
||||||
|
|
||||||
// Re-enable old messages
|
// Re-enable old messages
|
||||||
myOSystem.frameBuffer().enableMessages(true);
|
myOSystem.frameBuffer().enableMessages(true);
|
||||||
if(showmessage)
|
|
||||||
myOSystem.frameBuffer().showMessage(message);
|
|
||||||
}
|
}
|
||||||
|
myOSystem.frameBuffer().showMessage(message);
|
||||||
}
|
}
|
||||||
|
|
||||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
|
|
Loading…
Reference in New Issue