diff options
| author | Martin Braun <martin.braun@ettus.com> | 2018-02-03 16:58:15 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-02-03 16:58:43 +0100 |
| commit | db7e26bc73fd71bc88249131f57f7edef308fa63 (patch) | |
| tree | d084ad2615012d53c50a230821761349eb978d56 /gr-audio/lib | |
| parent | 3c63f7334d6de70d655aa97fcccbfb950645f4d4 (diff) | |
| parent | a35e10870bbb9a71b3ab66b1dc58135e08c9543e (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-audio/lib')
| -rw-r--r-- | gr-audio/lib/osx/osx_impl.cc | 2 | ||||
| -rw-r--r-- | gr-audio/lib/osx/osx_sink.cc | 4 | ||||
| -rw-r--r-- | gr-audio/lib/osx/osx_source.cc | 2 | ||||
| -rw-r--r-- | gr-audio/lib/portaudio/portaudio_sink.cc | 2 | ||||
| -rw-r--r-- | gr-audio/lib/portaudio/portaudio_source.cc | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/gr-audio/lib/osx/osx_impl.cc b/gr-audio/lib/osx/osx_impl.cc index d18c24c786..f3ed94c659 100644 --- a/gr-audio/lib/osx/osx_impl.cc +++ b/gr-audio/lib/osx/osx_impl.cc @@ -267,7 +267,7 @@ find_audio_devices } std::string name_buf(c_name_buf); - // compare the retreived name with the desired one, if + // compare the retrieved name with the desired one, if // provided; case insensitive. if (device_name.length() > 0) { diff --git a/gr-audio/lib/osx/osx_sink.cc b/gr-audio/lib/osx/osx_sink.cc index 0b304eea3f..8682f834bf 100644 --- a/gr-audio/lib/osx/osx_sink.cc +++ b/gr-audio/lib/osx/osx_sink.cc @@ -371,7 +371,7 @@ namespace gr { // set up a listener for the default output device so that if // the device changes, this routine will be called and we can - // internally handle this change (if/as necesary) + // internally handle this change (if/as necessary) { AudioObjectPropertyAddress property = { @@ -1002,7 +1002,7 @@ namespace gr { This->d_queue_sample_count -= in_number_frames; } - // signal that data is available, if appropraite + // signal that data is available, if appropriate if (This->d_waiting_for_data) { #if _OSX_AU_DEBUG_RENDER_ diff --git a/gr-audio/lib/osx/osx_source.cc b/gr-audio/lib/osx/osx_source.cc index bac94fbd72..0485c5478a 100644 --- a/gr-audio/lib/osx/osx_source.cc +++ b/gr-audio/lib/osx/osx_source.cc @@ -1455,7 +1455,7 @@ namespace gr { << ", mSC = " << This->d_buffer_sample_count << std::endl; #endif - // signal that data is available, if appropraite + // signal that data is available, if appropriate if (This->d_waiting_for_data) { This->d_cond_data.notify_one(); diff --git a/gr-audio/lib/portaudio/portaudio_sink.cc b/gr-audio/lib/portaudio/portaudio_sink.cc index e6698adb72..9803559487 100644 --- a/gr-audio/lib/portaudio/portaudio_sink.cc +++ b/gr-audio/lib/portaudio/portaudio_sink.cc @@ -80,7 +80,7 @@ namespace gr { N_BUFFERS*bufsize_samples/d_output_parameters.channelCount); } - // FYI, the buffer indicies are in units of samples. + // FYI, the buffer indices are in units of samples. d_writer = gr::make_buffer(N_BUFFERS * bufsize_samples, sizeof(sample_t)); d_reader = gr::buffer_add_reader(d_writer, 0); } diff --git a/gr-audio/lib/portaudio/portaudio_source.cc b/gr-audio/lib/portaudio/portaudio_source.cc index 7f2e8f30b9..789197472f 100644 --- a/gr-audio/lib/portaudio/portaudio_source.cc +++ b/gr-audio/lib/portaudio/portaudio_source.cc @@ -80,7 +80,7 @@ namespace gr { N_BUFFERS*bufsize_samples/d_input_parameters.channelCount); } - // FYI, the buffer indicies are in units of samples. + // FYI, the buffer indices are in units of samples. d_writer = gr::make_buffer(N_BUFFERS * bufsize_samples, sizeof(sample_t)); d_reader = gr::buffer_add_reader(d_writer, 0); } @@ -323,7 +323,7 @@ namespace gr { // There's no data and we're not allowed to block. // (A USRP is most likely controlling the pacing through the pipeline.) - // This is an underun. The scheduler wouldn't have called us if it + // This is an underrun. The scheduler wouldn't have called us if it // had anything better to do. Thus we really need to produce some amount // of "fill". // |