a better command stream debugger

src/engine/cmdStream.cpp

@@ -35,8 +35,30 @@ bool DivCSChannelState::doCall(unsigned int addr) {
   return true;
 }
 
+unsigned char* DivCSPlayer::getData() {
+  return b;
+}
+
+size_t DivCSPlayer::getDataLen() {
+  return bLen;
+}
+
+DivCSChannelState* DivCSPlayer::getChanState(int ch) {
+  return &chan[ch];
+}
+
+unsigned char* DivCSPlayer::getFastDelays() {
+  return fastDelays;
+}
+
+unsigned char* DivCSPlayer::getFastCmds() {
+  return fastCmds;
+}
+
 void DivCSPlayer::cleanup() {
   delete b;
+  b=NULL;
+  bLen=0;
 }
 
 bool DivCSPlayer::tick() {
@@ -383,7 +405,8 @@ bool DivCSPlayer::init() {
       stream.readI();
       continue;
     }
-    chan[i].readPos=stream.readI();
+    chan[i].startPos=stream.readI();
+    chan[i].readPos=chan[i].startPos;
   }
 
   stream.read(fastDelays,16);
@@ -427,3 +450,17 @@ bool DivEngine::playStream(unsigned char* f, size_t length) {
   BUSY_END;
   return true;
 }
+
+DivCSPlayer* DivEngine::getStreamPlayer() {
+  return cmdStreamInt;
+}
+
+bool DivEngine::killStream() {
+  if (!cmdStreamInt) return false;
+  BUSY_BEGIN;
+  cmdStreamInt->cleanup();
+  delete cmdStreamInt;
+  cmdStreamInt=NULL;
+  BUSY_END;
+  return true;
+}

src/engine/cmdStream.h

@@ -26,6 +26,7 @@
 class DivEngine;
 
 struct DivCSChannelState {
+  unsigned int startPos;
   unsigned int readPos;
   int waitTicks;
 
@@ -69,6 +70,7 @@ struct DivCSChannelState {
 class DivCSPlayer {
   DivEngine* e;
   unsigned char* b;
+  size_t bLen;
   SafeReader stream;
   DivCSChannelState chan[DIV_MAX_CHANS];
   unsigned char fastDelays[16];
@@ -77,12 +79,18 @@ class DivCSPlayer {
 
   short vibTable[64];
   public:
+    unsigned char* getData();
+    size_t getDataLen();
+    DivCSChannelState* getChanState(int ch);
+    unsigned char* getFastDelays();
+    unsigned char* getFastCmds();
     void cleanup();
     bool tick();
     bool init();
     DivCSPlayer(DivEngine* en, unsigned char* buf, size_t len):
       e(en),
       b(buf),
+      bLen(len),
       stream(buf,len) {}
 };
 

src/engine/engine.h

@@ -633,6 +633,10 @@ class DivEngine {
     bool load(unsigned char* f, size_t length);
     // play a binary command stream.
     bool playStream(unsigned char* f, size_t length);
+    // get the playing stream.
+    DivCSPlayer* getStreamPlayer();
+    // destroy command stream player.
+    bool killStream();
     // save as .dmf.
     SafeWriter* saveDMF(unsigned char version);
     // save as .fur.

src/engine/playback.cpp

@@ -1595,9 +1595,7 @@ bool DivEngine::nextTick(bool noAccum, bool inhibitLowLat) {
 
   if (subticks==tickMult && cmdStreamInt) {
     if (!cmdStreamInt->tick()) {
-      cmdStreamInt->cleanup();
-      delete cmdStreamInt;
-      cmdStreamInt=NULL;
+      // !!!
     }
   }
 

src/engine/safeWriter.cpp

@@ -227,3 +227,9 @@ void SafeWriter::finish() {
   buf=NULL;
   operative=false;
 }
+
+void SafeWriter::disown() {
+  if (!operative) return;
+  buf=NULL;
+  operative=false;
+}

src/engine/safeWriter.h

@@ -62,6 +62,7 @@ class SafeWriter {
     void init();
     SafeReader* toReader();
     void finish();
+    void disown();
 
     SafeWriter():
       operative(false),