ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

tweak API of Selectable

This commit is contained in:
Paul Davis 2016-06-05 19:49:51 -04:00
parent 6adac60323
commit 8125ea5909
7 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/audio_time_axis.cc
View File

@ -307,7 +307,7 @@ AudioTimeAxisView::update_control_names ()
}
}
if (get_selected()) {
if (selected()) {
controls_ebox.set_name (controls_base_selected_name);
time_axis_frame.set_name (controls_base_selected_name);
} else {

6
gtk2_ardour/automation_line.cc
View File

@ -171,7 +171,7 @@ AutomationLine::update_visibility ()
}
} else if (_visible & SelectedControlPoints) {
for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
if ((*i)->get_selected()) {
if ((*i)->selected()) {
(*i)->show ();
} else {
(*i)->hide ();
@ -470,9 +470,9 @@ AutomationLine::start_drag_single (ControlPoint* cp, double x, float fraction)
_drag_points.clear ();
_drag_points.push_back (cp);
if (cp->get_selected ()) {
if (cp->selected ()) {
for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
if (*i != cp && (*i)->get_selected()) {
if (*i != cp && (*i)->selected()) {
_drag_points.push_back (*i);
}
}

2
gtk2_ardour/editor_selection.cc
View File

@ -1566,7 +1566,7 @@ Editor::select_all_within (framepos_t start, framepos_t end, double top, double
if (preserve_if_selected && op != Selection::Toggle) {
list<Selectable*>::iterator i = found.begin();
while (i != found.end() && (*i)->get_selected()) {
while (i != found.end() && (*i)->selected()) {
++i;
}

2
gtk2_ardour/midi_time_axis.cc
View File

@ -1301,7 +1301,7 @@ MidiTimeAxisView::update_control_names ()
}
}
if (get_selected()) {
if (selected()) {
controls_ebox.set_name (controls_base_selected_name);
time_axis_frame.set_name (controls_base_selected_name);
} else {

4
gtk2_ardour/selectable.h
View File

@ -37,10 +37,12 @@ class Selectable : public virtual sigc::trackable
}
}
bool get_selected() const {
virtual bool selected() const {
return _selected;
}
virtual void show_selected() {}
protected:
bool _selected;
};

6
gtk2_ardour/selection.cc
View File

@ -951,7 +951,7 @@ Selection::selected (ArdourMarker* m)
bool
Selection::selected (TimeAxisView* tv)
{
return tv->get_selected ();
return tv->selected ();
}
bool
@ -997,7 +997,7 @@ Selection::toggle (ControlPoint* cp)
clear_time(); //enforce region/object exclusivity
clear_tracks(); //enforce object/track exclusivity
cp->set_selected (!cp->get_selected ());
cp->set_selected (!cp->selected ());
PointSelection::iterator i = find (points.begin(), points.end(), cp);
if (i == points.end()) {
points.push_back (cp);
@ -1147,7 +1147,7 @@ Selection::set (ControlPoint* cp)
clear_time (); //enforce region/object exclusivity
clear_tracks(); //enforce object/track exclusivity
if (cp->get_selected () && points.size () == 1) {
if (cp->selected () && points.size () == 1) {
return;
}

4
gtk2_ardour/streamview.cc
View File

@ -499,7 +499,7 @@ StreamView::num_selected_regionviews () const
uint32_t cnt = 0;
for (list<RegionView*>::const_iterator i = region_views.begin(); i != region_views.end(); ++i) {
if ((*i)->get_selected()) {
if ((*i)->selected()) {
++cnt;
}
}
@ -518,7 +518,7 @@ void
StreamView::foreach_selected_regionview (sigc::slot<void,RegionView*> slot)
{
for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
if ((*i)->get_selected()) {
if ((*i)->selected()) {
slot (*i);
}
}