diff options
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/about_dialog.cc | 1 | ||||
| -rw-r--r-- | src/wx/film_viewer.cc | 11 | ||||
| -rw-r--r-- | src/wx/film_viewer.h | 2 | ||||
| -rw-r--r-- | src/wx/supporters.cc | 6 | ||||
| -rw-r--r-- | src/wx/wx_util.cc | 2 |
5 files changed, 19 insertions, 3 deletions
diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc index 09c60df8f..67dee001c 100644 --- a/src/wx/about_dialog.cc +++ b/src/wx/about_dialog.cc @@ -165,6 +165,7 @@ AboutDialog::AboutDialog(wxWindow* parent) translated_by.Add(char_to_wx("Martin Srebotnjak")); translated_by.Add(char_to_wx("Laurent Tenzer")); translated_by.Add(char_to_wx("Michał Tomaszewski")); + translated_by.Add(char_to_wx("Marco Ville")); translated_by.Add(char_to_wx("Igor Voytovich")); translated_by.Add(char_to_wx("Rov (若文)")); translated_by.Add(char_to_wx("刘汉源")); diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 40d3be65c..dcee453d4 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -89,6 +89,7 @@ rtaudio_callback(void* out, void *, unsigned int frames, double, RtAudioStreamSt FilmViewer::FilmViewer(wxWindow* p, bool wake) : _closed_captions_dialog(new ClosedCaptionsDialog(p, this)) , _stream_time(0) + , _stream_time_update_needed(true) { #if wxCHECK_VERSION(3, 1, 0) switch (Config::instance()->video_view_type()) { @@ -354,7 +355,8 @@ FilmViewer::start_audio_stream_if_open() auto& audio = AudioBackend::instance()->rtaudio(); if (audio.isStreamOpen()) { - audio.setStreamTime(_video_view->position().seconds()); + _stream_time = _video_view->position().seconds(); + _stream_time_update_needed = true; auto error = AudioBackend::instance()->start_stream(); if (error) { _audio_channels = 0; @@ -729,7 +731,12 @@ FilmViewer::audio_callback(void* out_p, unsigned int frames) { auto& audio = AudioBackend::instance()->rtaudio(); - _stream_time = audio.getStreamTime(); + if (_stream_time_update_needed) { + audio.setStreamTime(_stream_time); + _stream_time_update_needed = false; + } else { + _stream_time = audio.getStreamTime(); + } while (true) { auto t = _butler->get_audio(Butler::Behaviour::NON_BLOCKING, reinterpret_cast<float*>(out_p), frames); diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h index e1360e7c0..6d08df368 100644 --- a/src/wx/film_viewer.h +++ b/src/wx/film_viewer.h @@ -237,6 +237,8 @@ private: * time in seconds. */ std::atomic<double> _stream_time; + /** true if we need to call setStreamTime() with the current _stream_time */ + std::atomic<bool> _stream_time_update_needed; boost::signals2::scoped_connection _config_changed_connection; }; diff --git a/src/wx/supporters.cc b/src/wx/supporters.cc index cd331bba7..173e7b6e9 100644 --- a/src/wx/supporters.cc +++ b/src/wx/supporters.cc @@ -110,6 +110,7 @@ supported_by.Add (wxT ("Remi Bergman")); supported_by.Add (wxT ("Zoltan Berkes")); supported_by.Add (wxT ("Alessandro Bernardi")); supported_by.Add (wxT ("Hakan Besim")); +supported_by.Add (wxT ("Diogo Vicente Inácio Portela Bessa")); supported_by.Add (wxT ("Betavita")); supported_by.Add (wxT ("Potong Bhramayana")); supported_by.Add (wxT ("James Bicaldo")); @@ -165,6 +166,7 @@ supported_by.Add (wxT ("Michael Bruce")); supported_by.Add (wxT ("Malia Bruker")); supported_by.Add (wxT ("Mike Southon BSC")); supported_by.Add (wxT ("Alexander Buchholz")); +supported_by.Add (wxT ("Mohit Budholia")); supported_by.Add (wxT ("Hans-Guenther Buecking")); supported_by.Add (wxT ("Edgar Bueltemeyer")); supported_by.Add (wxT ("Oscar Buenafuente")); @@ -672,6 +674,7 @@ supported_by.Add (wxT ("Ariel Montage Inc.")); supported_by.Add (wxT ("Digital Filmz International Inc.")); supported_by.Add (wxT ("Debergerac Productions, Inc.")); supported_by.Add (wxT ("Jeroen Inc.")); +supported_by.Add (wxT ("Already Alive, Inc.")); supported_by.Add (wxT ("Forrest Proctor Industries")); supported_by.Add (wxT ("Indyvideo")); supported_by.Add (wxT ("Innfoto")); @@ -751,6 +754,7 @@ supported_by.Add (wxT ("Razan Khatib")); supported_by.Add (wxT ("Marco Kies")); supported_by.Add (wxT ("Kert Kiima")); supported_by.Add (wxT ("Juho Kilkki")); +supported_by.Add (wxT ("Austin Kimmell")); supported_by.Add (wxT ("Jason King")); supported_by.Add (wxT ("Ben King")); supported_by.Add (wxT ("Movieplexx Kino")); @@ -1185,6 +1189,7 @@ supported_by.Add (wxT ("Bernard Pradal")); supported_by.Add (wxT ("Drago Prahin")); supported_by.Add (wxT ("Aditya Pratama")); supported_by.Add (wxT ("Jörg-Dieter Prause")); +supported_by.Add (wxT ("Hanski Prods")); supported_by.Add (wxT ("Spot On Production")); supported_by.Add (wxT ("CUT productions")); supported_by.Add (wxT ("Red Vault Productions")); @@ -1351,6 +1356,7 @@ supported_by.Add (wxT ("Marcus Smith")); supported_by.Add (wxT ("Martin Smith")); supported_by.Add (wxT ("Gregg Smith")); supported_by.Add (wxT ("Sandie Smith")); +supported_by.Add (wxT ("Chad Smykay")); supported_by.Add (wxT ("David Snell")); supported_by.Add (wxT ("John Sniadecki")); supported_by.Add (wxT ("John Snow")); diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc index 8e86a5408..9526b234c 100644 --- a/src/wx/wx_util.cc +++ b/src/wx/wx_util.cc @@ -627,7 +627,7 @@ bitmap_path(string name) { boost::filesystem::path base; -#ifdef DCPOMATIC_DEBUG +#ifdef DCPOMATIC_DEVELOPER /* Hack to allow Linux and OS X to find icons when running from the source tree */ char* path = getenv("DCPOMATIC_GRAPHICS"); if (path) { |