diff --git a/src/audio/file.cpp b/src/audio/file.cpp deleted file mode 100644 index 1b22dcaa..00000000 --- a/src/audio/file.cpp +++ /dev/null @@ -1,99 +0,0 @@ -#include -#include -#include "file.h" -#include "taAudio.h" - -void TAAudioFile::onProcess(unsigned char* buf, int nframes) { - if (audioProcCallback!=NULL) { - audioProcCallback(audioProcCallbackUser,inBufs,outBufs,desc.inChans,desc.outChans,desc.bufsize); - } - /* - float* fbuf=(float*)buf; - for (size_t j=0; j0) return false; - - memset(si,0,sizeof(SF_INFO)); - si.channels=request.outChans; - si.samplerate=request.rate; - switch (request.outFormat) { - case TA_AUDIO_FORMAT_F32: - si.format=SF_FORMAT_FLOAT; - break; - case TA_AUDIO_FORMAT_F64: - si.format=SF_FORMAT_DOUBLE; - break; - case TA_AUDIO_FORMAT_U8: - si.format=SF_FORMAT_PCM_U8; - break; - case TA_AUDIO_FORMAT_S8: - si.format=SF_FORMAT_PCM_S8; - break; - case TA_AUDIO_FORMAT_S16: - si.format=SF_FORMAT_PCM_16; - break; - case TA_AUDIO_FORMAT_S32: - si.format=SF_FORMAT_PCM_32; - break; - default: - return false; - } - si.format|=SF_FORMAT_WAV; - - file=sf_open(request.name.c_str(),SFM_WRITE,&si); - if (file==NULL) return false; - - if (desc.outChans>0) { - outBufs=new float*[desc.outChans]; - for (int i=0; i - -class TAAudioFile: public TAAudio { - float** iInBufs; - float** iOutBufs; - - SNDFILE* file; - SF_INFO si; - - public: - void onProcess(unsigned char* buf, int nframes); - - void* getContext(); - bool quit(); - bool setRun(bool run); - bool init(TAAudioDesc& request, TAAudioDesc& response); -}; diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp index ecc7d597..634aa139 100644 --- a/src/engine/engine.cpp +++ b/src/engine/engine.cpp @@ -5,7 +5,6 @@ #ifdef HAVE_JACK #include "../audio/jack.h" #endif -#include "../audio/file.h" #include "platform/genesis.h" #include "platform/genesisext.h" #include "platform/sms.h" @@ -708,9 +707,6 @@ bool DivEngine::init() { case DIV_AUDIO_SDL: output=new TAAudioSDL; break; - case DIV_AUDIO_FILE: - output=new TAAudioFile; - break; default: logE("invalid audio engine!\n"); return false; diff --git a/src/engine/engine.h b/src/engine/engine.h index 858efd98..1d853ea7 100644 --- a/src/engine/engine.h +++ b/src/engine/engine.h @@ -13,8 +13,7 @@ enum DivStatusView { enum DivAudioEngines { DIV_AUDIO_JACK=0, - DIV_AUDIO_SDL, - DIV_AUDIO_FILE + DIV_AUDIO_SDL }; struct DivChannelState { @@ -66,8 +65,6 @@ class DivEngine { DivChannelState chan[17]; DivAudioEngines audioEngine; - String outName; - short vibTable[64]; blip_buffer_t* bb[2]; @@ -108,11 +105,8 @@ class DivEngine { // set the view mode. void setView(DivStatusView which); - // open audio output file. - bool openAudioOut(String filename); - - // initialize the engine. - bool init(); + // initialize the engine. optionally provide an output file name. + bool init(String outName=""); DivEngine(): chans(0), diff --git a/src/main.cpp b/src/main.cpp index d9fc003d..d5b334ff 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -116,8 +116,7 @@ bool pLoops(String val) { } bool pOutput(String val) { - e.setAudio(DIV_AUDIO_FILE); - return e.openAudioOut(val); + return false; } bool needsValue(String param) {