From 0e048dee411cc20beb2a8667e5bb339f9b7fb939 Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Sat, 17 May 2014 21:27:52 +0200
Subject: New resample feature on output channels.

---
 drumgizmo/audiooutputenginedl.cc        | 12 ++++++++++++
 drumgizmo/audiooutputenginedl.h         |  3 +++
 drumgizmo/output/jackaudio/jackaudio.cc | 12 ++++++++++++
 3 files changed, 27 insertions(+)

(limited to 'drumgizmo')

diff --git a/drumgizmo/audiooutputenginedl.cc b/drumgizmo/audiooutputenginedl.cc
index 513d21b..fcedd9d 100644
--- a/drumgizmo/audiooutputenginedl.cc
+++ b/drumgizmo/audiooutputenginedl.cc
@@ -111,6 +111,12 @@ AudioOutputEngineDL::AudioOutputEngineDL(std::string name)
     o_bufsize = NULL;
   }
 
+  o_samplerate = (output_samplerate_func_t) dlsym(lib, "samplerate");
+  dlsym_error = dlerror();
+  if(dlsym_error) {
+    o_samplerate = NULL;
+  }
+
   ptr = o_create();
 
   if(is_jack_plugin) {
@@ -181,6 +187,12 @@ size_t AudioOutputEngineDL::getBufferSize()
   return 1024;
 }
 
+size_t AudioOutputEngineDL::samplerate()
+{
+  if(o_samplerate) return o_samplerate(ptr);
+  return UNKNOWN_SAMPLERATE;
+}
+
 #ifdef TEST_AUDIOOUTPUTENGINEDL
 //Additional dependency files
 //deps:
diff --git a/drumgizmo/audiooutputenginedl.h b/drumgizmo/audiooutputenginedl.h
index 471247e..75460f3 100644
--- a/drumgizmo/audiooutputenginedl.h
+++ b/drumgizmo/audiooutputenginedl.h
@@ -46,6 +46,7 @@ typedef void (*output_pre_func_t)(void*, size_t);
 typedef void (*output_run_func_t)(void*,int,sample_t*,size_t);
 typedef void (*output_post_func_t)(void*, size_t);
 typedef size_t (*output_bufsize_func_t)(void*);
+typedef size_t (*output_samplerate_func_t)(void*);
 
 class AudioOutputEngineDL : public AudioOutputEngine {
 public:
@@ -64,6 +65,7 @@ public:
   void post(size_t nsamples);
 
   size_t getBufferSize();
+  size_t samplerate();
 
 private:
   void *ptr;
@@ -77,6 +79,7 @@ private:
   output_run_func_t o_run;
   output_post_func_t o_post;
   output_bufsize_func_t o_bufsize;
+  output_samplerate_func_t o_samplerate;
 
   bool is_jack_plugin;
   JackClient *jackclient;
diff --git a/drumgizmo/output/jackaudio/jackaudio.cc b/drumgizmo/output/jackaudio/jackaudio.cc
index 2afe1ea..b7fa4f9 100644
--- a/drumgizmo/output/jackaudio/jackaudio.cc
+++ b/drumgizmo/output/jackaudio/jackaudio.cc
@@ -54,6 +54,7 @@ public:
   void jack_process(jack_nframes_t nframes);
 
   size_t bufsize();
+  size_t samplerate();
 
 private:
   JackClient *jackclient;
@@ -146,6 +147,11 @@ size_t JackAudio::bufsize()
   return jack_get_buffer_size(jackclient->jack_client);
 }
 
+size_t JackAudio::samplerate()
+{
+  return jack_get_sample_rate(jackclient->jack_client);
+}
+
 extern "C" {
   void *create()
   {
@@ -205,6 +211,12 @@ extern "C" {
     JackAudio *jack = (JackAudio*)h;
     return jack->bufsize();
   }
+
+  size_t samplerate(void *h)
+  {
+    JackAudio *jack = (JackAudio*)h;
+    return jack->samplerate();
+  }
 }
 
 #ifdef TEST_AUDIOINPUTENGINEJACKAUDIO
-- 
cgit v1.2.3