summaryrefslogtreecommitdiff
path: root/src/wx/timeline_content_view.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-08-19 01:04:59 +0100
committerCarl Hetherington <cth@carlh.net>2018-08-19 01:29:04 +0100
commit6c7489e5d778d3e71065d88a094a7383ba2c117d (patch)
treee3f05ad03095d88d297c7d61e03e265d28a97fa3 /src/wx/timeline_content_view.h
parent9a27d60ea7888d300a5a2414a477091428589b82 (diff)
Replace May/Done/NotDone signal sets with one signal and extend
this treatment to anything that caused Player::setup_pieces. This should fix out-of-sequence Player emissions caused by setup_pieces being called by one thread while the butler is calling pass().
Diffstat (limited to 'src/wx/timeline_content_view.h')
-rw-r--r--src/wx/timeline_content_view.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/wx/timeline_content_view.h b/src/wx/timeline_content_view.h
index b5b000bdb..27cfed53e 100644
--- a/src/wx/timeline_content_view.h
+++ b/src/wx/timeline_content_view.h
@@ -21,6 +21,7 @@
#ifndef DCPOMATIC_TIMELINE_CONTENT_VIEW_H
#define DCPOMATIC_TIMELINE_CONTENT_VIEW_H
+#include "lib/types.h"
#include "timeline_view.h"
#include <wx/wx.h>
#include <boost/signals2.hpp>
@@ -57,7 +58,7 @@ private:
void do_paint (wxGraphicsContext* gc, std::list<dcpomatic::Rect<int> > overlaps);
int y_pos (int t) const;
- void content_changed (int p);
+ void content_change (ChangeType type, int p);
boost::optional<int> _track;
bool _selected;