diff options
| author | Marcus Müller <mmueller@gnuradio.org> | 2019-05-12 01:22:33 +0200 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2019-06-15 18:29:35 -0700 |
| commit | 45cd823fcb3695b436c73baa49f5e21ca76435ec (patch) | |
| tree | 135016b3d49d0b30d68a8439da5137601b360ec5 | |
| parent | f800db5d6503193c6c764c7f2b92d923e5df01eb (diff) | |
audio: rename static internal var from d_ to s_
| -rw-r--r-- | gr-audio/docs/audio.dox | 6 | ||||
| -rw-r--r-- | gr-audio/lib/audio_registry.cc | 33 |
2 files changed, 20 insertions, 19 deletions
diff --git a/gr-audio/docs/audio.dox b/gr-audio/docs/audio.dox index 648f126104..258f00af1b 100644 --- a/gr-audio/docs/audio.dox +++ b/gr-audio/docs/audio.dox @@ -99,15 +99,15 @@ the .cc file for ALSA, OSS, and PortAudio: \code #ifdef ALSA_FOUND - d_registry.push_back(register_source(REG_PRIO_HIGH, "alsa", alsa_source_fcn)); + s_registry.push_back(register_source(REG_PRIO_HIGH, "alsa", alsa_source_fcn)); #endif /* ALSA_FOUND */ #ifdef OSS_FOUND - d_registry.push_back(register_source(REG_PRIO_LOW, "oss", oss_source_fcn)); + s_registry.push_back(register_source(REG_PRIO_LOW, "oss", oss_source_fcn)); #endif /* OSS_FOUND */ #ifdef PORTAUDIO_FOUND - d_registry.push_back(register_source(REG_PRIO_MED, "portaudio", portaudio_source_fcn)); + s_registry.push_back(register_source(REG_PRIO_MED, "portaudio", portaudio_source_fcn)); #endif /* PORTAUDIO_FOUND */ \endcode diff --git a/gr-audio/lib/audio_registry.cc b/gr-audio/lib/audio_registry.cc index ece723f287..421806558a 100644 --- a/gr-audio/lib/audio_registry.cc +++ b/gr-audio/lib/audio_registry.cc @@ -38,74 +38,75 @@ namespace gr { get_source_registry(void) { static bool src_reg = false; - static std::vector<source_entry_t> d_registry; + static std::vector<source_entry_t> s_registry; if(!src_reg) { #ifdef ALSA_FOUND - d_registry.push_back(register_source(REG_PRIO_HIGH, "alsa", alsa_source_fcn)); + s_registry.push_back(register_source(REG_PRIO_HIGH, "alsa", alsa_source_fcn)); #endif /* ALSA_FOUND */ #ifdef OSS_FOUND - d_registry.push_back(register_source(REG_PRIO_LOW, "oss", oss_source_fcn)); + s_registry.push_back(register_source(REG_PRIO_LOW, "oss", oss_source_fcn)); #endif /* OSS_FOUND */ #ifdef PORTAUDIO_FOUND - d_registry.push_back(register_source(REG_PRIO_MED, "portaudio", portaudio_source_fcn)); + s_registry.push_back(register_source(REG_PRIO_MED, "portaudio", portaudio_source_fcn)); #endif /* PORTAUDIO_FOUND */ #ifdef JACK_FOUND - d_registry.push_back(register_source(REG_PRIO_MED, "jack", jack_source_fcn)); + s_registry.push_back(register_source(REG_PRIO_MED, "jack", jack_source_fcn)); #endif /* JACK_FOUND */ #ifdef OSX_FOUND - d_registry.push_back(register_source(REG_PRIO_HIGH, "osx", osx_source_fcn)); + s_registry.push_back(register_source(REG_PRIO_HIGH, "osx", osx_source_fcn)); #endif /* OSX_FOUND */ #ifdef WIN32_FOUND - d_registry.push_back(register_source(REG_PRIO_HIGH, "windows", windows_source_fcn)); + s_registry.push_back(register_source(REG_PRIO_HIGH, "windows", windows_source_fcn)); #endif /* WIN32_FOUND */ src_reg = true; } - return d_registry; + + return s_registry; } static std::vector<sink_entry_t> & get_sink_registry(void) { static bool snk_reg = false; - static std::vector<sink_entry_t> d_registry; + static std::vector<sink_entry_t> s_registry; if(!snk_reg) { #if ALSA_FOUND - d_registry.push_back(register_sink(REG_PRIO_HIGH, "alsa", alsa_sink_fcn)); + s_registry.push_back(register_sink(REG_PRIO_HIGH, "alsa", alsa_sink_fcn)); #endif /* ALSA_FOUND */ #if OSS_FOUND - d_registry.push_back(register_sink(REG_PRIO_LOW, "oss", oss_sink_fcn)); + s_registry.push_back(register_sink(REG_PRIO_LOW, "oss", oss_sink_fcn)); #endif /* OSS_FOUND */ #if PORTAUDIO_FOUND - d_registry.push_back(register_sink(REG_PRIO_MED, "portaudio", portaudio_sink_fcn)); + s_registry.push_back(register_sink(REG_PRIO_MED, "portaudio", portaudio_sink_fcn)); #endif /* PORTAUDIO_FOUND */ #if JACK_FOUND - d_registry.push_back(register_sink(REG_PRIO_MED, "jack", jack_sink_fcn)); + s_registry.push_back(register_sink(REG_PRIO_MED, "jack", jack_sink_fcn)); #endif /* JACK_FOUND */ #ifdef OSX_FOUND - d_registry.push_back(register_sink(REG_PRIO_HIGH, "osx", osx_sink_fcn)); + s_registry.push_back(register_sink(REG_PRIO_HIGH, "osx", osx_sink_fcn)); #endif /* OSX_FOUND */ #ifdef WIN32_FOUND - d_registry.push_back(register_sink(REG_PRIO_HIGH, "windows", windows_sink_fcn)); + s_registry.push_back(register_sink(REG_PRIO_HIGH, "windows", windows_sink_fcn)); #endif /* WIN32_FOUND */ snk_reg = true; } - return d_registry; + return s_registry; } /*********************************************************************** |