Speculative fixes for hangs when audio stream cannot be opened.

[dcpomatic.git] / src / wx / film_viewer.cc

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index bc4a491f7f0c16d6e60312ce22125d7be5b62f8f..0bb582c66dffe8d6b46ca649eee103f20c53dc5d 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -75,10 +75,10 @@ rtaudio_callback (void* out, void *, unsigned int frames, double, RtAudioStreamS
 FilmViewer::FilmViewer (wxWindow* p, bool outline_content, bool jump_to_selected)
        : wxPanel (p)
        , _panel (new wxPanel (this))
-       , _outline_content (new wxCheckBox (this, wxID_ANY, _("Outline content")))
+       , _outline_content (0)
        , _left_eye (new wxRadioButton (this, wxID_ANY, _("Left eye"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP))
        , _right_eye (new wxRadioButton (this, wxID_ANY, _("Right eye")))
-       , _jump_to_selected (new wxCheckBox (this, wxID_ANY, _("Jump to selected content")))
+       , _jump_to_selected (0)
        , _slider (new wxSlider (this, wxID_ANY, 0, 0, 4096))
        , _back_button (new wxButton (this, wxID_ANY, wxT("<")))
        , _forward_button (new wxButton (this, wxID_ANY, wxT(">")))
@@ -108,11 +108,13 @@ FilmViewer::FilmViewer (wxWindow* p, bool outline_content, bool jump_to_selected
 
        wxBoxSizer* view_options = new wxBoxSizer (wxHORIZONTAL);
        if (outline_content) {
+               _outline_content = new wxCheckBox (this, wxID_ANY, _("Outline content"));
                view_options->Add (_outline_content, 0, wxRIGHT, DCPOMATIC_SIZER_GAP);
        }
        view_options->Add (_left_eye, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP);
        view_options->Add (_right_eye, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP);
        if (jump_to_selected) {
+               _jump_to_selected = new wxCheckBox (this, wxID_ANY, _("Jump to selected content"));
                view_options->Add (_jump_to_selected, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP);
        }
        _v_sizer->Add (view_options, 0, wxALL, DCPOMATIC_SIZER_GAP);
@@ -137,7 +139,9 @@ FilmViewer::FilmViewer (wxWindow* p, bool outline_content, bool jump_to_selected
 
        _panel->Bind            (wxEVT_PAINT,             boost::bind (&FilmViewer::paint_panel,     this));
        _panel->Bind            (wxEVT_SIZE,              boost::bind (&FilmViewer::panel_sized,     this, _1));
-       _outline_content->Bind  (wxEVT_CHECKBOX,          boost::bind (&FilmViewer::refresh_panel,   this));
+       if (_outline_content) {
+               _outline_content->Bind  (wxEVT_CHECKBOX, boost::bind (&FilmViewer::refresh_panel,   this));
+       }
        _left_eye->Bind         (wxEVT_RADIOBUTTON,       boost::bind (&FilmViewer::refresh,         this));
        _right_eye->Bind        (wxEVT_RADIOBUTTON,       boost::bind (&FilmViewer::refresh,         this));
        _slider->Bind           (wxEVT_SCROLL_THUMBTRACK, boost::bind (&FilmViewer::slider_moved,    this, false));
@@ -150,9 +154,10 @@ FilmViewer::FilmViewer (wxWindow* p, bool outline_content, bool jump_to_selected
        _forward_button->Bind   (wxEVT_LEFT_DOWN,         boost::bind (&FilmViewer::forward_clicked, this, _1));
        _frame_number->Bind     (wxEVT_LEFT_DOWN,         boost::bind (&FilmViewer::frame_number_clicked, this));
        _timecode->Bind         (wxEVT_LEFT_DOWN,         boost::bind (&FilmViewer::timecode_clicked, this));
-       _jump_to_selected->Bind (wxEVT_CHECKBOX,          boost::bind (&FilmViewer::jump_to_selected_clicked, this));
-
-       _jump_to_selected->SetValue (Config::instance()->jump_to_selected ());
+       if (_jump_to_selected) {
+               _jump_to_selected->Bind (wxEVT_CHECKBOX, boost::bind (&FilmViewer::jump_to_selected_clicked, this));
+               _jump_to_selected->SetValue (Config::instance()->jump_to_selected ());
+       }
 
        set_film (shared_ptr<Film> ());
 
@@ -192,6 +197,9 @@ FilmViewer::set_film (shared_ptr<Film> film)
        try {
                _player.reset (new Player (_film, _film->playlist ()));
                _player->set_fast ();
+               if (_dcp_decode_reduction) {
+                       _player->set_dcp_decode_reduction (_dcp_decode_reduction);
+               }
        } catch (bad_alloc) {
                error_dialog (this, _("There is not enough free memory to do that."));
                _film.reset ();
@@ -245,7 +253,7 @@ FilmViewer::recreate_butler ()
        }
 
        _butler.reset (new Butler (_player, _film->log(), map, _audio_channels));
-       if (!Config::instance()->sound()) {
+       if (!Config::instance()->sound() && !_audio.isStreamOpen()) {
                _butler->disable_audio ();
        }
 
@@ -282,7 +290,7 @@ FilmViewer::get ()
                return;
        }
 
-       if ((time() - video.second) > one_video_frame()) {
+       if (_playing && (time() - video.second) > one_video_frame()) {
                /* Too late; just drop this frame before we try to get its image (which will be the time-consuming
                   part if this frame is J2K).
                */
@@ -377,7 +385,7 @@ FilmViewer::paint_panel ()
                dc.DrawRectangle (0, _out_size.height, _panel_size.width, _panel_size.height - _out_size.height);
        }
 
-       if (_outline_content->GetValue ()) {
+       if (_outline_content && _outline_content->GetValue ()) {
                wxPen p (wxColour (255, 0, 0), 2);
                dc.SetPen (p);
                dc.SetBrush (*wxTRANSPARENT_BRUSH);
@@ -611,10 +619,14 @@ FilmViewer::setup_sensitivity ()
        _back_button->Enable (c);
        _forward_button->Enable (c);
        _play_button->Enable (c);
-       _outline_content->Enable (c);
+       if (_outline_content) {
+               _outline_content->Enable (c);
+       }
        _frame_number->Enable (c);
        _timecode->Enable (c);
-       _jump_to_selected->Enable (c);
+       if (_jump_to_selected) {
+               _jump_to_selected->Enable (c);
+       }
 
        _left_eye->Enable (c && _film->three_d ());
        _right_eye->Enable (c && _film->three_d ());
@@ -731,8 +743,6 @@ FilmViewer::config_changed (Config::Property p)
 
                _audio_channels = _audio.getDeviceInfo(st).outputChannels;
 
-               recreate_butler ();
-
                RtAudio::StreamParameters sp;
                sp.deviceId = st;
                sp.nChannels = _audio_channels;
@@ -749,6 +759,7 @@ FilmViewer::config_changed (Config::Property p)
                                wxString::Format (_("Could not set up audio output (%s).  There will be no audio during the preview."), e.what())
                                );
                }
+               recreate_butler ();
 
        } else {
                _audio_channels = 0;
@@ -802,7 +813,10 @@ FilmViewer::average_latency () const
 void
 FilmViewer::set_dcp_decode_reduction (optional<int> reduction)
 {
-       _player->set_dcp_decode_reduction (reduction);
+       _dcp_decode_reduction = reduction;
+       if (_player) {
+               _player->set_dcp_decode_reduction (reduction);
+       }
 }
 
 DCPTime