diff options
| author | Taybin Rutkin <taybin@taybin.com> | 2005-09-25 20:33:00 +0000 |
|---|---|---|
| committer | Taybin Rutkin <taybin@taybin.com> | 2005-09-25 20:33:00 +0000 |
| commit | e493b2b7c4fbbbfc457f02babf9546289b430177 (patch) | |
| tree | 598b5fa6dc9340c96961e3131cc994480d80ff6a /gtk2_ardour/streamview.h | |
| parent | f872433e8e81ba5a3a9ebffa32c6ddd9e3358f07 (diff) | |
Fly my pretties!
git-svn-id: svn://localhost/trunk/ardour2@28 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/streamview.h')
| -rw-r--r-- | gtk2_ardour/streamview.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h index 8d9162c8ab..9eb26cb5a4 100644 --- a/gtk2_ardour/streamview.h +++ b/gtk2_ardour/streamview.h @@ -25,7 +25,7 @@ #include <map> #include <cmath> -#include <gtk--.h> +#include <gtkmm.h> #include <gtk-canvas.h> #include <ardour/location.h> @@ -54,7 +54,7 @@ class AudioRegionSelection; class CrossfadeView; class Selection; -class StreamView : public SigC::Object +class StreamView : public sigc::trackable { public: StreamView (AudioTimeAxisView&); @@ -80,7 +80,7 @@ class StreamView : public SigC::Object GtkCanvasItem* canvas_item() { return canvas_group; } - SigC::Signal1<void,AudioRegionView*> AudioRegionViewAdded; + sigc::signal<void,AudioRegionView*> AudioRegionViewAdded; enum ColorTarget { RegionColor, @@ -93,7 +93,7 @@ class StreamView : public SigC::Object void get_inverted_selectables (Selection&, list<Selectable* >& results); GdkColor get_region_color () const { return region_color; } - void foreach_regionview (SigC::Slot1<void,AudioRegionView*> slot); + void foreach_regionview (sigc::slot<void,AudioRegionView*> slot); void foreach_crossfadeview (void (CrossfadeView::*pmf)(void)); void attach (); @@ -122,13 +122,13 @@ class StreamView : public SigC::Object double _samples_per_unit; double _amplitude_above_axis; - SigC::Connection screen_update_connection; + sigc::connection screen_update_connection; vector<RecBoxInfo> rec_rects; list<ARDOUR::AudioRegion* > rec_regions; bool rec_updating; bool rec_active; bool use_rec_regions; - list<SigC::Connection> peak_ready_connections; + list<sigc::connection> peak_ready_connections; jack_nframes_t last_rec_peak_frame; map<ARDOUR::Source*, bool> rec_peak_ready_map; @@ -164,8 +164,8 @@ class StreamView : public SigC::Object GdkColor region_color; uint32_t stream_base_color; - vector<SigC::Connection> playlist_connections; - SigC::Connection playlist_change_connection; + vector<sigc::connection> playlist_connections; + sigc::connection playlist_change_connection; }; #endif /* __ardour_streamview_h__ */ |