From b3721a12c5c31ae55141ff46af0c553d060fe363 Mon Sep 17 00:00:00 2001
From: Maarten Bosmans <mkbosmans@gmail.com>
Date: Wed, 9 Mar 2011 10:00:20 +0100
Subject: Fixup #include directives according to Coding Style

Use #include "header.h" if functionality of header.h is implemented
and #include <header.h> if functionality of header.h is used.
---
 src/pulsecore/asyncq.c          | 5 +++--
 src/pulsecore/protocol-esound.c | 3 +--
 src/pulsecore/resampler.c       | 2 +-
 src/pulsecore/sample-util.c     | 2 +-
 src/pulsecore/sconv-s16le.c     | 3 +--
 src/pulsecore/sconv.c           | 6 +++---
 src/pulsecore/sconv_sse.c       | 3 +--
 src/pulsecore/svolume_arm.c     | 2 +-
 src/pulsecore/svolume_c.c       | 2 +-
 src/pulsecore/svolume_mmx.c     | 2 +-
 src/pulsecore/svolume_sse.c     | 2 +-
 11 files changed, 15 insertions(+), 17 deletions(-)

(limited to 'src/pulsecore')

diff --git a/src/pulsecore/asyncq.c b/src/pulsecore/asyncq.c
index e62d0c16..8c2d58a0 100644
--- a/src/pulsecore/asyncq.c
+++ b/src/pulsecore/asyncq.c
@@ -26,6 +26,8 @@
 #include <unistd.h>
 #include <errno.h>
 
+#include <pulse/xmalloc.h>
+
 #include <pulsecore/atomic.h>
 #include <pulsecore/log.h>
 #include <pulsecore/thread.h>
@@ -33,10 +35,9 @@
 #include <pulsecore/core-util.h>
 #include <pulsecore/llist.h>
 #include <pulsecore/flist.h>
-#include <pulse/xmalloc.h>
+#include <pulsecore/fdsem.h>
 
 #include "asyncq.h"
-#include "fdsem.h"
 
 #define ASYNCQ_SIZE 256
 
diff --git a/src/pulsecore/protocol-esound.c b/src/pulsecore/protocol-esound.c
index 045c5c95..66fd73c8 100644
--- a/src/pulsecore/protocol-esound.c
+++ b/src/pulsecore/protocol-esound.c
@@ -55,8 +55,7 @@
 #include <pulsecore/macro.h>
 #include <pulsecore/thread-mq.h>
 #include <pulsecore/shared.h>
-
-#include "endianmacros.h"
+#include <pulsecore/endianmacros.h>
 
 #include "protocol-esound.h"
 
diff --git a/src/pulsecore/resampler.c b/src/pulsecore/resampler.c
index e5202212..312e75e5 100644
--- a/src/pulsecore/resampler.c
+++ b/src/pulsecore/resampler.c
@@ -36,11 +36,11 @@
 #include <pulsecore/log.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/strbuf.h>
+#include <pulsecore/remap.h>
 
 #include "ffmpeg/avcodec.h"
 
 #include "resampler.h"
-#include "remap.h"
 
 /* Number of samples of extra space we allow the resamplers to return */
 #define EXTRA_FRAMES 128
diff --git a/src/pulsecore/sample-util.c b/src/pulsecore/sample-util.c
index ee1da60a..62b7c468 100644
--- a/src/pulsecore/sample-util.c
+++ b/src/pulsecore/sample-util.c
@@ -37,9 +37,9 @@
 #include <pulsecore/macro.h>
 #include <pulsecore/g711.h>
 #include <pulsecore/core-util.h>
+#include <pulsecore/endianmacros.h>
 
 #include "sample-util.h"
-#include "endianmacros.h"
 
 #define PA_SILENCE_MAX (PA_PAGE_SIZE*16)
 
diff --git a/src/pulsecore/sconv-s16le.c b/src/pulsecore/sconv-s16le.c
index 0fefdf1c..43587f3e 100644
--- a/src/pulsecore/sconv-s16le.c
+++ b/src/pulsecore/sconv-s16le.c
@@ -31,8 +31,7 @@
 #include <pulsecore/sconv.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/log.h>
-
-#include "endianmacros.h"
+#include <pulsecore/endianmacros.h>
 
 #include "sconv-s16le.h"
 
diff --git a/src/pulsecore/sconv.c b/src/pulsecore/sconv.c
index 301f08b4..988d4b33 100644
--- a/src/pulsecore/sconv.c
+++ b/src/pulsecore/sconv.c
@@ -29,10 +29,10 @@
 
 #include <pulsecore/g711.h>
 #include <pulsecore/macro.h>
+#include <pulsecore/endianmacros.h>
 
-#include "endianmacros.h"
-#include "sconv-s16le.h"
-#include "sconv-s16be.h"
+#include <pulsecore/sconv-s16le.h>
+#include <pulsecore/sconv-s16be.h>
 
 #include "sconv.h"
 
diff --git a/src/pulsecore/sconv_sse.c b/src/pulsecore/sconv_sse.c
index ac57f01e..26daa223 100644
--- a/src/pulsecore/sconv_sse.c
+++ b/src/pulsecore/sconv_sse.c
@@ -29,8 +29,7 @@
 
 #include <pulsecore/g711.h>
 #include <pulsecore/macro.h>
-
-#include "endianmacros.h"
+#include <pulsecore/endianmacros.h>
 
 #include "cpu-x86.h"
 #include "sconv.h"
diff --git a/src/pulsecore/svolume_arm.c b/src/pulsecore/svolume_arm.c
index 71113060..42e8cbf9 100644
--- a/src/pulsecore/svolume_arm.c
+++ b/src/pulsecore/svolume_arm.c
@@ -29,11 +29,11 @@
 #include <pulsecore/macro.h>
 #include <pulsecore/g711.h>
 #include <pulsecore/core-util.h>
+#include <pulsecore/endianmacros.h>
 
 #include "cpu-arm.h"
 
 #include "sample-util.h"
-#include "endianmacros.h"
 
 #if defined (__arm__) && defined (HAVE_ARMV6)
 
diff --git a/src/pulsecore/svolume_c.c b/src/pulsecore/svolume_c.c
index dfe7ccb0..e55d0d7b 100644
--- a/src/pulsecore/svolume_c.c
+++ b/src/pulsecore/svolume_c.c
@@ -28,9 +28,9 @@
 #include <pulsecore/macro.h>
 #include <pulsecore/g711.h>
 #include <pulsecore/core-util.h>
+#include <pulsecore/endianmacros.h>
 
 #include "sample-util.h"
-#include "endianmacros.h"
 
 static void pa_volume_u8_c(uint8_t *samples, int32_t *volumes, unsigned channels, unsigned length) {
     unsigned channel;
diff --git a/src/pulsecore/svolume_mmx.c b/src/pulsecore/svolume_mmx.c
index 263790d9..4f109543 100644
--- a/src/pulsecore/svolume_mmx.c
+++ b/src/pulsecore/svolume_mmx.c
@@ -31,11 +31,11 @@
 #include <pulsecore/macro.h>
 #include <pulsecore/g711.h>
 #include <pulsecore/core-util.h>
+#include <pulsecore/endianmacros.h>
 
 #include "cpu-x86.h"
 
 #include "sample-util.h"
-#include "endianmacros.h"
 
 #if defined (__i386__) || defined (__amd64__)
 /* in s: 2 int16_t samples
diff --git a/src/pulsecore/svolume_sse.c b/src/pulsecore/svolume_sse.c
index 86828072..ef07a243 100644
--- a/src/pulsecore/svolume_sse.c
+++ b/src/pulsecore/svolume_sse.c
@@ -31,11 +31,11 @@
 #include <pulsecore/macro.h>
 #include <pulsecore/g711.h>
 #include <pulsecore/core-util.h>
+#include <pulsecore/endianmacros.h>
 
 #include "cpu-x86.h"
 
 #include "sample-util.h"
-#include "endianmacros.h"
 
 #if defined (__i386__) || defined (__amd64__)
 
-- 
cgit