X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_view.h;h=60de56d76f329832ecaeebc3cb389b74e2773c54;hb=553cf2982c4905c5a08f305ce2772beaa8c50324;hp=9a663eac02171b72feb2de16e38f8f990d2c2e03;hpb=aae367b63c9b619db1e40f27dc334c6987219481;p=ardour.git

diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h
index 9a663eac02..60de56d76f 100644
--- a/gtk2_ardour/region_view.h
+++ b/gtk2_ardour/region_view.h
@@ -45,7 +45,8 @@ class RegionView : public TimeAxisViewItem
 	            TimeAxisView&        time_view,
 	            boost::shared_ptr<ARDOUR::Region> region,
 	            double               samples_per_unit,
-	            Gdk::Color const &   basic_color);
+	            Gdk::Color const &   basic_color,
+		    bool 		 automation = false);
 
 	RegionView (const RegionView& other);
 	RegionView (const RegionView& other, boost::shared_ptr<ARDOUR::Region> other_region);
@@ -62,20 +63,20 @@ class RegionView : public TimeAxisViewItem
 
 	virtual void set_height (double);
 	virtual void set_samples_per_unit (double);
-	virtual bool set_duration (nframes64_t, void*);
+	virtual bool set_duration (framecnt_t, void*);
 
 	void move (double xdelta, double ydelta);
 
 	void raise_to_top ();
 	void lower_to_bottom ();
 
-	bool set_position(nframes64_t pos, void* src, double* delta = 0);
+	bool set_position(framepos_t pos, void* src, double* delta = 0);
 	void fake_set_opaque (bool yn);
 
-	virtual void show_region_editor () {}
-	virtual void hide_region_editor();
+	virtual void show_region_editor ();
+	void hide_region_editor ();
 
-	virtual void region_changed (ARDOUR::Change);
+	virtual void region_changed (const PBD::PropertyChange&);
 
 	virtual GhostRegion* add_ghost (TimeAxisView&) = 0;
 	void remove_ghost_in (TimeAxisView&);
@@ -83,66 +84,80 @@ class RegionView : public TimeAxisViewItem
 
 	uint32_t get_fill_color ();
 
-	virtual void entered () {}
+	virtual void entered (bool) {}
 	virtual void exited () {}
 
-	void enable_display(bool yn) { _enable_display = yn; }
+	virtual void enable_display(bool yn) { _enable_display = yn; }
 	virtual void update_coverage_frames (LayerDisplay);
 
 	static PBD::Signal1<void,RegionView*> RegionViewGoingAway;
 
-  protected:
-
-	/** Allows derived types to specify their visibility requirements
-     * to the TimeAxisViewItem parent class
-     */
-    RegionView (ArdourCanvas::Group *,
-		TimeAxisView&,
-		boost::shared_ptr<ARDOUR::Region>,
-		double samples_per_unit,
-		Gdk::Color const & basic_color,
-		bool recording,
-		TimeAxisViewItem::Visibility);
-
-    virtual void region_resized (ARDOUR::Change);
-    virtual void region_muted ();
-    void         region_locked ();
-    void         region_opacity ();
-    virtual void region_renamed ();
-    void         region_sync_changed ();
-
-    Glib::ustring make_name () const;
-
-    static gint _lock_toggle (ArdourCanvas::Item*, GdkEvent*, void*);
-    void        lock_toggle ();
-
-    virtual void set_colors ();
-    virtual void set_frame_color ();
-    virtual void reset_width_dependent_items (double pixel_width);
+	ARDOUR::BeatsFramesConverter const & time_converter () {
+		return _time_converter;
+	}
 
-    virtual void color_handler () {}
+	/** Called when a start trim is about to begin */
+	virtual void trim_start_starting () {}
 
-    boost::shared_ptr<ARDOUR::Region> _region;
+	void trim_start (framepos_t, bool);
 
-    ArdourCanvas::Polygon* sync_mark; ///< polgyon for sync position
-    ArdourCanvas::Line* sync_line; ///< polgyon for sync position
+	/** Called when a start trim has finished */
+	virtual void trim_start_ending () {}
+	
+	void trim_end (framepos_t, bool);
+	void trim_contents (framepos_t, bool, bool);
+	virtual void thaw_after_trim ();
 
-    RegionEditor* editor;
-
-    std::vector<ControlPoint *> control_points;
-    double current_visible_sync_position;
-
-    bool    valid; ///< see StreamView::redisplay_diskstream()
-    bool    _enable_display; ///< see StreamView::redisplay_diskstream()
-    double  _pixel_width;
-    double  _height;
-    bool    in_destructor;
-
-    bool             wait_for_data;
-    PBD::ScopedConnection data_ready_connection;
-
-    std::vector<GhostRegion*> ghosts;
+  protected:
 
+	/** Allows derived types to specify their visibility requirements
+	 * to the TimeAxisViewItem parent class
+	 */
+	RegionView (ArdourCanvas::Group *,
+		    TimeAxisView&,
+		    boost::shared_ptr<ARDOUR::Region>,
+		    double samples_per_unit,
+		    Gdk::Color const & basic_color,
+		    bool recording,
+		    TimeAxisViewItem::Visibility);
+	
+	virtual void region_resized (const PBD::PropertyChange&);
+	virtual void region_muted ();
+	void         region_locked ();
+	void         region_opacity ();
+	virtual void region_renamed ();
+	void         region_sync_changed ();
+	
+	std::string make_name () const;
+	
+	static gint _lock_toggle (ArdourCanvas::Item*, GdkEvent*, void*);
+	void        lock_toggle ();
+	
+	virtual void set_colors ();
+	virtual void set_frame_color ();
+	virtual void reset_width_dependent_items (double pixel_width);
+	
+	virtual void color_handler () {}
+	
+	boost::shared_ptr<ARDOUR::Region> _region;
+	
+	ArdourCanvas::Polygon* sync_mark; ///< polgyon for sync position
+	ArdourCanvas::Line* sync_line; ///< polgyon for sync position
+	
+	RegionEditor* editor;
+	
+	std::vector<ControlPoint *> control_points;
+	double current_visible_sync_position;
+
+	bool    valid; ///< see StreamView::redisplay_diskstream()
+	bool    _enable_display; ///< see StreamView::redisplay_diskstream()
+	double  _pixel_width;
+	bool    in_destructor;
+	
+	bool wait_for_data;
+	
+	std::vector<GhostRegion*> ghosts;
+	
 	/** a list of rectangles which are used in stacked display mode to colour
 	    different bits of regions according to whether or not they are the one
 	    that will be played at any given time.