diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-07-26 11:47:24 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-07-26 11:47:24 +0200 |
| commit | 95abcc7d18997c1391423d15506bf03ab20997e6 (patch) | |
| tree | 64fc82bdb7b45275436e1216d81847087ffb1788 /src/wx/film_viewer.h | |
| parent | 4d721e683b584fe48e7905e44ab3da23afe76145 (diff) | |
| parent | 98b7a493933a5a47c6e1abb21ef2710ad2730a0e (diff) | |
Merge branch 'main' into v2.17.x
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 3ade364fe..5c379575d 100644 --- a/src/wx/film_viewer.h +++ b/src/wx/film_viewer.h @@ -180,13 +180,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; @@ -199,7 +192,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; |