projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow markers to be glued to bar/beat time. Fixes #1815.
[ardour.git]
/
gtk2_ardour
/
selection.h
diff --git
a/gtk2_ardour/selection.h
b/gtk2_ardour/selection.h
index 17862e127b0aeb3529b405360c3252bc0aba5b7b..ca678fd832c59d7f38d93ff6cdb4a5b7edd8ef4a 100644
(file)
--- a/
gtk2_ardour/selection.h
+++ b/
gtk2_ardour/selection.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2000-2003 Paul Davis
+ Copyright (C) 2000-2003 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-22,9
+22,12
@@
#include <vector>
#include <boost/shared_ptr.hpp>
#include <vector>
#include <boost/shared_ptr.hpp>
+#include <boost/noncopyable.hpp>
#include <sigc++/signal.h>
#include <sigc++/signal.h>
+#include "pbd/signals.h"
+
#include "time_selection.h"
#include "region_selection.h"
#include "track_selection.h"
#include "time_selection.h"
#include "region_selection.h"
#include "track_selection.h"
@@
-33,11
+36,13
@@
#include "processor_selection.h"
#include "point_selection.h"
#include "marker_selection.h"
#include "processor_selection.h"
#include "point_selection.h"
#include "marker_selection.h"
+#include "midi_selection.h"
class TimeAxisView;
class RegionView;
class Selectable;
class PublicEditor;
class TimeAxisView;
class RegionView;
class Selectable;
class PublicEditor;
+class MidiRegionView;
namespace ARDOUR {
class Region;
namespace ARDOUR {
class Region;
@@
-47,11
+52,15
@@
namespace ARDOUR {
class AutomationList;
}
class AutomationList;
}
+namespace Evoral {
+ class ControlList;
+}
+
/// Lists of selected things
/** The Selection class holds lists of selected items (tracks, regions, etc. etc.). */
/// Lists of selected things
/** The Selection class holds lists of selected items (tracks, regions, etc. etc.). */
-class Selection : public sigc::trackable
+class Selection : public sigc::trackable
, public PBD::ScopedConnectionList
{
public:
enum SelectionType {
{
public:
enum SelectionType {
@@
-73,12
+82,12
@@
class Selection : public sigc::trackable
PlaylistSelection playlists;
PointSelection points;
MarkerSelection markers;
PlaylistSelection playlists;
PointSelection points;
MarkerSelection markers;
+ MidiRegionSelection midi_regions;
+ MidiNoteSelection midi_notes;
- Selection (PublicEditor const * e) : editor (e), next_time_id (0) {
- clear();
- }
+ Selection (PublicEditor const * e);
- Selection& operator= (const Selection& other);
+
//
Selection& operator= (const Selection& other);
sigc::signal<void> RegionsChanged;
sigc::signal<void> TracksChanged;
sigc::signal<void> RegionsChanged;
sigc::signal<void> TracksChanged;
@@
-87,25
+96,30
@@
class Selection : public sigc::trackable
sigc::signal<void> PlaylistsChanged;
sigc::signal<void> PointsChanged;
sigc::signal<void> MarkersChanged;
sigc::signal<void> PlaylistsChanged;
sigc::signal<void> PointsChanged;
sigc::signal<void> MarkersChanged;
+ sigc::signal<void> MidiNotesChanged;
+ sigc::signal<void> MidiRegionsChanged;
void clear ();
void clear ();
- bool empty
(
);
+ bool empty
(bool internal_selection = false
);
void dump_region_layers();
bool selected (TimeAxisView*);
bool selected (RegionView*);
void dump_region_layers();
bool selected (TimeAxisView*);
bool selected (RegionView*);
+ bool selected (Marker*);
+
+ void set (std::list<Selectable*> const &);
+ void add (std::list<Selectable*> const &);
+ void toggle (std::list<Selectable*> const &);
- void set (std::list<Selectable*>&);
- void add (std::list<Selectable*>&);
- void toggle (std::list<Selectable*>&);
-
void set (TimeAxisView*);
void set (TimeAxisView*);
- void set (const std::list<TimeAxisView*>&);
+ void set (const TrackViewList&);
+ void set (const MidiNoteSelection&);
void set (RegionView*, bool also_clear_tracks = true);
void set (RegionView*, bool also_clear_tracks = true);
+ void set (MidiRegionView*);
void set (std::vector<RegionView*>&);
void set (std::vector<RegionView*>&);
- long set (
TimeAxisView*,
nframes_t, nframes_t);
- void set (
ARDOUR::AutomationList*
);
+ long set (nframes_t, nframes_t);
+ void set (
boost::shared_ptr<Evoral::ControlList>
);
void set (boost::shared_ptr<ARDOUR::Playlist>);
void set (const std::list<boost::shared_ptr<ARDOUR::Playlist> >&);
void set (AutomationSelectable*);
void set (boost::shared_ptr<ARDOUR::Playlist>);
void set (const std::list<boost::shared_ptr<ARDOUR::Playlist> >&);
void set (AutomationSelectable*);
@@
-113,8
+127,11
@@
class Selection : public sigc::trackable
void set (const RegionSelection&);
void toggle (TimeAxisView*);
void set (const RegionSelection&);
void toggle (TimeAxisView*);
- void toggle (const std::list<TimeAxisView*>&);
+ void toggle (const TrackViewList&);
+ void toggle (const MidiNoteSelection&);
void toggle (RegionView*);
void toggle (RegionView*);
+ void toggle (MidiRegionView*);
+ void toggle (MidiCutBuffer*);
void toggle (std::vector<RegionView*>&);
long toggle (nframes_t, nframes_t);
void toggle (ARDOUR::AutomationList*);
void toggle (std::vector<RegionView*>&);
long toggle (nframes_t, nframes_t);
void toggle (ARDOUR::AutomationList*);
@@
-124,29
+141,35
@@
class Selection : public sigc::trackable
void toggle (Marker*);
void add (TimeAxisView*);
void toggle (Marker*);
void add (TimeAxisView*);
- void add (const std::list<TimeAxisView*>&);
+ void add (const TrackViewList&);
+ void add (const MidiNoteSelection&);
void add (RegionView*);
void add (RegionView*);
+ void add (MidiRegionView*);
+ void add (MidiCutBuffer*);
void add (std::vector<RegionView*>&);
long add (nframes_t, nframes_t);
void add (std::vector<RegionView*>&);
long add (nframes_t, nframes_t);
- void add (
ARDOUR::AutomationList*
);
+ void add (
boost::shared_ptr<Evoral::ControlList>
);
void add (boost::shared_ptr<ARDOUR::Playlist>);
void add (const std::list<boost::shared_ptr<ARDOUR::Playlist> >&);
void add (Marker*);
void add (boost::shared_ptr<ARDOUR::Playlist>);
void add (const std::list<boost::shared_ptr<ARDOUR::Playlist> >&);
void add (Marker*);
+ void add (const std::list<Marker*>&);
void add (const RegionSelection&);
void add (const RegionSelection&);
-
void remove (TimeAxisView*);
void remove (TimeAxisView*);
- void remove (const std::list<TimeAxisView*>&);
+ void remove (const TrackViewList&);
+ void remove (const MidiNoteSelection&);
void remove (RegionView*);
void remove (RegionView*);
+ void remove (MidiRegionView*);
+ void remove (MidiCutBuffer*);
void remove (uint32_t selection_id);
void remove (nframes_t, nframes_t);
void remove (uint32_t selection_id);
void remove (nframes_t, nframes_t);
- void remove (
ARDOUR::AutomationList*
);
+ void remove (
boost::shared_ptr<ARDOUR::AutomationList>
);
void remove (boost::shared_ptr<ARDOUR::Playlist>);
void remove (const std::list<boost::shared_ptr<ARDOUR::Playlist> >&);
void remove (boost::shared_ptr<ARDOUR::Playlist>);
void remove (const std::list<boost::shared_ptr<ARDOUR::Playlist> >&);
- void remove (const list<Selectable*>&);
+ void remove (const
std::
list<Selectable*>&);
void remove (Marker*);
void replace (uint32_t time_index, nframes_t start, nframes_t end);
void remove (Marker*);
void replace (uint32_t time_index, nframes_t start, nframes_t end);
-
+
void clear_regions();
void clear_tracks ();
void clear_time();
void clear_regions();
void clear_tracks ();
void clear_time();
@@
-154,17
+177,18
@@
class Selection : public sigc::trackable
void clear_playlists ();
void clear_points ();
void clear_markers ();
void clear_playlists ();
void clear_points ();
void clear_markers ();
+ void clear_midi_notes ();
+ void clear_midi_regions ();
void foreach_region (void (ARDOUR::Region::*method)(void));
void foreach_regionview (void (RegionView::*method)(void));
void foreach_region (void (ARDOUR::Region::*method)(void));
void foreach_regionview (void (RegionView::*method)(void));
+ void foreach_midi_regionview (void (MidiRegionView::*method)(void));
template<class A> void foreach_region (void (ARDOUR::Region::*method)(A), A arg);
template<class A> void foreach_region (void (ARDOUR::Region::*method)(A), A arg);
- void select_edit_group_regions ();
-
private:
PublicEditor const * editor;
uint32_t next_time_id;
private:
PublicEditor const * editor;
uint32_t next_time_id;
-
+
void add (std::vector<AutomationSelectable*>&);
};
void add (std::vector<AutomationSelectable*>&);
};