X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_region_view.h;h=646d044c07be2cbd28ff741f690716cf658d864c;hb=234b06a18cf3e8c07bc44fb4f8c1218e17fb65f1;hp=bb5cbf29c4be3f7b8e122639841eb36ad1534ab9;hpb=28759617c4eb0cbadbd41e6d7ea97d5de182966c;p=ardour.git diff --git a/gtk2_ardour/audio_region_view.h b/gtk2_ardour/audio_region_view.h index bb5cbf29c4..646d044c07 100644 --- a/gtk2_ardour/audio_region_view.h +++ b/gtk2_ardour/audio_region_view.h @@ -19,6 +19,10 @@ #ifndef __gtk_ardour_audio_region_view_h__ #define __gtk_ardour_audio_region_view_h__ +#ifdef interface +#undef interface +#endif + #include #include @@ -26,6 +30,7 @@ #include "canvas/fwd.h" #include "canvas/wave_view.h" +#include "canvas/xfade_curve.h" #include "region_view.h" #include "time_axis_view_item.h" @@ -46,17 +51,17 @@ class RouteTimeAxisView; class AudioRegionView : public RegionView { public: - AudioRegionView (ArdourCanvas::Group *, + AudioRegionView (ArdourCanvas::Container *, RouteTimeAxisView&, boost::shared_ptr, double initial_samples_per_pixel, - Gdk::Color const & basic_color); + uint32_t base_color); - AudioRegionView (ArdourCanvas::Group *, + AudioRegionView (ArdourCanvas::Container *, RouteTimeAxisView&, boost::shared_ptr, double samples_per_pixel, - Gdk::Color const & basic_color, + uint32_t base_color, bool recording, TimeAxisViewItem::Visibility); @@ -64,11 +69,12 @@ class AudioRegionView : public RegionView ~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); @@ -80,7 +86,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; } @@ -90,8 +96,8 @@ 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, framecnt_t, bool drag_active = false); + void reset_fade_out_shape_width (boost::shared_ptr ar, framecnt_t, bool drag_active = false); framepos_t get_fade_in_shape_width (); framepos_t get_fade_out_shape_width (); @@ -104,7 +110,7 @@ class AudioRegionView : public RegionView void show_region_editor (); - virtual void entered (bool); + virtual void entered (); virtual void exited (); void thaw_after_trim (); @@ -112,11 +118,11 @@ class AudioRegionView : public RegionView void drag_start (); void drag_end (); - void redraw_start_xfade_to (boost::shared_ptr, framecnt_t, ArdourCanvas::Points&, double); - void redraw_end_xfade_to (boost::shared_ptr, framecnt_t, ArdourCanvas::Points&, double); + 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 (); void redraw_end_xfade (); - + void hide_xfades (); void hide_start_xfade (); void hide_end_xfade (); @@ -151,27 +157,26 @@ class AudioRegionView : public RegionView 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; + + static Cairo::RefPtr pending_peak_pattern; - ArdourCanvas::PolyLine *start_xfade_in; - ArdourCanvas::PolyLine *start_xfade_out; - ArdourCanvas::Rectangle* start_xfade_rect; + 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 (); @@ -190,8 +195,6 @@ class AudioRegionView : public RegionView void set_colors (); void set_waveform_colors (); - void set_one_waveform_color (ArdourCanvas::WaveView*); - void compute_colors (Gdk::Color const &); void reset_width_dependent_items (double pixel_width); void set_frame_color (); @@ -206,9 +209,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. @@ -219,6 +220,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__ */