use lucida grande for clocks with all OS X versions, BUT BETTER

[ardour.git] / gtk2_ardour / streamview.h

diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index 3268519534194eb9530455bdc4f129b72880f562..49001f57f6808d590619b75e10f82ac43d335548 100644 (file)
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -34,12 +34,12 @@ namespace Gdk {
 }
 
 namespace ARDOUR {
-       class Route;
        class Crossfade;
-       class PeakData;
        class Region;
+       class Route;
        class Source;
        class Track;
+       struct PeakData;
 }
 
 struct RecBoxInfo {
@@ -74,8 +74,8 @@ public:
        gdouble     get_samples_per_unit () { return _samples_per_unit; }
        virtual void horizontal_position_changed () {}
 
-        virtual void enter_internal_edit_mode () {}
-        virtual void leave_internal_edit_mode () {}
+        virtual void enter_internal_edit_mode ();
+        virtual void leave_internal_edit_mode ();
 
        void set_layer_display (LayerDisplay);
        LayerDisplay layer_display () const { return _layer_display; }
@@ -89,7 +89,7 @@ public:
        };
 
        Gdk::Color get_region_color () const { return region_color; }
-       void       apply_color (Gdk::Color&, ColorTarget t);
+       void       apply_color (Gdk::Color, ColorTarget t);
 
        uint32_t     num_selected_regionviews () const;
 
@@ -117,9 +117,13 @@ public:
        }
 
        void check_record_layers (boost::shared_ptr<ARDOUR::Region>, ARDOUR::framepos_t);
+
+       virtual void playlist_layered (boost::weak_ptr<ARDOUR::Track>);
        
        sigc::signal<void, RegionView*> RegionViewAdded;
        sigc::signal<void> RegionViewRemoved;
+       /** Emitted when the height of regions has changed */
+       sigc::signal<void> ContentsHeightChanged;
 
 protected:
        StreamView (RouteTimeAxisView&, ArdourCanvas::Group* background_group = 0, ArdourCanvas::Group* canvas_group = 0);
@@ -140,8 +144,7 @@ protected:
        void         diskstream_changed ();
        void         layer_regions ();
 
-       virtual void playlist_switched (boost::weak_ptr<ARDOUR::Track>);
-       virtual void playlist_layered (boost::weak_ptr<ARDOUR::Track>);
+       void playlist_switched (boost::weak_ptr<ARDOUR::Track>);
 
        virtual void color_handler () = 0;
 
@@ -182,7 +185,7 @@ protected:
        */
        framepos_t _new_rec_layer_time;
        void setup_new_rec_layer_time (boost::shared_ptr<ARDOUR::Region>);
-       
+
 private:
        void update_coverage_frames ();
 };