4 files changed, 22 insertions, 22 deletions
diff --git a/gr-audio/lib/alsa/alsa_sink.cc b/gr-audio/lib/alsa/alsa_sink.cc
index 4af57105a9..fa77933669 100644
--- a/gr-audio/lib/alsa/alsa_sink.cc
+++ b/gr-audio/lib/alsa/alsa_sink.cc
@@ -27,8 +27,8 @@
 #include "audio_registry.h"
 #include <alsa_sink.h>
 #include <alsa_impl.h>
-#include <gr_io_signature.h>
-#include <gr_prefs.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/prefs.h>
 #include <stdio.h>
 #include <iostream>
 #include <stdexcept>
@@ -57,21 +57,21 @@ namespace gr {
     static std::string
     default_device_name()
     {
-      return gr_prefs::singleton()->get_string("audio_alsa", "default_output_device", "hw:0,0");
+      return prefs::singleton()->get_string("audio_alsa", "default_output_device", "hw:0,0");
     }
 
     static double
     default_period_time()
     {
       return std::max(0.001,
-                      gr_prefs::singleton()->get_double("audio_alsa", "period_time", 0.010));
+                      prefs::singleton()->get_double("audio_alsa", "period_time", 0.010));
     }
 
     static int
     default_nperiods()
     {
       return std::max(2L,
-                      gr_prefs::singleton()->get_long("audio_alsa", "nperiods", 4));
+                      prefs::singleton()->get_long("audio_alsa", "nperiods", 4));
     }
 
     // ----------------------------------------------------------------
@@ -79,9 +79,9 @@ namespace gr {
     alsa_sink::alsa_sink(int sampling_rate,
                          const std::string device_name,
                          bool ok_to_block)
-      : gr_sync_block("audio_alsa_sink",
-                      gr_make_io_signature(0, 0, 0),
-                      gr_make_io_signature(0, 0, 0)),
+      : sync_block("audio_alsa_sink",
+                      io_signature::make(0, 0, 0),
+                      io_signature::make(0, 0, 0)),
         d_sampling_rate(sampling_rate),
         d_device_name(device_name.empty() ? default_device_name() : device_name),
         d_pcm_handle(0),
@@ -94,7 +94,7 @@ namespace gr {
         d_worker(0), d_special_case_mono_to_stereo(false),
         d_nunderuns(0), d_nsuspends(0), d_ok_to_block(ok_to_block)
     {
-      CHATTY_DEBUG = gr_prefs::singleton()->get_bool("audio_alsa", "verbose", false);
+      CHATTY_DEBUG = prefs::singleton()->get_bool("audio_alsa", "verbose", false);
 
       int error;
       int dir;
@@ -131,7 +131,7 @@ namespace gr {
         min_chan = 1;
         d_special_case_mono_to_stereo = true;
       }
-      set_input_signature(gr_make_io_signature(min_chan, max_chan,
+      set_input_signature(io_signature::make(min_chan, max_chan,
                                                sizeof(float)));
 
       // fill in portions of the d_hw_params that we know now...
diff --git a/gr-audio/lib/alsa/alsa_sink.h b/gr-audio/lib/alsa/alsa_sink.h
index 1dea62f56e..c1e4670341 100644
--- a/gr-audio/lib/alsa/alsa_sink.h
+++ b/gr-audio/lib/alsa/alsa_sink.h
@@ -27,7 +27,7 @@
 #define ALSA_PCM_NEW_HW_PARAMS_API
 #define ALSA_PCM_NEW_SW_PARAMS_API
 
-#include <audio/sink.h>
+#include <gnuradio/audio/sink.h>
 #include <alsa/asoundlib.h>
 #include <string>
 #include <stdexcept>
diff --git a/gr-audio/lib/alsa/alsa_source.cc b/gr-audio/lib/alsa/alsa_source.cc
index 838da60af3..0f265e75b4 100644
--- a/gr-audio/lib/alsa/alsa_source.cc
+++ b/gr-audio/lib/alsa/alsa_source.cc
@@ -27,8 +27,8 @@
 #include "audio_registry.h"
 #include <alsa_source.h>
 #include <alsa_impl.h>
-#include <gr_io_signature.h>
-#include <gr_prefs.h>
+#include <gnuradio/io_signature.h>
+#include <gnuradio/prefs.h>
 #include <stdio.h>
 #include <iostream>
 #include <stdexcept>
@@ -57,7 +57,7 @@ namespace gr {
     static std::string
     default_device_name()
     {
-      return gr_prefs::singleton()->get_string("audio_alsa",
+      return prefs::singleton()->get_string("audio_alsa",
                                                "default_input_device",
                                                "hw:0,0");
     }
@@ -66,14 +66,14 @@ namespace gr {
     default_period_time()
     {
       return std::max(0.001,
-                      gr_prefs::singleton()->get_double("audio_alsa", "period_time", 0.010));
+                      prefs::singleton()->get_double("audio_alsa", "period_time", 0.010));
     }
 
     static int
     default_nperiods()
     {
       return std::max(2L,
-                      gr_prefs::singleton()->get_long("audio_alsa", "nperiods", 4));
+                      prefs::singleton()->get_long("audio_alsa", "nperiods", 4));
     }
 
     // ----------------------------------------------------------------
@@ -81,9 +81,9 @@ namespace gr {
     alsa_source::alsa_source(int sampling_rate,
                              const std::string device_name,
                              bool ok_to_block)
-      : gr_sync_block("audio_alsa_source",
-                      gr_make_io_signature(0, 0, 0),
-                      gr_make_io_signature(0, 0, 0)),
+      : sync_block("audio_alsa_source",
+                      io_signature::make(0, 0, 0),
+                      io_signature::make(0, 0, 0)),
         d_sampling_rate(sampling_rate),
         d_device_name(device_name.empty() ? default_device_name() : device_name),
         d_pcm_handle(0),
@@ -97,7 +97,7 @@ namespace gr {
         d_special_case_stereo_to_mono(false),
         d_noverruns(0), d_nsuspends(0)
     {
-      CHATTY_DEBUG = gr_prefs::singleton()->get_bool("audio_alsa", "verbose", false);
+      CHATTY_DEBUG = prefs::singleton()->get_bool("audio_alsa", "verbose", false);
 
       int error;
       int dir;
@@ -134,7 +134,7 @@ namespace gr {
         d_special_case_stereo_to_mono = true;
       }
 
-      set_output_signature(gr_make_io_signature(min_chan, max_chan,
+      set_output_signature(io_signature::make(min_chan, max_chan,
                                                 sizeof(float)));
 
       // fill in portions of the d_hw_params that we know now...
diff --git a/gr-audio/lib/alsa/alsa_source.h b/gr-audio/lib/alsa/alsa_source.h
index 6314fc1376..88e16932ca 100644
--- a/gr-audio/lib/alsa/alsa_source.h
+++ b/gr-audio/lib/alsa/alsa_source.h
@@ -27,7 +27,7 @@
 #define ALSA_PCM_NEW_HW_PARAMS_API
 #define ALSA_PCM_NEW_SW_PARAMS_API
 
-#include <audio/source.h>
+#include <gnuradio/audio/source.h>
 #include <alsa/asoundlib.h>
 #include <string>
 #include <stdexcept>