cleanup: fix local includes in gr-audio

Previously all directories were in the include path which breaks for local includes in pointy brackets. This commit uses quotes for local includes in gr-audio now.
author: Andrej Rode <mail@andrejro.de> 2019-02-01 10:36:10 +0100
committer: Marcus Müller <marcus@hostalia.de> 2019-02-01 15:16:43 +0100
commit: 668ae25e46ab9e4ec592dfdb6d6bd0da1b0b150e (patch)
tree: 249a2e078e2c9621f47f57a438e079800c78294d
parent: 441c155ad9b33c6f84c389003a5cb1646ba6211b (diff)
13 files changed, 46 insertions, 48 deletions
diff --git a/gr-audio/lib/alsa/alsa_impl.cc b/gr-audio/lib/alsa/alsa_impl.cc
index 63a0b0de8e..7080ae8f7a 100644
--- a/gr-audio/lib/alsa/alsa_impl.cc
+++ b/gr-audio/lib/alsa/alsa_impl.cc
@@ -24,7 +24,7 @@
 #include "config.h"
 #endif
 
-#include <alsa/alsa_impl.h>
+#include "alsa_impl.h"
 #include <algorithm>
 
 static snd_pcm_access_t access_types[] = {
diff --git a/gr-audio/lib/alsa/alsa_sink.cc b/gr-audio/lib/alsa/alsa_sink.cc
index a9558bc545..924e4f88a2 100644
--- a/gr-audio/lib/alsa/alsa_sink.cc
+++ b/gr-audio/lib/alsa/alsa_sink.cc
@@ -24,9 +24,9 @@
 #include "config.h"
 #endif
 
-#include "audio_registry.h"
-#include <alsa_sink.h>
-#include <alsa_impl.h>
+#include "../audio_registry.h"
+#include "alsa_sink.h"
+#include "alsa_impl.h"
 #include <gnuradio/io_signature.h>
 #include <gnuradio/prefs.h>
 #include <stdio.h>
diff --git a/gr-audio/lib/alsa/alsa_source.cc b/gr-audio/lib/alsa/alsa_source.cc
index 1b26ca7cb5..6655849362 100644
--- a/gr-audio/lib/alsa/alsa_source.cc
+++ b/gr-audio/lib/alsa/alsa_source.cc
@@ -24,9 +24,9 @@
 #include "config.h"
 #endif
 
-#include "audio_registry.h"
-#include <alsa_source.h>
-#include <alsa_impl.h>
+#include "../audio_registry.h"
+#include "alsa_source.h"
+#include "alsa_impl.h"
 #include <gnuradio/io_signature.h>
 #include <gnuradio/prefs.h>
 #include <stdio.h>
diff --git a/gr-audio/lib/jack/jack_impl.cc b/gr-audio/lib/jack/jack_impl.cc
index c1f3b320fc..08dd88a1c1 100644
--- a/gr-audio/lib/jack/jack_impl.cc
+++ b/gr-audio/lib/jack/jack_impl.cc
@@ -24,7 +24,5 @@
 #include "config.h"
 #endif
 
-#include <jack_impl.h>
+#include "jack_impl.h"
 #include <algorithm>
-
-
diff --git a/gr-audio/lib/jack/jack_sink.cc b/gr-audio/lib/jack/jack_sink.cc
index b9bb6c82de..c82c576174 100644
--- a/gr-audio/lib/jack/jack_sink.cc
+++ b/gr-audio/lib/jack/jack_sink.cc
@@ -24,9 +24,9 @@
 #include "config.h"
 #endif
 
-#include "audio_registry.h"
-#include <jack_sink.h>
-#include <jack_impl.h>
+#include "../audio_registry.h"
+#include "jack_sink.h"
+#include "jack_impl.h"
 #include <gnuradio/io_signature.h>
 #include <gnuradio/prefs.h>
 #include <stdio.h>
diff --git a/gr-audio/lib/jack/jack_source.cc b/gr-audio/lib/jack/jack_source.cc
index 7b610e795a..6ca93989c4 100644
--- a/gr-audio/lib/jack/jack_source.cc
+++ b/gr-audio/lib/jack/jack_source.cc
@@ -24,9 +24,9 @@
 #include "config.h"
 #endif
 
-#include "audio_registry.h"
-#include <jack_source.h>
-#include <jack_impl.h>
+#include "../audio_registry.h"
+#include "jack_source.h"
+#include "jack_impl.h"
 #include <gnuradio/io_signature.h>
 #include <gnuradio/prefs.h>
 #include <stdio.h>
diff --git a/gr-audio/lib/oss/oss_sink.cc b/gr-audio/lib/oss/oss_sink.cc
index b11adc0f7e..36aca18e7a 100644
--- a/gr-audio/lib/oss/oss_sink.cc
+++ b/gr-audio/lib/oss/oss_sink.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include "audio_registry.h"
-#include <oss_sink.h>
+#include "../audio_registry.h"
+#include "oss_sink.h"
 #include <gnuradio/io_signature.h>
 #include <gnuradio/prefs.h>
 #include <sys/soundcard.h>
diff --git a/gr-audio/lib/oss/oss_source.cc b/gr-audio/lib/oss/oss_source.cc
index 719349e948..4c6365d057 100644
--- a/gr-audio/lib/oss/oss_source.cc
+++ b/gr-audio/lib/oss/oss_source.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include "audio_registry.h"
-#include <oss_source.h>
+#include "../audio_registry.h"
+#include "oss_source.h"
 #include <gnuradio/io_signature.h>
 #include <gnuradio/prefs.h>
 #include <sys/soundcard.h>
diff --git a/gr-audio/lib/portaudio/portaudio_impl.cc b/gr-audio/lib/portaudio/portaudio_impl.cc
index ba37acc5fa..acc92cf237 100644
--- a/gr-audio/lib/portaudio/portaudio_impl.cc
+++ b/gr-audio/lib/portaudio/portaudio_impl.cc
@@ -24,7 +24,7 @@
 #include "config.h"
 #endif
 
-#include <portaudio_impl.h>
+#include "portaudio_impl.h"
 #include <portaudio.h>
 #include <string.h>
 
diff --git a/gr-audio/lib/portaudio/portaudio_sink.cc b/gr-audio/lib/portaudio/portaudio_sink.cc
index 942167d9d6..56ade35b19 100644
--- a/gr-audio/lib/portaudio/portaudio_sink.cc
+++ b/gr-audio/lib/portaudio/portaudio_sink.cc
@@ -28,9 +28,9 @@
 #include <io.h>
 #endif
 
-#include "audio_registry.h"
-#include <portaudio_sink.h>
-#include <portaudio_impl.h>
+#include "../audio_registry.h"
+#include "portaudio_sink.h"
+#include "portaudio_impl.h"
 #include <gnuradio/io_signature.h>
 #include <gnuradio/prefs.h>
 #include <stdio.h>
@@ -40,7 +40,7 @@
 #include <string.h>
 #ifdef _MSC_VER
 #include <io.h>
-#endif 
+#endif
 
 namespace gr {
   namespace audio {
diff --git a/gr-audio/lib/portaudio/portaudio_source.cc b/gr-audio/lib/portaudio/portaudio_source.cc
index f00667fc7f..767fc8e281 100644
--- a/gr-audio/lib/portaudio/portaudio_source.cc
+++ b/gr-audio/lib/portaudio/portaudio_source.cc
@@ -28,9 +28,9 @@
 #include <io.h>
 #endif
 
-#include "audio_registry.h"
-#include <portaudio_source.h>
-#include <portaudio_impl.h>
+#include "../audio_registry.h"
+#include "portaudio_source.h"
+#include "portaudio_impl.h"
 #include <gnuradio/io_signature.h>
 #include <gnuradio/prefs.h>
 #include <stdio.h>
@@ -40,7 +40,7 @@
 #include <string.h>
 #ifdef _MSC_VER
 #include <io.h>
-#endif 
+#endif
 
 namespace gr {
   namespace audio {
diff --git a/gr-audio/lib/windows/windows_sink.cc b/gr-audio/lib/windows/windows_sink.cc
index 067c71cbf7..04aaba0470 100644
--- a/gr-audio/lib/windows/windows_sink.cc
+++ b/gr-audio/lib/windows/windows_sink.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include "audio_registry.h"
-#include <windows_sink.h>
+#include "../audio_registry.h"
+#include "windows_sink.h"
 #include <gnuradio/io_signature.h>
 #include <gnuradio/prefs.h>
 #include <gnuradio/logger.h>
@@ -164,7 +164,7 @@ namespace gr {
           }
         }
         if (c++ > 10) {
-          // After waiting for 1 second, then something else is seriously wrong so let's 
+          // After waiting for 1 second, then something else is seriously wrong so let's
           // just fail and give some debugging information about the status
           // of the buffers.
           for (int i = 0; i < nPeriods; i++) {
@@ -222,11 +222,11 @@ namespace gr {
     MMRESULT windows_sink::is_format_supported(LPWAVEFORMATEX pwfx, UINT uDeviceID)
     {
       return (waveOutOpen(
-        NULL,                 // ptr can be NULL for query 
-        uDeviceID,            // the device identifier 
-        pwfx,                 // defines requested format 
-        NULL,                 // no callback 
-        NULL,                 // no instance data 
+        NULL,                 // ptr can be NULL for query
+        uDeviceID,            // the device identifier
+        pwfx,                 // defines requested format
+        NULL,                 // no callback
+        NULL,                 // no instance data
         WAVE_FORMAT_QUERY));  // query only, do not open device
     }
 
diff --git a/gr-audio/lib/windows/windows_source.cc b/gr-audio/lib/windows/windows_source.cc
index 9f177462e2..b5550a59c2 100644
--- a/gr-audio/lib/windows/windows_source.cc
+++ b/gr-audio/lib/windows/windows_source.cc
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include "audio_registry.h"
-#include <windows_source.h>
+#include "../audio_registry.h"
+#include "windows_source.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -77,7 +77,7 @@ namespace gr {
 			wave_format.wFormatTag = WAVE_FORMAT_PCM;
 			wave_format.nChannels = 1;						  // changing this will require adjustments to the work routine.
 			wave_format.wBitsPerSample = 16;				// changing this will necessitate changing buffer type from short.
-			wave_format.nSamplesPerSec = d_sampling_freq;	// defined by flowgraph settings, but note that the microphone will likely have a native sample rate 
+			wave_format.nSamplesPerSec = d_sampling_freq;	// defined by flowgraph settings, but note that the microphone will likely have a native sample rate
 			                                              // that the audio system may upsample to you desired rate, so check where the cutoff ends up or check your control panel
 			wave_format.nBlockAlign =
 				wave_format.nChannels * (wave_format.wBitsPerSample / 8);
@@ -101,7 +101,7 @@ namespace gr {
 			for (int i = 0; i < nPeriods; i++)
 			{
 				lp_buffers[i] = new WAVEHDR;
-				LPWAVEHDR lp_buffer = lp_buffers[i]; 
+				LPWAVEHDR lp_buffer = lp_buffers[i];
 				lp_buffer->dwLoops = 0L;
 				lp_buffer->dwFlags = 0;
 				lp_buffer->dwBufferLength = d_buffer_size;
@@ -147,7 +147,7 @@ namespace gr {
 			float *f0, *f1;
 			DWORD dw_items = 0;
 
-			while (!buffer_queue.empty()) 
+			while (!buffer_queue.empty())
 			{
 				// Pull the next incoming buffer off the queue
 				LPWAVEHDR next_header = buffer_queue.front();
@@ -157,7 +157,7 @@ namespace gr {
 				DWORD buffer_length = next_header->dwBytesRecorded / sizeof(short);
 
 				if (buffer_length + dw_items > noutput_items * output_items.size()) {
-					// There's not enough output buffer space to send the whole input buffer 
+					// There's not enough output buffer space to send the whole input buffer
 					// so don't try, just leave it in the queue
 					// or else we'd have to track how much we sent etc
 					// In theory we should never reach this code because the buffers should all be
@@ -206,11 +206,11 @@ namespace gr {
 		MMRESULT windows_source::is_format_supported(LPWAVEFORMATEX pwfx, UINT uDeviceID)
 		{
 			return (waveInOpen(
-				NULL,                 // ptr can be NULL for query 
-				uDeviceID,            // the device identifier 
-				pwfx,                 // defines requested format 
-				NULL,                 // no callback 
-				NULL,                 // no instance data 
+				NULL,                 // ptr can be NULL for query
+				uDeviceID,            // the device identifier
+				pwfx,                 // defines requested format
+				NULL,                 // no callback
+				NULL,                 // no instance data
 				WAVE_FORMAT_QUERY));  // query only, do not open device
 		}
author	Andrej Rode <mail@andrejro.de>	2019-02-01 10:36:10 +0100
committer	Marcus Müller <marcus@hostalia.de>	2019-02-01 15:16:43 +0100
commit	668ae25e46ab9e4ec592dfdb6d6bd0da1b0b150e (patch)
tree	249a2e078e2c9621f47f57a438e079800c78294d
parent	441c155ad9b33c6f84c389003a5cb1646ba6211b (diff)