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 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'drumgizmo/audiooutputenginedl.cc')

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:
-- 
cgit v1.2.3


From 36630b0fa3d29c54a666d3bb00a2fac804fa7df9 Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Thu, 6 Nov 2014 08:03:56 +0100
Subject: Make cli output modules work with new samplerate() design.

---
 drumgizmo/audiooutputenginedl.cc | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

(limited to 'drumgizmo/audiooutputenginedl.cc')

diff --git a/drumgizmo/audiooutputenginedl.cc b/drumgizmo/audiooutputenginedl.cc
index fcedd9d..2648e8f 100644
--- a/drumgizmo/audiooutputenginedl.cc
+++ b/drumgizmo/audiooutputenginedl.cc
@@ -114,7 +114,8 @@ AudioOutputEngineDL::AudioOutputEngineDL(std::string name)
   o_samplerate = (output_samplerate_func_t) dlsym(lib, "samplerate");
   dlsym_error = dlerror();
   if(dlsym_error) {
-    o_samplerate = NULL;
+    printf("Cannot load symbol samplerate: %s\n", dlsym_error);
+    return;
   }
 
   ptr = o_create();
@@ -190,22 +191,5 @@ size_t AudioOutputEngineDL::getBufferSize()
 size_t AudioOutputEngineDL::samplerate()
 {
   if(o_samplerate) return o_samplerate(ptr);
-  return UNKNOWN_SAMPLERATE;
+  return 44100;
 }
-
-#ifdef TEST_AUDIOOUTPUTENGINEDL
-//Additional dependency files
-//deps:
-//Required cflags (autoconf vars may be used)
-//cflags:
-//Required link options (autoconf vars may be used)
-//libs:
-#include "test.h"
-
-TEST_BEGIN;
-
-// TODO: Put some testcode here (see test.h for usable macros).
-
-TEST_END;
-
-#endif/*TEST_AUDIOOUTPUTENGINEDL*/
-- 
cgit v1.2.3