summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2013-02-11 23:12:08 -0500
committerTom Rondeau <trondeau@vt.edu>2013-02-11 23:12:08 -0500
commita64df4e322933006f954c72bccbe53f6ce1a2381 (patch)
tree9025e923229a28c6c923de477ef13753f3bad13b
parent0c8763a943dde47b4bbebf526c442509a9cf8bd4 (diff)
analog: wip: name changes for alsa, oss, jack files.
Diffstat
-rw-r--r--gr-audio/lib/CMakeLists.txt18
-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
-rw-r--r--gr-audio/lib/audio_registry.cc (renamed from gr-audio/lib/gr_audio_registry.cc)2
-rw-r--r--gr-audio/lib/audio_registry.h (renamed from gr-audio/lib/gr_audio_registry.h)0
-rw-r--r--gr-audio/lib/jack/jack_impl.cc (renamed from gr-audio/lib/jack/gri_jack.cc)2
-rw-r--r--gr-audio/lib/jack/jack_impl.h (renamed from gr-audio/lib/jack/gri_jack.h)0
-rw-r--r--gr-audio/lib/jack/jack_sink.cc (renamed from gr-audio/lib/jack/audio_jack_sink.cc)6
-rw-r--r--gr-audio/lib/jack/jack_sink.h (renamed from gr-audio/lib/jack/audio_jack_sink.h)0
-rw-r--r--gr-audio/lib/jack/jack_source.cc (renamed from gr-audio/lib/jack/audio_jack_source.cc)6
-rw-r--r--gr-audio/lib/jack/jack_source.h (renamed from gr-audio/lib/jack/audio_jack_source.h)0
-rw-r--r--gr-audio/lib/oss/oss_sink.cc (renamed from gr-audio/lib/oss/audio_oss_sink.cc)4
-rw-r--r--gr-audio/lib/oss/oss_sink.h (renamed from gr-audio/lib/oss/audio_oss_sink.h)0
-rw-r--r--gr-audio/lib/oss/oss_source.cc (renamed from gr-audio/lib/oss/audio_oss_source.cc)4
-rw-r--r--gr-audio/lib/oss/oss_source.h (renamed from gr-audio/lib/oss/audio_oss_source.h)0
19 files changed, 30 insertions, 30 deletions
diff --git a/gr-audio/lib/CMakeLists.txt b/gr-audio/lib/CMakeLists.txt
index f39264d5d2..b6e6a1f2db 100644
--- a/gr-audio/lib/CMakeLists.txt
+++ b/gr-audio/lib/CMakeLists.txt
@@ -31,7 +31,7 @@ include_directories(
link_directories(${Boost_LIBRARY_DIRS})
list(APPEND gr_audio_libs gnuradio-core ${Boost_LIBRARIES})
-list(APPEND gr_audio_sources gr_audio_registry.cc)
+list(APPEND gr_audio_sources audio_registry.cc)
list(APPEND gr_audio_confs ${CMAKE_CURRENT_SOURCE_DIR}/gr-audio.conf)
########################################################################
@@ -44,9 +44,9 @@ if(ALSA_FOUND)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/alsa ${ALSA_INCLUDE_DIRS})
list(APPEND gr_audio_libs ${ALSA_LIBRARIES})
list(APPEND gr_audio_sources
- ${CMAKE_CURRENT_SOURCE_DIR}/alsa/gri_alsa.cc
- ${CMAKE_CURRENT_SOURCE_DIR}/alsa/audio_alsa_source.cc
- ${CMAKE_CURRENT_SOURCE_DIR}/alsa/audio_alsa_sink.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/alsa/alsa_impl.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/alsa/alsa_source.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/alsa/alsa_sink.cc
)
list(APPEND gr_audio_confs ${CMAKE_CURRENT_SOURCE_DIR}/alsa/gr-audio-alsa.conf)
@@ -61,8 +61,8 @@ if(OSS_FOUND)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/oss ${OSS_INCLUDE_DIRS})
list(APPEND gr_audio_sources
- ${CMAKE_CURRENT_SOURCE_DIR}/oss/audio_oss_source.cc
- ${CMAKE_CURRENT_SOURCE_DIR}/oss/audio_oss_sink.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/oss/oss_source.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/oss/oss_sink.cc
)
list(APPEND gr_audio_confs ${CMAKE_CURRENT_SOURCE_DIR}/oss/gr-audio-oss.conf)
@@ -80,9 +80,9 @@ if(JACK_FOUND)
list(APPEND gr_audio_libs ${JACK_LIBRARIES})
add_definitions(${JACK_DEFINITIONS})
list(APPEND gr_audio_sources
- ${CMAKE_CURRENT_SOURCE_DIR}/jack/gri_jack.cc
- ${CMAKE_CURRENT_SOURCE_DIR}/jack/audio_jack_source.cc
- ${CMAKE_CURRENT_SOURCE_DIR}/jack/audio_jack_sink.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/jack/jack_impl.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/jack/jack_source.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/jack/jack_sink.cc
)
list(APPEND gr_audio_confs ${CMAKE_CURRENT_SOURCE_DIR}/jack/gr-audio-jack.conf)
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
diff --git a/gr-audio/lib/gr_audio_registry.cc b/gr-audio/lib/audio_registry.cc
index 5446eb09bb..71f9099a63 100644
--- a/gr-audio/lib/gr_audio_registry.cc
+++ b/gr-audio/lib/audio_registry.cc
@@ -19,7 +19,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include "gr_audio_registry.h"
+#include "audio_registry.h"
#include <boost/foreach.hpp>
#include <gr_prefs.h>
#include <stdexcept>
diff --git a/gr-audio/lib/gr_audio_registry.h b/gr-audio/lib/audio_registry.h
index 70612de574..70612de574 100644
--- a/gr-audio/lib/gr_audio_registry.h
+++ b/gr-audio/lib/audio_registry.h
diff --git a/gr-audio/lib/jack/gri_jack.cc b/gr-audio/lib/jack/jack_impl.cc
index 793ed8336b..c1f3b320fc 100644
--- a/gr-audio/lib/jack/gri_jack.cc
+++ b/gr-audio/lib/jack/jack_impl.cc
@@ -24,7 +24,7 @@
#include "config.h"
#endif
-#include <gri_jack.h>
+#include <jack_impl.h>
#include <algorithm>
diff --git a/gr-audio/lib/jack/gri_jack.h b/gr-audio/lib/jack/jack_impl.h
index 5dcd3b811e..5dcd3b811e 100644
--- a/gr-audio/lib/jack/gri_jack.h
+++ b/gr-audio/lib/jack/jack_impl.h
diff --git a/gr-audio/lib/jack/audio_jack_sink.cc b/gr-audio/lib/jack/jack_sink.cc
index 3b5c474a24..9e9d1e34db 100644
--- a/gr-audio/lib/jack/audio_jack_sink.cc
+++ b/gr-audio/lib/jack/jack_sink.cc
@@ -24,14 +24,14 @@
#include "config.h"
#endif
-#include "gr_audio_registry.h"
-#include <audio_jack_sink.h>
+#include "audio_registry.h"
+#include <jack_sink.h>
+#include <jack_impl.h>
#include <gr_io_signature.h>
#include <gr_prefs.h>
#include <stdio.h>
#include <iostream>
#include <stdexcept>
-#include <gri_jack.h>
#ifndef NO_PTHREAD
#include <pthread.h>
diff --git a/gr-audio/lib/jack/audio_jack_sink.h b/gr-audio/lib/jack/jack_sink.h
index 2caecbd54c..2caecbd54c 100644
--- a/gr-audio/lib/jack/audio_jack_sink.h
+++ b/gr-audio/lib/jack/jack_sink.h
diff --git a/gr-audio/lib/jack/audio_jack_source.cc b/gr-audio/lib/jack/jack_source.cc
index 3c09081d57..e5a46e3416 100644
--- a/gr-audio/lib/jack/audio_jack_source.cc
+++ b/gr-audio/lib/jack/jack_source.cc
@@ -24,14 +24,14 @@
#include "config.h"
#endif
-#include "gr_audio_registry.h"
-#include <audio_jack_source.h>
+#include "audio_registry.h"
+#include <jack_source.h>
+#include <jack_impl.h>
#include <gr_io_signature.h>
#include <gr_prefs.h>
#include <stdio.h>
#include <iostream>
#include <stdexcept>
-#include <gri_jack.h>
#ifndef NO_PTHREAD
#include <pthread.h>
diff --git a/gr-audio/lib/jack/audio_jack_source.h b/gr-audio/lib/jack/jack_source.h
index f096220b26..f096220b26 100644
--- a/gr-audio/lib/jack/audio_jack_source.h
+++ b/gr-audio/lib/jack/jack_source.h
diff --git a/gr-audio/lib/oss/audio_oss_sink.cc b/gr-audio/lib/oss/oss_sink.cc
index 28567bae11..129e771fd6 100644
--- a/gr-audio/lib/oss/audio_oss_sink.cc
+++ b/gr-audio/lib/oss/oss_sink.cc
@@ -24,8 +24,8 @@
#include "config.h"
#endif
-#include "gr_audio_registry.h"
-#include <audio_oss_sink.h>
+#include "audio_registry.h"
+#include <oss_sink.h>
#include <gr_io_signature.h>
#include <gr_prefs.h>
#include <sys/soundcard.h>
diff --git a/gr-audio/lib/oss/audio_oss_sink.h b/gr-audio/lib/oss/oss_sink.h
index 3bb5f4ee1a..3bb5f4ee1a 100644
--- a/gr-audio/lib/oss/audio_oss_sink.h
+++ b/gr-audio/lib/oss/oss_sink.h
diff --git a/gr-audio/lib/oss/audio_oss_source.cc b/gr-audio/lib/oss/oss_source.cc
index 5682594d13..6d6bafceb8 100644
--- a/gr-audio/lib/oss/audio_oss_source.cc
+++ b/gr-audio/lib/oss/oss_source.cc
@@ -24,8 +24,8 @@
#include "config.h"
#endif
-#include "gr_audio_registry.h"
-#include <audio_oss_source.h>
+#include "audio_registry.h"
+#include <oss_source.h>
#include <gr_io_signature.h>
#include <gr_prefs.h>
#include <sys/soundcard.h>
diff --git a/gr-audio/lib/oss/audio_oss_source.h b/gr-audio/lib/oss/oss_source.h
index bf5183bd32..bf5183bd32 100644
--- a/gr-audio/lib/oss/audio_oss_source.h
+++ b/gr-audio/lib/oss/oss_source.h
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-21 21:07:29 +0000