projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use enum class for VideoRange.
[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 117eee2181241768990be4adecb5c24ca5c03c49..cd138e2393bff7d581584618d3f419d243fe0507 100644
(file)
--- a/
src/wx/simple_video_view.cc
+++ b/
src/wx/simple_video_view.cc
@@
-27,12
+27,12
@@
#include "lib/butler.h"
#include <dcp/util.h>
#include <wx/wx.h>
#include "lib/butler.h"
#include <dcp/util.h>
#include <wx/wx.h>
-#include <boost/bind.hpp>
+#include <boost/bind
/bind
.hpp>
using std::max;
using std::string;
using boost::optional;
using std::max;
using std::string;
using boost::optional;
-using
boost
::shared_ptr;
+using
std
::shared_ptr;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif
@@
-75,18
+75,26
@@
SimpleVideoView::paint ()
dc.DrawBitmap (frame_bitmap, 0, max(0, (panel_size.GetHeight() - out_size.height) / 2));
}
dc.DrawBitmap (frame_bitmap, 0, max(0, (panel_size.GetHeight() - out_size.height) / 2));
}
+#ifdef DCPOMATIC_OSX
+ auto appearance = wxSystemSettings::GetAppearance();
+ auto dark = appearance.IsDark();
+#else
+ auto dark = false;
+#endif
+
+ auto const pad_colour = (_viewer->pad_black() || dark) ? wxColour(0, 0, 0) : wxColour(240, 240, 240);
+
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_colour);
+ wxBrush b (pad_colour);
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_colour
);
+ wxBrush b (
pad_colour
);
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;
@@
-156,19
+164,12
@@
SimpleVideoView::start ()
* false to ask the butler to block until it has video (unless it is suspended).
* @return true on success, false if we did nothing because it would have taken too long.
*/
* false to ask the butler to block until it has video (unless it is suspended).
* @return true on success, false if we did nothing because it would have taken too long.
*/
-bool
+VideoView::NextFrameResult
SimpleVideoView::display_next_frame (bool non_blocking)
{
SimpleVideoView::display_next_frame (bool non_blocking)
{
- bool r = get_next_frame (non_blocking);
- if (!r) {
- if (non_blocking) {
- /* No video available; return saying we failed */
- return false;
- } else {
- /* Player was suspended; come back later */
- signal_manager->when_idle (boost::bind(&SimpleVideoView::display_next_frame, this, false));
- return false;
- }
+ NextFrameResult const r = get_next_frame (non_blocking);
+ if (r != SUCCESS) {
+ return r;
}
update ();
}
update ();
@@
-179,7
+180,7
@@
SimpleVideoView::display_next_frame (bool non_blocking)
error_dialog (get(), e.what());
}
error_dialog (get(), e.what());
}
- return
true
;
+ return
SUCCESS
;
}
void
}
void
@@
-220,7
+221,7
@@
SimpleVideoView::update ()
_state_timer.set ("get image");
set_image (
_state_timer.set ("get image");
set_image (
- player_video().first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), V
IDEO_RANGE_
FULL, false, true)
+ player_video().first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), V
ideoRange::
FULL, false, true)
);
_state_timer.set ("ImageChanged");
);
_state_timer.set ("ImageChanged");