6 files changed, 29 insertions, 29 deletions
diff --git a/gr-audio/lib/audio_alsa_sink.cc b/gr-audio/lib/audio_alsa_sink.cc
index e02dfc31f..af5cc02be 100644
--- a/gr-audio/lib/audio_alsa_sink.cc
+++ b/gr-audio/lib/audio_alsa_sink.cc
@@ -33,10 +33,10 @@
 #include <stdexcept>
 #include <gri_alsa.h>
 
-GR_AUDIO_REGISTER_SINK(alsa)(
+AUDIO_REGISTER_SINK(alsa)(
     int sampling_rate, const std::string &device_name, bool ok_to_block
 ){
-    return gr_audio_sink::sptr(new audio_alsa_sink(sampling_rate, device_name, ok_to_block));
+    return audio_sink::sptr(new audio_alsa_sink(sampling_rate, device_name, ok_to_block));
 }
 
 static bool CHATTY_DEBUG = false;
@@ -74,7 +74,7 @@ default_nperiods ()
 audio_alsa_sink::audio_alsa_sink (int sampling_rate,
 				  const std::string device_name,
 				  bool ok_to_block)
-  : gr_audio_sink ("audio_alsa_sink",
+  : audio_sink ("audio_alsa_sink",
 		   gr_make_io_signature (0, 0, 0),
 		   gr_make_io_signature (0, 0, 0)),
     d_sampling_rate (sampling_rate),
diff --git a/gr-audio/lib/audio_alsa_sink.h b/gr-audio/lib/audio_alsa_sink.h
index aa3e88058..23e406d6b 100644
--- a/gr-audio/lib/audio_alsa_sink.h
+++ b/gr-audio/lib/audio_alsa_sink.h
@@ -40,7 +40,7 @@
  *
  * Input samples must be in the range [-1,1].
  */
-class audio_alsa_sink : public gr_audio_sink {
+class audio_alsa_sink : public audio_sink {
   // typedef for pointer to class work method
   typedef int (audio_alsa_sink::*work_t)(int noutput_items,
 					 gr_vector_const_void_star &input_items,
diff --git a/gr-audio/lib/audio_alsa_source.cc b/gr-audio/lib/audio_alsa_source.cc
index 33c2c3932..a8667361e 100644
--- a/gr-audio/lib/audio_alsa_source.cc
+++ b/gr-audio/lib/audio_alsa_source.cc
@@ -33,10 +33,10 @@
 #include <stdexcept>
 #include <gri_alsa.h>
 
-GR_AUDIO_REGISTER_SOURCE(alsa)(
+AUDIO_REGISTER_SOURCE(alsa)(
     int sampling_rate, const std::string &device_name, bool ok_to_block
 ){
-    return gr_audio_source::sptr(new audio_alsa_source(sampling_rate, device_name, ok_to_block));
+    return audio_source::sptr(new audio_alsa_source(sampling_rate, device_name, ok_to_block));
 }
 
 static bool CHATTY_DEBUG = false;
@@ -73,7 +73,7 @@ default_nperiods ()
 audio_alsa_source::audio_alsa_source (int sampling_rate,
 				      const std::string device_name,
 				      bool ok_to_block)
-  : gr_audio_source ("audio_alsa_source",
+  : audio_source ("audio_alsa_source",
 		   gr_make_io_signature (0, 0, 0),
 		   gr_make_io_signature (0, 0, 0)),
     d_sampling_rate (sampling_rate),
diff --git a/gr-audio/lib/audio_alsa_source.h b/gr-audio/lib/audio_alsa_source.h
index 8ddc00bd2..e38af3872 100644
--- a/gr-audio/lib/audio_alsa_source.h
+++ b/gr-audio/lib/audio_alsa_source.h
@@ -43,7 +43,7 @@ typedef boost::shared_ptr<audio_alsa_source> audio_alsa_source_sptr;
  *
  * Output samples will be in the range [-1,1].
  */
-class audio_alsa_source : public gr_audio_source {
+class audio_alsa_source : public audio_source {
   // typedef for pointer to class work method
   typedef int (audio_alsa_source::*work_t)(int noutput_items,
 					   gr_vector_const_void_star &input_items,
diff --git a/gr-audio/lib/gr_audio_registry.cc b/gr-audio/lib/gr_audio_registry.cc
index 708601489..be1337101 100644
--- a/gr-audio/lib/gr_audio_registry.cc
+++ b/gr-audio/lib/gr_audio_registry.cc
@@ -40,18 +40,18 @@ static std::vector<std::pair<std::string, sink_factory_t> > &get_sink_registry(v
 /***********************************************************************
  * Register functions
  **********************************************************************/
-void gr_audio_register_source(const std::string &name, source_factory_t source){
+void audio_register_source(const std::string &name, source_factory_t source){
     get_source_registry().push_back(std::make_pair(name, source));
 }
 
-void gr_audio_register_sink(const std::string &name, sink_factory_t sink){
+void audio_register_sink(const std::string &name, sink_factory_t sink){
     get_sink_registry().push_back(std::make_pair(name, sink));
 }
 
 /***********************************************************************
  * Factory functions
  **********************************************************************/
-gr_audio_source::sptr gr_make_audio_source(
+audio_source::sptr audio_make_source(
     int sampling_rate,
     const std::string device_name,
     bool ok_to_block
@@ -63,7 +63,7 @@ gr_audio_source::sptr gr_make_audio_source(
     return get_source_registry().front().second(sampling_rate, device_name, ok_to_block);
 }
 
-gr_audio_sink::sptr gr_make_audio_sink(
+audio_sink::sptr audio_make_sink(
     int sampling_rate,
     const std::string device_name,
     bool ok_to_block
@@ -80,7 +80,7 @@ gr_audio_sink::sptr gr_make_audio_sink(
  **********************************************************************/
 #include <gr_io_signature.h>
 
-gr_audio_sink::gr_audio_sink(
+audio_sink::audio_sink(
         const std::string &name,
         gr_io_signature_sptr insig,
         gr_io_signature_sptr outsig
@@ -88,7 +88,7 @@ gr_audio_sink::gr_audio_sink(
     gr_sync_block(name, insig, outsig)
 {}
 
-gr_audio_source::gr_audio_source(
+audio_source::audio_source(
         const std::string &name,
         gr_io_signature_sptr insig,
         gr_io_signature_sptr outsig
diff --git a/gr-audio/lib/gr_audio_registry.h b/gr-audio/lib/gr_audio_registry.h
index b84665017..71f6ad11d 100644
--- a/gr-audio/lib/gr_audio_registry.h
+++ b/gr-audio/lib/gr_audio_registry.h
@@ -26,24 +26,24 @@
 #include <gr_audio_source.h>
 #include <string>
 
-typedef gr_audio_source::sptr(*source_factory_t)(int, const std::string &, bool);
-typedef gr_audio_sink::sptr(*sink_factory_t)(int, const std::string &, bool);
+typedef audio_source::sptr(*source_factory_t)(int, const std::string &, bool);
+typedef audio_sink::sptr(*sink_factory_t)(int, const std::string &, bool);
 
-void gr_audio_register_source(const std::string &name, source_factory_t source);
-void gr_audio_register_sink(const std::string &name, sink_factory_t sink);
+void audio_register_source(const std::string &name, source_factory_t source);
+void audio_register_sink(const std::string &name, sink_factory_t sink);
 
-#define GR_AUDIO_REGISTER_FIXTURE(x) static struct x{x();}x;x::x()
+#define AUDIO_REGISTER_FIXTURE(x) static struct x{x();}x;x::x()
 
-#define GR_AUDIO_REGISTER_SOURCE(name) \
-    static gr_audio_source::sptr name##_source_fcn(int, const std::string &, bool); \
-    GR_AUDIO_REGISTER_FIXTURE(name##_source_reg){ \
-        gr_audio_register_source(#name, &name##_source_fcn); \
-    } static gr_audio_source::sptr name##_source_fcn
+#define AUDIO_REGISTER_SOURCE(name) \
+    static audio_source::sptr name##_source_fcn(int, const std::string &, bool); \
+    AUDIO_REGISTER_FIXTURE(name##_source_reg){ \
+        audio_register_source(#name, &name##_source_fcn); \
+    } static audio_source::sptr name##_source_fcn
 
-#define GR_AUDIO_REGISTER_SINK(name) \
-    static gr_audio_sink::sptr name##_sink_fcn(int, const std::string &, bool); \
-    GR_AUDIO_REGISTER_FIXTURE(name##_sink_reg){ \
-        gr_audio_register_sink(#name, &name##_sink_fcn); \
-    } static gr_audio_sink::sptr name##_sink_fcn
+#define AUDIO_REGISTER_SINK(name) \
+    static audio_sink::sptr name##_sink_fcn(int, const std::string &, bool); \
+    AUDIO_REGISTER_FIXTURE(name##_sink_reg){ \
+        audio_register_sink(#name, &name##_sink_fcn); \
+    } static audio_sink::sptr name##_sink_fcn
 
 #endif /* INCLUDED_GR_AUDIO_REGISTRY_H */