summaryrefslogtreecommitdiff
path: root/gtk2_ardour/streamview.h
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2010-01-25 20:34:09 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2010-01-25 20:34:09 +0000
commit832aa18a813f5ed4cb8e1228c52d89ee6d8946c7 (patch)
tree7f6edd7d4cabb58ccddceac9aa18d38cc2987313 /gtk2_ardour/streamview.h
parent10395d2feeeac8949e9fd491173e467c9852879e (diff)
a boatload of minor and middle-sized changes to try to speed up undo. imperfect, unfinished, but probably right to commit now
git-svn-id: svn://localhost/ardour2/branches/3.0@6561 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/streamview.h')
-rw-r--r--gtk2_ardour/streamview.h11
1 files changed, 4 insertions, 7 deletions
diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index b32d75d5ac..a1ebe2cc2a 100644
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -99,8 +99,7 @@ public:
virtual void update_contents_metrics(boost::shared_ptr<ARDOUR::Region>) {}
- void add_region_view_weak (boost::weak_ptr<ARDOUR::Region> r);
- void add_region_view (boost::shared_ptr<ARDOUR::Region>);
+ void add_region_view (boost::weak_ptr<ARDOUR::Region>);
void region_layered (RegionView*);
virtual void update_contents_height ();
@@ -135,10 +134,8 @@ protected:
void diskstream_changed ();
void layer_regions ();
- virtual void playlist_changed_weak (boost::weak_ptr<ARDOUR::Diskstream>);
- virtual void playlist_changed (boost::shared_ptr<ARDOUR::Diskstream>);
- virtual void playlist_modified_weak (boost::weak_ptr<ARDOUR::Diskstream>);
- virtual void playlist_modified (boost::shared_ptr<ARDOUR::Diskstream>);
+ virtual void playlist_switched (boost::weak_ptr<ARDOUR::Diskstream>);
+ virtual void playlist_layered (boost::weak_ptr<ARDOUR::Diskstream>);
virtual void color_handler () = 0;
@@ -164,7 +161,7 @@ protected:
uint32_t stream_base_color; ///< Background color
PBD::ScopedConnectionList playlist_connections;
- PBD::ScopedConnection playlist_change_connection;
+ PBD::ScopedConnection playlist_switched_connection;
ARDOUR::layer_t _layers;
LayerDisplay _layer_display;