/*
- 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"
+#include "lib/text_content.h"
extern "C" {
#include <libavutil/pixfmt.h>
}
using boost::dynamic_pointer_cast;
using boost::weak_ptr;
using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using dcp::Size;
static
, _playing (false)
, _latency_history_count (0)
, _dropped (0)
- , _closed_captions_dialog (new ClosedCaptionsDialog(p))
+ , _closed_captions_dialog (new ClosedCaptionsDialog(p, this))
, _outline_content (false)
, _eyes (EYES_LEFT)
, _pad_black (false)
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;
_player->set_play_referenced ();
_film->Change.connect (boost::bind (&FilmViewer::film_change, this, _1, _2));
+ _film->ContentChange.connect (boost::bind(&FilmViewer::content_change, this, _1, _3));
_player->Change.connect (boost::bind (&FilmViewer::player_change, this, _1, _2, _3));
/* Keep about 1 second's worth of history samples */
_latency_history_count = _film->audio_frame_rate() / _audio_block_size;
+ _closed_captions_dialog->update_tracks (_film);
+
recreate_butler ();
calculate_sizes ();
Map so that Lt = L(-3dB) + Ls(-3dB) + C(-6dB) + Lfe(-10dB)
Rt = R(-3dB) + Rs(-3dB) + C(-6dB) + Lfe(-10dB)
*/
- map.set (dcp::LEFT, 0, 1 / sqrt(2)); // L -> Lt
- map.set (dcp::RIGHT, 1, 1 / sqrt(2)); // R -> Rt
- map.set (dcp::CENTRE, 0, 1 / 2.0); // C -> Lt
- map.set (dcp::CENTRE, 1, 1 / 2.0); // C -> Rt
- map.set (dcp::LFE, 0, 1 / sqrt(10)); // Lfe -> Lt
- map.set (dcp::LFE, 1, 1 / sqrt(10)); // Lfe -> Rt
- map.set (dcp::LS, 0, 1 / sqrt(2)); // Ls -> Lt
- map.set (dcp::RS, 1, 1 / sqrt(2)); // Rs -> Rt
+ if (_film->audio_channels() > 0) {
+ map.set (dcp::LEFT, 0, 1 / sqrt(2)); // L -> Lt
+ }
+ if (_film->audio_channels() > 1) {
+ map.set (dcp::RIGHT, 1, 1 / sqrt(2)); // R -> Rt
+ }
+ if (_film->audio_channels() > 2) {
+ map.set (dcp::CENTRE, 0, 1 / 2.0); // C -> Lt
+ map.set (dcp::CENTRE, 1, 1 / 2.0); // C -> Rt
+ }
+ if (_film->audio_channels() > 3) {
+ map.set (dcp::LFE, 0, 1 / sqrt(10)); // Lfe -> Lt
+ map.set (dcp::LFE, 1, 1 / sqrt(10)); // Lfe -> Rt
+ }
+ if (_film->audio_channels() > 4) {
+ map.set (dcp::LS, 0, 1 / sqrt(2)); // Ls -> Lt
+ }
+ if (_film->audio_channels() > 5) {
+ map.set (dcp::RS, 1, 1 / sqrt(2)); // Rs -> Rt
+ }
}
_butler.reset (new Butler(_player, map, _audio_channels, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
} 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 ();
+ try {
+ _butler->rethrow ();
+ } catch (DecodeError& e) {
+ error_dialog (_panel, e.what());
+ }
display_player_video ();
}
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 ();
- return;
- }
+ } else {
- wxImage frame (_out_size.width, _out_size.height, _frame->data()[0], true);
- wxBitmap frame_bitmap (frame);
- dc.DrawBitmap (frame_bitmap, 0, max(0, (_panel_size.height - _out_size.height) / 2));
+ wxImage frame (_out_size.width, _out_size.height, _frame->data()[0], true);
+ wxBitmap frame_bitmap (frame);
+ dc.DrawBitmap (frame_bitmap, 0, max(0, (_panel_size.height - _out_size.height) / 2));
#ifdef DCPOMATIC_VARIANT_SWAROOP
- DCPTime const period = DCPTime::from_seconds(Config::instance()->player_watermark_period() * 60);
- int64_t n = _video_position.get() / period.get();
- DCPTime from(n * period.get());
- DCPTime to = from + DCPTime::from_seconds(Config::instance()->player_watermark_duration() / 1000.0);
- if (from <= _video_position && _video_position <= to) {
- if (!_in_watermark) {
- _in_watermark = true;
- _watermark_x = rand() % _panel_size.width;
- _watermark_y = rand() % _panel_size.height;
+ DCPTime const period = DCPTime::from_seconds(Config::instance()->player_watermark_period() * 60);
+ int64_t n = _video_position.get() / period.get();
+ DCPTime from(n * period.get());
+ DCPTime to = from + DCPTime::from_seconds(Config::instance()->player_watermark_duration() / 1000.0);
+ if (from <= _video_position && _video_position <= to) {
+ if (!_in_watermark) {
+ _in_watermark = true;
+ _watermark_x = rand() % _panel_size.width;
+ _watermark_y = rand() % _panel_size.height;
+ }
+ dc.SetTextForeground(*wxWHITE);
+ string wm = Config::instance()->player_watermark_theatre();
+ boost::posix_time::ptime t = boost::posix_time::second_clock::local_time();
+ wm += "\n" + boost::posix_time::to_iso_extended_string(t);
+ dc.DrawText(std_to_wx(wm), _watermark_x, _watermark_y);
+ } else {
+ _in_watermark = false;
}
- dc.SetTextForeground(*wxWHITE);
- string wm = Config::instance()->player_watermark_theatre();
- boost::posix_time::ptime t = boost::posix_time::second_clock::local_time();
- wm += "\n" + boost::posix_time::to_iso_extended_string(t);
- dc.DrawText(std_to_wx(wm), _watermark_x, _watermark_y);
- } else {
- _in_watermark = false;
- }
#endif
+ }
if (_out_size.width < _panel_size.width) {
/* XXX: these colours are right for GNOME; may need adjusting for other OS */
dc.SetBrush (b);
int const gap = (_panel_size.height - _out_size.height) / 2;
dc.DrawRectangle (0, 0, _panel_size.width, gap);
- dc.DrawRectangle (0, gap + _out_size.height + 1, _panel_size.width, gap);
+ dc.DrawRectangle (0, gap + _out_size.height + 1, _panel_size.width, gap + 1);
}
if (_outline_content) {
{
if (type == CHANGE_TYPE_DONE && p == Film::AUDIO_CHANNELS) {
recreate_butler ();
+ } else if (p == Film::CONTENT) {
+ _closed_captions_dialog->update_tracks (_film);
}
}
sp.firstChannel = 0;
try {
_audio.openStream (&sp, 0, RTAUDIO_FLOAT32, 48000, &_audio_block_size, &rtaudio_callback, this);
-#ifdef DCPOMATIC_USE_RTERROR
- } catch (RtError& e) {
-#else
} catch (RtAudioError& e) {
-#endif
error_dialog (
_panel,
_("Could not set up audio output. There will be no audio during the preview."), std_to_wx(e.what())
{
_pad_black = p;
}
+
+void
+FilmViewer::content_change (ChangeType type, int property)
+{
+ if (type != CHANGE_TYPE_DONE) {
+ return;
+ }
+
+ if (property == TextContentProperty::USE || property == TextContentProperty::TYPE || property == TextContentProperty::DCP_TRACK) {
+ _closed_captions_dialog->update_tracks (_film);
+ }
+}
projects / dcpomatic.git / blobdiff