summaryrefslogtreecommitdiff
path: root/gr-audio/lib/osx
diff options
context:
space:
mode:
Diffstat (limited to 'gr-audio/lib/osx')
-rw-r--r--gr-audio/lib/osx/circular_buffer.h2
-rw-r--r--gr-audio/lib/osx/osx_sink.cc10
-rw-r--r--gr-audio/lib/osx/osx_sink.h2
-rw-r--r--gr-audio/lib/osx/osx_source.cc10
-rw-r--r--gr-audio/lib/osx/osx_source.h2
5 files changed, 13 insertions, 13 deletions
diff --git a/gr-audio/lib/osx/circular_buffer.h b/gr-audio/lib/osx/circular_buffer.h
index 7abbeaeb0c..fee9eeafbc 100644
--- a/gr-audio/lib/osx/circular_buffer.h
+++ b/gr-audio/lib/osx/circular_buffer.h
@@ -23,7 +23,7 @@
#ifndef _CIRCULAR_BUFFER_H_
#define _CIRCULAR_BUFFER_H_
-#include <thread/thread.h>
+#include <gnuradio/thread/thread.h>
#include <iostream>
#include <stdexcept>
diff --git a/gr-audio/lib/osx/osx_sink.cc b/gr-audio/lib/osx/osx_sink.cc
index b7fe4e9d11..7c5be43d76 100644
--- a/gr-audio/lib/osx/osx_sink.cc
+++ b/gr-audio/lib/osx/osx_sink.cc
@@ -27,7 +27,7 @@
#include "audio_registry.h"
#include <osx_sink.h>
#include <osx_impl.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
namespace gr {
@@ -48,9 +48,9 @@ namespace gr {
bool do_block,
int channel_config,
int max_sample_count)
- : gr_sync_block("audio_osx_sink",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("audio_osx_sink",
+ io_signature::make(0, 0, 0),
+ io_signature::make(0, 0, 0)),
d_sample_rate(0.0), d_channel_config(0), d_n_channels(0),
d_queueSampleCount(0), d_max_sample_count(0),
d_do_block(do_block), d_internal(0), d_cond_data(0),
@@ -84,7 +84,7 @@ namespace gr {
// set the input signature
- set_input_signature(gr_make_io_signature(1, d_n_channels, sizeof(float)));
+ set_input_signature(io_signature::make(1, d_n_channels, sizeof(float)));
// check that the max # of samples to store is valid
diff --git a/gr-audio/lib/osx/osx_sink.h b/gr-audio/lib/osx/osx_sink.h
index 153d2d76e6..241e10ab79 100644
--- a/gr-audio/lib/osx/osx_sink.h
+++ b/gr-audio/lib/osx/osx_sink.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_AUDIO_OSX_SINK_H
#define INCLUDED_AUDIO_OSX_SINK_H
-#include <audio/sink.h>
+#include <gnuradio/audio/sink.h>
#include <string>
#include <list>
#include <AudioUnit/AudioUnit.h>
diff --git a/gr-audio/lib/osx/osx_source.cc b/gr-audio/lib/osx/osx_source.cc
index c666bb7ad8..3e2dcef4fe 100644
--- a/gr-audio/lib/osx/osx_source.cc
+++ b/gr-audio/lib/osx/osx_source.cc
@@ -27,7 +27,7 @@
#include "audio_registry.h"
#include <osx_source.h>
#include <osx_impl.h>
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
namespace gr {
@@ -71,9 +71,9 @@ namespace gr {
bool do_block,
int channel_config,
int max_sample_count)
- : gr_sync_block("audio_osx_source",
- gr_make_io_signature(0, 0, 0),
- gr_make_io_signature(0, 0, 0)),
+ : sync_block("audio_osx_source",
+ io_signature::make(0, 0, 0),
+ io_signature::make(0, 0, 0)),
d_deviceSampleRate(0.0), d_outputSampleRate(0.0),
d_channel_config(0),
d_inputBufferSizeFrames(0), d_inputBufferSizeBytes(0),
@@ -310,7 +310,7 @@ namespace gr {
// create the output io signature;
// no input siganture to set (source is hardware)
- set_output_signature(gr_make_io_signature(1,
+ set_output_signature(io_signature::make(1,
d_n_max_channels,
sizeof(float)));
diff --git a/gr-audio/lib/osx/osx_source.h b/gr-audio/lib/osx/osx_source.h
index 03a2d8879c..0b675f8863 100644
--- a/gr-audio/lib/osx/osx_source.h
+++ b/gr-audio/lib/osx/osx_source.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_AUDIO_OSX_SOURCE_H
#define INCLUDED_AUDIO_OSX_SOURCE_H
-#include <audio/source.h>
+#include <gnuradio/audio/source.h>
#include <string>
#include <AudioToolbox/AudioToolbox.h>
#include <AudioUnit/AudioUnit.h>