X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_region_view.h;h=d12d8ff0868c0aacc9e3c951a7a3b8f610eef520;hb=863a6ade9ee42ca6623980b122aed9c8378066df;hp=ab3d59a235d564c7848b32371fc9231f380d4d76;hpb=6acdfc69b785841ac10a324484ddd0208612a213;p=ardour.git diff --git a/gtk2_ardour/audio_region_view.h b/gtk2_ardour/audio_region_view.h index ab3d59a235..d12d8ff086 100644 --- a/gtk2_ardour/audio_region_view.h +++ b/gtk2_ardour/audio_region_view.h @@ -29,7 +29,9 @@ #include "ardour/audioregion.h" #include "canvas/fwd.h" -#include "canvas/wave_view.h" +#include "canvas/xfade_curve.h" + +#include "waveview/wave_view.h" #include "region_view.h" #include "time_axis_view_item.h" @@ -49,30 +51,31 @@ class RouteTimeAxisView; class AudioRegionView : public RegionView { - public: - AudioRegionView (ArdourCanvas::Group *, - RouteTimeAxisView&, - boost::shared_ptr, - double initial_samples_per_pixel, - Gdk::Color const & basic_color); - - AudioRegionView (ArdourCanvas::Group *, - RouteTimeAxisView&, - boost::shared_ptr, - double samples_per_pixel, - Gdk::Color const & basic_color, - bool recording, - TimeAxisViewItem::Visibility); +public: + AudioRegionView (ArdourCanvas::Container *, + RouteTimeAxisView&, + boost::shared_ptr, + double initial_samples_per_pixel, + uint32_t base_color); + + AudioRegionView (ArdourCanvas::Container *, + RouteTimeAxisView&, + boost::shared_ptr, + double samples_per_pixel, + uint32_t base_color, + bool recording, + TimeAxisViewItem::Visibility); AudioRegionView (const AudioRegionView& other, boost::shared_ptr); ~AudioRegionView (); - virtual void init (Gdk::Color const & base_color, bool wait_for_data); + void init (bool wait_for_data); boost::shared_ptr audio_region() const; void create_waves (); + void delete_waves (); void set_height (double); void set_samples_per_pixel (double); @@ -84,7 +87,7 @@ class AudioRegionView : public RegionView void update_envelope_visibility (); - void add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *event); + void add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *event, bool with_guard_points); void remove_gain_point_event (ArdourCanvas::Item *item, GdkEvent *event); boost::shared_ptr get_gain_line() const { return gain_line; } @@ -94,21 +97,21 @@ class AudioRegionView : public RegionView GhostRegion* add_ghost (TimeAxisView&); - void reset_fade_in_shape_width (boost::shared_ptr ar, framecnt_t); - void reset_fade_out_shape_width (boost::shared_ptr ar, framecnt_t); + void reset_fade_in_shape_width (boost::shared_ptr ar, samplecnt_t, bool drag_active = false); + void reset_fade_out_shape_width (boost::shared_ptr ar, samplecnt_t, bool drag_active = false); - framepos_t get_fade_in_shape_width (); - framepos_t get_fade_out_shape_width (); + samplepos_t get_fade_in_shape_width (); + samplepos_t get_fade_out_shape_width (); void set_fade_visibility (bool); - void update_coverage_frames (LayerDisplay); + void update_coverage_samples (LayerDisplay); void update_transient(float old_pos, float new_pos); void remove_transient(float pos); void show_region_editor (); - virtual void entered (bool); + virtual void entered (); virtual void exited (); void thaw_after_trim (); @@ -116,11 +119,11 @@ class AudioRegionView : public RegionView void drag_start (); void drag_end (); - void redraw_start_xfade_to (boost::shared_ptr, framecnt_t, ArdourCanvas::Points&, double, double); - void redraw_end_xfade_to (boost::shared_ptr, framecnt_t, ArdourCanvas::Points&, double, double, double); + void redraw_start_xfade_to (boost::shared_ptr, samplecnt_t, ArdourCanvas::Points&, double, double); + void redraw_end_xfade_to (boost::shared_ptr, samplecnt_t, ArdourCanvas::Points&, double, double, double); void redraw_start_xfade (); void redraw_end_xfade (); - + void hide_xfades (); void hide_start_xfade (); void hide_end_xfade (); @@ -136,12 +139,12 @@ class AudioRegionView : public RegionView return _end_xfade_visible; } - protected: +protected: /* this constructor allows derived types - to specify their visibility requirements - to the TimeAxisViewItem parent class - */ + * to specify their visibility requirements + * to the TimeAxisViewItem parent class + */ enum Flags { WaveformVisible = 0x4, @@ -149,33 +152,32 @@ class AudioRegionView : public RegionView WaveformLogScaled = 0x10, }; - std::vector waves; - std::vector tmp_waves; ///< see ::create_waves() + std::vector waves; + std::vector tmp_waves; ///< see ::create_waves() - std::list > feature_lines; + std::list > feature_lines; ArdourCanvas::Polygon* sync_mark; ///< polgyon for sync position - ArdourCanvas::PolyLine* fade_in_shape; - ArdourCanvas::PolyLine* fade_out_shape; ArdourCanvas::Rectangle* fade_in_handle; ///< fade in handle, or 0 ArdourCanvas::Rectangle* fade_out_handle; ///< fade out handle, or 0 + ArdourCanvas::Rectangle* fade_in_trim_handle; ///< fade in trim handle, or 0 + ArdourCanvas::Rectangle* fade_out_trim_handle; ///< fade out trim handle, or 0 + ArdourCanvas::Rectangle* pending_peak_data; - ArdourCanvas::PolyLine *start_xfade_in; - ArdourCanvas::PolyLine *start_xfade_out; - ArdourCanvas::Rectangle* start_xfade_rect; + static Cairo::RefPtr pending_peak_pattern; + + ArdourCanvas::XFadeCurve* start_xfade_curve; + ArdourCanvas::Rectangle* start_xfade_rect; bool _start_xfade_visible; - ArdourCanvas::PolyLine *end_xfade_in; - ArdourCanvas::PolyLine *end_xfade_out; - ArdourCanvas::Rectangle* end_xfade_rect; + ArdourCanvas::XFadeCurve* end_xfade_curve; + ArdourCanvas::Rectangle* end_xfade_rect; bool _end_xfade_visible; boost::shared_ptr gain_line; double _amplitude_above_axis; - uint32_t fade_color; - void reset_fade_shapes (); void reset_fade_in_shape (); void reset_fade_out_shape (); @@ -193,11 +195,9 @@ class AudioRegionView : public RegionView void peaks_ready_handler (uint32_t); void set_colors (); - void set_waveform_colors (); - void set_one_waveform_color (ArdourCanvas::WaveView*); - void compute_colors (Gdk::Color const &); + void set_waveform_colors (); void reset_width_dependent_items (double pixel_width); - void set_frame_color (); + void set_sample_color (); void color_handler (); @@ -210,9 +210,7 @@ private: void parameter_changed (std::string const &); void setup_waveform_visibility (); - void setup_waveform_shape (); - void setup_waveform_scale (); - void setup_waveform_clipping (); + void set_some_waveform_colors (std::vector& waves_to_color); /** A ScopedConnection for each PeaksReady callback (one per channel). Each member * may be 0 if no connection exists. @@ -223,6 +221,9 @@ private: * first list is for start xfades, second list is for end xfades. */ std::pair, std::list > _hidden_xfades; + + bool trim_fade_in_drag_active; + bool trim_fade_out_drag_active; }; #endif /* __gtk_ardour_audio_region_view_h__ */