Add "-e rawout" to "play" a file to an OPL2/3 .RAW file

Author: arodland

src/adplay.cc

@@ -26,6 +26,7 @@
 #include <adplug/emuopl.h>
 #include <adplug/kemuopl.h>
 #include <adplug/wemuopl.h>
+#include <adplug/diskopl.h>
 
 /*
  * Sun systems declare getopt in unistd.h,
@@ -79,6 +80,7 @@ typedef enum {
 #ifdef HAVE_ADPLUG_NUKEDOPL
 	Emu_Nuked,
 #endif
+	Emu_Rawout,
 } EmuType;
 
 /***** Global variables *****/
@@ -184,11 +186,11 @@ static void usage()
 	 program_name);
 
   // Print list of available output mechanisms
-  printf("Available emulators: satoh ken woody ");
+  printf("Available emulators: satoh ken woody");
 #ifdef HAVE_ADPLUG_NUKEDOPL
-  printf("nuked");
+  printf(" nuked");
 #endif
-  printf("\n");
+  printf(" rawout\n");
   printf("Available output mechanisms: "
 #ifdef DRIVER_OSS
 	 "oss "
@@ -320,6 +322,12 @@ static int decode_switches(int argc, char **argv)
 #ifdef HAVE_ADPLUG_NUKEDOPL
 	else if(!strcmp(optarg, "nuked")) cfg.emutype = Emu_Nuked;
 #endif
+	else if(!strcmp(optarg, "rawout")) {
+	  cfg.emutype = Emu_Rawout;
+	  cfg.output = null;
+	  cfg.endless = false;
+	}
+
 	else {
 	  message(MSG_ERROR, "unknown emulator -- %s", optarg);
 	  exit(EXIT_FAILURE);
@@ -540,6 +548,8 @@ int main(int argc, char **argv)
   	}
   	break;
 #endif
+  case Emu_Rawout:
+    opl = new CDiskopl(cfg.device);
   }
 
   // init player
@@ -555,7 +565,7 @@ int main(int argc, char **argv)
 #endif
 #ifdef DRIVER_NULL
   case null:
-    player = new NullOutput();
+    player = new NullOutput(opl);
     break;
 #endif
 #ifdef DRIVER_DISK

src/null.h

@@ -20,20 +20,29 @@
 #ifndef H_NULL
 #define H_NULL
 
-#include <adplug/silentopl.h>
 #include "output.h"
 
 class NullOutput: public Player
 {
 public:
-  virtual void frame()
-    { }
+  NullOutput(Copl *nopl)
+    :opl(nopl)
+  { }
+
+  virtual void frame() {
+    playing = p->update();
+
+    CDiskopl *dopl = dynamic_cast<CDiskopl *>(opl);
+    if (dopl != NULL) {
+      dopl->update(p);
+    }
+  }
 
   virtual Copl *get_opl()
-    { return &opl; }
+    { return opl; }
 
 private:
-  CSilentopl opl;
+  Copl *opl;
 };
 
 #endif

src/output.cc

@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <adplug/emuopl.h>
 #include <adplug/kemuopl.h>
+#include <adplug/diskopl.h>
 
 #include "output.h"
 #include "defines.h"
@@ -72,6 +73,11 @@ void EmuPlayer::frame()
     }
     i = MIN(towrite, (long)(minicnt / p->getrefresh() + 4) & ~3);
     opl->update((short *)pos, i);
+    CDiskopl *dopl = dynamic_cast<CDiskopl *>(opl);
+    if (dopl != NULL) {
+      dopl->update(p);
+    }
+
     pos += i * getsampsize(); towrite -= i;
     i = (long)(p->getrefresh() * i);
     minicnt -= MAX(1, i);