13
0

NO-OP: whitespace

This commit is contained in:
Robin Gareus 2017-05-04 00:43:40 +02:00
parent a23ac120f2
commit 0afd18eb5d

View File

@ -347,10 +347,10 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
rec_enable_button->show(); rec_enable_button->show();
rec_enable_button->set_controllable (t->rec_enable_control()); rec_enable_button->set_controllable (t->rec_enable_control());
if (is_midi_track()) { if (is_midi_track()) {
midi_track()->StepEditStatusChange.connect (route_connections, invalidator (*this), midi_track()->StepEditStatusChange.connect (route_connections, invalidator (*this),
boost::bind (&RouteUI::step_edit_changed, this, _1), gui_context()); boost::bind (&RouteUI::step_edit_changed, this, _1), gui_context());
} }
} }
@ -400,9 +400,9 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
void void
RouteUI::polarity_changed () RouteUI::polarity_changed ()
{ {
if (!_route) { if (!_route) {
return; return;
} }
set_invert_button_state (); set_invert_button_state ();
} }
@ -1342,11 +1342,11 @@ RouteUI::mute_active_state (Session*, boost::shared_ptr<Stripable> s)
void void
RouteUI::update_mute_display () RouteUI::update_mute_display ()
{ {
if (!_route) { if (!_route) {
return; return;
} }
mute_button->set_active_state (mute_active_state (_session, _route)); mute_button->set_active_state (mute_active_state (_session, _route));
} }
@ -1378,31 +1378,31 @@ RouteUI::blink_rec_display (bool blinkOn)
} }
if (track()->rec_enable_control()->get_value()) { if (track()->rec_enable_control()->get_value()) {
switch (_session->record_status ()) { switch (_session->record_status ()) {
case Session::Recording: case Session::Recording:
rec_enable_button->set_active_state (Gtkmm2ext::ExplicitActive); rec_enable_button->set_active_state (Gtkmm2ext::ExplicitActive);
break; break;
case Session::Disabled: case Session::Disabled:
case Session::Enabled: case Session::Enabled:
if (UIConfiguration::instance().get_blink_rec_arm()) { if (UIConfiguration::instance().get_blink_rec_arm()) {
rec_enable_button->set_active_state ( blinkOn ? Gtkmm2ext::ExplicitActive : Gtkmm2ext::Off ); rec_enable_button->set_active_state ( blinkOn ? Gtkmm2ext::ExplicitActive : Gtkmm2ext::Off );
} else { } else {
rec_enable_button->set_active_state ( ImplicitActive ); rec_enable_button->set_active_state ( ImplicitActive );
} }
break; break;
} }
if (step_edit_item) { if (step_edit_item) {
step_edit_item->set_sensitive (false); step_edit_item->set_sensitive (false);
} }
} else { } else {
rec_enable_button->unset_active_state (); rec_enable_button->unset_active_state ();
if (step_edit_item) { if (step_edit_item) {
step_edit_item->set_sensitive (true); step_edit_item->set_sensitive (true);
} }
} }
check_rec_enable_sensitivity (); check_rec_enable_sensitivity ();
@ -1422,14 +1422,14 @@ RouteUI::build_solo_menu (void)
check->set_active (_route->solo_isolate_control()->solo_isolated()); check->set_active (_route->solo_isolate_control()->solo_isolated());
check->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &RouteUI::toggle_solo_isolated), check)); check->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &RouteUI::toggle_solo_isolated), check));
items.push_back (CheckMenuElem(*check)); items.push_back (CheckMenuElem(*check));
solo_isolated_check = dynamic_cast<Gtk::CheckMenuItem*>(&items.back()); solo_isolated_check = dynamic_cast<Gtk::CheckMenuItem*>(&items.back());
check->show_all(); check->show_all();
check = new Gtk::CheckMenuItem(_("Solo Safe")); check = new Gtk::CheckMenuItem(_("Solo Safe"));
check->set_active (_route->solo_safe_control()->solo_safe()); check->set_active (_route->solo_safe_control()->solo_safe());
check->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &RouteUI::toggle_solo_safe), check)); check->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &RouteUI::toggle_solo_safe), check));
items.push_back (CheckMenuElem(*check)); items.push_back (CheckMenuElem(*check));
solo_safe_check = dynamic_cast<Gtk::CheckMenuItem*>(&items.back()); solo_safe_check = dynamic_cast<Gtk::CheckMenuItem*>(&items.back());
check->show_all(); check->show_all();
//items.push_back (SeparatorElem()); //items.push_back (SeparatorElem());
@ -1606,14 +1606,14 @@ RouteUI::solo_safe_button_release (GdkEventButton* ev)
void void
RouteUI::toggle_solo_isolated (Gtk::CheckMenuItem* check) RouteUI::toggle_solo_isolated (Gtk::CheckMenuItem* check)
{ {
bool view = check->get_active(); bool view = check->get_active();
bool model = _route->solo_isolate_control()->solo_isolated(); bool model = _route->solo_isolate_control()->solo_isolated();
/* called AFTER the view has changed */ /* called AFTER the view has changed */
if (model != view) { if (model != view) {
_route->solo_isolate_control()->set_value (view ? 1.0 : 0.0, Controllable::UseGroup); _route->solo_isolate_control()->set_value (view ? 1.0 : 0.0, Controllable::UseGroup);
} }
} }
void void
@ -1622,8 +1622,7 @@ RouteUI::toggle_solo_safe (Gtk::CheckMenuItem* check)
_route->solo_safe_control()->set_value (check->get_active() ? 1.0 : 0.0, Controllable::UseGroup); _route->solo_safe_control()->set_value (check->get_active() ? 1.0 : 0.0, Controllable::UseGroup);
} }
/** Ask the user to choose a colour, and then apply that color to my route /** Ask the user to choose a colour, and then apply that color to my route */
*/
void void
RouteUI::choose_color () RouteUI::choose_color ()
{ {
@ -2179,9 +2178,9 @@ RouteUI::invert_menu_toggled (uint32_t c)
void void
RouteUI::set_invert_sensitive (bool yn) RouteUI::set_invert_sensitive (bool yn)
{ {
for (vector<ArdourButton*>::iterator b = _invert_buttons.begin(); b != _invert_buttons.end(); ++b) { for (vector<ArdourButton*>::iterator b = _invert_buttons.begin(); b != _invert_buttons.end(); ++b) {
(*b)->set_sensitive (yn); (*b)->set_sensitive (yn);
} }
} }
void void
@ -2220,9 +2219,8 @@ RouteUI::track_mode_changed (void)
} }
/** @return the color that this route should use; it maybe its own, /** @return the color that this route should use; it maybe its own,
or it maybe that of its route group. * or it maybe that of its route group.
*/ */
Gdk::Color Gdk::Color
RouteUI::route_color () const RouteUI::route_color () const
{ {