mirror of
https://github.com/Ardour/ardour.git
synced 2026-01-06 05:35:47 +01:00
Rename member variables (and unpack some items for MB)
This commit is contained in:
Ben Loftis
Robin Gareus
parent
8dc50ac33c
commit
3ac035c85f
2 changed files with 122 additions and 120 deletions
|
|
@ -48,118 +48,110 @@ TransportControlUI::map_actions ()
|
|||
RefPtr<Action> act;
|
||||
|
||||
act = ActionManager::get_action (X_("Transport"), X_("ToggleClick"));
|
||||
click_button.set_related_action (act);
|
||||
_click_button.set_related_action (act);
|
||||
act = ActionManager::get_action (X_("Transport"), X_("Stop"));
|
||||
stop_button.set_related_action (act);
|
||||
_stop_button.set_related_action (act);
|
||||
act = ActionManager::get_action (X_("Transport"), X_("Roll"));
|
||||
roll_button.set_related_action (act);
|
||||
_roll_button.set_related_action (act);
|
||||
act = ActionManager::get_action (X_("Transport"), X_("Record"));
|
||||
rec_button.set_related_action (act);
|
||||
_rec_button.set_related_action (act);
|
||||
act = ActionManager::get_action (X_("Transport"), X_("GotoStart"));
|
||||
goto_start_button.set_related_action (act);
|
||||
_goto_start_button.set_related_action (act);
|
||||
act = ActionManager::get_action (X_("Transport"), X_("GotoEnd"));
|
||||
goto_end_button.set_related_action (act);
|
||||
_goto_end_button.set_related_action (act);
|
||||
act = ActionManager::get_action (X_("Transport"), X_("Loop"));
|
||||
auto_loop_button.set_related_action (act);
|
||||
_auto_loop_button.set_related_action (act);
|
||||
act = ActionManager::get_action (X_("Transport"), X_("PlaySelection"));
|
||||
play_selection_button.set_related_action (act);
|
||||
_play_selection_button.set_related_action (act);
|
||||
|
||||
act = ActionManager::get_action (X_("MIDI"), X_("panic"));
|
||||
midi_panic_button.set_related_action (act);
|
||||
_midi_panic_button.set_related_action (act);
|
||||
|
||||
/* tooltips depend on actions */
|
||||
set_tooltip (roll_button, _("Play from playhead"));
|
||||
set_tooltip (stop_button, _("Stop playback"));
|
||||
set_tooltip (rec_button, _("Toggle record"));
|
||||
set_tooltip (play_selection_button, _("Play range/selection"));
|
||||
set_tooltip (goto_start_button, _("Go to start of session"));
|
||||
set_tooltip (goto_end_button, _("Go to end of session"));
|
||||
set_tooltip (auto_loop_button, _("Play loop range"));
|
||||
set_tooltip (midi_panic_button, _("MIDI Panic\nSend note off and reset controller messages on all MIDI channels"));
|
||||
set_tooltip (_roll_button, _("Play from playhead"));
|
||||
set_tooltip (_stop_button, _("Stop playback"));
|
||||
set_tooltip (_rec_button, _("Toggle record"));
|
||||
set_tooltip (_play_selection_button, _("Play range/selection"));
|
||||
set_tooltip (_goto_start_button, _("Go to start of session"));
|
||||
set_tooltip (_goto_end_button, _("Go to end of session"));
|
||||
set_tooltip (_auto_loop_button, _("Play loop range"));
|
||||
set_tooltip (_midi_panic_button, _("MIDI Panic\nSend note off and reset controller messages on all MIDI channels"));
|
||||
|
||||
/* set click_button tooltip */
|
||||
/* set _click_button tooltip */
|
||||
parameter_changed ("click-gain");
|
||||
}
|
||||
|
||||
void
|
||||
TransportControlUI::setup (TransportControlProvider* ui)
|
||||
{
|
||||
click_button.signal_button_press_event().connect (sigc::mem_fun (*ui, &TransportControlProvider::click_button_clicked), false);
|
||||
click_button.signal_scroll_event().connect (sigc::mem_fun (*this, &TransportControlUI::click_button_scroll), false);
|
||||
_click_button.signal_button_press_event().connect (sigc::mem_fun (*ui, &TransportControlProvider::click_button_clicked), false);
|
||||
_click_button.signal_scroll_event().connect (sigc::mem_fun (*this, &TransportControlUI::click_button_scroll), false);
|
||||
|
||||
/* setup icons */
|
||||
|
||||
click_button.set_icon (ArdourIcon::TransportMetronom);
|
||||
goto_start_button.set_icon (ArdourIcon::TransportStart);
|
||||
goto_end_button.set_icon (ArdourIcon::TransportEnd);
|
||||
roll_button.set_icon (ArdourIcon::TransportPlay);
|
||||
stop_button.set_icon (ArdourIcon::TransportStop);
|
||||
play_selection_button.set_icon (ArdourIcon::TransportRange);
|
||||
auto_loop_button.set_icon (ArdourIcon::TransportLoop);
|
||||
rec_button.set_icon (ArdourIcon::RecButton);
|
||||
midi_panic_button.set_icon (ArdourIcon::TransportPanic);
|
||||
_click_button.set_icon (ArdourIcon::TransportMetronom);
|
||||
_goto_start_button.set_icon (ArdourIcon::TransportStart);
|
||||
_goto_end_button.set_icon (ArdourIcon::TransportEnd);
|
||||
_roll_button.set_icon (ArdourIcon::TransportPlay);
|
||||
_stop_button.set_icon (ArdourIcon::TransportStop);
|
||||
_play_selection_button.set_icon (ArdourIcon::TransportRange);
|
||||
_auto_loop_button.set_icon (ArdourIcon::TransportLoop);
|
||||
_rec_button.set_icon (ArdourIcon::RecButton);
|
||||
_midi_panic_button.set_icon (ArdourIcon::TransportPanic);
|
||||
|
||||
/* transport control size-group */
|
||||
|
||||
Glib::RefPtr<SizeGroup> transport_button_size_group = SizeGroup::create (SIZE_GROUP_BOTH);
|
||||
transport_button_size_group->add_widget (goto_start_button);
|
||||
transport_button_size_group->add_widget (goto_end_button);
|
||||
transport_button_size_group->add_widget (auto_loop_button);
|
||||
transport_button_size_group->add_widget (rec_button);
|
||||
if (!ARDOUR::Profile->get_mixbus()) {
|
||||
/*note: since we aren't showing this button, it doesn't get allocated
|
||||
* and therefore blows-up the size-group. so remove it.
|
||||
*/
|
||||
transport_button_size_group->add_widget (play_selection_button);
|
||||
transport_button_size_group->add_widget (_goto_start_button);
|
||||
transport_button_size_group->add_widget (_goto_end_button);
|
||||
transport_button_size_group->add_widget (_auto_loop_button);
|
||||
transport_button_size_group->add_widget (_rec_button);
|
||||
transport_button_size_group->add_widget (_play_selection_button);
|
||||
transport_button_size_group->add_widget (_roll_button);
|
||||
transport_button_size_group->add_widget (_stop_button);
|
||||
transport_button_size_group->add_widget (_midi_panic_button);
|
||||
transport_button_size_group->add_widget (_click_button);
|
||||
}
|
||||
transport_button_size_group->add_widget (roll_button);
|
||||
transport_button_size_group->add_widget (stop_button);
|
||||
|
||||
transport_button_size_group->add_widget (midi_panic_button);
|
||||
transport_button_size_group->add_widget (click_button);
|
||||
|
||||
#define PX_SCALE(px) std::max((float)px, rintf((float)px * UIConfiguration::instance().get_ui_scale()))
|
||||
|
||||
click_button.set_size_request (PX_SCALE(20), PX_SCALE(20));
|
||||
_click_button.set_size_request (PX_SCALE(20), PX_SCALE(20));
|
||||
set_spacing (PX_SCALE(2));
|
||||
|
||||
#undef PX_SCALE
|
||||
|
||||
if (!ARDOUR::Profile->get_mixbus()) {
|
||||
pack_start (midi_panic_button, true, true, 0);
|
||||
} else {
|
||||
pack_start (midi_panic_button, true, true, 3);
|
||||
pack_start (_midi_panic_button, true, true, 0);
|
||||
pack_start (_click_button, true, true, 0);
|
||||
pack_start (_goto_start_button, true, true);
|
||||
pack_start (_goto_end_button, true, true);
|
||||
pack_start (_auto_loop_button, true, true);
|
||||
pack_start (_play_selection_button, true, true);
|
||||
pack_start (_roll_button, true, true);
|
||||
pack_start (_stop_button, true, true);
|
||||
pack_start (_rec_button, true, true, 3);
|
||||
}
|
||||
pack_start (click_button, true, true, 0);
|
||||
pack_start (goto_start_button, true, true);
|
||||
pack_start (goto_end_button, true, true);
|
||||
pack_start (auto_loop_button, true, true);
|
||||
if (!ARDOUR::Profile->get_mixbus()) {
|
||||
pack_start (play_selection_button, true, true);
|
||||
}
|
||||
pack_start (roll_button, true, true);
|
||||
pack_start (stop_button, true, true);
|
||||
pack_start (rec_button, true, true, 3);
|
||||
|
||||
roll_button.set_name ("transport button");
|
||||
stop_button.set_name ("transport button");
|
||||
goto_start_button.set_name ("transport button");
|
||||
goto_end_button.set_name ("transport button");
|
||||
auto_loop_button.set_name ("transport button");
|
||||
play_selection_button.set_name ("transport button");
|
||||
rec_button.set_name ("transport recenable button");
|
||||
midi_panic_button.set_name ("transport button"); // XXX ???
|
||||
click_button.set_name ("transport button");
|
||||
_roll_button.set_name ("transport button");
|
||||
_stop_button.set_name ("transport button");
|
||||
_goto_start_button.set_name ("transport button");
|
||||
_goto_end_button.set_name ("transport button");
|
||||
_auto_loop_button.set_name ("transport button");
|
||||
_play_selection_button.set_name ("transport button");
|
||||
_rec_button.set_name ("transport recenable button");
|
||||
_midi_panic_button.set_name ("transport button"); // XXX ???
|
||||
_click_button.set_name ("transport button");
|
||||
|
||||
roll_button.set_controllable (ui->roll_controllable);
|
||||
stop_button.set_controllable (ui->stop_controllable);
|
||||
goto_start_button.set_controllable (ui->goto_start_controllable);
|
||||
goto_end_button.set_controllable (ui->goto_end_controllable);
|
||||
auto_loop_button.set_controllable (ui->auto_loop_controllable);
|
||||
play_selection_button.set_controllable (ui->play_selection_controllable);
|
||||
rec_button.set_controllable (ui->rec_controllable);
|
||||
_roll_button.set_controllable (ui->roll_controllable);
|
||||
_stop_button.set_controllable (ui->stop_controllable);
|
||||
_goto_start_button.set_controllable (ui->goto_start_controllable);
|
||||
_goto_end_button.set_controllable (ui->goto_end_controllable);
|
||||
_auto_loop_button.set_controllable (ui->auto_loop_controllable);
|
||||
_play_selection_button.set_controllable (ui->play_selection_controllable);
|
||||
_rec_button.set_controllable (ui->rec_controllable);
|
||||
|
||||
stop_button.set_active (true);
|
||||
_stop_button.set_active (true);
|
||||
|
||||
show_all ();
|
||||
|
||||
|
|
@ -174,7 +166,7 @@ TransportControlUI::set_session (ARDOUR::Session *s)
|
|||
map_transport_state ();
|
||||
|
||||
if (!_session) {
|
||||
rec_button.set_sensitive (false);
|
||||
_rec_button.set_sensitive (false);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -184,7 +176,7 @@ TransportControlUI::set_session (ARDOUR::Session *s)
|
|||
_session->auto_loop_location_changed.connect (_session_connections, MISSING_INVALIDATOR, std::bind (&TransportControlUI::set_loop_sensitivity, this), gui_context ());
|
||||
_session->PunchLoopConstraintChange.connect (_session_connections, MISSING_INVALIDATOR, std::bind (&TransportControlUI::set_loop_sensitivity, this), gui_context ());
|
||||
|
||||
rec_button.set_sensitive (true);
|
||||
_rec_button.set_sensitive (true);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -195,15 +187,15 @@ TransportControlUI::parameter_changed (std::string p)
|
|||
} else if (p == "click-record-only") {
|
||||
// TODO set a flag, blink or gray-out metronome button while rolling, only
|
||||
if (Config->get_click_record_only()) {
|
||||
click_button.set_name ("generic button"); // XXX
|
||||
_click_button.set_name ("generic button"); // XXX
|
||||
} else {
|
||||
click_button.set_name ("transport button");
|
||||
_click_button.set_name ("transport button");
|
||||
}
|
||||
} else if (p == "click-gain") {
|
||||
float gain_db = accurate_coefficient_to_dB (Config->get_click_gain());
|
||||
char tmp[32];
|
||||
snprintf(tmp, 31, "%+.1f", gain_db);
|
||||
set_tooltip (click_button, string_compose (_("Enable/Disable metronome\n\nRight-click to access preferences\nMouse-wheel to modify level\nSignal Level: %1 dBFS"), tmp));
|
||||
set_tooltip (_click_button, string_compose (_("Enable/Disable metronome\n\nRight-click to access preferences\nMouse-wheel to modify level\nSignal Level: %1 dBFS"), tmp));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -211,10 +203,10 @@ void
|
|||
TransportControlUI::map_transport_state ()
|
||||
{
|
||||
if (!_session) {
|
||||
auto_loop_button.unset_active_state ();
|
||||
play_selection_button.unset_active_state ();
|
||||
roll_button.unset_active_state ();
|
||||
stop_button.set_active_state (Gtkmm2ext::ExplicitActive);
|
||||
_auto_loop_button.unset_active_state ();
|
||||
_play_selection_button.unset_active_state ();
|
||||
_roll_button.unset_active_state ();
|
||||
_stop_button.set_active_state (Gtkmm2ext::ExplicitActive);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -226,46 +218,46 @@ TransportControlUI::map_transport_state ()
|
|||
|
||||
if (_session->get_play_range()) {
|
||||
|
||||
play_selection_button.set_active_state (Gtkmm2ext::ExplicitActive);
|
||||
roll_button.unset_active_state ();
|
||||
auto_loop_button.unset_active_state ();
|
||||
_play_selection_button.set_active_state (Gtkmm2ext::ExplicitActive);
|
||||
_roll_button.unset_active_state ();
|
||||
_auto_loop_button.unset_active_state ();
|
||||
|
||||
} else if (_session->get_play_loop ()) {
|
||||
|
||||
auto_loop_button.set_active (true);
|
||||
play_selection_button.set_active (false);
|
||||
_auto_loop_button.set_active (true);
|
||||
_play_selection_button.set_active (false);
|
||||
|
||||
if (Config->get_loop_is_mode()) {
|
||||
roll_button.set_active (true);
|
||||
_roll_button.set_active (true);
|
||||
} else {
|
||||
roll_button.set_active (false);
|
||||
_roll_button.set_active (false);
|
||||
}
|
||||
|
||||
} else {
|
||||
|
||||
roll_button.set_active (true);
|
||||
play_selection_button.set_active (false);
|
||||
auto_loop_button.set_active (false);
|
||||
_roll_button.set_active (true);
|
||||
_play_selection_button.set_active (false);
|
||||
_auto_loop_button.set_active (false);
|
||||
|
||||
}
|
||||
|
||||
if (UIConfiguration::instance().get_follow_edits() && !_session->config.get_external_sync()) {
|
||||
/* light up both roll and play-selection if they are joined */
|
||||
roll_button.set_active (true);
|
||||
play_selection_button.set_active (true);
|
||||
_roll_button.set_active (true);
|
||||
_play_selection_button.set_active (true);
|
||||
}
|
||||
|
||||
stop_button.set_active (false);
|
||||
_stop_button.set_active (false);
|
||||
|
||||
} else {
|
||||
|
||||
stop_button.set_active (true);
|
||||
roll_button.set_active (false);
|
||||
play_selection_button.set_active (false);
|
||||
_stop_button.set_active (true);
|
||||
_roll_button.set_active (false);
|
||||
_play_selection_button.set_active (false);
|
||||
if (Config->get_loop_is_mode ()) {
|
||||
auto_loop_button.set_active (_session->get_play_loop());
|
||||
_auto_loop_button.set_active (_session->get_play_loop());
|
||||
} else {
|
||||
auto_loop_button.set_active (false);
|
||||
_auto_loop_button.set_active (false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -277,11 +269,11 @@ TransportControlUI::step_edit_status_change (bool yn)
|
|||
// we make insensitive
|
||||
|
||||
if (yn) {
|
||||
rec_button.set_active_state (Gtkmm2ext::ImplicitActive);
|
||||
rec_button.set_sensitive (false);
|
||||
_rec_button.set_active_state (Gtkmm2ext::ImplicitActive);
|
||||
_rec_button.set_sensitive (false);
|
||||
} else {
|
||||
rec_button.unset_active_state ();;
|
||||
rec_button.set_sensitive (true);
|
||||
_rec_button.unset_active_state ();;
|
||||
_rec_button.set_sensitive (true);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -289,9 +281,9 @@ void
|
|||
TransportControlUI::set_loop_sensitivity ()
|
||||
{
|
||||
if (!_session || _session->config.get_external_sync()) {
|
||||
auto_loop_button.set_sensitive (false);
|
||||
_auto_loop_button.set_sensitive (false);
|
||||
} else {
|
||||
auto_loop_button.set_sensitive (_session && _session->loop_is_possible() && _session->locations()->auto_loop_location());
|
||||
_auto_loop_button.set_sensitive (_session && _session->loop_is_possible() && _session->locations()->auto_loop_location());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -315,14 +307,14 @@ TransportControlUI::blink_rec_enable (bool onoff)
|
|||
|
||||
if (r == Enabled || (r == Recording && !h)) {
|
||||
if (onoff) {
|
||||
rec_button.set_active_state (Gtkmm2ext::ExplicitActive);
|
||||
_rec_button.set_active_state (Gtkmm2ext::ExplicitActive);
|
||||
} else {
|
||||
rec_button.set_active_state (Gtkmm2ext::Off);
|
||||
_rec_button.set_active_state (Gtkmm2ext::Off);
|
||||
}
|
||||
} else if (r == Recording && h) {
|
||||
rec_button.set_active_state (Gtkmm2ext::ExplicitActive);
|
||||
_rec_button.set_active_state (Gtkmm2ext::ExplicitActive);
|
||||
} else {
|
||||
rec_button.unset_active_state ();
|
||||
_rec_button.unset_active_state ();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue