diff options
author | Tom Rondeau <trondeau@vt.edu> | 2013-02-11 23:12:08 -0500 |
---|---|---|
committer | Tom Rondeau <trondeau@vt.edu> | 2013-02-11 23:12:08 -0500 |
commit | a64df4e322933006f954c72bccbe53f6ce1a2381 (patch) | |
tree | 9025e923229a28c6c923de477ef13753f3bad13b /gr-audio/lib/alsa | |
parent | 0c8763a943dde47b4bbebf526c442509a9cf8bd4 (diff) |
analog: wip: name changes for alsa, oss, jack files.
Diffstat (limited to 'gr-audio/lib/alsa')
-rw-r--r-- | gr-audio/lib/alsa/alsa_impl.cc (renamed from gr-audio/lib/alsa/gri_alsa.cc) | 2 | ||||
-rw-r--r-- | gr-audio/lib/alsa/alsa_impl.h (renamed from gr-audio/lib/alsa/gri_alsa.h) | 4 | ||||
-rw-r--r-- | gr-audio/lib/alsa/alsa_sink.cc (renamed from gr-audio/lib/alsa/audio_alsa_sink.cc) | 6 | ||||
-rw-r--r-- | gr-audio/lib/alsa/alsa_sink.h (renamed from gr-audio/lib/alsa/audio_alsa_sink.h) | 0 | ||||
-rw-r--r-- | gr-audio/lib/alsa/alsa_source.cc (renamed from gr-audio/lib/alsa/audio_alsa_source.cc) | 6 | ||||
-rw-r--r-- | gr-audio/lib/alsa/alsa_source.h (renamed from gr-audio/lib/alsa/audio_alsa_source.h) | 0 |
6 files changed, 9 insertions, 9 deletions
diff --git a/gr-audio/lib/alsa/gri_alsa.cc b/gr-audio/lib/alsa/alsa_impl.cc index 7bae0937d2..63a0b0de8e 100644 --- a/gr-audio/lib/alsa/gri_alsa.cc +++ b/gr-audio/lib/alsa/alsa_impl.cc @@ -24,7 +24,7 @@ #include "config.h" #endif -#include <gri_alsa.h> +#include <alsa/alsa_impl.h> #include <algorithm> static snd_pcm_access_t access_types[] = { diff --git a/gr-audio/lib/alsa/gri_alsa.h b/gr-audio/lib/alsa/alsa_impl.h index 9c64e2c368..1340ce403a 100644 --- a/gr-audio/lib/alsa/gri_alsa.h +++ b/gr-audio/lib/alsa/alsa_impl.h @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef INCLUDED_GRI_ALSA_H -#define INCLUDED_GRI_ALSA_H +#ifndef INCLUDED_ALSA_IMPL_H +#define INCLUDED_ALSA_IMPL_H #include <stdio.h> #include <alsa/asoundlib.h> diff --git a/gr-audio/lib/alsa/audio_alsa_sink.cc b/gr-audio/lib/alsa/alsa_sink.cc index 65f4379310..4af57105a9 100644 --- a/gr-audio/lib/alsa/audio_alsa_sink.cc +++ b/gr-audio/lib/alsa/alsa_sink.cc @@ -24,14 +24,14 @@ #include "config.h" #endif -#include "gr_audio_registry.h" -#include <audio_alsa_sink.h> +#include "audio_registry.h" +#include <alsa_sink.h> +#include <alsa_impl.h> #include <gr_io_signature.h> #include <gr_prefs.h> #include <stdio.h> #include <iostream> #include <stdexcept> -#include <gri_alsa.h> namespace gr { namespace audio { diff --git a/gr-audio/lib/alsa/audio_alsa_sink.h b/gr-audio/lib/alsa/alsa_sink.h index 1dea62f56e..1dea62f56e 100644 --- a/gr-audio/lib/alsa/audio_alsa_sink.h +++ b/gr-audio/lib/alsa/alsa_sink.h diff --git a/gr-audio/lib/alsa/audio_alsa_source.cc b/gr-audio/lib/alsa/alsa_source.cc index 64238fdd8b..838da60af3 100644 --- a/gr-audio/lib/alsa/audio_alsa_source.cc +++ b/gr-audio/lib/alsa/alsa_source.cc @@ -24,14 +24,14 @@ #include "config.h" #endif -#include "gr_audio_registry.h" -#include <audio_alsa_source.h> +#include "audio_registry.h" +#include <alsa_source.h> +#include <alsa_impl.h> #include <gr_io_signature.h> #include <gr_prefs.h> #include <stdio.h> #include <iostream> #include <stdexcept> -#include <gri_alsa.h> namespace gr { namespace audio { diff --git a/gr-audio/lib/alsa/audio_alsa_source.h b/gr-audio/lib/alsa/alsa_source.h index 6314fc1376..6314fc1376 100644 --- a/gr-audio/lib/alsa/audio_alsa_source.h +++ b/gr-audio/lib/alsa/alsa_source.h |