summaryrefslogtreecommitdiff
path: root/gtk2_ardour/streamview.h
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2009-12-17 18:24:23 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2009-12-17 18:24:23 +0000
commitf6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe (patch)
tree5214c580b9e6c17a499fa587660dbf949e892bf2 /gtk2_ardour/streamview.h
parentda762129f19c28aff64f833b6ec09fba946faef6 (diff)
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash
git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/streamview.h')
-rw-r--r--gtk2_ardour/streamview.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index 3b715ff099..0fe0b1a9ed 100644
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -22,6 +22,8 @@
#include <list>
#include <cmath>
+#include "pbd/scoped_connections.h"
+
#include "ardour/location.h"
#include "enums.h"
#include "simplerect.h"
@@ -53,7 +55,7 @@ class RegionSelection;
class CrossfadeView;
class Selection;
-class StreamView : public sigc::trackable
+class StreamView : public sigc::trackable, public PBD::ScopedConnectionList
{
public:
virtual ~StreamView ();
@@ -158,16 +160,16 @@ protected:
Gdk::Color region_color; ///< Contained region color
uint32_t stream_base_color; ///< Background color
- std::vector<sigc::connection> playlist_connections;
- sigc::connection playlist_change_connection;
+ PBD::ScopedConnectionList playlist_connections;
+ boost::signals2::scoped_connection playlist_change_connection;
ARDOUR::layer_t _layers;
LayerDisplay _layer_display;
double height;
- std::list<sigc::connection> rec_data_ready_connections;
- nframes_t last_rec_data_frame;
+ PBD::ScopedConnectionList rec_data_ready_connections;
+ nframes_t last_rec_data_frame;
private:
void update_coverage_frames ();