/*
- Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "lib/log.h"
#include "lib/config.h"
#include "lib/compose.hpp"
+#include "lib/dcpomatic_log.h"
extern "C" {
#include <libavutil/pixfmt.h>
}
if (_dcp_decode_reduction) {
_player->set_dcp_decode_reduction (_dcp_decode_reduction);
}
- } catch (bad_alloc) {
+ } catch (bad_alloc &) {
error_dialog (_panel, _("There is not enough free memory to do that."));
_film.reset ();
return;
} while (
_player_video.first &&
_film->three_d() &&
- (_eyes != _player_video.first->eyes())
+ _eyes != _player_video.first->eyes() &&
+ _player_video.first->eyes() != EYES_BOTH
);
_butler->rethrow ();
return;
}
+ LOG_DEBUG_PLAYER("%1 -> %2; delay %3", next.seconds(), time().seconds(), max((next.seconds() - time().seconds()) * 1000, 1.0));
_timer.Start (max ((next.seconds() - time().seconds()) * 1000, 1.0), wxTIMER_ONE_SHOT);
if (_butler) {
}
bool
+#ifdef DCPOMATIC_VARIANT_SWAROOP
FilmViewer::maybe_draw_background_image (wxPaintDC& dc)
{
-#ifdef DCPOMATIC_VARIANT_SWAROOP
optional<boost::filesystem::path> bg = Config::instance()->player_background_image();
if (bg) {
wxImage image (std_to_wx(bg->string()));
dc.DrawBitmap (bitmap, max(0, (_panel_size.width - image.GetSize().GetWidth()) / 2), max(0, (_panel_size.height - image.GetSize().GetHeight()) / 2));
return true;
}
-#endif
return false;
}
+#else
+FilmViewer::maybe_draw_background_image (wxPaintDC &)
+{
+ return false;
+}
+#endif
void
FilmViewer::paint_panel ()
{
wxPaintDC dc (_panel);
+#ifdef DCPOMATIC_VARIANT_SWAROOP
if (_background_image) {
dc.Clear ();
maybe_draw_background_image (dc);
return;
}
+#endif
if (!_out_size.width || !_out_size.height || !_film || !_frame || _out_size != _frame->size()) {
dc.Clear ();