summaryrefslogtreecommitdiff
path: root/drivers/alsa
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2012-02-08 12:12:05 -0500
committerPaul Davis <paul@linuxaudiosystems.com>2012-02-08 12:12:05 -0500
commitd094819df40afbe74992d400795e936737ddba20 (patch)
treecab9da68345c6361285d499ca746474529015d82 /drivers/alsa
parent46ef653917ce92381c1f48bb8ad88f9aee44fa87 (diff)
downloadjack1-d094819df40afbe74992d400795e936737ddba20.tar.gz
#include changes to reflect separation of public and private headers
Diffstat (limited to 'drivers/alsa')
-rw-r--r--drivers/alsa/alsa_driver.c6
-rw-r--r--drivers/alsa/alsa_driver.h10
-rw-r--r--drivers/alsa/generic_hw.c2
-rw-r--r--drivers/alsa/hammerfall.c4
-rw-r--r--drivers/alsa/hdsp.c4
-rw-r--r--drivers/alsa/ice1712.c4
-rw-r--r--drivers/alsa/memops.c2
-rw-r--r--drivers/alsa/usx2y.c8
8 files changed, 20 insertions, 20 deletions
diff --git a/drivers/alsa/alsa_driver.c b/drivers/alsa/alsa_driver.c
index 05581ee..da1f843 100644
--- a/drivers/alsa/alsa_driver.c
+++ b/drivers/alsa/alsa_driver.c
@@ -30,9 +30,9 @@
#include <regex.h>
#include <string.h>
-#include <jack/internal.h>
-#include <jack/engine.h>
-#include <jack/messagebuffer.h>
+#include "internal.h"
+#include "engine.h"
+#include "messagebuffer.h"
#include <sysdeps/time.h>
diff --git a/drivers/alsa/alsa_driver.h b/drivers/alsa/alsa_driver.h
index ddfc5ac..e1e4fa8 100644
--- a/drivers/alsa/alsa_driver.h
+++ b/drivers/alsa/alsa_driver.h
@@ -22,7 +22,7 @@
#include <alsa/asoundlib.h>
#include <alsa/pcm.h>
-#include <jack/bitset.h>
+#include "bitset.h"
#if __BYTE_ORDER == __LITTLE_ENDIAN
#define IS_LE 0
@@ -32,11 +32,11 @@
#define IS_BE 0
#endif
-#include <jack/types.h>
-#include <jack/hardware.h>
-#include <jack/driver.h>
#include <jack/jack.h>
-#include <jack/memops.h>
+#include <jack/types.h>
+#include "hardware.h"
+#include "driver.h"
+#include "memops.h"
#include "../alsa-midi/alsa_midi.h"
diff --git a/drivers/alsa/generic_hw.c b/drivers/alsa/generic_hw.c
index 7b3291f..69457e2 100644
--- a/drivers/alsa/generic_hw.c
+++ b/drivers/alsa/generic_hw.c
@@ -17,7 +17,7 @@
*/
-#include <jack/hardware.h>
+#include "hardware.h"
#include "alsa_driver.h"
static int generic_set_input_monitor_mask (jack_hardware_t *hw, unsigned long mask)
diff --git a/drivers/alsa/hammerfall.c b/drivers/alsa/hammerfall.c
index 814a464..fcb9add 100644
--- a/drivers/alsa/hammerfall.c
+++ b/drivers/alsa/hammerfall.c
@@ -17,10 +17,10 @@
*/
-#include <jack/hardware.h>
+#include "hardware.h"
#include "alsa_driver.h"
#include "hammerfall.h"
-#include <jack/internal.h>
+#include "internal.h"
/* Set this to 1 if you want this compile error:
* warning: `hammerfall_monitor_controls' defined but not used */
diff --git a/drivers/alsa/hdsp.c b/drivers/alsa/hdsp.c
index 059c2bd..cf28a91 100644
--- a/drivers/alsa/hdsp.c
+++ b/drivers/alsa/hdsp.c
@@ -18,10 +18,10 @@
*/
-#include <jack/hardware.h>
+#include "hardware.h"
#include "alsa_driver.h"
#include "hdsp.h"
-#include <jack/internal.h>
+#include "internal.h"
/* Constants to make working with the hdsp matrix mixer easier */
static const int HDSP_MINUS_INFINITY_GAIN = 0;
diff --git a/drivers/alsa/ice1712.c b/drivers/alsa/ice1712.c
index 5cfe365..6c38364 100644
--- a/drivers/alsa/ice1712.c
+++ b/drivers/alsa/ice1712.c
@@ -21,10 +21,10 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <jack/hardware.h>
+#include "hardware.h"
#include "alsa_driver.h"
#include "ice1712.h"
-#include <jack/internal.h>
+#include "internal.h"
static int
ice1712_hw_monitor_toggle(jack_hardware_t *hw, int idx, int onoff)
diff --git a/drivers/alsa/memops.c b/drivers/alsa/memops.c
index 9f7453b..3df7b19 100644
--- a/drivers/alsa/memops.c
+++ b/drivers/alsa/memops.c
@@ -32,7 +32,7 @@
#include <limits.h>
#include <endian.h>
-#include <jack/memops.h>
+#include "memops.h"
/* Notes about these *_SCALING values.
diff --git a/drivers/alsa/usx2y.c b/drivers/alsa/usx2y.c
index 7328b90..41960ef 100644
--- a/drivers/alsa/usx2y.c
+++ b/drivers/alsa/usx2y.c
@@ -18,12 +18,12 @@
*/
-#include <jack/hardware.h>
+#include "hardware.h"
#include "alsa_driver.h"
#include "usx2y.h"
-#include <jack/internal.h>
-#include <jack/engine.h>
-#include <jack/messagebuffer.h>
+#include "internal.h"
+#include "engine.h"
+#include "messagebuffer.h"
#include <sys/mman.h>
#ifndef ARRAY_SIZE