From 1ce0d5cd617a8c584a3a4ed0897d27cc11f8205d Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Sat, 7 Jan 2012 13:27:55 +0000
Subject: [PATCH] Correction to use public headers in dbus code.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4675 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 common/jack/control.h                   | 2 +-
 dbus/audio_reserve.c                    | 2 +-
 dbus/controller_iface_session_manager.c | 2 +-
 dbus/sigsegv.c                          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/jack/control.h b/common/jack/control.h
index 61a7be33..fbe5be26 100644
--- a/common/jack/control.h
+++ b/common/jack/control.h
@@ -341,7 +341,7 @@ jackctl_driver_get_parameters(
  */
 int
 jackctl_driver_params_parse(
-    jackctl_driver * driver,
+    jackctl_driver_t * driver,
     int argc,
     char* argv[]);
 
diff --git a/dbus/audio_reserve.c b/dbus/audio_reserve.c
index da811c83..aee00af9 100644
--- a/dbus/audio_reserve.c
+++ b/dbus/audio_reserve.c
@@ -26,7 +26,7 @@
 
 #include "reserve.h"
 #include "audio_reserve.h"
-#include "JackError.h"
+#include "jack/control.h"
 
 #define DEVICE_MAX 2
 
diff --git a/dbus/controller_iface_session_manager.c b/dbus/controller_iface_session_manager.c
index 1ea89593..d0341b5f 100644
--- a/dbus/controller_iface_session_manager.c
+++ b/dbus/controller_iface_session_manager.c
@@ -30,7 +30,7 @@
 #include "jackdbus.h"
 #include "controller_internal.h"
 #include "jack/session.h"
-#include "common/JackError.h"
+#include "jack/control.h"
 
 #define JACK_DBUS_IFACE_NAME "org.jackaudio.SessionManager"
 
diff --git a/dbus/sigsegv.c b/dbus/sigsegv.c
index ea309547..03b1183b 100644
--- a/dbus/sigsegv.c
+++ b/dbus/sigsegv.c
@@ -33,7 +33,7 @@
 char * __cxa_demangle(const char * __mangled_name, char * __output_buffer, size_t * __length, int * __status);
 #endif
 
-#include "JackError.h"
+#include "jack/control.h"
 
 #if defined(REG_RIP)
 # define SIGSEGV_STACK_IA64