diff options
Diffstat (limited to 'drumgizmo/output')
| -rw-r--r-- | drumgizmo/output/wavfile.cc | 24 | ||||
| -rw-r--r-- | drumgizmo/output/wavfile.h | 168 |
2 files changed, 15 insertions, 177 deletions
diff --git a/drumgizmo/output/wavfile.cc b/drumgizmo/output/wavfile.cc index e0c18cb..7a59892 100644 --- a/drumgizmo/output/wavfile.cc +++ b/drumgizmo/output/wavfile.cc @@ -24,6 +24,8 @@ * along with DrumGizmo; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#include <cassert> + #include "wavfile.h" WavfileOutputEngine::WavfileOutputEngine() @@ -31,7 +33,7 @@ WavfileOutputEngine::WavfileOutputEngine() , channels{} , file{"output"} { info.frames = 0; - info.samplerrate = 44100; + info.samplerate = 44100; info.channels = 1; info.format = SF_FORMAT_WAV | SF_FORMAT_FLOAT; info.sections = 0; @@ -46,13 +48,13 @@ WavfileOutputEngine::~WavfileOutputEngine() { } } -bool WavfileOutputEngine::init(Channels channels) { +bool WavfileOutputEngine::init(Channels data) { channels.clear(), - channels.resize(channels.size(), nullptr); - for (auto i = 0u; i < channels.size(); ++i) { + channels.resize(data.size()); // value-initialized with null + for (auto i = 0u; i < data.size(); ++i) { // write channel to file - auto fname = file + channels[i]->name + "-" + std::to_string(i); - channels[i] = sf_open(fname, SFM_WRITE, &info); + auto fname = file + data[i].name + "-" + std::to_string(i) + ".wav"; + channels[i] = sf_open(fname.c_str(), SFM_WRITE, &info); if (channels[i] == nullptr) { printf("Write error...\n"); return false; @@ -64,10 +66,10 @@ bool WavfileOutputEngine::init(Channels channels) { void WavfileOutputEngine::setParm(std::string parm, std::string value) { if (parm == "file") { file = value; - } else if (parm == "srate") {[ + } else if (parm == "srate") { info.samplerate = std::stoi(value); } else { - printf("Unsupported wavfile parameter '%s'\n", parm); + printf("Unsupported wavfile parameter '%s'\n", parm.c_str()); } } @@ -83,11 +85,13 @@ void WavfileOutputEngine::pre(size_t nsamples) { void WavfileOutputEngine::run(int ch, sample_t* samples, size_t nsamples) { if (ch >= channels.size()) { - printf("Invalid channel %d (%d channels available)", ch, channels.size()); + printf("Invalid channel %d (%lu channels available)", ch, channels.size()); return; } - sf_writef_float(channels[ch], samples, nsampels); + assert(channels[ch] != nullptr); + assert(samples != nullptr); + sf_writef_float(channels[ch], samples, nsamples); } void WavfileOutputEngine::post(size_t nsamples) { 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(); - } -} |