summaryrefslogtreecommitdiff
path: root/gr-audio
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-03-16 15:07:37 -0700
committerJosh Blum <josh@joshknows.com>2011-03-28 10:30:22 -0700
commitf8ce10742ab6b9ac170432ae78d2ee2d6c538d72 (patch)
treeddca9aad42ae4a90c13029df4f81520a240f13d6 /gr-audio
parent35a4938e598f6be6034e21ef1818c412a16a22d1 (diff)
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.
Diffstat (limited to 'gr-audio')
-rw-r--r--gr-audio/include/gr_audio_sink.h9
-rw-r--r--gr-audio/include/gr_audio_source.h9
-rw-r--r--gr-audio/lib/alsa/audio_alsa_sink.cc2
-rw-r--r--gr-audio/lib/alsa/audio_alsa_source.cc2
-rw-r--r--gr-audio/lib/gr_audio_registry.cc21
-rw-r--r--gr-audio/lib/jack/audio_jack_sink.cc2
-rw-r--r--gr-audio/lib/jack/audio_jack_source.cc2
-rw-r--r--gr-audio/lib/oss/audio_oss_sink.cc2
-rw-r--r--gr-audio/lib/oss/audio_oss_source.cc2
-rw-r--r--gr-audio/lib/osx/audio_osx_sink.cc2
-rw-r--r--gr-audio/lib/osx/audio_osx_source.cc2
-rw-r--r--gr-audio/lib/portaudio/audio_portaudio_sink.cc2
-rw-r--r--gr-audio/lib/portaudio/audio_portaudio_source.cc2
-rw-r--r--gr-audio/lib/windows/audio_windows_sink.cc2
-rw-r--r--gr-audio/lib/windows/audio_windows_source.cc2
15 files changed, 14 insertions, 49 deletions
diff --git a/gr-audio/include/gr_audio_sink.h b/gr-audio/include/gr_audio_sink.h
index c76ec65508..ca3b15a37a 100644
--- a/gr-audio/include/gr_audio_sink.h
+++ b/gr-audio/include/gr_audio_sink.h
@@ -25,16 +25,9 @@
#include <gr_audio_api.h>
#include <gr_sync_block.h>
-class GR_AUDIO_API audio_sink : public gr_sync_block{
+class GR_AUDIO_API audio_sink : virtual public gr_sync_block{
public:
typedef boost::shared_ptr<audio_sink> sptr;
-
- audio_sink(
- const std::string &name,
- gr_io_signature_sptr insig,
- gr_io_signature_sptr outsig
- );
-
};
GR_AUDIO_API audio_sink::sptr audio_make_sink(
diff --git a/gr-audio/include/gr_audio_source.h b/gr-audio/include/gr_audio_source.h
index ed3c31c10c..b8ae2ca5fa 100644
--- a/gr-audio/include/gr_audio_source.h
+++ b/gr-audio/include/gr_audio_source.h
@@ -25,16 +25,9 @@
#include <gr_audio_api.h>
#include <gr_sync_block.h>
-class GR_AUDIO_API audio_source : public gr_sync_block{
+class GR_AUDIO_API audio_source : virtual public gr_sync_block{
public:
typedef boost::shared_ptr<audio_source> sptr;
-
- audio_source(
- const std::string &name,
- gr_io_signature_sptr insig,
- gr_io_signature_sptr outsig
- );
-
};
GR_AUDIO_API audio_source::sptr audio_make_source(
diff --git a/gr-audio/lib/alsa/audio_alsa_sink.cc b/gr-audio/lib/alsa/audio_alsa_sink.cc
index 0728f421c8..5fd197ec77 100644
--- a/gr-audio/lib/alsa/audio_alsa_sink.cc
+++ b/gr-audio/lib/alsa/audio_alsa_sink.cc
@@ -74,7 +74,7 @@ default_nperiods ()
audio_alsa_sink::audio_alsa_sink (int sampling_rate,
const std::string device_name,
bool ok_to_block)
- : audio_sink ("audio_alsa_sink",
+ : gr_sync_block ("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/alsa/audio_alsa_source.cc b/gr-audio/lib/alsa/audio_alsa_source.cc
index e46a7fdd4e..4f0042b22e 100644
--- a/gr-audio/lib/alsa/audio_alsa_source.cc
+++ b/gr-audio/lib/alsa/audio_alsa_source.cc
@@ -73,7 +73,7 @@ default_nperiods ()
audio_alsa_source::audio_alsa_source (int sampling_rate,
const std::string device_name,
bool ok_to_block)
- : audio_source ("audio_alsa_source",
+ : gr_sync_block ("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/gr_audio_registry.cc b/gr-audio/lib/gr_audio_registry.cc
index c47db82893..da4b16b358 100644
--- a/gr-audio/lib/gr_audio_registry.cc
+++ b/gr-audio/lib/gr_audio_registry.cc
@@ -130,24 +130,3 @@ audio_sink::sptr audio_make_sink(
//std::cout << "Audio sink arch: " << entry.name << std::endl;
return entry.sink(sampling_rate, device_name, ok_to_block);
}
-
-/***********************************************************************
- * Default constructors
- **********************************************************************/
-#include <gr_io_signature.h>
-
-audio_sink::audio_sink(
- const std::string &name,
- gr_io_signature_sptr insig,
- gr_io_signature_sptr outsig
-):
- gr_sync_block(name, insig, outsig)
-{}
-
-audio_source::audio_source(
- const std::string &name,
- gr_io_signature_sptr insig,
- gr_io_signature_sptr outsig
-):
- gr_sync_block(name, insig, outsig)
-{}
diff --git a/gr-audio/lib/jack/audio_jack_sink.cc b/gr-audio/lib/jack/audio_jack_sink.cc
index db365a1f86..f06e77bd58 100644
--- a/gr-audio/lib/jack/audio_jack_sink.cc
+++ b/gr-audio/lib/jack/audio_jack_sink.cc
@@ -94,7 +94,7 @@ jack_sink_process (jack_nframes_t nframes, void *arg)
audio_jack_sink::audio_jack_sink (int sampling_rate,
const std::string device_name,
bool ok_to_block)
- : audio_sink ("audio_jack_sink",
+ : gr_sync_block ("audio_jack_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/jack/audio_jack_source.cc b/gr-audio/lib/jack/audio_jack_source.cc
index 415c7f22b8..dcd41c3ac7 100644
--- a/gr-audio/lib/jack/audio_jack_source.cc
+++ b/gr-audio/lib/jack/audio_jack_source.cc
@@ -95,7 +95,7 @@ jack_source_process (jack_nframes_t nframes, void *arg)
audio_jack_source::audio_jack_source (int sampling_rate,
const std::string device_name,
bool ok_to_block)
- : audio_source ("audio_jack_source",
+ : gr_sync_block ("audio_jack_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/oss/audio_oss_sink.cc b/gr-audio/lib/oss/audio_oss_sink.cc
index 4e9e7cd791..34af16ccef 100644
--- a/gr-audio/lib/oss/audio_oss_sink.cc
+++ b/gr-audio/lib/oss/audio_oss_sink.cc
@@ -53,7 +53,7 @@ default_device_name ()
audio_oss_sink::audio_oss_sink (int sampling_rate,
const std::string device_name,
bool ok_to_block)
- : audio_sink ("audio_oss_sink",
+ : gr_sync_block ("audio_oss_sink",
gr_make_io_signature (1, 2, sizeof (float)),
gr_make_io_signature (0, 0, 0)),
d_sampling_rate (sampling_rate),
diff --git a/gr-audio/lib/oss/audio_oss_source.cc b/gr-audio/lib/oss/audio_oss_source.cc
index b7d53931dc..eefe4dd04b 100644
--- a/gr-audio/lib/oss/audio_oss_source.cc
+++ b/gr-audio/lib/oss/audio_oss_source.cc
@@ -53,7 +53,7 @@ default_device_name ()
audio_oss_source::audio_oss_source (int sampling_rate,
const std::string device_name,
bool ok_to_block)
- : audio_source ("audio_oss_source",
+ : gr_sync_block ("audio_oss_source",
gr_make_io_signature (0, 0, 0),
gr_make_io_signature (1, 2, sizeof (float))),
d_sampling_rate (sampling_rate),
diff --git a/gr-audio/lib/osx/audio_osx_sink.cc b/gr-audio/lib/osx/audio_osx_sink.cc
index f7aeb54f88..901881da67 100644
--- a/gr-audio/lib/osx/audio_osx_sink.cc
+++ b/gr-audio/lib/osx/audio_osx_sink.cc
@@ -43,7 +43,7 @@ audio_osx_sink::audio_osx_sink (int sample_rate,
bool do_block,
int channel_config,
int max_sample_count)
- : audio_sink ("audio_osx_sink",
+ : gr_sync_block ("audio_osx_sink",
gr_make_io_signature (0, 0, 0),
gr_make_io_signature (0, 0, 0)),
d_sample_rate (0.0), d_channel_config (0), d_n_channels (0),
diff --git a/gr-audio/lib/osx/audio_osx_source.cc b/gr-audio/lib/osx/audio_osx_source.cc
index e380156d6f..61f8eb4a6d 100644
--- a/gr-audio/lib/osx/audio_osx_source.cc
+++ b/gr-audio/lib/osx/audio_osx_source.cc
@@ -65,7 +65,7 @@ audio_osx_source::audio_osx_source (int sample_rate,
bool do_block,
int channel_config,
int max_sample_count)
- : audio_source ("audio_osx_source",
+ : gr_sync_block ("audio_osx_source",
gr_make_io_signature (0, 0, 0),
gr_make_io_signature (0, 0, 0)),
d_deviceSampleRate (0.0), d_outputSampleRate (0.0),
diff --git a/gr-audio/lib/portaudio/audio_portaudio_sink.cc b/gr-audio/lib/portaudio/audio_portaudio_sink.cc
index 515cd04d9d..7fdb995770 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 bdb8b3b3da..55828ad218 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),
diff --git a/gr-audio/lib/windows/audio_windows_sink.cc b/gr-audio/lib/windows/audio_windows_sink.cc
index e3f67a8f4d..5284ce1734 100644
--- a/gr-audio/lib/windows/audio_windows_sink.cc
+++ b/gr-audio/lib/windows/audio_windows_sink.cc
@@ -54,7 +54,7 @@ default_device_name ()
}
audio_windows_sink::audio_windows_sink (int sampling_freq, const std::string device_name)
- : audio_sink ("audio_windows_sink",
+ : gr_sync_block ("audio_windows_sink",
gr_make_io_signature (1, 2, sizeof (float)),
gr_make_io_signature (0, 0, 0)),
d_sampling_freq (sampling_freq),
diff --git a/gr-audio/lib/windows/audio_windows_source.cc b/gr-audio/lib/windows/audio_windows_source.cc
index 4b657a0e3c..75b0a33bbc 100644
--- a/gr-audio/lib/windows/audio_windows_source.cc
+++ b/gr-audio/lib/windows/audio_windows_source.cc
@@ -54,7 +54,7 @@ default_device_name ()
}
audio_windows_source::audio_windows_source (int sampling_freq, const std::string device_name)
- : audio_source ("audio_windows_source",
+ : gr_sync_block ("audio_windows_source",
gr_make_io_signature (0, 0, 0),
gr_make_io_signature (1, 2, sizeof (float))),
d_sampling_freq (sampling_freq),
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-13 18:07:38 +0000