diff options
| author | A. Maitland Bottoms <bottoms@debian.org> | 2018-03-27 12:54:48 +0200 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2018-03-27 16:58:41 +0200 |
| commit | 5daef5e209f79eedc8bbeb45e32b3fa3e5edad4b (patch) | |
| tree | 964808d59d85eec1a7ffb265dbffe015c70c1dea /gr-audio/lib | |
| parent | 53d831638f54592e04ffa82c272e3c9f19487fc0 (diff) | |
gr-audio: ALSA on non-Linux ALSA systems
From the debian patch set
Diffstat (limited to 'gr-audio/lib')
| -rw-r--r-- | gr-audio/lib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gr-audio/lib/alsa/alsa_sink.cc | 4 | ||||
| -rw-r--r-- | gr-audio/lib/alsa/alsa_source.cc | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/gr-audio/lib/CMakeLists.txt b/gr-audio/lib/CMakeLists.txt index df510ef9c9..b95163beb0 100644 --- a/gr-audio/lib/CMakeLists.txt +++ b/gr-audio/lib/CMakeLists.txt @@ -44,7 +44,7 @@ endif(ENABLE_GR_CTRLPORT) ######################################################################## find_package(ALSA) -if(ALSA_FOUND) +if((ALSA_FOUND) AND NOT (CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD") AND NOT (CMAKE_SYSTEM_NAME STREQUAL GNU)) add_definitions(-DALSA_FOUND) GR_APPEND_SUBCOMPONENT("alsa") @@ -59,7 +59,7 @@ if(ALSA_FOUND) ) list(APPEND gr_audio_confs ${CMAKE_CURRENT_SOURCE_DIR}/alsa/gr-audio-alsa.conf) -endif(ALSA_FOUND) +endif((ALSA_FOUND) AND NOT (CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD") AND NOT (CMAKE_SYSTEM_NAME STREQUAL GNU)) ######################################################################## ## OSS Support diff --git a/gr-audio/lib/alsa/alsa_sink.cc b/gr-audio/lib/alsa/alsa_sink.cc index f2e70ca2d2..9695ad2c71 100644 --- a/gr-audio/lib/alsa/alsa_sink.cc +++ b/gr-audio/lib/alsa/alsa_sink.cc @@ -507,7 +507,7 @@ namespace gr { } continue; // try again } - +#ifdef ESTRPIPE else if(r == -ESTRPIPE) { // h/w is suspended (whatever that means) // This is apparently related to power management d_nsuspends++; @@ -517,7 +517,7 @@ namespace gr { } continue; // try again } - +#endif else if (r < 0) { output_error_msg("snd_pcm_writei failed", r); return false; diff --git a/gr-audio/lib/alsa/alsa_source.cc b/gr-audio/lib/alsa/alsa_source.cc index 2cfc33dd44..20b5417c73 100644 --- a/gr-audio/lib/alsa/alsa_source.cc +++ b/gr-audio/lib/alsa/alsa_source.cc @@ -472,7 +472,7 @@ namespace gr { } continue; // try again } - +#ifdef ESTRPIPE else if(r == -ESTRPIPE) { // h/w is suspended (whatever that means) // This is apparently related to power management d_nsuspends++; @@ -482,7 +482,7 @@ namespace gr { } continue; // try again } - +#endif else if(r < 0) { output_error_msg("snd_pcm_readi failed", r); return false; |