projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Supporters update.
[dcpomatic.git]
/
src
/
wx
/
timeline_content_view.cc
diff --git
a/src/wx/timeline_content_view.cc
b/src/wx/timeline_content_view.cc
index bb84d6147fe50e1b22f4a74145e3eac80c73257a..633110c18f9e0d55accdf2fde9770a8ab745e242 100644
(file)
--- a/
src/wx/timeline_content_view.cc
+++ b/
src/wx/timeline_content_view.cc
@@
-18,11
+18,16
@@
*/
*/
-#include "timeline_content_view.h"
+
#include "timeline.h"
#include "timeline.h"
+#include "timeline_content_view.h"
#include "wx_util.h"
#include "lib/content.h"
#include "wx_util.h"
#include "lib/content.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/graphics.h>
#include <wx/graphics.h>
+LIBDCP_ENABLE_WARNINGS
+
using std::list;
using std::shared_ptr;
using std::list;
using std::shared_ptr;
@@
-31,14
+36,15
@@
using namespace dcpomatic;
using namespace boost::placeholders;
#endif
using namespace boost::placeholders;
#endif
+
TimelineContentView::TimelineContentView (Timeline& tl, shared_ptr<Content> c)
: TimelineView (tl)
, _content (c)
TimelineContentView::TimelineContentView (Timeline& tl, shared_ptr<Content> c)
: TimelineView (tl)
, _content (c)
- , _selected (false)
{
_content_connection = c->Change.connect (bind (&TimelineContentView::content_change, this, _1, _3));
}
{
_content_connection = c->Change.connect (bind (&TimelineContentView::content_change, this, _1, _3));
}
+
dcpomatic::Rect<int>
TimelineContentView::bbox () const
{
dcpomatic::Rect<int>
TimelineContentView::bbox () const
{
@@
-58,6
+64,7
@@
TimelineContentView::bbox () const
);
}
);
}
+
void
TimelineContentView::set_selected (bool s)
{
void
TimelineContentView::set_selected (bool s)
{
@@
-65,38
+72,44
@@
TimelineContentView::set_selected (bool s)
force_redraw ();
}
force_redraw ();
}
+
bool
TimelineContentView::selected () const
{
return _selected;
}
bool
TimelineContentView::selected () const
{
return _selected;
}
+
shared_ptr<Content>
TimelineContentView::content () const
{
return _content.lock ();
}
shared_ptr<Content>
TimelineContentView::content () const
{
return _content.lock ();
}
+
void
TimelineContentView::set_track (int t)
{
_track = t;
}
void
TimelineContentView::set_track (int t)
{
_track = t;
}
+
void
TimelineContentView::unset_track ()
{
_track = boost::optional<int>();
}
void
TimelineContentView::unset_track ()
{
_track = boost::optional<int>();
}
+
boost::optional<int>
TimelineContentView::track () const
{
return _track;
}
boost::optional<int>
TimelineContentView::track () const
{
return _track;
}
+
void
void
-TimelineContentView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>
> overlaps)
+TimelineContentView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>> overlaps)
{
DCPOMATIC_ASSERT (_track);
{
DCPOMATIC_ASSERT (_track);
@@
-106,8
+119,8
@@
TimelineContentView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>
return;
}
return;
}
-
DCPTime
const position = cont->position ();
-
DCPTime
const len = cont->length_after_trim (film);
+
auto
const position = cont->position ();
+
auto
const len = cont->length_after_trim (film);
wxColour selected (background_colour().Red() / 2, background_colour().Green() / 2, background_colour().Blue() / 2);
wxColour selected (background_colour().Red() / 2, background_colour().Green() / 2, background_colour().Blue() / 2);
@@
-157,12
+170,14
@@
TimelineContentView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>
gc->PopState ();
}
gc->PopState ();
}
+
int
TimelineContentView::y_pos (int t) const
{
return t * _timeline.pixels_per_track() + _timeline.tracks_y_offset();
}
int
TimelineContentView::y_pos (int t) const
{
return t * _timeline.pixels_per_track() + _timeline.tracks_y_offset();
}
+
void
TimelineContentView::content_change (ChangeType type, int p)
{
void
TimelineContentView::content_change (ChangeType type, int p)
{
@@
-177,6
+192,7
@@
TimelineContentView::content_change (ChangeType type, int p)
}
}
}
}
+
wxString
TimelineContentView::label () const
{
wxString
TimelineContentView::label () const
{