summaryrefslogtreecommitdiff
path: root/gr-audio/lib
diff options
context:
space:
mode:
authorMarcus Müller <marcus@hostalia.de>2018-08-31 23:02:22 +0200
committerMarcus Müller <marcus@hostalia.de>2018-08-31 23:02:22 +0200
commit254fe5e89403d4de1fa6663d09efdf946996aff3 (patch)
tree62877d7ac7fdedf6c397c51e22ac6f97eba97ddf /gr-audio/lib
parent896d1c9da31963ecf5b0d90942c2af51ca998a69 (diff)
parent5ad935c3a3dd46ce2860b13e2b774e4841784616 (diff)
Merge remote-tracking branch 'origin/next' into merge_next
Diffstat (limited to 'gr-audio/lib')
-rw-r--r--gr-audio/lib/CMakeLists.txt6
-rw-r--r--gr-audio/lib/alsa/alsa_sink.cc2
-rw-r--r--gr-audio/lib/alsa/alsa_sink.h2
-rw-r--r--gr-audio/lib/alsa/alsa_source.cc2
-rw-r--r--gr-audio/lib/alsa/alsa_source.h2
-rw-r--r--gr-audio/lib/jack/jack_sink.cc2
-rw-r--r--gr-audio/lib/jack/jack_sink.h2
-rw-r--r--gr-audio/lib/jack/jack_source.cc2
-rw-r--r--gr-audio/lib/jack/jack_source.h2
-rw-r--r--gr-audio/lib/portaudio/portaudio_sink.cc2
-rw-r--r--gr-audio/lib/portaudio/portaudio_sink.h2
-rw-r--r--gr-audio/lib/portaudio/portaudio_source.cc2
-rw-r--r--gr-audio/lib/portaudio/portaudio_source.h2
13 files changed, 15 insertions, 15 deletions
diff --git a/gr-audio/lib/CMakeLists.txt b/gr-audio/lib/CMakeLists.txt
index b95163beb0..7d01bac39d 100644
--- a/gr-audio/lib/CMakeLists.txt
+++ b/gr-audio/lib/CMakeLists.txt
@@ -199,9 +199,9 @@ endif(WIN32)
########################################################################
add_library(gnuradio-audio SHARED ${gr_audio_sources})
target_link_libraries(gnuradio-audio ${gr_audio_libs})
-GR_LIBRARY_FOO(gnuradio-audio RUNTIME_COMPONENT "audio_runtime" DEVEL_COMPONENT "audio_devel")
+GR_LIBRARY_FOO(gnuradio-audio)
-install(FILES ${gr_audio_confs} DESTINATION ${GR_PREFSDIR} COMPONENT "audio_runtime")
+install(FILES ${gr_audio_confs} DESTINATION ${GR_PREFSDIR})
if(ENABLE_STATIC_LIBS)
if(ENABLE_GR_CTRLPORT)
@@ -223,6 +223,6 @@ if(ENABLE_STATIC_LIBS)
endif(NOT WIN32)
install(TARGETS gnuradio-audio_static
- ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "audio_devel" # .lib file
+ ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file
)
endif(ENABLE_STATIC_LIBS)
diff --git a/gr-audio/lib/alsa/alsa_sink.cc b/gr-audio/lib/alsa/alsa_sink.cc
index 9695ad2c71..a9558bc545 100644
--- a/gr-audio/lib/alsa/alsa_sink.cc
+++ b/gr-audio/lib/alsa/alsa_sink.cc
@@ -538,7 +538,7 @@ namespace gr {
}
void
- alsa_sink::bail(const char *msg, int err) throw (std::runtime_error)
+ alsa_sink::bail(const char *msg, int err)
{
output_error_msg(msg, err);
throw std::runtime_error("audio_alsa_sink");
diff --git a/gr-audio/lib/alsa/alsa_sink.h b/gr-audio/lib/alsa/alsa_sink.h
index c1e4670341..27ca047507 100644
--- a/gr-audio/lib/alsa/alsa_sink.h
+++ b/gr-audio/lib/alsa/alsa_sink.h
@@ -71,7 +71,7 @@ namespace gr {
bool d_ok_to_block; // defaults to "true", controls blocking/non-block I/O
void output_error_msg(const char *msg, int err);
- void bail(const char *msg, int err) throw (std::runtime_error);
+ void bail(const char *msg, int err);
public:
alsa_sink(int sampling_rate,
diff --git a/gr-audio/lib/alsa/alsa_source.cc b/gr-audio/lib/alsa/alsa_source.cc
index 20b5417c73..1b26ca7cb5 100644
--- a/gr-audio/lib/alsa/alsa_source.cc
+++ b/gr-audio/lib/alsa/alsa_source.cc
@@ -503,7 +503,7 @@ namespace gr {
}
void
- alsa_source::bail(const char *msg, int err) throw (std::runtime_error)
+ alsa_source::bail(const char *msg, int err)
{
output_error_msg(msg, err);
throw std::runtime_error("audio_alsa_source");
diff --git a/gr-audio/lib/alsa/alsa_source.h b/gr-audio/lib/alsa/alsa_source.h
index 88e16932ca..61c50be754 100644
--- a/gr-audio/lib/alsa/alsa_source.h
+++ b/gr-audio/lib/alsa/alsa_source.h
@@ -74,7 +74,7 @@ namespace gr {
int d_nsuspends; // count of suspends
void output_error_msg(const char *msg, int err);
- void bail(const char *msg, int err) throw (std::runtime_error);
+ void bail(const char *msg, int err);
public:
alsa_source(int sampling_rate,
diff --git a/gr-audio/lib/jack/jack_sink.cc b/gr-audio/lib/jack/jack_sink.cc
index 6261545028..b9bb6c82de 100644
--- a/gr-audio/lib/jack/jack_sink.cc
+++ b/gr-audio/lib/jack/jack_sink.cc
@@ -256,7 +256,7 @@ namespace gr {
}
void
- jack_sink::bail(const char *msg, int err) throw (std::runtime_error)
+ jack_sink::bail(const char *msg, int err)
{
output_error_msg(msg, err);
throw std::runtime_error("audio_jack_sink");
diff --git a/gr-audio/lib/jack/jack_sink.h b/gr-audio/lib/jack/jack_sink.h
index eefe5d5b50..23f5d298e5 100644
--- a/gr-audio/lib/jack/jack_sink.h
+++ b/gr-audio/lib/jack/jack_sink.h
@@ -67,7 +67,7 @@ namespace gr {
int d_nunderuns; // count of underruns
void output_error_msg(const char *msg, int err);
- void bail(const char *msg, int err) throw (std::runtime_error);
+ void bail(const char *msg, int err);
public:
jack_sink(int sampling_rate,
diff --git a/gr-audio/lib/jack/jack_source.cc b/gr-audio/lib/jack/jack_source.cc
index ced1d47d2e..7b610e795a 100644
--- a/gr-audio/lib/jack/jack_source.cc
+++ b/gr-audio/lib/jack/jack_source.cc
@@ -256,7 +256,7 @@ namespace gr {
}
void
- jack_source::bail(const char *msg, int err) throw (std::runtime_error)
+ jack_source::bail(const char *msg, int err)
{
output_error_msg(msg, err);
throw std::runtime_error("audio_jack_source");
diff --git a/gr-audio/lib/jack/jack_source.h b/gr-audio/lib/jack/jack_source.h
index 6c895ae067..f40e46d4f0 100644
--- a/gr-audio/lib/jack/jack_source.h
+++ b/gr-audio/lib/jack/jack_source.h
@@ -67,7 +67,7 @@ namespace gr {
int d_noverruns; // count of overruns
void output_error_msg(const char *msg, int err);
- void bail(const char *msg, int err) throw (std::runtime_error);
+ void bail(const char *msg, int err);
public:
jack_source(int sampling_rate,
diff --git a/gr-audio/lib/portaudio/portaudio_sink.cc b/gr-audio/lib/portaudio/portaudio_sink.cc
index 9803559487..942167d9d6 100644
--- a/gr-audio/lib/portaudio/portaudio_sink.cc
+++ b/gr-audio/lib/portaudio/portaudio_sink.cc
@@ -368,7 +368,7 @@ namespace gr {
}
void
- portaudio_sink::bail(const char *msg, int err) throw (std::runtime_error)
+ portaudio_sink::bail(const char *msg, int err)
{
output_error_msg(msg, err);
throw std::runtime_error("audio_portaudio_sink");
diff --git a/gr-audio/lib/portaudio/portaudio_sink.h b/gr-audio/lib/portaudio/portaudio_sink.h
index 6327f4397c..d86681036f 100644
--- a/gr-audio/lib/portaudio/portaudio_sink.h
+++ b/gr-audio/lib/portaudio/portaudio_sink.h
@@ -67,7 +67,7 @@ namespace gr {
//gri_logger_sptr d_log; // handle to non-blocking logging instance
void output_error_msg(const char *msg, int err);
- void bail(const char *msg, int err) throw (std::runtime_error);
+ void bail(const char *msg, int err);
void create_ringbuffer();
public:
diff --git a/gr-audio/lib/portaudio/portaudio_source.cc b/gr-audio/lib/portaudio/portaudio_source.cc
index 789197472f..f00667fc7f 100644
--- a/gr-audio/lib/portaudio/portaudio_source.cc
+++ b/gr-audio/lib/portaudio/portaudio_source.cc
@@ -376,7 +376,7 @@ namespace gr {
}
void
- portaudio_source::bail(const char *msg, int err) throw (std::runtime_error)
+ portaudio_source::bail(const char *msg, int err)
{
output_error_msg(msg, err);
throw std::runtime_error("audio_portaudio_source");
diff --git a/gr-audio/lib/portaudio/portaudio_source.h b/gr-audio/lib/portaudio/portaudio_source.h
index b42f9a3a9b..7d315c5bc1 100644
--- a/gr-audio/lib/portaudio/portaudio_source.h
+++ b/gr-audio/lib/portaudio/portaudio_source.h
@@ -66,7 +66,7 @@ namespace gr {
int d_noverruns; // count of overruns
void output_error_msg(const char *msg, int err);
- void bail(const char *msg, int err) throw (std::runtime_error);
+ void bail(const char *msg, int err);
void create_ringbuffer();
public:
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-29 00:28:24 +0000