Add AudioBackend::start_stream().

diff --git a/src/wx/audio_backend.cc b/src/wx/audio_backend.cc
index ae37ab8519ac00e4d3837f70609e14486f18fc0f..351f0d78b090b8de5a4aeb4354ae83cf17fed49d 100644 (file)
--- a/src/wx/audio_backend.cc
+++ b/src/wx/audio_backend.cc
@@ -84,3 +84,22 @@ AudioBackend::abort_stream_if_running()
 }
 
 
+optional<string>
+AudioBackend::start_stream()
+{
+#if (RTAUDIO_VERSION_MAJOR >= 6)
+       if (_rtaudio.startStream() != RTAUDIO_NO_ERROR) {
+               return last_rtaudio_error();
+       }
+#else
+       try {
+               _rtaudio.startStream();
+       } catch (RtAudioError& e) {
+               return string(e.what());
+       }
+#endif
+
+       return {};
+}
+
+

diff --git a/src/wx/audio_backend.h b/src/wx/audio_backend.h
index 10646ebae8591c9c58ce1584740c8103f1e95165..91e8ccab56d970c22e76c1ce5f889e2edf9eef60 100644 (file)
--- a/src/wx/audio_backend.h
+++ b/src/wx/audio_backend.h
@@ -39,6 +39,8 @@ public:
        }
 
        void abort_stream_if_running();
+       boost::optional<std::string> start_stream();
+
 #if (RTAUDIO_VERSION_MAJOR >= 6)
        std::string last_rtaudio_error() const;
 #endif

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 65e2afb56adc509f1e63bb4984e9a74c342b66b1..1876aac74829687eb405fb11c74059300914e18b 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -353,25 +353,14 @@ FilmViewer::start_audio_stream_if_open ()
 
        if (audio.isStreamOpen()) {
                audio.setStreamTime(_video_view->position().seconds());
-#if (RTAUDIO_VERSION_MAJOR >= 6)
-               if (audio.startStream() != RTAUDIO_NO_ERROR) {
+               auto error = AudioBackend::instance()->start_stream();
+               if (error) {
                        _audio_channels = 0;
                        error_dialog(
                                _video_view->get(),
-                               _("There was a problem starting audio playback.  Please try another audio output device in Preferences."), std_to_wx(audio.last_rtaudio_error())
-                               );
-               }
-#else
-               try {
-                       audio.startStream ();
-               } catch (RtAudioError& e) {
-                       _audio_channels = 0;
-                       error_dialog (
-                               _video_view->get(),
-                               _("There was a problem starting audio playback.  Please try another audio output device in Preferences."), std_to_wx(e.what())
+                               _("There was a problem starting audio playback.  Please try another audio output device in Preferences."), std_to_wx(*error)
                                );
                }
-#endif
        }
 }