X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_view.h;h=b33d6abf2ca341bac983c752cf072e96b10dbf7a;hb=fcb822c45c06d94eff9d72ce399788080b3dad3a;hp=a5d5fddbd08acb5d2be6a0b4b82e0264e52a9a04;hpb=8f930477be9e2c88859a8ea30b213fba3f7fc443;p=ardour.git diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h index a5d5fddbd0..b33d6abf2c 100644 --- a/gtk2_ardour/region_view.h +++ b/gtk2_ardour/region_view.h @@ -27,7 +27,7 @@ #include #include "ardour/region.h" -#include "ardour/beats_frames_converter.h" +#include "ardour/beats_samples_converter.h" #include "canvas/fwd.h" @@ -48,20 +48,25 @@ namespace ArdourCanvas { class RegionView : public TimeAxisViewItem { - public: - RegionView (ArdourCanvas::Group* parent, +public: + RegionView (ArdourCanvas::Container* parent, TimeAxisView& time_view, boost::shared_ptr region, double samples_per_pixel, - Gdk::Color const & basic_color, - bool automation = false); + uint32_t base_color, + bool automation = false); RegionView (const RegionView& other); RegionView (const RegionView& other, boost::shared_ptr other_region); ~RegionView (); - virtual void init (Gdk::Color const & base_color, bool wait_for_data); + virtual void set_selected (bool yn) { + _region->set_selected_for_solo(yn); + TimeAxisViewItem::set_selected(yn); + } + + virtual void init (bool wait_for_data); boost::shared_ptr region() const { return _region; } @@ -71,75 +76,72 @@ class RegionView : public TimeAxisViewItem virtual void set_height (double); virtual void set_samples_per_pixel (double); - virtual bool set_duration (framecnt_t, void*); + virtual bool set_duration (samplecnt_t, void*); void move (double xdelta, double ydelta); void raise_to_top (); void lower_to_bottom (); - bool set_position(framepos_t pos, void* src, double* delta = 0); - void fake_set_opaque (bool yn); + bool set_position(samplepos_t pos, void* src, double* delta = 0); virtual void show_region_editor (); void hide_region_editor (); virtual void region_changed (const PBD::PropertyChange&); + uint32_t get_fill_color () const; + virtual GhostRegion* add_ghost (TimeAxisView&) = 0; void remove_ghost_in (TimeAxisView&); void remove_ghost (GhostRegion*); - uint32_t get_fill_color (); - - virtual void entered (bool) {} + virtual void entered () {} virtual void exited () {} virtual void enable_display(bool yn) { _enable_display = yn; } - virtual void update_coverage_frames (LayerDisplay); + virtual void update_coverage_samples (LayerDisplay); static PBD::Signal1 RegionViewGoingAway; - ARDOUR::BeatsFramesConverter const & region_relative_time_converter () const { - return _region_relative_time_converter; - } - - ARDOUR::BeatsFramesConverter const & source_relative_time_converter () const { - return _source_relative_time_converter; - } - /** Called when a front trim is about to begin */ virtual void trim_front_starting () {} - bool trim_front (framepos_t, bool); + bool trim_front (samplepos_t, bool, const int32_t sub_num); /** Called when a start trim has finished */ virtual void trim_front_ending () {} - bool trim_end (framepos_t, bool); - void move_contents (ARDOUR::frameoffset_t); + bool trim_end (samplepos_t, bool, const int32_t sub_num); + void move_contents (ARDOUR::sampleoffset_t); virtual void thaw_after_trim (); - void set_silent_frames (const ARDOUR::AudioIntervalResult&, double threshold); - void drop_silent_frames (); - void hide_silent_frames (); + void set_silent_samples (const ARDOUR::AudioIntervalResult&, double threshold); + void drop_silent_samples (); + void hide_silent_samples (); + + struct PositionOrder { + bool operator()(const RegionView* a, const RegionView* b) { + return a->region()->position() < b->region()->position(); + } + }; + + ARDOUR::MusicSample snap_sample_to_sample (ARDOUR::sampleoffset_t, bool ensure_snap = false) const; - ARDOUR::frameoffset_t snap_frame_to_frame (ARDOUR::frameoffset_t) const; - - protected: +protected: /** Allows derived types to specify their visibility requirements * to the TimeAxisViewItem parent class */ - RegionView (ArdourCanvas::Group *, - TimeAxisView&, - boost::shared_ptr, - double samples_per_pixel, - Gdk::Color const & basic_color, - bool recording, - TimeAxisViewItem::Visibility); + RegionView (ArdourCanvas::Container *, + TimeAxisView&, + boost::shared_ptr, + double samples_per_pixel, + uint32_t basic_color, + bool recording, + TimeAxisViewItem::Visibility); - bool canvas_group_event (GdkEvent*); + bool canvas_group_event (GdkEvent*); virtual void region_resized (const PBD::PropertyChange&); virtual void region_muted (); @@ -154,7 +156,7 @@ class RegionView : public TimeAxisViewItem void lock_toggle (); virtual void set_colors (); - virtual void set_frame_color (); + virtual void set_sync_mark_color (); virtual void reset_width_dependent_items (double pixel_width); virtual void color_handler () {} @@ -179,23 +181,19 @@ class RegionView : public TimeAxisViewItem std::vector 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. - */ - std::list _coverage_frames; + * different bits of regions according to whether or not they are the one + * that will be played at any given time. + */ + std::list _coverage_samples; /** a list of rectangles used to show silent segments */ - std::list _silent_frames; + std::list _silent_samples; /** a list of rectangles used to show the current silence threshold */ - std::list _silent_threshold_frames; - /** a text item to display strip silence statistics - */ - ArdourCanvas::Text* _silence_text; - - ARDOUR::BeatsFramesConverter _region_relative_time_converter; - ARDOUR::BeatsFramesConverter _source_relative_time_converter; + std::list _silent_threshold_samples; + /** a text item to display strip silence statistics */ + ArdourCanvas::Text* _silence_text; }; #endif /* __gtk_ardour_region_view_h__ */