#include "lib/butler.h"
#include "lib/log.h"
#include "lib/config.h"
+#include "lib/compose.hpp"
extern "C" {
#include <libavutil/pixfmt.h>
}
, _closed_captions_dialog (new ClosedCaptionsDialog(p))
, _outline_content (false)
, _eyes (EYES_LEFT)
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ , _in_watermark (false)
+#endif
{
#ifndef __WXOSX__
_panel->SetDoubleBuffered (true);
#endif
_panel->SetBackgroundStyle (wxBG_STYLE_PAINT);
+ _panel->SetBackgroundColour (*wxBLACK);
- _panel->Bind (wxEVT_PAINT, boost::bind (&FilmViewer::paint_panel, this));
- _panel->Bind (wxEVT_SIZE, boost::bind (&FilmViewer::panel_sized, this, _1));
- _timer.Bind (wxEVT_TIMER, boost::bind (&FilmViewer::timer, this));
+ _panel->Bind (wxEVT_PAINT, boost::bind (&FilmViewer::paint_panel, this));
+ _panel->Bind (wxEVT_SIZE, boost::bind (&FilmViewer::panel_sized, this, _1));
+ _timer.Bind (wxEVT_TIMER, boost::bind (&FilmViewer::timer, this));
set_film (shared_ptr<Film> ());
*/
_frame = _player_video.first->image (
- bind (&Log::dcp_log, _film->log().get(), _1, _2),
+ optional<dcp::NoteHandler>(bind(&Log::dcp_log, _film->log().get(), _1, _2)),
bind (&PlayerVideo::always_rgb, _1),
false, true
);
if (!_frame || !_film || !_out_size.width || !_out_size.height || _out_size != _frame->size()) {
dc.Clear ();
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ optional<boost::filesystem::path> bg = Config::instance()->player_background_image();
+ if (bg) {
+ wxImage image (std_to_wx(bg->string()));
+ wxBitmap bitmap (image);
+ dc.DrawBitmap (bitmap, max(0, (_panel_size.width - image.GetSize().GetWidth()) / 2), max(0, (_panel_size.height - image.GetSize().GetHeight()) / 2));
+ }
+#endif
return;
}
wxImage frame (_out_size.width, _out_size.height, _frame->data()[0], true);
wxBitmap frame_bitmap (frame);
- dc.DrawBitmap (frame_bitmap, 0, 0);
+ 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;
+ }
+ 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) {
- wxPen p (_panel->GetParent()->GetBackgroundColour());
- wxBrush b (_panel->GetParent()->GetBackgroundColour());
+ /* XXX: these colours are right for GNOME; may need adjusting for other OS */
+ wxPen p (wxColour (240, 240, 240));
+ wxBrush b (wxColour (240, 240, 240));
dc.SetPen (p);
dc.SetBrush (b);
dc.DrawRectangle (_out_size.width, 0, _panel_size.width - _out_size.width, _panel_size.height);
}
if (_out_size.height < _panel_size.height) {
- wxPen p (_panel->GetParent()->GetBackgroundColour());
- wxBrush b (_panel->GetParent()->GetBackgroundColour());
+ wxPen p (wxColour (240, 240, 240));
+ wxBrush b (wxColour (240, 240, 240));
dc.SetPen (p);
dc.SetBrush (b);
- dc.DrawRectangle (0, _out_size.height, _panel_size.width, _panel_size.height - _out_size.height);
+ 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);
}
if (_outline_content) {
wxPen p (wxColour (255, 0, 0), 2);
dc.SetPen (p);
dc.SetBrush (*wxTRANSPARENT_BRUSH);
- dc.DrawRectangle (_inter_position.x, _inter_position.y, _inter_size.width, _inter_size.height);
+ dc.DrawRectangle (_inter_position.x, _inter_position.y + (_panel_size.height - _out_size.height) / 2, _inter_size.width, _inter_size.height);
}
}
return;
}
+ optional<bool> v = PlaybackPermitted ();
+ if (v && !*v) {
+ /* Computer says no */
+ return;
+ }
+
if (_audio.isStreamOpen()) {
_audio.setStreamTime (_video_position.seconds());
_audio.startStream ();
_playing = true;
_dropped = 0;
timer ();
- Started ();
+ Started (position());
}
bool
}
_playing = false;
- Stopped ();
+ Stopped (position());
return true;
}
-void
-FilmViewer::go_to (DCPTime t)
-{
- if (t < DCPTime ()) {
- t = DCPTime ();
- }
-
- if (t >= _film->length ()) {
- t = _film->length ();
- }
-
- seek (t, true);
- PositionChanged ();
-}
-
void
FilmViewer::player_change (ChangeType type, int property, bool frequent)
{
}
void
-FilmViewer::set_position (DCPTime p)
-{
- _video_position = p;
- seek (p, true);
- PositionChanged ();
-}
-
-void
-FilmViewer::set_position (shared_ptr<Content> content, ContentTime t)
+FilmViewer::seek (shared_ptr<Content> content, ContentTime t, bool accurate)
{
optional<DCPTime> dt = _player->content_time_to_dcp (content, t);
if (dt) {
- set_position (*dt);
+ seek (*dt, accurate);
}
}
return;
}
+ if (t < DCPTime ()) {
+ t = DCPTime ();
+ }
+
+ if (t >= _film->length ()) {
+ t = _film->length ();
+ }
+
bool const was_running = stop ();
_closed_captions_dialog->clear ();
if (was_running) {
start ();
}
+
+ PositionChanged ();
+ Seeked (position());
}
void
FilmViewer::config_changed (Config::Property p)
{
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ if (p == Config::PLAYER_BACKGROUND_IMAGE) {
+ refresh_panel ();
+ return;
+ }
+#endif
+
if (p != Config::SOUND && p != Config::SOUND_OUTPUT) {
return;
}
return DCPTime::from_frames (1, _film->video_frame_rate());
}
+/** Open a dialog box showing our film's closed captions */
void
FilmViewer::show_closed_captions ()
{
}
void
-FilmViewer::move (DCPTime by)
+FilmViewer::seek_by (DCPTime by, bool accurate)
{
- if (!_film) {
- return;
- }
-
- go_to (_video_position + by);
+ seek (_video_position + by, accurate);
}
projects / dcpomatic.git / blobdiff