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

Reach first/last movie frame, show both fields and mute. (#1003)

This commit is contained in:
lodefmode 2024-01-04 02:52:04 -05:00 committed by GitHub
parent b338b68b69
commit 402ee101c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/emucore/CartMVC.cxx
View File

@ -159,7 +159,7 @@ class StreamReader : public Serializable
{ {
const size_t offset = ((fnum + 0) * CartridgeMVC::MVC_FIELD_SIZE); const size_t offset = ((fnum + 0) * CartridgeMVC::MVC_FIELD_SIZE);
if(offset + CartridgeMVC::MVC_FIELD_SIZE < myFileSize) if(offset + CartridgeMVC::MVC_FIELD_SIZE <= myFileSize)
{ {
myFile.setPosition(offset); myFile.setPosition(offset);
if(index) if(index)
@ -856,11 +856,12 @@ class MovieCart : public Serializable
// state machine info // state machine info
uInt8 myState{3}; uInt8 myState{3};
bool myPlaying{true}; bool myPlaying{true};
uInt8 myMute{0};
bool myOdd{true}; bool myOdd{true};
bool myBufferIndex{false}; bool myBufferIndex{false};
uInt8 myLines{0}; uInt8 myLines{0};
Int32 myFrameNumber{1}; // signed Int32 myFrameNumber{0}; // signed
uInt8 myMode{Mode::Volume}; uInt8 myMode{Mode::Volume};
uInt8 myBright{DEFAULT_LEVEL}; uInt8 myBright{DEFAULT_LEVEL};
@ -898,9 +899,10 @@ bool MovieCart::init(string_view path)
myState = 3; myState = 3;
myPlaying = true; myPlaying = true;
myMute = 0;
myOdd = true; myOdd = true;
myBufferIndex = false; myBufferIndex = false;
myFrameNumber = 1; myFrameNumber = 0;
myInputs.init(); myInputs.init();
myLastInputs.init(); myLastInputs.init();
@ -998,7 +1000,7 @@ void MovieCart::updateTransport()
if(myInputs.reset) if(myInputs.reset)
{ {
myFrameNumber = 1; myFrameNumber = 0;
myPlaying = true; myPlaying = true;
myDrawTimeCode = OSD_FRAMES; myDrawTimeCode = OSD_FRAMES;
@ -1083,7 +1085,7 @@ void MovieCart::updateTransport()
if(myInputs.select && !myLastInputs.select) if(myInputs.select && !myLastInputs.select)
{ {
myDrawTimeCode = OSD_FRAMES; myDrawTimeCode = OSD_FRAMES;
myFrameNumber -= 60 * BACK_SECONDS + 1; myFrameNumber -= 60 * BACK_SECONDS;
//goto update_stream; //goto update_stream;
myLastInputs = myInputs; myLastInputs = myInputs;
return; return;
@ -1113,7 +1115,10 @@ void MovieCart::updateTransport()
else else
myDrawLevelBars = 0; myDrawLevelBars = 0;
if(myPlaying) if (myMute)
myMute--;
if(myPlaying && !myMute)
myVolumeScale = scales[myVolume]; myVolumeScale = scales[myVolume];
else else
myVolumeScale = scales[0]; myVolumeScale = scales[0];
@ -1153,10 +1158,11 @@ void MovieCart::updateTransport()
} }
myFrameNumber += step; myFrameNumber += step;
if(myFrameNumber < 1) while(myFrameNumber < 0)
{ {
myFrameNumber = 1; myFrameNumber += 2;
mySpeed = 1; mySpeed = 1;
myMute = 4;
} }
myLastInputs = myInputs; myLastInputs = myInputs;
@ -1451,12 +1457,12 @@ void MovieCart::runStateMachine()
if(myA7) if(myA7)
{ {
// hit end? rewind just before end // hit end? rewind just before end
while (myFrameNumber >= 2 && while (myFrameNumber >= 0 &&
!myStream.readField(myFrameNumber, myBufferIndex)) !myStream.readField(myFrameNumber, myBufferIndex))
{ {
myFrameNumber -= 2; myFrameNumber -= 2;
myJoyRepeat = 0; mySpeed = 1;
myPlaying = false; myMute = 4;
} }
myForceColor = 0; myForceColor = 0;