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(">")))
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);
_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));
_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> ());
setup_sensitivity ();
_config_changed_connection = Config::instance()->Changed.connect (bind (&FilmViewer::config_changed, this, _1));
- config_changed (Config::PREVIEW_SOUND_OUTPUT);
+ config_changed (Config::SOUND_OUTPUT);
}
FilmViewer::~FilmViewer ()
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 ();
}
_butler.reset (new Butler (_player, _film->log(), map, _audio_channels));
- if (!Config::instance()->preview_sound()) {
+ if (!Config::instance()->sound() && !_audio.isStreamOpen()) {
_butler->disable_audio ();
}
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).
*/
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);
_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 ());
void
FilmViewer::config_changed (Config::Property p)
{
- if (p != Config::PREVIEW_SOUND && p != Config::PREVIEW_SOUND_OUTPUT) {
+ if (p != Config::SOUND && p != Config::SOUND_OUTPUT) {
return;
}
_audio.closeStream ();
}
- if (Config::instance()->preview_sound()) {
+ if (Config::instance()->sound()) {
unsigned int st = 0;
- if (Config::instance()->preview_sound_output()) {
+ if (Config::instance()->sound_output()) {
while (st < _audio.getDeviceCount()) {
- if (_audio.getDeviceInfo(st).name == Config::instance()->preview_sound_output().get()) {
+ if (_audio.getDeviceInfo(st).name == Config::instance()->sound_output().get()) {
break;
}
++st;
_audio_channels = _audio.getDeviceInfo(st).outputChannels;
- recreate_butler ();
-
RtAudio::StreamParameters sp;
sp.deviceId = st;
sp.nChannels = _audio_channels;
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;
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
projects / dcpomatic.git / blobdiff