summaryrefslogtreecommitdiff
path: root/src/wx/timeline.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-05-26 00:21:53 +0100
committerCarl Hetherington <cth@carlh.net>2013-05-26 00:21:53 +0100
commitc77dabbe4e6bb031edf4aa82f5e890fe605bafe1 (patch)
treed3a3f2f34b44eecedabc0240ea82c741b49385ba /src/wx/timeline.h
parent996b0c06e23bcb6b300d7b8799df94993692e07d (diff)
Add unfinished timing tab; fix crash on reconstruction of timeline; fix lack of black / silence at end of films.
Diffstat (limited to 'src/wx/timeline.h')
-rw-r--r--src/wx/timeline.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index 79ceceaa0..52b29de86 100644
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
-
/*
Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
@@ -21,6 +19,7 @@
#include <boost/shared_ptr.hpp>
#include <boost/weak_ptr.hpp>
+#include <boost/signals2.hpp>
#include <wx/wx.h>
#include "util.h"
@@ -76,4 +75,6 @@ private:
boost::shared_ptr<ContentView> _down_view;
Time _down_view_start;
bool _first_move;
+
+ boost::signals2::scoped_connection _playlist_connection;
};