Do not hijack Null player, implement our own

Author: mywave82

src/Makefile.am

@@ -4,7 +4,7 @@ adplay_SOURCES = adplay.cc output.cc output.h players.h defines.h
 
 EXTRA_adplay_SOURCES = oss.cc oss.h null.h disk.cc disk.h esound.cc esound.h \
 	qsa.cc qsa.h sdl.cc sdl_driver.h alsa.cc alsa.h ao.cc ao.h getopt.c \
-	getopt1.c getopt.h
+	getopt1.c getopt.h diskraw.h
 
 adplay_LDADD = $(drivers) $(adplug_LIBS) @ESD_LIBS@ @QSA_LIBS@ @SDL_LIBS@ \
 	@ALSA_LIBS@ @AO_LIBS@ $(GETOPT_SOURCES)

src/adplay.cc

@@ -324,8 +324,7 @@ static int decode_switches(int argc, char **argv)
 #endif
 	else if(!strcmp(optarg, "rawout")) {
 	  cfg.emutype = Emu_Rawout;
-	  cfg.output = null;
-	  cfg.endless = false;
+	  cfg.endless = false; // endless output is almost never desired here
 	}
 
 	else {
@@ -338,6 +337,10 @@ static int decode_switches(int argc, char **argv)
   }
   if (!cfg.loops) cfg.loops = 1;
 
+  if (cfg.emutype == Emu_Rawout) {
+    cfg.output = diskraw; // output must be diskraw when Emu_Rawout is selected
+  }
+
   return optind;
 }
 
@@ -434,6 +437,7 @@ int main(int argc, char **argv)
   int			optind, i;
   const char		*homedir;
   char			*userdb = NULL;
+  CDiskopl              *dopl = 0;
 
   // init
   program_name = argv[0];
@@ -549,7 +553,8 @@ int main(int argc, char **argv)
   	break;
 #endif
   case Emu_Rawout:
-    opl = new CDiskopl(cfg.device);
+    dopl = new CDiskopl(cfg.device);
+    opl = dopl;
   }
 
   // init player
@@ -565,7 +570,7 @@ int main(int argc, char **argv)
 #endif
 #ifdef DRIVER_NULL
   case null:
-    player = new NullOutput(opl);
+    player = new NullOutput();
     break;
 #endif
 #ifdef DRIVER_DISK
@@ -600,6 +605,10 @@ int main(int argc, char **argv)
 			    cfg.buf_size);
     break;
 #endif
+  case diskraw:
+    player = new DiskRawWriter(dopl);
+    dopl = NULL;
+    break;
   default:
     message(MSG_ERROR, "output method not available");
     exit(EXIT_FAILURE);

src/diskraw.h

@@ -0,0 +1,45 @@
+/*
+ * AdPlay/UNIX - OPL2 audio player
+ * Copyright (C) 2001, 2002 Simon Peter <dn.tlp@gmx.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef H_DISKRAW
+#define H_DISKRAW
+
+#include "output.h"
+
+/* pairs up to AdPlay CDiskopl */
+class DiskRawWriter: public Player
+{
+public:
+  DiskRawWriter(CDiskopl *nopl)
+    :opl(nopl)
+  { }
+
+  virtual void frame() {
+    playing = p->update();
+    opl->update(p);
+  }
+
+  virtual Copl *get_opl()
+    { return opl; }
+
+private:
+  CDiskopl *opl;
+};
+
+#endif

src/null.h

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

src/output.cc

@@ -20,7 +20,6 @@
 #include <stdio.h>
 #include <adplug/emuopl.h>
 #include <adplug/kemuopl.h>
-#include <adplug/diskopl.h>
 
 #include "output.h"
 #include "defines.h"
@@ -73,11 +72,6 @@ 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);

src/players.h

@@ -28,7 +28,7 @@
 #include "config.h"
 
 // Enumerate ALL outputs (regardless of availability)
-enum Outputs {none, null, ao, oss, disk, esound, qsa, sdl, alsa};
+enum Outputs {none, null, ao, oss, disk, esound, qsa, sdl, alsa, diskraw};
 
 #define DEFAULT_DRIVER none
 
@@ -88,4 +88,6 @@ enum Outputs {none, null, ao, oss, disk, esound, qsa, sdl, alsa};
 #define DEFAULT_DRIVER qsa
 #endif
 
+#include "diskraw.h"
+
 #endif