From 909c1616381ca14aab1bec5c5d38d42589b44c5c Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Tue, 21 Apr 2009 16:19:04 +0000
Subject: [PATCH] Add jackctl_server_load_master/jackctl_server_unload_master
 API.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3517 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 ChangeLog                 |  4 ++++
 common/JackControlAPI.cpp | 15 +++++++++++++--
 common/JackControlAPI.h   | 11 +++++++++--
 common/Jackdmp.cpp        |  2 +-
 common/jack/control.h     | 13 +++++++++++--
 5 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c5e8d636..e3b3f1ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,10 @@ Paul Davis
 ---------------------------
   Jackdmp changes log
 ---------------------------
+
+2009-04-21 Stephane Letz  <letz@grame.fr>
+
+	* Add jackctl_server_load_master/jackctl_server_unload_master API.
 
 2009-04-20 Stephane Letz  <letz@grame.fr>
 
diff --git a/common/JackControlAPI.cpp b/common/JackControlAPI.cpp
index e17408e0..7c1f891a 100644
--- a/common/JackControlAPI.cpp
+++ b/common/JackControlAPI.cpp
@@ -1182,7 +1182,7 @@ EXPORT bool jackctl_server_unload_internal(
     }
 }
 
-EXPORT bool jackctl_server_load_slave(jackctl_server * server_ptr, jackctl_driver * driver_ptr)
+EXPORT bool jackctl_server_add_slave(jackctl_server * server_ptr, jackctl_driver * driver_ptr)
 {
     if (server_ptr->engine != NULL) {
         driver_ptr->info = server_ptr->engine->AddSlave(driver_ptr->desc_ptr, driver_ptr->set_parameters);
@@ -1192,7 +1192,7 @@ EXPORT bool jackctl_server_load_slave(jackctl_server * server_ptr, jackctl_drive
     }
 }
 
-EXPORT bool jackctl_server_unload_slave(jackctl_server * server_ptr, jackctl_driver * driver_ptr)
+EXPORT bool jackctl_server_remove_slave(jackctl_server * server_ptr, jackctl_driver * driver_ptr)
 {
     if (server_ptr->engine != NULL) {
         server_ptr->engine->RemoveSlave(driver_ptr->info);
@@ -1202,3 +1202,14 @@ EXPORT bool jackctl_server_unload_slave(jackctl_server * server_ptr, jackctl_dri
     }
 }
 
+EXPORT bool jackctl_server_load_master(jackctl_server * server_ptr, jackctl_driver * driver_ptr)
+{
+    // TODO
+    return false;
+}
+
+EXPORT bool jackctl_server_unload_master(jackctl_server * server_ptr, jackctl_driver * driver_ptr)
+{
+    // TODO
+    return false;
+}
diff --git a/common/JackControlAPI.h b/common/JackControlAPI.h
index 54be6f3f..bcff2fab 100644
--- a/common/JackControlAPI.h
+++ b/common/JackControlAPI.h
@@ -220,12 +220,19 @@ EXPORT bool jackctl_server_unload_internal(
     jackctl_server * server,
     jackctl_internal * internal);
     
-EXPORT bool jackctl_server_load_slave(jackctl_server_t * server,
+EXPORT bool jackctl_server_add_slave(jackctl_server_t * server,
                             jackctl_driver_t * driver);
 
-EXPORT bool jackctl_server_unload_slave(jackctl_server_t * server,
+EXPORT bool jackctl_server_remove_slave(jackctl_server_t * server,
                             jackctl_driver_t * driver);
 
+EXPORT bool 
+jackctl_server_load_master(jackctl_server_t * server,
+                            jackctl_driver_t * driver);
+
+EXPORT bool 
+jackctl_server_unload_master(jackctl_server_t * server,
+                            jackctl_driver_t * driver);
 
 #if 0
 { /* Adjust editor indent */
diff --git a/common/Jackdmp.cpp b/common/Jackdmp.cpp
index 8a396e41..3b9efcc1 100644
--- a/common/Jackdmp.cpp
+++ b/common/Jackdmp.cpp
@@ -416,7 +416,7 @@ int main(int argc, char* argv[])
             goto fail_free;
         }
 
-        jackctl_server_load_slave(server_ctl, midi_driver_ctl);
+        jackctl_server_add_slave(server_ctl, midi_driver_ctl);
     }
     */
 
diff --git a/common/jack/control.h b/common/jack/control.h
index 87d62e72..2530c656 100644
--- a/common/jack/control.h
+++ b/common/jack/control.h
@@ -511,12 +511,21 @@ jack_log(
 /* @} */
 
 bool 
-jackctl_server_load_slave(jackctl_server_t * server,
+jackctl_server_add_slave(jackctl_server_t * server,
                             jackctl_driver_t * driver);
 
 bool 
-jackctl_server_unload_slave(jackctl_server_t * server,
+jackctl_server_remove_slave(jackctl_server_t * server,
                             jackctl_driver_t * driver);
+                            
+bool 
+jackctl_server_load_master(jackctl_server_t * server,
+                            jackctl_driver_t * driver);
+
+bool 
+jackctl_server_unload_master(jackctl_server_t * server,
+                            jackctl_driver_t * driver);
+                            
 
 #if 0
 { /* Adjust editor indent */