mirror of
https://github.com/Ardour/ardour.git
synced 2026-01-29 00:13:10 +01:00
[Summary] Code Cleanup: Removing unused controls, remaining from Ardour. Reverting Commit: a86befc9cd [a86befc]
This commit is contained in:
Valeriy Kamyshniy
parent
3c050a91d9
commit
e64a78a134
5 changed files with 15 additions and 164 deletions
|
|
@ -265,29 +265,8 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
|
|||
session_loaded = false;
|
||||
ignore_dual_punch = false;
|
||||
|
||||
roll_button.set_controllable (roll_controllable);
|
||||
stop_button.set_controllable (stop_controllable);
|
||||
|
||||
goto_start_button.set_controllable (goto_start_controllable);
|
||||
|
||||
goto_end_button.set_controllable (goto_end_controllable);
|
||||
|
||||
auto_loop_button.set_controllable (auto_loop_controllable);
|
||||
|
||||
play_selection_button.set_controllable (play_selection_controllable);
|
||||
rec_button.set_controllable (rec_controllable);
|
||||
|
||||
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");
|
||||
|
||||
goto_start_button.set_tweaks (ArdourButton::ShowClick);
|
||||
goto_end_button.set_tweaks (ArdourButton::ShowClick);
|
||||
midi_panic_button.set_tweaks (ArdourButton::ShowClick);
|
||||
|
||||
last_configure_time= 0;
|
||||
|
|
@ -2078,12 +2057,8 @@ void
|
|||
ARDOUR_UI::map_transport_state ()
|
||||
{
|
||||
if (!_session) {
|
||||
auto_loop_button.unset_active_state ();
|
||||
editor->get_waves_button ("transport_loop_button").set_active (false);
|
||||
play_selection_button.unset_active_state ();
|
||||
roll_button.unset_active_state ();
|
||||
editor->get_waves_button ("transport_play_button").set_active (false);
|
||||
stop_button.set_active_state (Gtkmm2ext::ExplicitActive);
|
||||
editor->get_waves_button ("transport_stop_button").set_active (true);
|
||||
return;
|
||||
}
|
||||
|
|
@ -2097,56 +2072,33 @@ ARDOUR_UI::map_transport_state ()
|
|||
/* we're rolling */
|
||||
|
||||
if (_session->get_play_range()) {
|
||||
|
||||
play_selection_button.set_active_state (Gtkmm2ext::ExplicitActive);
|
||||
roll_button.unset_active_state ();
|
||||
editor->get_waves_button ("transport_play_button").set_active (true);
|
||||
auto_loop_button.unset_active_state ();
|
||||
editor->get_waves_button ("transport_loop_button").set_active (false);
|
||||
} else if (_session->get_play_loop ()) {
|
||||
|
||||
auto_loop_button.set_active (true);
|
||||
editor->get_waves_button ("transport_loop_button").set_active (true);
|
||||
play_selection_button.set_active (false);
|
||||
if (Config->get_loop_is_mode()) {
|
||||
roll_button.set_active (true);
|
||||
editor->get_waves_button ("transport_play_button").set_active (true);
|
||||
} else {
|
||||
roll_button.set_active (false);
|
||||
editor->get_waves_button ("transport_play_button").set_active (false);
|
||||
}
|
||||
|
||||
} else {
|
||||
|
||||
roll_button.set_active (true);
|
||||
editor->get_waves_button ("transport_play_button").set_active (true);
|
||||
play_selection_button.set_active (false);
|
||||
auto_loop_button.set_active (false);
|
||||
editor->get_waves_button ("transport_loop_button").set_active (false);
|
||||
}
|
||||
|
||||
if (Config->get_follow_edits()) {
|
||||
/* light up both roll and play-selection if they are joined */
|
||||
roll_button.set_active (true);
|
||||
play_selection_button.set_active (true);
|
||||
}
|
||||
|
||||
stop_button.set_active (false);
|
||||
editor->get_waves_button ("transport_stop_button").set_active (false);
|
||||
|
||||
} else {
|
||||
|
||||
stop_button.set_active (true);
|
||||
editor->get_waves_button ("transport_stop_button").set_active (true);
|
||||
roll_button.set_active (false);
|
||||
editor->get_waves_button ("transport_play_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());
|
||||
editor->get_waves_button ("transport_loop_button").set_active (_session->get_play_loop());
|
||||
} else {
|
||||
auto_loop_button.set_active (false);
|
||||
editor->get_waves_button ("transport_loop_button").set_active (false);
|
||||
}
|
||||
update_disk_space ();
|
||||
|
|
@ -2591,17 +2543,13 @@ ARDOUR_UI::transport_rec_enable_blink (bool onoff)
|
|||
|
||||
if (r == Session::Enabled || (r == Session::Recording && !h)) {
|
||||
if (onoff) {
|
||||
rec_button.set_active_state (Gtkmm2ext::ExplicitActive);
|
||||
editor->get_waves_button ("transport_record_button").set_active (true);
|
||||
} else {
|
||||
rec_button.set_active_state (Gtkmm2ext::ImplicitActive);
|
||||
editor->get_waves_button ("transport_record_button").set_active (false);
|
||||
}
|
||||
} else if (r == Session::Recording && h) {
|
||||
rec_button.set_active_state (Gtkmm2ext::ExplicitActive);
|
||||
editor->get_waves_button ("transport_record_button").set_active (true);
|
||||
} else {
|
||||
rec_button.unset_active_state ();
|
||||
editor->get_waves_button ("transport_record_button").set_active (false);
|
||||
}
|
||||
}
|
||||
|
|
@ -4455,16 +4403,12 @@ ARDOUR_UI::step_edit_status_change (bool yn)
|
|||
{
|
||||
// XXX should really store pre-step edit status of things
|
||||
// we make insensitive
|
||||
|
||||
|
||||
if (yn) {
|
||||
rec_button.set_active_state (Gtkmm2ext::ImplicitActive);
|
||||
editor->get_waves_button ("transport_record_button").set_active (true);
|
||||
rec_button.set_sensitive (false);
|
||||
editor->get_waves_button ("transport_record_button").set_active_state (Gtkmm2ext::ImplicitActive);
|
||||
editor->get_waves_button ("transport_record_button").set_sensitive (false);
|
||||
} else {
|
||||
rec_button.unset_active_state ();
|
||||
editor->get_waves_button ("transport_record_button").set_active (false);
|
||||
rec_button.set_sensitive (true);
|
||||
editor->get_waves_button ("transport_record_button").set_sensitive (true);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -515,14 +515,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
|
|||
void set_transport_controllable_state (const XMLNode&);
|
||||
XMLNode& get_transport_controllable_state ();
|
||||
|
||||
ArdourButton roll_button;
|
||||
ArdourButton stop_button;
|
||||
ArdourButton goto_start_button;
|
||||
ArdourButton goto_end_button;
|
||||
ArdourButton auto_loop_button;
|
||||
ArdourButton play_selection_button;
|
||||
ArdourButton rec_button;
|
||||
|
||||
void toggle_external_sync ();
|
||||
void toggle_time_master ();
|
||||
void toggle_video_sync ();
|
||||
|
|
@ -821,8 +813,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
|
|||
int missing_file (ARDOUR::Session*s, std::string str, ARDOUR::DataType type);
|
||||
int ambiguous_file (std::string file, std::vector<std::string> hits);
|
||||
|
||||
bool transport_button_press (GdkEventButton*, Glib::RefPtr<Gtk::Action>&);
|
||||
|
||||
bool click_button_clicked (GdkEventButton *);
|
||||
|
||||
Gtk::Adjustment* _dsp_load_adjustment;
|
||||
|
|
|
|||
|
|
@ -103,13 +103,6 @@ ARDOUR_UI::setup_windows ()
|
|||
void
|
||||
ARDOUR_UI::setup_tooltips ()
|
||||
{
|
||||
set_tip (roll_button, _("Play from playhead"));
|
||||
set_tip (stop_button, _("Stop playback"));
|
||||
set_tip (rec_button, _("Toggle record"));
|
||||
set_tip (play_selection_button, _("Play range/selection"));
|
||||
set_tip (goto_start_button, _("Go to start of session"));
|
||||
set_tip (goto_end_button, _("Go to end of session"));
|
||||
set_tip (auto_loop_button, _("Play loop range"));
|
||||
set_tip (midi_panic_button, _("MIDI Panic\nSend note off and reset controller messages on all MIDI channels"));
|
||||
set_tip (follow_edits_button, _("Playhead follows Range Selections and Edits"));
|
||||
set_tip (auto_input_button, _("Be sensible about input monitoring"));
|
||||
|
|
@ -224,50 +217,35 @@ ARDOUR_UI::setup_transport ()
|
|||
|
||||
click_button.set_name ("transport button");
|
||||
|
||||
stop_button.set_active (true);
|
||||
editor->get_waves_button ("transport_stop_button").set_active (true);
|
||||
|
||||
goto_start_button.set_image (get_icon (X_("transport_start")));
|
||||
goto_end_button.set_image (get_icon (X_("transport_end")));
|
||||
roll_button.set_image (get_icon (X_("transport_play")));
|
||||
stop_button.set_image (get_icon (X_("transport_stop")));
|
||||
play_selection_button.set_image (get_icon (X_("transport_range")));
|
||||
rec_button.set_image (get_icon (X_("transport_record")));
|
||||
auto_loop_button.set_image (get_icon (X_("transport_loop")));
|
||||
|
||||
midi_panic_button.set_image (get_icon (X_("midi_panic")));
|
||||
/* the icon for this has an odd aspect ratio, so fatten up the button */
|
||||
midi_panic_button.set_size_request (25, -1);
|
||||
|
||||
act = ActionManager::get_action (X_("Transport"), X_("Stop"));
|
||||
stop_button.set_related_action (act);
|
||||
editor->get_waves_button ("transport_stop_button").signal_button_press_event().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::transport_button_press), act), false);
|
||||
editor->get_waves_button ("transport_stop_button").set_related_action (act);
|
||||
|
||||
act = ActionManager::get_action (X_("Transport"), X_("Roll"));
|
||||
roll_button.set_related_action (act);
|
||||
editor->get_waves_button ("transport_play_button").signal_button_press_event().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::transport_button_press), act), false);
|
||||
editor->get_waves_button ("transport_play_button").set_related_action (act);
|
||||
|
||||
|
||||
act = ActionManager::get_action (X_("Transport"), X_("Record"));
|
||||
rec_button.set_related_action (act);
|
||||
editor->get_waves_button ("transport_record_button").signal_button_press_event().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::transport_button_press), act), false);
|
||||
editor->get_waves_button ("transport_record_button").set_related_action (act);
|
||||
|
||||
act = ActionManager::get_action (X_("Transport"), X_("GotoStart"));
|
||||
goto_start_button.set_related_action (act);
|
||||
editor->get_waves_button ("transport_start_button").set_related_action (act);
|
||||
|
||||
act = ActionManager::get_action (X_("Transport"), X_("GotoEnd"));
|
||||
goto_end_button.set_related_action (act);
|
||||
editor->get_waves_button ("transport_end_button").set_related_action (act);
|
||||
|
||||
act = ActionManager::get_action (X_("Transport"), X_("Loop"));
|
||||
auto_loop_button.set_related_action (act);
|
||||
editor->get_waves_button ("transport_loop_button").signal_button_press_event().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::transport_button_press), act), false);
|
||||
editor->get_waves_button ("transport_loop_button").set_related_action (act);
|
||||
|
||||
act = ActionManager::get_action (X_("Transport"), X_("PlaySelection"));
|
||||
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);
|
||||
act = ActionManager::get_action (X_("Transport"), X_("ToggleExternalSync"));
|
||||
|
||||
/* clocks, etc. */
|
||||
|
|
@ -304,50 +282,6 @@ ARDOUR_UI::setup_transport ()
|
|||
* horizontally
|
||||
*/
|
||||
|
||||
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);
|
||||
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);
|
||||
|
||||
goto_start_button.set_size_request (33, 25);
|
||||
|
||||
HBox* tbox1 = manage (new HBox);
|
||||
HBox* tbox2 = manage (new HBox);
|
||||
HBox* tbox = manage (new HBox);
|
||||
|
||||
VBox* vbox1 = manage (new VBox);
|
||||
VBox* vbox2 = manage (new VBox);
|
||||
|
||||
Alignment* a1 = manage (new Alignment);
|
||||
Alignment* a2 = manage (new Alignment);
|
||||
|
||||
tbox1->set_spacing (2);
|
||||
tbox2->set_spacing (2);
|
||||
tbox->set_spacing (2);
|
||||
|
||||
tbox1->pack_start (goto_start_button, false, false);
|
||||
tbox1->pack_start (goto_end_button, false, false);
|
||||
tbox1->pack_start (auto_loop_button, false, false);
|
||||
|
||||
tbox2->pack_start (roll_button, false, false);
|
||||
tbox2->pack_start (stop_button, false, false);
|
||||
tbox2->pack_start (rec_button, false, false, 5);
|
||||
|
||||
vbox1->pack_start (*tbox1, false, false);
|
||||
vbox2->pack_start (*tbox2, false, false);
|
||||
|
||||
a1->add (*vbox1);
|
||||
a1->set (0.5, 1.0, 0.0, 0.0);
|
||||
a2->add (*vbox2);
|
||||
a2->set (0.5, 1.0, 0.0, 0.0);
|
||||
|
||||
tbox->pack_start (*a1, false, false);
|
||||
tbox->pack_start (*a2, false, false);
|
||||
|
||||
primary_clock->set_draw_background (false);
|
||||
primary_clock->set_visible_window (false);
|
||||
editor->get_box ("primary_clock_home").pack_start (*primary_clock, false, false);
|
||||
|
|
@ -355,26 +289,13 @@ ARDOUR_UI::setup_transport ()
|
|||
shuttle_box = manage (new ShuttleControl);
|
||||
shuttle_box->show ();
|
||||
|
||||
VBox* transport_vbox = manage (new VBox);
|
||||
transport_vbox->set_name ("TransportBase");
|
||||
transport_vbox->set_border_width (0);
|
||||
transport_vbox->set_spacing (3);
|
||||
transport_vbox->pack_start (*tbox, true, true, 0);
|
||||
|
||||
time_info_box = manage (new TimeInfoBox);
|
||||
time_info_box->mode_changed.connect (mem_fun(*this, &ARDOUR_UI::on_time_info_box_mode_changed));
|
||||
|
||||
editor->get_box ("time_info_box_home").pack_start (*time_info_box, false, false);
|
||||
|
||||
|
||||
/* transport related toggle controls */
|
||||
|
||||
VBox* auto_box = manage (new VBox);
|
||||
auto_box->set_homogeneous (true);
|
||||
auto_box->set_spacing (2);
|
||||
|
||||
/* desensitize */
|
||||
|
||||
set_transport_sensitivity (false);
|
||||
}
|
||||
|
||||
|
|
@ -580,11 +501,3 @@ ARDOUR_UI::toggle_follow_edits ()
|
|||
|
||||
Config->set_follow_edits (tact->get_active ());
|
||||
}
|
||||
|
||||
bool
|
||||
ARDOUR_UI::transport_button_press (GdkEventButton*, Glib::RefPtr<Gtk::Action>& act)
|
||||
{
|
||||
assert (act);
|
||||
act->activate ();
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@ ARDOUR_UI::set_session (Session *s)
|
|||
ActionManager::set_sensitive (ActionManager::point_selection_sensitive_actions, false);
|
||||
ActionManager::set_sensitive (ActionManager::playlist_selection_sensitive_actions, false);
|
||||
|
||||
rec_button.set_sensitive (true);
|
||||
editor->get_waves_button ("transport_record_button").set_sensitive (true);
|
||||
|
||||
solo_alert_button.set_active (_session->soloing());
|
||||
|
||||
|
|
@ -301,7 +301,7 @@ ARDOUR_UI::unload_session (bool hide_stuff)
|
|||
|
||||
ActionManager::set_sensitive (ActionManager::session_sensitive_actions, false);
|
||||
|
||||
rec_button.set_sensitive (false);
|
||||
editor->get_waves_button ("transport_record_button").set_sensitive (false);
|
||||
|
||||
WM::Manager::instance().set_session ((ARDOUR::Session*) 0);
|
||||
|
||||
|
|
|
|||
|
|
@ -315,24 +315,28 @@
|
|||
tooltip="Play"
|
||||
width="34"
|
||||
height="26"
|
||||
toggleable="true"
|
||||
normalicon="transport_play"
|
||||
activeicon="transport_play_active"/>
|
||||
<iconbutton id="transport_record_button"
|
||||
tooltip="Record"
|
||||
width="34"
|
||||
height="26"
|
||||
toggleable="true"
|
||||
normalicon="transport_record"
|
||||
activeicon="transport_record_active"/>
|
||||
<iconbutton id="transport_stop_button"
|
||||
tooltip="Stop"
|
||||
width="34"
|
||||
height="26"
|
||||
toggleable="true"
|
||||
normalicon="transport_stop"
|
||||
activeicon="transport_stop_active"/>
|
||||
<iconbutton id="transport_loop_button"
|
||||
tooltip="Loop"
|
||||
width="34"
|
||||
height="26"
|
||||
toggleable="true"
|
||||
normalicon="transport_loop"
|
||||
activeicon="transport_loop_active"/>
|
||||
<iconbutton id="lock_session_button"
|
||||
|
|
@ -686,7 +690,7 @@
|
|||
box.fill="true"
|
||||
box.expand="true"/>
|
||||
</VBox>
|
||||
<EventBox bgnormal="#000000" width="3"/>
|
||||
<EventBox bgnormal="#000000" width="2"/>
|
||||
</HBox>
|
||||
</VBox>
|
||||
</Window>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue