ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Timeline and buttons in TimeMachineDialog are now syncronized.

This commit is contained in:
Stephen Anthony 2018-01-27 19:34:26 -03:30
parent 307e496109
commit 2c90aaa7c7
7 changed files with 74 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -56,7 +56,7 @@ endif
ifdef CLANG_WARNINGS
CXXFLAGS+= -Weverything -Wno-c++17-extensions -Wno-c++98-compat -Wno-c++98-compat-pedantic \
-Wno-double-promotion -Wno-switch-enum -Wno-conversion -Wno-covered-switch-default \
-Wno-inconsistent-missing-destructor-override \
-Wno-inconsistent-missing-destructor-override -Wno-float-equal \
-Wno-exit-time-destructors -Wno-global-constructors -Wno-weak-vtables \
-Wno-four-char-constants -Wno-padded
endif

21
src/common/RewindManager.cxx
View File

@ -42,7 +42,7 @@ void RewindManager::setup()
mySize = myOSystem.settings().getInt(prefix + "tm.size");
if(mySize != myStateList.capacity())
myStateList.resize(mySize);
resize(mySize);
myUncompressed = myOSystem.settings().getInt(prefix + "tm.uncompressed");
@ -146,7 +146,7 @@ uInt32 RewindManager::rewindState(uInt32 numStates)
for(i = 0; i < numStates; ++i)
{
if(!atFirst())
if(!atFirst())
{
if(!myLastTimeMachineAdd)
// Set internal current iterator to previous state (back in time),
@ -306,14 +306,14 @@ string RewindManager::getUnitString(Int64 cycles)
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
uInt32 RewindManager::getFirstCycles()
uInt32 RewindManager::getFirstCycles() const
{
// TODO: check if valid
return Common::LinkedObjectPool<RewindState>::const_iter(myStateList.first())->cycles;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
uInt32 RewindManager::getCurrentCycles()
uInt32 RewindManager::getCurrentCycles() const
{
if(myStateList.currentIsValid())
return myStateList.current().cycles;
@ -322,9 +322,20 @@ uInt32 RewindManager::getCurrentCycles()
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
uInt32 RewindManager::getLastCycles()
uInt32 RewindManager::getLastCycles() const
{
// TODO: check if valid
return Common::LinkedObjectPool<RewindState>::const_iter(myStateList.last())->cycles;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
IntArray RewindManager::cyclesList() const
{
IntArray arr;
uInt64 firstCycle = getFirstCycles();
for(auto it = myStateList.first(); it != myStateList.last(); ++it)
arr.push_back(uInt32(it->cycles - firstCycle));
return arr;
}

12
src/common/RewindManager.hxx
View File

@ -136,9 +136,15 @@ class RewindManager
uInt32 getCurrentIdx() { return myStateList.currentIdx(); }
uInt32 getLastIdx() { return myStateList.size(); }
uInt32 getFirstCycles();
uInt32 getCurrentCycles();
uInt32 getLastCycles();
uInt32 getFirstCycles() const;
uInt32 getCurrentCycles() const;
uInt32 getLastCycles() const;
/**
Get a collection of cycle timestamps, offset from the first one in
the list. This also determines the number of states in the list.
*/
IntArray cyclesList() const;
private:
OSystem& myOSystem;

2
src/common/Version.hxx
View File

@ -18,7 +18,7 @@
#ifndef VERSION_HXX
#define VERSION_HXX
#define STELLA_VERSION "5.1_a2"
#define STELLA_VERSION "5.1_b1"
#define STELLA_BUILD "3826"
#endif

2
src/gui/TimeLineWidget.cxx
View File

@ -73,11 +73,13 @@ void TimeLineWidget::setMaxValue(int value)
_valueMax = value;
}
#if 0
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void TimeLineWidget::setStepValue(int value)
{
_stepValue = value;
}
#endif
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void TimeLineWidget::handleMouseMoved(int x, int y)

2
src/gui/TimeLineWidget.hxx
View File

@ -34,8 +34,10 @@ class TimeLineWidget : public ButtonWidget
int getMinValue() const { return _valueMin; }
void setMaxValue(int value);
int getMaxValue() const { return _valueMax; }
#if 0
void setStepValue(int value);
int getStepValue() const { return _stepValue; }
#endif
protected:
void handleMouseMoved(int x, int y) override;

67
src/gui/TimeMachineDialog.cxx
View File

@ -179,12 +179,12 @@ TimeMachineDialog::TimeMachineDialog(OSystem& osystem, DialogContainer& parent,
};
const GUI::Font& font = instance().frameBuffer().font();
const int H_BORDER = 6, BUTTON_GAP = 4, V_BORDER = 4; // FIXME, V_GAP = 4;
const int H_BORDER = 6, BUTTON_GAP = 4, V_BORDER = 4;
const int buttonWidth = BUTTON_W + 8,
buttonHeight = BUTTON_H + 10,
rowHeight = font.getLineHeight();
WidgetArray wid;
// WidgetArray wid;
int xpos, ypos;
// Set real dimensions
@ -210,7 +210,7 @@ TimeMachineDialog::TimeMachineDialog(OSystem& osystem, DialogContainer& parent,
tl_y = ypos + (myCurrentIdxWidget->getHeight() - tl_h) / 2,
tl_w = myLastIdxWidget->getAbsX() - tl_x - 8;
myTimeline = new TimeLineWidget(this, font, tl_x, tl_y, tl_w, tl_h, "", 0, kTimeline);
wid.push_back(myTimeline);
// wid.push_back(myTimeline);
ypos += rowHeight;
// Add time info
@ -224,37 +224,37 @@ TimeMachineDialog::TimeMachineDialog(OSystem& osystem, DialogContainer& parent,
// Add buttons
myRewindAllWidget = new ButtonWidget(this, font, xpos, ypos, buttonWidth, buttonHeight, REWIND_ALL,
BUTTON_W, BUTTON_H, kRewindAll);
wid.push_back(myRewindAllWidget);
// wid.push_back(myRewindAllWidget);
xpos += buttonWidth + BUTTON_GAP;
myRewind10Widget = new ButtonWidget(this, font, xpos, ypos, buttonWidth, buttonHeight, REWIND_10,
BUTTON_W, BUTTON_H, kRewind10);
wid.push_back(myRewind10Widget);
// wid.push_back(myRewind10Widget);
xpos += buttonWidth + BUTTON_GAP;
myRewind1Widget = new ButtonWidget(this, font, xpos, ypos, buttonWidth, buttonHeight, REWIND_1,
BUTTON_W, BUTTON_H, kRewind1);
wid.push_back(myRewind1Widget);
// wid.push_back(myRewind1Widget);
xpos += buttonWidth + BUTTON_GAP*2;
myPlayWidget = new ButtonWidget(this, font, xpos, ypos, buttonWidth, buttonHeight, PLAY,
BUTTON_W, BUTTON_H, kPlay);
wid.push_back(myPlayWidget);
// wid.push_back(myPlayWidget);
xpos += buttonWidth + BUTTON_GAP*2;
myUnwind1Widget = new ButtonWidget(this, font, xpos, ypos, buttonWidth, buttonHeight, UNWIND_1,
BUTTON_W, BUTTON_H, kUnwind1);
wid.push_back(myUnwind1Widget);
// wid.push_back(myUnwind1Widget);
xpos += buttonWidth + BUTTON_GAP;
myUnwind10Widget = new ButtonWidget(this, font, xpos, ypos, buttonWidth, buttonHeight, UNWIND_10,
BUTTON_W, BUTTON_H, kUnwind10);
wid.push_back(myUnwind10Widget);
// wid.push_back(myUnwind10Widget);
xpos += buttonWidth + BUTTON_GAP;
myUnwindAllWidget = new ButtonWidget(this, font, xpos, ypos, buttonWidth, buttonHeight, UNWIND_ALL,
BUTTON_W, BUTTON_H, kUnwindAll);
wid.push_back(myUnwindAllWidget);
// wid.push_back(myUnwindAllWidget);
xpos = myUnwindAllWidget->getRight() + BUTTON_GAP * 3;
// Add message
@ -262,7 +262,7 @@ TimeMachineDialog::TimeMachineDialog(OSystem& osystem, DialogContainer& parent,
TextAlign::Left, kBGColor);
myMessageWidget->setTextColor(kWidColor);
// FIXME - add wid list to focus list
// addToFocusList(wid);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -277,13 +277,29 @@ void TimeMachineDialog::center()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void TimeMachineDialog::loadConfig()
{
cerr << "loadConfig()\n";
// FIXME - set range for timeline
//myTimeline->setMinValue(..); myTimeline->setMaxValue(..);
RewindManager& r = instance().state().rewindManager();
IntArray cycles = r.cyclesList();
surface().attributes().blending = true;
surface().attributes().blendalpha = 80;
surface().applyAttributes();
#if 0 // if we won't be using focused widget, this code can disappear
// Set default focus
bool timelineEnabled = cycles.size() > 0;
myTimeline->setEnabled(timelineEnabled);
if(timelineEnabled)
setFocus(myTimeline);
else
setFocus(myPlayWidget);
#endif
// Set range for timeline
myTimeline->setMaxValue(std::max(Int32(cycles.size()), 1));
// Enable blending (only once is necessary)
if(!surface().attributes().blending)
{
surface().attributes().blending = true;
surface().attributes().blendalpha = 80;
surface().applyAttributes();
}
handleWinds();
myMessageWidget->setLabel("");
@ -296,8 +312,12 @@ void TimeMachineDialog::handleCommand(CommandSender* sender, int cmd,
switch(cmd)
{
case kTimeline:
cerr << "timeline: " << myTimeline->getValue() << endl;
{
Int32 winds = myTimeline->getValue() -
instance().state().rewindManager().getCurrentIdx() + 1;
handleWinds(winds);
break;
}
case kPlay:
instance().eventHandler().leaveMenuMode();
@ -338,7 +358,7 @@ string TimeMachineDialog::getTimeString(uInt64 cycles)
const Int32 scanlines = std::max(instance().console().tia().scanlinesLastFrame(), 240u);
const bool isNTSC = scanlines <= 287;
const Int32 NTSC_FREQ = 1193182; // ~76*262*60
const Int32 PAL_FREQ = 1182298; // ~76*312*50
const Int32 PAL_FREQ = 1182298; // ~76*312*50
const Int32 freq = isNTSC ? NTSC_FREQ : PAL_FREQ; // = cycles/second
uInt32 minutes = cycles / (freq * 60);
@ -347,7 +367,7 @@ string TimeMachineDialog::getTimeString(uInt64 cycles)
cycles -= seconds * freq;
uInt32 frames = cycles / (scanlines * 76);
stringstream time;
ostringstream time;
time << Common::Base::toString(minutes, Common::Base::F_10_2) << ":";
time << Common::Base::toString(seconds, Common::Base::F_10_2) << ".";
time << Common::Base::toString(frames, Common::Base::F_10_2);
@ -363,10 +383,8 @@ void TimeMachineDialog::handleWinds(Int32 numWinds)
if(numWinds)
{
uInt64 startCycles = instance().console().tia().cycles();
if(numWinds < 0)
r.rewindState(-numWinds);
else
r.unwindState(numWinds);
if(numWinds < 0) r.rewindState(-numWinds);
else if(numWinds > 0) r.unwindState(numWinds);
string message = r.getUnitString(instance().console().tia().cycles() - startCycles);
myMessageWidget->setLabel((numWinds < 0 ? "(-" : "(+") + message + ")");
@ -374,6 +392,7 @@ void TimeMachineDialog::handleWinds(Int32 numWinds)
// Update time
myCurrentTimeWidget->setLabel(getTimeString(r.getCurrentCycles() - r.getFirstCycles()));
myLastTimeWidget->setLabel(getTimeString(r.getLastCycles() - r.getFirstCycles()));
myTimeline->setValue(r.getCurrentIdx()-1);
// Update index
myCurrentIdxWidget->setValue(r.getCurrentIdx());
myLastIdxWidget->setValue(r.getLastIdx());