_video_view->clear ();
_closed_captions_dialog->clear ();
+ destroy_butler();
+
if (!_film) {
- _player.reset ();
- recreate_butler ();
+ _player = boost::none;
+ resume();
_video_view->update ();
return;
}
try {
- _player = make_shared<Player>(_film, _optimise_for_j2k ? Image::Alignment::COMPACT : Image::Alignment::PADDED);
+ _player.emplace(_film, _optimise_for_j2k ? Image::Alignment::COMPACT : Image::Alignment::PADDED);
_player->set_fast ();
if (_dcp_decode_reduction) {
_player->set_dcp_decode_reduction (_dcp_decode_reduction);
} catch (bad_alloc &) {
error_dialog (_video_view->get(), _("There is not enough free memory to do that."));
_film.reset ();
+ resume();
return;
}
_film->LengthChange.connect (boost::bind(&FilmViewer::film_length_change, this));
_player->Change.connect (boost::bind (&FilmViewer::player_change, this, _1, _2, _3));
- film_change (ChangeType::DONE, Film::Property::VIDEO_FRAME_RATE);
- film_change (ChangeType::DONE, Film::Property::THREE_D);
+ film_change(ChangeType::DONE, FilmProperty::VIDEO_FRAME_RATE);
+ film_change(ChangeType::DONE, FilmProperty::THREE_D);
film_length_change ();
/* Keep about 1 second's worth of history samples */
_closed_captions_dialog->update_tracks (_film);
- recreate_butler ();
+ create_butler();
calculate_sizes ();
slow_refresh ();
void
-FilmViewer::recreate_butler ()
+FilmViewer::destroy_butler()
{
suspend ();
_butler.reset ();
+}
+
+
+void
+FilmViewer::destroy_and_maybe_create_butler()
+{
+ destroy_butler();
if (!_film) {
resume ();
return;
}
+ create_butler();
+}
+
+
+void
+FilmViewer::create_butler()
+{
#if wxCHECK_VERSION(3, 1, 0)
auto const j2k_gl_optimised = dynamic_pointer_cast<GLVideoView>(_video_view) && _optimise_for_j2k;
#else
auto const j2k_gl_optimised = false;
#endif
+ DCPOMATIC_ASSERT(_player);
+
_butler = std::make_shared<Butler>(
_film,
- _player,
+ *_player,
Config::instance()->audio_mapping(_audio_channels),
_audio_channels,
boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24),
VideoRange::FULL,
j2k_gl_optimised ? Image::Alignment::COMPACT : Image::Alignment::PADDED,
true,
- j2k_gl_optimised
+ j2k_gl_optimised,
+ (Config::instance()->sound() && _audio.isStreamOpen()) ? Butler::Audio::ENABLED : Butler::Audio::DISABLED
);
- if (!Config::instance()->sound() && !_audio.isStreamOpen()) {
- _butler->disable_audio ();
- }
-
_closed_captions_dialog->set_butler (_butler);
resume ();
out_size.width = max (64, out_size.width);
out_size.height = max (64, out_size.height);
+ /* Make sure the video container sizes are always a multiple of 2 so that
+ * we don't get gaps with subsampled sources (e.g. YUV420)
+ */
+ if (out_size.width % 2) {
+ out_size.width++;
+ }
+ if (out_size.height % 2) {
+ out_size.height++;
+ }
+
_player->set_video_container_size (out_size);
}
void
-FilmViewer::film_change (ChangeType type, Film::Property p)
+FilmViewer::film_change(ChangeType type, FilmProperty p)
{
if (type != ChangeType::DONE) {
return;
}
- if (p == Film::Property::AUDIO_CHANNELS) {
- recreate_butler ();
- } else if (p == Film::Property::VIDEO_FRAME_RATE) {
+ if (p == FilmProperty::AUDIO_CHANNELS) {
+ destroy_and_maybe_create_butler();
+ } else if (p == FilmProperty::VIDEO_FRAME_RATE) {
_video_view->set_video_frame_rate (_film->video_frame_rate());
- } else if (p == Film::Property::THREE_D) {
+ } else if (p == FilmProperty::THREE_D) {
_video_view->set_three_d (_film->three_d());
- } else if (p == Film::Property::CONTENT) {
+ } else if (p == FilmProperty::CONTENT) {
_closed_captions_dialog->update_tracks (_film);
}
}
void
FilmViewer::seek (shared_ptr<Content> content, ContentTime t, bool accurate)
{
+ DCPOMATIC_ASSERT(_player);
auto dt = _player->content_time_to_dcp (content, t);
if (dt) {
seek (*dt, accurate);
FilmViewer::config_changed (Config::Property p)
{
if (p == Config::AUDIO_MAPPING) {
- recreate_butler ();
+ destroy_and_maybe_create_butler();
return;
}
++st;
}
if (st == _audio.getDeviceCount()) {
- st = _audio.getDefaultOutputDevice();
+ try {
+ st = _audio.getDefaultOutputDevice();
+ } catch (RtAudioError&) {
+ /* Something went wrong with that device so we don't want to use it anyway */
+ }
}
} else {
- st = _audio.getDefaultOutputDevice();
+ try {
+ st = _audio.getDefaultOutputDevice();
+ } catch (RtAudioError&) {
+ /* Something went wrong with that device so we don't want to use it anyway */
+ }
}
try {
_("Could not set up audio output. There will be no audio during the preview."), std_to_wx(e.what())
);
}
- recreate_butler ();
+ destroy_and_maybe_create_butler();
} else {
_audio_channels = 0;
- recreate_butler ();
+ destroy_and_maybe_create_butler();
}
}
optional<ContentTime>
FilmViewer::position_in_content (shared_ptr<const Content> content) const
{
+ DCPOMATIC_ASSERT(_player);
return _player->dcp_to_content_time (content, position());
}
void
-FilmViewer::set_crop_guess (Rect<float> crop)
+FilmViewer::set_crop_guess (dcpomatic::Rect<float> crop)
{
if (crop != _crop_guess) {
_crop_guess = crop;
void
FilmViewer::unset_crop_guess ()
{
- _crop_guess = {};
+ _crop_guess = boost::none;
_video_view->update ();
}