X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_view.h;h=26d7cdde86364de972ab3341e510f2001672d63f;hb=4e4cb140a0713cabec624f13e86eaf9b375ab6c5;hp=64ab256f89bd531b53424122d229fa6b83a01921;hpb=62c4e8188457c8e0da9eb98202a5bc2a07c9250b;p=ardour.git

diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h
index 64ab256f89..26d7cdde86 100644
--- a/gtk2_ardour/region_view.h
+++ b/gtk2_ardour/region_view.h
@@ -56,41 +56,40 @@ class RegionView : public TimeAxisViewItem
 	boost::shared_ptr<ARDOUR::Region> region() const { return _region; }
 	
 	bool is_valid() const    { return valid; }
-    void set_valid (bool yn) { valid = yn; }
 
-    virtual void set_height (double) = 0;
-    virtual void set_samples_per_unit (double);
-    virtual bool set_duration (nframes_t, void*);
 
-    void move (double xdelta, double ydelta);
-
-    void raise ();
-    void raise_to_top ();
-    void lower ();
-    void lower_to_bottom ();
-
-    bool set_position(nframes_t pos, void* src, double* delta = 0);
-    void fake_set_opaque (bool yn);
-
-    virtual void show_region_editor () = 0;
-    virtual void hide_region_editor();
-
-    virtual void region_changed (ARDOUR::Change);
-
-    virtual GhostRegion* add_ghost (AutomationTimeAxisView&) = 0;
-    void                 remove_ghost (GhostRegion*);
-
-    uint32_t get_fill_color ();
+	void set_valid (bool yn) { valid = yn; }
+	
+	virtual void set_samples_per_unit (double);
+	virtual bool set_duration (nframes_t, void*);
+	
+	void move (double xdelta, double ydelta);
+	
+	void raise_to_top ();
+	void lower_to_bottom ();
 
-    virtual void entered () {}
-    virtual void exited () {}
-    
-    static sigc::signal<void,RegionView*> RegionViewGoingAway;
-    sigc::signal<void>                    GoingAway;
+	bool set_position(nframes_t pos, void* src, double* delta = 0);
+	void fake_set_opaque (bool yn);
+	
+	virtual void show_region_editor () = 0;
+	virtual void hide_region_editor();
+	
+	virtual void region_changed (ARDOUR::Change);
+	
+	virtual GhostRegion* add_ghost (AutomationTimeAxisView&) = 0;
+	void                 remove_ghost (GhostRegion*);
+	
+	uint32_t get_fill_color ();
 
+	virtual void entered () {}
+	virtual void exited () {}
+	
+	static sigc::signal<void,RegionView*> RegionViewGoingAway;
+	sigc::signal<void>                    GoingAway;
+	
   protected:
-
-    /** Allows derived types to specify their visibility requirements
+	
+	/** Allows derived types to specify their visibility requirements
      * to the TimeAxisViewItem parent class
      */
     RegionView (ArdourCanvas::Group *, 
@@ -99,16 +98,17 @@ class RegionView : public TimeAxisViewItem
 		double      samples_per_unit,
 		Gdk::Color& basic_color,
 		TimeAxisViewItem::Visibility);
-
+    
     virtual void region_resized (ARDOUR::Change);
-    void         region_moved (void *);
     virtual void region_muted ();
     void         region_locked ();
     void         region_opacity ();
     void         region_layered ();
-    void         region_renamed ();
+    virtual void region_renamed ();
     void         region_sync_changed ();
 
+    Glib::ustring make_name () const;
+
     static gint _lock_toggle (ArdourCanvas::Item*, GdkEvent*, void*);
     void        lock_toggle ();
 
@@ -116,8 +116,8 @@ class RegionView : public TimeAxisViewItem
     virtual void compute_colors (Gdk::Color&);
     virtual void set_frame_color ();
     virtual void reset_width_dependent_items (double pixel_width);
-    
-    virtual void color_handler (ColorID, uint32_t) {}
+
+    virtual void color_handler () {}
 	
     boost::shared_ptr<ARDOUR::Region> _region;
     
@@ -130,7 +130,6 @@ class RegionView : public TimeAxisViewItem
 
     bool     valid; ///< see StreamView::redisplay_diskstream() 
     double  _pixel_width;
-    double  _height;
     bool    in_destructor;
     
     bool             wait_for_data;