From 3605c085a7bcdeea4425f8793743bfac091f96cd Mon Sep 17 00:00:00 2001
From: Lars Bisballe Jensen <larsbisballe@gmail.com>
Date: Wed, 22 Oct 2014 15:34:18 +0200
Subject: Changed name to id

---
 drumgizmo/audioinputenginedl.cc  | 8 ++++----
 drumgizmo/audioinputenginedl.h   | 2 +-
 drumgizmo/audiooutputenginedl.cc | 8 ++++----
 drumgizmo/audiooutputenginedl.h  | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/drumgizmo/audioinputenginedl.cc b/drumgizmo/audioinputenginedl.cc
index e7f19c6..4192280 100644
--- a/drumgizmo/audioinputenginedl.cc
+++ b/drumgizmo/audioinputenginedl.cc
@@ -36,11 +36,11 @@
 
 #include "jackclient.h"
 
-AudioInputEngineDL::AudioInputEngineDL(std::string name)
+AudioInputEngineDL::AudioInputEngineDL(std::string id)
 {
-  is_jack_plugin = strstr(name.c_str(), "jack");
+  is_jack_plugin = strstr(id.c_str(), "jack");
 
-  std::string plugin = INPUT_PLUGIN_DIR"/lib" + name + ".so";
+  std::string plugin = INPUT_PLUGIN_DIR"/lib" + id + ".so";
   void *lib = dlopen(plugin.c_str(), RTLD_LAZY);
   if(!lib) {
     printf("Cannot load device: %s\n", dlerror());
@@ -130,7 +130,7 @@ bool AudioInputEngineDL::init(Instruments &instruments)
 {
   char **n = (char**)malloc(sizeof(char*)*instruments.size());
   for(size_t i = 0; i < instruments.size(); i++) {
-    n[i] = strdup(instruments[i]->name().c_str());
+    n[i] = strdup(instruments[i]->id().c_str());
   }
 
   bool ret = i_init(ptr, instruments.size(), n);
diff --git a/drumgizmo/audioinputenginedl.h b/drumgizmo/audioinputenginedl.h
index ed1fb27..8fa2391 100644
--- a/drumgizmo/audioinputenginedl.h
+++ b/drumgizmo/audioinputenginedl.h
@@ -42,7 +42,7 @@ typedef void (*input_post_func_t)(void*);
   
 class AudioInputEngineDL : public AudioInputEngine {
 public:
-  AudioInputEngineDL(std::string name);
+  AudioInputEngineDL(std::string id);
   ~AudioInputEngineDL();
 
   bool init(Instruments &instruments);
diff --git a/drumgizmo/audiooutputenginedl.cc b/drumgizmo/audiooutputenginedl.cc
index 513d21b..3e90345 100644
--- a/drumgizmo/audiooutputenginedl.cc
+++ b/drumgizmo/audiooutputenginedl.cc
@@ -31,11 +31,11 @@
 #include <config.h>
 #include <string.h>
 
-AudioOutputEngineDL::AudioOutputEngineDL(std::string name)
+AudioOutputEngineDL::AudioOutputEngineDL(std::string id)
 {
-  is_jack_plugin = strstr(name.c_str(), "jack");
+  is_jack_plugin = strstr(id.c_str(), "jack");
 
-  std::string plugin = OUTPUT_PLUGIN_DIR"/lib" + name + ".so";
+  std::string plugin = OUTPUT_PLUGIN_DIR"/lib" + id + ".so";
   void *lib = dlopen(plugin.c_str(), RTLD_LAZY);
   if(!lib) {
     printf("Cannot load device: %s\n", dlerror());
@@ -131,7 +131,7 @@ bool AudioOutputEngineDL::init(Channels channels)
 {
   char **n = (char**)malloc(sizeof(char*)*channels.size());
   for(size_t i = 0; i < channels.size(); i++) {
-    n[i] = strdup(channels[i].name.c_str());
+    n[i] = strdup(channels[i].id.c_str());
   }
 
   bool ret = o_init(ptr, channels.size(), n);
diff --git a/drumgizmo/audiooutputenginedl.h b/drumgizmo/audiooutputenginedl.h
index 471247e..6063e50 100644
--- a/drumgizmo/audiooutputenginedl.h
+++ b/drumgizmo/audiooutputenginedl.h
@@ -49,7 +49,7 @@ typedef size_t (*output_bufsize_func_t)(void*);
 
 class AudioOutputEngineDL : public AudioOutputEngine {
 public:
-  AudioOutputEngineDL(std::string name);
+  AudioOutputEngineDL(std::string id);
   ~AudioOutputEngineDL();
 
   bool init(Channels channels);
-- 
cgit v1.2.3