X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_region_view.h;h=773e136952ee398629bb8943125d08a959a9d1af;hb=c40437430acf4b65d8acb8b084eae8cd2f6f5402;hp=9fe658f877bdd081c61df5d61e0ea639c45c9420;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/gtk2_ardour/audio_region_view.h b/gtk2_ardour/audio_region_view.h
index 9fe658f877..773e136952 100644
--- a/gtk2_ardour/audio_region_view.h
+++ b/gtk2_ardour/audio_region_view.h
@@ -35,12 +35,11 @@
 
 namespace ARDOUR {
 	class AudioRegion;
-	class PeakData;
+	struct PeakData;
 };
 
 class AudioTimeAxisView;
 class AudioRegionGainLine;
-class AudioRegionEditor;
 class GhostRegion;
 class AutomationTimeAxisView;
 class RouteTimeAxisView;
@@ -62,7 +61,6 @@ class AudioRegionView : public RegionView
 			 bool recording,
 			 TimeAxisViewItem::Visibility);
 
-	AudioRegionView (const AudioRegionView& other);
 	AudioRegionView (const AudioRegionView& other, boost::shared_ptr<ARDOUR::AudioRegion>);
 
 	~AudioRegionView ();
@@ -81,7 +79,7 @@ class AudioRegionView : public RegionView
 	void temporarily_hide_envelope (); ///< Dangerous!
 	void unhide_envelope ();           ///< Dangerous!
 
-	void set_envelope_visible (bool);
+	void update_envelope_visibility ();
 	void set_waveform_visible (bool yn);
 	void set_waveform_shape (ARDOUR::WaveformShape);
 	void set_waveform_scale (ARDOUR::WaveformScale);
@@ -89,91 +87,126 @@ class AudioRegionView : public RegionView
 	bool waveform_rectified() const { return _flags & WaveformRectified; }
 	bool waveform_logscaled() const { return _flags & WaveformLogScaled; }
 	bool waveform_visible()   const { return _flags & WaveformVisible; }
-	bool envelope_visible()   const { return _flags & EnvelopeVisible; }
-
-	void show_region_editor ();
 
 	void add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *event);
 	void remove_gain_point_event (ArdourCanvas::Item *item, GdkEvent *event);
 
-	AudioRegionGainLine* get_gain_line() const { return gain_line; }
+	boost::shared_ptr<AudioRegionGainLine> get_gain_line() const { return gain_line; }
 
-	void region_changed (ARDOUR::Change);
+	void region_changed (const PBD::PropertyChange&);
 	void envelope_active_changed ();
 
 	GhostRegion* add_ghost (TimeAxisView&);
 
-	void reset_fade_in_shape_width (nframes_t);
-	void reset_fade_out_shape_width (nframes_t);
+	void reset_fade_in_shape_width (framecnt_t);
+	void reset_fade_out_shape_width (framecnt_t);
+
+	void show_fade_line(framepos_t pos);
+	void hide_fade_line();
 
 	void set_fade_visibility (bool);
 	void update_coverage_frames (LayerDisplay);
 
-	virtual void entered ();
+	void update_transient(float old_pos, float new_pos);
+	void remove_transient(float pos);
+
+	void show_region_editor ();
+
+	virtual void entered (bool);
 	virtual void exited ();
 
+	void thaw_after_trim ();
+
+	void drag_start ();
+	void drag_end ();
+
+	void redraw_start_xfade_to (boost::shared_ptr<ARDOUR::AudioRegion>, framecnt_t);
+	void redraw_end_xfade_to (boost::shared_ptr<ARDOUR::AudioRegion>, framecnt_t);
+	void redraw_start_xfade ();
+	void redraw_end_xfade ();
+	
+	void hide_xfades ();
+	void show_xfades ();
+
   protected:
 
-    /* this constructor allows derived types
-       to specify their visibility requirements
-       to the TimeAxisViewItem parent class
-    */
-
-    enum Flags {
-	    EnvelopeVisible = 0x1,
-	    WaveformVisible = 0x4,
-	    WaveformRectified = 0x8,
-	    WaveformLogScaled = 0x10,
-    };
-
-    std::vector<ArdourCanvas::WaveView *> waves;
-    std::vector<ArdourCanvas::WaveView *> tmp_waves; ///< see ::create_waves()
-    ArdourCanvas::Polygon*           sync_mark; ///< polgyon for sync position
-    ArdourCanvas::SimpleLine*        zero_line;
-    ArdourCanvas::Polygon*           fade_in_shape;
-    ArdourCanvas::Polygon*           fade_out_shape;
-    ArdourCanvas::SimpleRect*        fade_in_handle;
-    ArdourCanvas::SimpleRect*        fade_out_handle;
-
-    AudioRegionGainLine * gain_line;
-
-    double _amplitude_above_axis;
-
-    uint32_t _flags;
-    uint32_t fade_color;
-
-    void reset_fade_shapes ();
-    void reset_fade_in_shape ();
-    void reset_fade_out_shape ();
-    void fade_in_changed ();
-    void fade_out_changed ();
-    void fade_in_active_changed ();
-    void fade_out_active_changed ();
-
-    void region_resized (ARDOUR::Change);
-    void region_muted ();
-    void region_scale_amplitude_changed ();
+	/* this constructor allows derived types
+	   to specify their visibility requirements
+	   to the TimeAxisViewItem parent class
+	*/
+
+	enum Flags {
+		WaveformVisible = 0x4,
+		WaveformRectified = 0x8,
+		WaveformLogScaled = 0x10,
+	};
+
+	std::vector<ArdourCanvas::WaveView *> waves;
+	std::vector<ArdourCanvas::WaveView *> tmp_waves; ///< see ::create_waves()
+
+	std::list<std::pair<framepos_t, ArdourCanvas::Line*> > feature_lines;
+
+	ArdourCanvas::Polygon*           sync_mark; ///< polgyon for sync position
+	ArdourCanvas::Polygon*           fade_in_shape;
+	ArdourCanvas::Polygon*           fade_out_shape;
+	ArdourCanvas::SimpleRect*        fade_in_handle; ///< fade in handle, or 0
+	ArdourCanvas::SimpleRect*        fade_out_handle; ///< fade out handle, or 0
+	ArdourCanvas::SimpleLine*        fade_position_line;
+
+	ArdourCanvas::Line *start_xfade_in;
+	ArdourCanvas::Line *start_xfade_out;
+	ArdourCanvas::SimpleRect* start_xfade_rect;
+
+	ArdourCanvas::Line *end_xfade_in;
+	ArdourCanvas::Line *end_xfade_out;
+	ArdourCanvas::SimpleRect* end_xfade_rect;
+
+	boost::shared_ptr<AudioRegionGainLine> gain_line;
+
+	double _amplitude_above_axis;
+
+	uint32_t _flags;
+	uint32_t fade_color;
+
+	void reset_fade_shapes ();
+	void reset_fade_in_shape ();
+	void reset_fade_out_shape ();
+	void fade_in_changed ();
+	void fade_out_changed ();
+	void fade_in_active_changed ();
+	void fade_out_active_changed ();
+
+	void region_resized (const PBD::PropertyChange&);
+	void region_muted ();
+	void region_scale_amplitude_changed ();
 	void region_renamed ();
 
-    void create_one_wave (uint32_t, bool);
-    void manage_zero_line ();
-    void peaks_ready_handler (uint32_t);
-    void set_flags (XMLNode *);
-    void store_flags ();
+	void create_one_wave (uint32_t, bool);
+	void peaks_ready_handler (uint32_t);
+	void set_flags (XMLNode *);
+	void store_flags ();
+
+	void set_colors ();
+	void compute_colors (Gdk::Color const &);
+	void reset_width_dependent_items (double pixel_width);
+	void set_waveview_data_src();
+	void set_frame_color ();
+
+	void color_handler ();
 
-    void set_colors ();
-    void compute_colors (Gdk::Color const &);
-    void reset_width_dependent_items (double pixel_width);
-    void set_waveview_data_src();
-    void set_frame_color ();
+	std::vector<GnomeCanvasWaveViewCache*> wave_caches;
 
-    void color_handler ();
+	void transients_changed();
 
-    std::vector<GnomeCanvasWaveViewCache*> wave_caches;
+	AutomationLine::VisibleAspects automation_line_visibility () const;
 
-  private:
+private:
+	void setup_fade_handle_positions ();
 
-    void setup_fade_handle_positions ();
+	/** A ScopedConnection for each PeaksReady callback (one per channel).  Each member
+	 *  may be 0 if no connection exists.
+	 */
+	std::vector<PBD::ScopedConnection*> _data_ready_connections;
 };
 
 #endif /* __gtk_ardour_audio_region_view_h__ */