From 180eacc2af8a69b8ee947750ae7708b78c499f7d Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Thu, 28 Jan 2016 18:17:01 +0100 Subject: Revert files that shouldn't have been changed in this branch... --- drumgizmo/output/alsa/alsa.cc | 12 ------------ drumgizmo/output/jackaudio/jackaudio.cc | 1 + 2 files changed, 1 insertion(+), 12 deletions(-) (limited to 'drumgizmo/output') diff --git a/drumgizmo/output/alsa/alsa.cc b/drumgizmo/output/alsa/alsa.cc index f9a2068..71e0c3d 100644 --- a/drumgizmo/output/alsa/alsa.cc +++ b/drumgizmo/output/alsa/alsa.cc @@ -49,7 +49,6 @@ public: void pre(size_t size); void run(int channel, sample_t* data, size_t size); void post(size_t size); - size_t bufsize(); size_t samplerate(); private: @@ -159,11 +158,6 @@ void Alsa::post(size_t size) snd_pcm_writei(handle, data, size); } -size_t Alsa::bufsize() -{ - return frames; -} - size_t Alsa::samplerate() { return srate; @@ -223,12 +217,6 @@ extern "C" { alsa->post(s); } - size_t bufsize(void *h) - { - Alsa *alsa = (Alsa*)h; - return alsa->bufsize(); - } - size_t samplerate(void *h) { Alsa *alsa = (Alsa*)h; diff --git a/drumgizmo/output/jackaudio/jackaudio.cc b/drumgizmo/output/jackaudio/jackaudio.cc index e027742..511c145 100644 --- a/drumgizmo/output/jackaudio/jackaudio.cc +++ b/drumgizmo/output/jackaudio/jackaudio.cc @@ -130,6 +130,7 @@ void JackAudio::post(size_t size) void JackAudio::jack_process(jack_nframes_t nframes) { + //printf("o"); fflush(stdout); for(size_t c = 0; c < nchannels; c++) { jack_default_audio_sample_t *out = (jack_default_audio_sample_t *) jack_port_get_buffer(output_port[c], -- cgit v1.2.3