projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use libdcp's warnings.h
[dcpomatic.git]
/
src
/
wx
/
simple_video_view.cc
diff --git
a/src/wx/simple_video_view.cc
b/src/wx/simple_video_view.cc
index 2b86ea68884194b0711ee75e3a95bdf9d0b5f254..46854653485e5b6643a85ad056f60ff64d5e6012 100644
(file)
--- a/
src/wx/simple_video_view.cc
+++ b/
src/wx/simple_video_view.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2019 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2019
-2021
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,21
+18,26
@@
*/
*/
-#include "simple_video_view.h"
+
+#include "closed_captions_dialog.h"
#include "film_viewer.h"
#include "film_viewer.h"
+#include "simple_video_view.h"
#include "wx_util.h"
#include "wx_util.h"
-#include "closed_captions_dialog.h"
-#include "lib/image.h"
-#include "lib/dcpomatic_log.h"
#include "lib/butler.h"
#include "lib/butler.h"
+#include "lib/dcpomatic_log.h"
+#include "lib/image.h"
#include <dcp/util.h>
#include <dcp/util.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
#include <boost/bind/bind.hpp>
#include <boost/bind/bind.hpp>
+
using std::max;
using std::max;
+using std::shared_ptr;
using std::string;
using boost::optional;
using std::string;
using boost::optional;
-using boost::shared_ptr;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif
@@
-57,36
+62,41
@@
SimpleVideoView::SimpleVideoView (FilmViewer* viewer, wxWindow* parent)
_timer.Bind (wxEVT_TIMER, boost::bind(&SimpleVideoView::timer, this));
}
_timer.Bind (wxEVT_TIMER, boost::bind(&SimpleVideoView::timer, this));
}
+
void
SimpleVideoView::paint ()
{
_state_timer.set("paint-panel");
wxPaintDC dc (_panel);
void
SimpleVideoView::paint ()
{
_state_timer.set("paint-panel");
wxPaintDC dc (_panel);
+ auto scale = 1 / dpi_scale_factor (_panel);
+ dc.SetLogicalScale (scale, scale);
- dcp::Size const out_size = _viewer->out_size ();
- wxSize const panel_size = _panel->GetSize ();
+ auto const panel_size = _panel->GetSize ();
- if (!out_size.width || !out_size.height || !_image || out_size != _image->size()) {
+ dcp::Size out_size;
+ if (!_image) {
dc.Clear ();
} else {
dc.Clear ();
} else {
-
+ DCPOMATIC_ASSERT (_image->alignment() == Image::Alignment::COMPACT);
+ out_size = _image->size();
wxImage frame (out_size.width, out_size.height, _image->data()[0], true);
wxBitmap frame_bitmap (frame);
dc.DrawBitmap (frame_bitmap, 0, max(0, (panel_size.GetHeight() - out_size.height) / 2));
}
wxImage frame (out_size.width, out_size.height, _image->data()[0], true);
wxBitmap frame_bitmap (frame);
dc.DrawBitmap (frame_bitmap, 0, max(0, (panel_size.GetHeight() - out_size.height) / 2));
}
+ auto pad = pad_colour();
+
if (out_size.width < panel_size.GetWidth()) {
if (out_size.width < panel_size.GetWidth()) {
- /* XXX: these colours are right for GNOME; may need adjusting for other OS */
- wxPen p (_viewer->pad_black() ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
- wxBrush b (_viewer->pad_black() ? wxColour(0, 0, 0) : wxColour(240, 240, 240));
+ wxPen p (pad);
+ wxBrush b (pad);
dc.SetPen (p);
dc.SetBrush (b);
dc.DrawRectangle (out_size.width, 0, panel_size.GetWidth() - out_size.width, panel_size.GetHeight());
}
if (out_size.height < panel_size.GetHeight()) {
dc.SetPen (p);
dc.SetBrush (b);
dc.DrawRectangle (out_size.width, 0, panel_size.GetWidth() - out_size.width, panel_size.GetHeight());
}
if (out_size.height < panel_size.GetHeight()) {
- wxPen p (
_viewer->pad_black() ? wxColour(0, 0, 0) : wxColour(240, 240, 240)
);
- wxBrush b (
_viewer->pad_black() ? wxColour(0, 0, 0) : wxColour(240, 240, 240)
);
+ wxPen p (
pad
);
+ wxBrush b (
pad
);
dc.SetPen (p);
dc.SetBrush (b);
int const gap = (panel_size.GetHeight() - out_size.height) / 2;
dc.SetPen (p);
dc.SetBrush (b);
int const gap = (panel_size.GetHeight() - out_size.height) / 2;
@@
-95,15
+105,15
@@
SimpleVideoView::paint ()
}
if (_viewer->outline_content()) {
}
if (_viewer->outline_content()) {
- wxPen p (
wxColour (255, 0, 0
), 2);
+ wxPen p (
outline_content_colour(
), 2);
dc.SetPen (p);
dc.SetBrush (*wxTRANSPARENT_BRUSH);
dc.DrawRectangle (_inter_position.x, _inter_position.y + (panel_size.GetHeight() - out_size.height) / 2, _inter_size.width, _inter_size.height);
}
dc.SetPen (p);
dc.SetBrush (*wxTRANSPARENT_BRUSH);
dc.DrawRectangle (_inter_position.x, _inter_position.y + (panel_size.GetHeight() - out_size.height) / 2, _inter_size.width, _inter_size.height);
}
-
optional<dcpomatic::Rect<double> >
subs = _viewer->outline_subtitles();
+
auto
subs = _viewer->outline_subtitles();
if (subs) {
if (subs) {
- wxPen p (
wxColour(0, 255, 0
), 2);
+ wxPen p (
outline_subtitles_colour(
), 2);
dc.SetPen (p);
dc.SetBrush (*wxTRANSPARENT_BRUSH);
dc.DrawRectangle (subs->x * out_size.width, subs->y * out_size.height, subs->width * out_size.width, subs->height * out_size.height);
dc.SetPen (p);
dc.SetBrush (*wxTRANSPARENT_BRUSH);
dc.DrawRectangle (subs->x * out_size.width, subs->y * out_size.height, subs->width * out_size.width, subs->height * out_size.height);
@@
-112,6
+122,7
@@
SimpleVideoView::paint ()
_state_timer.unset();
}
_state_timer.unset();
}
+
void
SimpleVideoView::refresh_panel ()
{
void
SimpleVideoView::refresh_panel ()
{
@@
-121,6
+132,7
@@
SimpleVideoView::refresh_panel ()
_state_timer.unset ();
}
_state_timer.unset ();
}
+
void
SimpleVideoView::timer ()
{
void
SimpleVideoView::timer ()
{
@@
-129,7
+141,7
@@
SimpleVideoView::timer ()
}
display_next_frame (false);
}
display_next_frame (false);
-
DCPTime
const next = position() + _viewer->one_video_frame();
+
auto
const next = position() + _viewer->one_video_frame();
if (next >= length()) {
_viewer->finished ();
if (next >= length()) {
_viewer->finished ();
@@
-144,6
+156,7
@@
SimpleVideoView::timer ()
}
}
}
}
+
void
SimpleVideoView::start ()
{
void
SimpleVideoView::start ()
{
@@
-151,6
+164,7
@@
SimpleVideoView::start ()
timer ();
}
timer ();
}
+
/** Try to get a frame from the butler and display it.
* @param non_blocking true to return false quickly if no video is available quickly (i.e. we are waiting for the butler).
* false to ask the butler to block until it has video (unless it is suspended).
/** Try to get a frame from the butler and display it.
* @param non_blocking true to return false quickly if no video is available quickly (i.e. we are waiting for the butler).
* false to ask the butler to block until it has video (unless it is suspended).
@@
-159,7
+173,7
@@
SimpleVideoView::start ()
VideoView::NextFrameResult
SimpleVideoView::display_next_frame (bool non_blocking)
{
VideoView::NextFrameResult
SimpleVideoView::display_next_frame (bool non_blocking)
{
-
NextFrameResult
const r = get_next_frame (non_blocking);
+
auto
const r = get_next_frame (non_blocking);
if (r != SUCCESS) {
return r;
}
if (r != SUCCESS) {
return r;
}
@@
-175,11
+189,12
@@
SimpleVideoView::display_next_frame (bool non_blocking)
return SUCCESS;
}
return SUCCESS;
}
+
void
SimpleVideoView::update ()
{
if (!player_video().first) {
void
SimpleVideoView::update ()
{
if (!player_video().first) {
-
set_image (shared_ptr<Image>()
);
+
_image.reset (
);
refresh_panel ();
return;
}
refresh_panel ();
return;
}
@@
-212,9
+227,7
@@
SimpleVideoView::update ()
_state_timer.set ("get image");
_state_timer.set ("get image");
- set_image (
- player_video().first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VIDEO_RANGE_FULL, false, true)
- );
+ _image = player_video().first->image(boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, true);
_state_timer.set ("ImageChanged");
_viewer->image_changed (player_video().first);
_state_timer.set ("ImageChanged");
_viewer->image_changed (player_video().first);