diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2016-11-02 12:20:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-02 12:20:46 +0100 |
| commit | 9ce1cdde98bb9c569fe27d952240f69bcdc14720 (patch) | |
| tree | b6e9aed9e22565b68c82fd8bd11ff915eb5ad980 /Source/Core/AudioCommon/AlsaSoundStream.cpp | |
| parent | 24fa4c9e57911b7dc17d1935b3de9da3e8774f14 (diff) | |
| parent | c9e6b05ce90714d4be1093d4d3d3ed33013d5b06 (diff) | |
Merge pull request #4414 from linkmauve/single-newline
Remove double newlines at the end of *_LOG messages
Diffstat (limited to 'Source/Core/AudioCommon/AlsaSoundStream.cpp')
| -rw-r--r-- | Source/Core/AudioCommon/AlsaSoundStream.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/Source/Core/AudioCommon/AlsaSoundStream.cpp b/Source/Core/AudioCommon/AlsaSoundStream.cpp index 3598958c75..a2842b5fec 100644 --- a/Source/Core/AudioCommon/AlsaSoundStream.cpp +++ b/Source/Core/AudioCommon/AlsaSoundStream.cpp @@ -98,7 +98,7 @@ bool AlsaSound::AlsaInit() err = snd_pcm_open(&handle, "default", SND_PCM_STREAM_PLAYBACK, 0); if (err < 0) { - ERROR_LOG(AUDIO, "Audio open error: %s\n", snd_strerror(err)); + ERROR_LOG(AUDIO, "Audio open error: %s", snd_strerror(err)); return false; } @@ -107,21 +107,21 @@ bool AlsaSound::AlsaInit() err = snd_pcm_hw_params_any(handle, hwparams); if (err < 0) { - ERROR_LOG(AUDIO, "Broken configuration for this PCM: %s\n", snd_strerror(err)); + ERROR_LOG(AUDIO, "Broken configuration for this PCM: %s", snd_strerror(err)); return false; } err = snd_pcm_hw_params_set_access(handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED); if (err < 0) { - ERROR_LOG(AUDIO, "Access type not available: %s\n", snd_strerror(err)); + ERROR_LOG(AUDIO, "Access type not available: %s", snd_strerror(err)); return false; } err = snd_pcm_hw_params_set_format(handle, hwparams, SND_PCM_FORMAT_S16_LE); if (err < 0) { - ERROR_LOG(AUDIO, "Sample format not available: %s\n", snd_strerror(err)); + ERROR_LOG(AUDIO, "Sample format not available: %s", snd_strerror(err)); return false; } @@ -129,14 +129,14 @@ bool AlsaSound::AlsaInit() err = snd_pcm_hw_params_set_rate_near(handle, hwparams, &sample_rate, &dir); if (err < 0) { - ERROR_LOG(AUDIO, "Rate not available: %s\n", snd_strerror(err)); + ERROR_LOG(AUDIO, "Rate not available: %s", snd_strerror(err)); return false; } err = snd_pcm_hw_params_set_channels(handle, hwparams, CHANNEL_COUNT); if (err < 0) { - ERROR_LOG(AUDIO, "Channels count not available: %s\n", snd_strerror(err)); + ERROR_LOG(AUDIO, "Channels count not available: %s", snd_strerror(err)); return false; } @@ -144,7 +144,7 @@ bool AlsaSound::AlsaInit() err = snd_pcm_hw_params_set_periods_max(handle, hwparams, &periods, &dir); if (err < 0) { - ERROR_LOG(AUDIO, "Cannot set maximum periods per buffer: %s\n", snd_strerror(err)); + ERROR_LOG(AUDIO, "Cannot set maximum periods per buffer: %s", snd_strerror(err)); return false; } @@ -152,28 +152,28 @@ bool AlsaSound::AlsaInit() err = snd_pcm_hw_params_set_buffer_size_max(handle, hwparams, &buffer_size_max); if (err < 0) { - ERROR_LOG(AUDIO, "Cannot set maximum buffer size: %s\n", snd_strerror(err)); + ERROR_LOG(AUDIO, "Cannot set maximum buffer size: %s", snd_strerror(err)); return false; } err = snd_pcm_hw_params(handle, hwparams); if (err < 0) { - ERROR_LOG(AUDIO, "Unable to install hw params: %s\n", snd_strerror(err)); + ERROR_LOG(AUDIO, "Unable to install hw params: %s", snd_strerror(err)); return false; } err = snd_pcm_hw_params_get_buffer_size(hwparams, &buffer_size); if (err < 0) { - ERROR_LOG(AUDIO, "Cannot get buffer size: %s\n", snd_strerror(err)); + ERROR_LOG(AUDIO, "Cannot get buffer size: %s", snd_strerror(err)); return false; } err = snd_pcm_hw_params_get_periods_max(hwparams, &periods, &dir); if (err < 0) { - ERROR_LOG(AUDIO, "Cannot get periods: %s\n", snd_strerror(err)); + ERROR_LOG(AUDIO, "Cannot get periods: %s", snd_strerror(err)); return false; } @@ -187,7 +187,7 @@ bool AlsaSound::AlsaInit() if ((unsigned int)frames_to_deliver > buffer_size) frames_to_deliver = buffer_size; NOTICE_LOG(AUDIO, "ALSA gave us a %ld sample \"hardware\" buffer with %d periods. Will send %d " - "samples per fragments.\n", + "samples per fragments.", buffer_size, periods, frames_to_deliver); snd_pcm_sw_params_alloca(&swparams); @@ -195,31 +195,31 @@ bool AlsaSound::AlsaInit() err = snd_pcm_sw_params_current(handle, swparams); if (err < 0) { - ERROR_LOG(AUDIO, "cannot init sw params: %s\n", snd_strerror(err)); + ERROR_LOG(AUDIO, "cannot init sw params: %s", snd_strerror(err)); return false; } err = snd_pcm_sw_params_set_start_threshold(handle, swparams, 0U); if (err < 0) { - ERROR_LOG(AUDIO, "cannot set start thresh: %s\n", snd_strerror(err)); + ERROR_LOG(AUDIO, "cannot set start thresh: %s", snd_strerror(err)); return false; } err = snd_pcm_sw_params(handle, swparams); if (err < 0) { - ERROR_LOG(AUDIO, "cannot set sw params: %s\n", snd_strerror(err)); + ERROR_LOG(AUDIO, "cannot set sw params: %s", snd_strerror(err)); return false; } err = snd_pcm_prepare(handle); if (err < 0) { - ERROR_LOG(AUDIO, "Unable to prepare: %s\n", snd_strerror(err)); + ERROR_LOG(AUDIO, "Unable to prepare: %s", snd_strerror(err)); return false; } - NOTICE_LOG(AUDIO, "ALSA successfully initialized.\n"); + NOTICE_LOG(AUDIO, "ALSA successfully initialized."); return true; } |
