Rename last_rtaudio_error stuff to last_error.

3 files changed, 10 insertions, 10 deletions

diff --git a/src/wx/audio_backend.cc b/src/wx/audio_backend.cc
index a626f9538..1bc2c76e5 100644
--- a/src/wx/audio_backend.cc
+++ b/src/wx/audio_backend.cc
@@ -61,15 +61,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
 
@@ -171,7 +171,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 0b0bff882..4d5a99fe8 100644
--- a/src/wx/audio_backend.h
+++ b/src/wx/audio_backend.h
@@ -53,7 +53,7 @@ public:
 	wxString current_api_name() const;
 
 #if (RTAUDIO_VERSION_MAJOR >= 6)
-	std::string last_rtaudio_error() const;
+	std::string last_error() const;
 #endif
 
 	static AudioBackend* instance();
@@ -65,8 +65,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
 };
 
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 4967f5aea..92e3ceab7 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -634,7 +634,7 @@ FilmViewer::config_changed (Config::Property p)
 			_audio_channels = 0;
 			error_dialog(
 				_video_view->get(),
-				_("Could not set up audio output.  There will be no audio during the preview."), std_to_wx(backend->last_rtaudio_error())
+				_("Could not set up audio output.  There will be no audio during the preview."), std_to_wx(backend->last_error())
 				);
 		}
 #else