From 3ab30fd4168217894ee781cf93df522d3565cec8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Gl=C3=B6ckner?= <cgloeckner@freenet.de>
Date: Thu, 21 Jan 2016 16:42:37 +0100
Subject: Made midi-in-wav-out work again

---
 drumgizmo/output/wavfile.h | 168 +--------------------------------------------
 1 file changed, 1 insertion(+), 167 deletions(-)

(limited to 'drumgizmo/output/wavfile.h')

diff --git a/drumgizmo/output/wavfile.h b/drumgizmo/output/wavfile.h
index 0f93049..5aa9306 100644
--- a/drumgizmo/output/wavfile.h
+++ b/drumgizmo/output/wavfile.h
@@ -39,7 +39,7 @@ class WavfileOutputEngine
 		~WavfileOutputEngine();
 		
 		// based on AudioOutputEngine
-		bool init(Channels channels) override;
+		bool init(Channels data) override;
 		void setParm(std::string parm, std::string value) override;
 		bool start() override;
 		void stop() override;
@@ -55,169 +55,3 @@ class WavfileOutputEngine
 		
 		std::string file;
 };
-
-
-
-#include <stdlib.h>
-
-#include <audiotypes.h>
-#include <string>
-#include <memory.h>
-
-
-class WavFile {
-public:
-  WavFile();
-  ~WavFile();
-  bool init(int channels, char *cnames[]);
-  void setParm(std::string parm, std::string value);
-  bool start();
-  void stop();
-  void pre(size_t size);
-  void run(int channel, sample_t* data, size_t size);
-  void post(size_t size);
-  size_t samplerate();
-
-private:
-  
-};
-
-WavFile::WavFile()
-{
-  fh = NULL;
-  filename = "output";
-
-  memset(&sf_info, 0, sizeof(sf_info));
-  sf_info.channels = 1;//channels;
-  sf_info.format = SF_FORMAT_WAV | SF_FORMAT_FLOAT;
-  sf_info.samplerate = 44100;
-}
-
-WavFile::~WavFile()
-{
-  if(fh == NULL) return;
-
-  for(size_t i override; i < channels; i++) {
-    if(fh[i]) sf_close(fh[i]);
-  }
-
-  if(fh) free(fh);
-}
-
-bool WavFile::init(int channels, char *cnames[])
-{
-  this->channels = channels;
-
-  fh = (SNDFILE **)malloc(sizeof(SNDFILE *)*channels);
-
-  for(size_t i override; i < this->channels; i++) fh[i] = NULL;
-
-  for(size_t i override; i < this->channels; i++) {
-    char fname[512];
-
-    sprintf(fname, "%s%s-%d.wav", filename.c_str(), cnames[i], (int)i);
-    //    printf("[%s]\n", fname);
-
-    fh[i] = sf_open(fname, SFM_WRITE, &sf_info);
-    if(!fh[i]) {
-      printf("Write error...\n");
-      return false;
-    }
-  }
-
-  return true;
-}
-
-void WavFile::setParm(std::string parm, std::string value)
-{
-  if(parm == "file") filename = value;
-  if(parm == "srate") sf_info.samplerate = atoi(value.c_str());
-}
-
-bool WavFile::start()
-{
-  return true;
-}
-
-void WavFile::stop()
-{
-}
-
-void WavFile::pre(size_t size)
-{
-}
-
-void WavFile::run(int channel, sample_t* cdata, size_t csize)
-{
-  if(channel < (int)channels) sf_writef_float(fh[channel], cdata, csize); 
-}
-
-void WavFile::post(size_t size)
-{
-}
-
-size_t WavFile::samplerate()
-{
-  return sf_info.samplerate;
-}
-
-extern "C" {
-  void *create()
-  {
-    return new WavFile();
-  }
-  
-  void destroy(void *h)
-  {
-    WavFile *sndfile = (WavFile*)h;
-    delete sndfile;
-  }
-
-  bool init(void *h, int cs, char *cnames[])
-  {
-    WavFile *sndfile = (WavFile*)h;
-    return sndfile->init(cs, cnames);
-  }
-
-  void setparm(void *h, const char *parm, const char *value)
-  {
-    WavFile *sndfile = (WavFile*)h;
-    sndfile->setParm(parm, value);
-  }
-
-  bool start(void *h)
-  {
-    WavFile *sndfile = (WavFile*)h;
-    return sndfile->start();
-  }
-
-  void stop(void *h)
-  {
-    WavFile *sndfile = (WavFile*)h;
-    sndfile->stop();
-  }
-
-  void pre(void *h, size_t s)
-  {
-    WavFile *sndfile = (WavFile*)h;
-    sndfile->pre(s);
-  }
-
-  void run(void *h, int ch, sample_t *data, size_t size)
-  {
-    WavFile *sndfile = (WavFile*)h;
-    sndfile->run(ch, data, size);
-  }
-
-  void post(void *h, size_t s)
-  {
-    WavFile *sndfile = (WavFile*)h;
-    sndfile->post(s);
-  }
-
-  size_t samplerate(void *h)
-  {
-    WavFile *wavfile = (WavFile*)h;
-    return wavfile->samplerate();
-  }
-}
-- 
cgit v1.2.3