diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-09-11 02:00:40 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-09-11 02:00:40 +0200 |
| commit | e2270ddc7a50e72e9058c497a8967f70721a8b6d (patch) | |
| tree | ee780c90b106cd76592c88a2f1dde20190fd7195 | |
| parent | 0d58df4dfd13b715280ce64ac1b3c6e556c80d44 (diff) | |
Rename _last_rtaudio_error{,_mutex} to _last_error{,_mutex}.
| -rw-r--r-- | src/wx/audio_backend.cc | 12 | ||||
| -rw-r--r-- | src/wx/audio_backend.h | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/wx/audio_backend.cc b/src/wx/audio_backend.cc index fbbe17bfe..7245772c8 100644 --- a/src/wx/audio_backend.cc +++ b/src/wx/audio_backend.cc @@ -60,15 +60,15 @@ AudioBackend::AudioBackend() void AudioBackend::rtaudio_error_callback(string const& error) { - boost::mutex::scoped_lock lm(_last_rtaudio_error_mutex); - _last_rtaudio_error = error; + boost::mutex::scoped_lock lm(_last_error_mutex); + _last_error = error; } string -AudioBackend::last_rtaudio_error() const +AudioBackend::last_error() const { - boost::mutex::scoped_lock lm(_last_rtaudio_error_mutex); - return _last_rtaudio_error; + boost::mutex::scoped_lock lm(_last_error_mutex); + return _last_error; } #endif @@ -170,7 +170,7 @@ AudioBackend::start_stream() { #if (RTAUDIO_VERSION_MAJOR >= 6) if (_rtaudio.startStream() != RTAUDIO_NO_ERROR) { - return last_rtaudio_error(); + return last_error(); } #else try { diff --git a/src/wx/audio_backend.h b/src/wx/audio_backend.h index e76c7a3df..6ca70da4c 100644 --- a/src/wx/audio_backend.h +++ b/src/wx/audio_backend.h @@ -48,7 +48,7 @@ public: boost::optional<std::string> start_stream(); #if (RTAUDIO_VERSION_MAJOR >= 6) - std::string last_rtaudio_error() const; + std::string last_error() const; #endif static AudioBackend* instance(); @@ -60,8 +60,8 @@ private: #if (RTAUDIO_VERSION_MAJOR >= 6) void rtaudio_error_callback(std::string const& error); - mutable boost::mutex _last_rtaudio_error_mutex; - std::string _last_rtaudio_error; + mutable boost::mutex _last_error_mutex; + std::string _last_error; #endif }; |