diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-07-25 14:46:44 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-07-26 11:39:59 +0200 |
| commit | 051bac905d3ab8776c804e0e21fecd4c49927549 (patch) | |
| tree | 07fef88f1fa0c53fca71098b63caec8589b0c9cb /src/wx/film_viewer.h | |
| parent | c7d5e56219f39a6304be9644cc577d89be16b7de (diff) | |
Stop instantiating RtAudio all over the place
and instead just have a singleton. On Windows I saw a situation where
the first instantiation would use ASIO and the second WASAPI, causing
all kinds of confusion.
Diffstat (limited to 'src/wx/film_viewer.h')
| -rw-r--r-- | src/wx/film_viewer.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h index 5824f8baa..a0aac62dd 100644 --- a/src/wx/film_viewer.h +++ b/src/wx/film_viewer.h @@ -171,13 +171,6 @@ private: void ui_finished (); void start_audio_stream_if_open (); -#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; - std::string last_rtaudio_error() const; -#endif - dcpomatic::DCPTime uncorrected_time () const; Frame average_latency () const; @@ -190,7 +183,6 @@ private: bool _coalesce_player_changes = false; std::vector<int> _pending_player_changes; - RtAudio _audio; int _audio_channels = 0; unsigned int _audio_block_size = 1024; bool _playing = false; |