From 6f4a92f740b2fd75794489ce58f9348f8adf6bf4 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 1 Aug 2006 03:23:35 +0000 Subject: Heavy-duty abstraction work to split type-specific classes into specializations of (new, for the most part) generic bases. (eg. most everything from the MIDI branch except for actual MIDI things, so merges have a chance of succeeding). Also the new edit toolbar, and various other cleanup things I did along the way. Should be functionally equivalent (except the toolbar), this is just design work. She's a big'un.... git-svn-id: svn://localhost/ardour2/trunk@727 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/selection.h | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) (limited to 'gtk2_ardour/selection.h') diff --git a/gtk2_ardour/selection.h b/gtk2_ardour/selection.h index 102e6e9410..7b503a5e63 100644 --- a/gtk2_ardour/selection.h +++ b/gtk2_ardour/selection.h @@ -35,7 +35,7 @@ #include "point_selection.h" class TimeAxisView; -class AudioRegionView; +class RegionView; class Selectable; namespace ARDOUR { @@ -61,7 +61,7 @@ class Selection : public sigc::trackable }; TrackSelection tracks; - AudioRegionSelection audio_regions; + RegionSelection regions; TimeSelection time; AutomationSelection lines; PlaylistSelection playlists; @@ -89,15 +89,15 @@ class Selection : public sigc::trackable void dump_region_layers(); bool selected (TimeAxisView*); - bool selected (AudioRegionView*); + bool selected (RegionView*); void set (list&); void add (list&); void set (TimeAxisView*); void set (const list&); - void set (AudioRegionView*); - void set (std::vector&); + void set (RegionView*); + void set (std::vector&); long set (TimeAxisView*, jack_nframes_t, jack_nframes_t); void set (ARDOUR::AutomationList*); void set (ARDOUR::Playlist*); @@ -107,8 +107,8 @@ class Selection : public sigc::trackable void toggle (TimeAxisView*); void toggle (const list&); - void toggle (AudioRegionView*); - void toggle (std::vector&); + void toggle (RegionView*); + void toggle (std::vector&); long toggle (jack_nframes_t, jack_nframes_t); void toggle (ARDOUR::AutomationList*); void toggle (ARDOUR::Playlist*); @@ -117,8 +117,8 @@ class Selection : public sigc::trackable void add (TimeAxisView*); void add (const list&); - void add (AudioRegionView*); - void add (std::vector&); + void add (RegionView*); + void add (std::vector&); long add (jack_nframes_t, jack_nframes_t); void add (ARDOUR::AutomationList*); void add (ARDOUR::Playlist*); @@ -127,7 +127,7 @@ class Selection : public sigc::trackable void remove (TimeAxisView*); void remove (const list&); - void remove (AudioRegionView*); + void remove (RegionView*); void remove (uint32_t selection_id); void remove (jack_nframes_t, jack_nframes_t); void remove (ARDOUR::AutomationList*); @@ -137,7 +137,7 @@ class Selection : public sigc::trackable void replace (uint32_t time_index, jack_nframes_t start, jack_nframes_t end); - void clear_audio_regions(); + void clear_regions(); void clear_tracks (); void clear_time(); void clear_lines (); @@ -145,10 +145,8 @@ class Selection : public sigc::trackable void clear_redirects (); void clear_points (); - void foreach_audio_region (void (ARDOUR::AudioRegion::*method)(void)); - void foreach_audio_region (void (ARDOUR::Region::*method)(void)); - template void foreach_audio_region (void (ARDOUR::AudioRegion::*method)(A), A arg); - template void foreach_audio_region (void (ARDOUR::Region::*method)(A), A arg); + void foreach_region (void (ARDOUR::Region::*method)(void)); + template void foreach_region (void (ARDOUR::Region::*method)(A), A arg); private: uint32_t next_time_id; -- cgit v1.2.3