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

Clean up logic with an EOF tag

This commit is contained in:
Jeffrey Pfau 2014-07-29 23:13:16 -07:00
parent 6845454969
commit fade994137
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/gba/gba-rr.c
View File

@ -3,6 +3,8 @@
#include "gba.h" #include "gba.h"
#include "util/vfs.h" #include "util/vfs.h"
#define BINEXT ".log"
static enum GBARRTag _readTag(struct GBARRContext* rr, struct VFile* vf); static enum GBARRTag _readTag(struct GBARRContext* rr, struct VFile* vf);
static bool _seekTag(struct GBARRContext* rr, struct VFile* vf, enum GBARRTag tag); static bool _seekTag(struct GBARRContext* rr, struct VFile* vf, enum GBARRTag tag);
static bool _emitTag(struct GBARRContext* rr, struct VFile* vf, uint8_t tag); static bool _emitTag(struct GBARRContext* rr, struct VFile* vf, uint8_t tag);
@ -49,7 +51,7 @@ bool GBARRLoadStream(struct GBARRContext* rr, uint32_t streamId) {
rr->movieStream = 0; rr->movieStream = 0;
rr->streamId = streamId; rr->streamId = streamId;
char buffer[14]; char buffer[14];
snprintf(buffer, sizeof(buffer), "%u.log", streamId); snprintf(buffer, sizeof(buffer), "%u" BINEXT, streamId);
if (GBARRIsRecording(rr)) { if (GBARRIsRecording(rr)) {
rr->movieStream = rr->streamDir->openFile(rr->streamDir, buffer, O_TRUNC | O_CREAT | O_WRONLY); rr->movieStream = rr->streamDir->openFile(rr->streamDir, buffer, O_TRUNC | O_CREAT | O_WRONLY);
} else if (GBARRIsPlaying(rr)) { } else if (GBARRIsPlaying(rr)) {
@ -240,14 +242,16 @@ enum GBARRTag _readTag(struct GBARRContext* rr, struct VFile* vf) {
case TAG_BEGIN: case TAG_BEGIN:
case TAG_END: case TAG_END:
case TAG_INVALID: case TAG_INVALID:
case TAG_EOF:
break; break;
} }
uint8_t tagBuffer; uint8_t tagBuffer;
if (vf->read(vf, &tagBuffer, 1) != 1) { if (vf->read(vf, &tagBuffer, 1) != 1) {
tagBuffer = TAG_END; rr->peekedTag = TAG_EOF;
} else {
rr->peekedTag = tagBuffer;
} }
rr->peekedTag = tagBuffer;
return tag; return tag;
} }
@ -255,19 +259,13 @@ bool _seekTag(struct GBARRContext* rr, struct VFile* vf, enum GBARRTag tag) {
enum GBARRTag readTag; enum GBARRTag readTag;
while ((readTag = _readTag(rr, vf)) != tag) { while ((readTag = _readTag(rr, vf)) != tag) {
if (readTag == TAG_END) { if (readTag == TAG_END) {
if (rr->peekedTag == TAG_NEXT_TIME) { while (_readTag(rr, vf) != TAG_EOF);
while (_readTag(rr, vf) != TAG_END) { if (!rr->nextTime || !GBARRLoadStream(rr, rr->nextTime)) {
if (!rr->nextTime) {
return false;
}
}
if (!rr->nextTime || !GBARRLoadStream(rr, rr->nextTime)) {
return false;
}
vf = rr->movieStream;
} else {
return false; return false;
} }
vf = rr->movieStream;
} else if (readTag == TAG_EOF) {
return false;
} }
} }
return true; return true;

4
src/gba/gba-rr.h
View File

@ -29,7 +29,9 @@ enum GBARRTag {
// User metadata tags // User metadata tags
TAG_AUTHOR = 0x30, TAG_AUTHOR = 0x30,
TAG_COMMENT = 0x31 TAG_COMMENT = 0x31,
TAG_EOF = INT_MAX
}; };
struct GBARRContext { struct GBARRContext {