From f8ce10742ab6b9ac170432ae78d2ee2d6c538d72 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Wed, 16 Mar 2011 15:07:37 -0700
Subject: audio: cleanup audio source/sink with virtual inheritance

The audio implementations now inherit from sync block (as they used to).
And the redundant constructor in audio source/sink has been removed.
---
 gr-audio/lib/portaudio/audio_portaudio_sink.cc   | 2 +-
 gr-audio/lib/portaudio/audio_portaudio_source.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'gr-audio/lib/portaudio')

diff --git a/gr-audio/lib/portaudio/audio_portaudio_sink.cc b/gr-audio/lib/portaudio/audio_portaudio_sink.cc
index 515cd04d9..7fdb99577 100644
--- a/gr-audio/lib/portaudio/audio_portaudio_sink.cc
+++ b/gr-audio/lib/portaudio/audio_portaudio_sink.cc
@@ -130,7 +130,7 @@ portaudio_sink_callback (const void *inputBuffer,
 audio_portaudio_sink::audio_portaudio_sink(int sampling_rate,
 					   const std::string device_name,
 					   bool ok_to_block)
-  : audio_sink ("audio_portaudio_sink",
+  : gr_sync_block ("audio_portaudio_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/portaudio/audio_portaudio_source.cc b/gr-audio/lib/portaudio/audio_portaudio_source.cc
index bdb8b3b3d..55828ad21 100644
--- a/gr-audio/lib/portaudio/audio_portaudio_source.cc
+++ b/gr-audio/lib/portaudio/audio_portaudio_source.cc
@@ -129,7 +129,7 @@ portaudio_source_callback (const void *inputBuffer,
 audio_portaudio_source::audio_portaudio_source(int sampling_rate,
 					       const std::string device_name,
 					       bool ok_to_block)
-  : audio_source ("audio_portaudio_source",
+  : gr_sync_block ("audio_portaudio_source",
 		   gr_make_io_signature(0, 0, 0),
 		   gr_make_io_signature(0, 0, 0)),
     d_sampling_rate(sampling_rate),
-- 
cgit