smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-29 08:23:01 +01:00
Code Issues Projects Releases Wiki Activity

[Summary] Removing unused controls, which came from Ardour.

Browse source
This commit is contained in:
VKamyshniy 2015-04-15 13:19:05 +03:00
parent 5a673f6635
commit c8ab91df54
5 changed files with 0 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

25
gtk2_ardour/ardour_ui.cc
View file

@ -192,13 +192,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
, auto_loop_controllable (new TransportControllable ("transport auto loop", *this, TransportControllable::AutoLoop))
, play_selection_controllable (new TransportControllable ("transport play selection", *this, TransportControllable::PlaySelection))
, rec_controllable (new TransportControllable ("transport rec-enable", *this, TransportControllable::RecordEnable))
, follow_edits_button (ArdourButton::led_default_elements)
, auto_input_button (ArdourButton::led_default_elements)
, auditioning_alert_button (_("audition"))
, solo_alert_button (_("solo"))
, feedback_alert_button (_("feedback"))
, editor_meter(0)
, editor_meter_peak_display()
, speaker_config_window (X_("speaker-config"), _("Speaker Configuration"))
, theme_manager (X_("theme-manager"), _("Theme Manager"))
, key_editor (X_("key-editor"), _("Key Command Editor"))
@ -265,10 +258,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
session_loaded = false;
ignore_dual_punch = false;
midi_panic_button.set_name ("transport button");
midi_panic_button.set_tweaks (ArdourButton::ShowClick);
last_configure_time= 0;
last_peak_grab = 0;
@ -1141,15 +1130,6 @@ ARDOUR_UI::every_point_zero_something_seconds ()
// august 2007: actual update frequency: 25Hz (40ms), not 100Hz
SuperRapidScreenUpdate(); /* EMIT_SIGNAL */
if (editor_meter && Config->get_show_editor_meter()) {
float mpeak = editor_meter->update_meters();
if (mpeak > editor_meter_max_peak) {
if (mpeak >= Config->get_meter_peak()) {
editor_meter_peak_display.set_name ("meterbridge peakindicator on");
editor_meter_peak_display.set_elements((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body));
}
}
}
return TRUE;
}
@ -4658,11 +4638,6 @@ ARDOUR_UI::session_format_mismatch (std::string xml_path, std::string backup_pat
void
ARDOUR_UI::reset_peak_display ()
{
if (!_session || !_session->master_out() || !editor_meter) return;
editor_meter->clear_meters();
editor_meter_max_peak = -INFINITY;
editor_meter_peak_display.set_name ("meterbridge peakindicator");
editor_meter_peak_display.set_elements((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body));
}
void

15
gtk2_ardour/ardour_ui.h
View file

@ -531,20 +531,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
void toggle_auto_return_state (ARDOUR::AutoReturnTarget);
void toggle_all_auto_return ();
ArdourButton follow_edits_button;
ArdourButton auto_input_button;
ArdourButton click_button;
// NO NEED TO HAVE IT: ArdourButton sync_button;
ArdourButton auditioning_alert_button;
ArdourButton solo_alert_button;
ArdourButton feedback_alert_button;
Gtk::VBox alert_box;
Gtk::VBox meter_box;
LevelMeterHBox * editor_meter;
float editor_meter_max_peak;
ArdourButton editor_meter_peak_display;
bool editor_meter_peak_button_release (GdkEventButton*);
void solo_blink (bool);
@ -831,7 +817,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
void feedback_detected ();
ArdourButton midi_panic_button;
void midi_panic ();
void successful_graph_sort ();

63
gtk2_ardour/ardour_ui2.cc
View file

@ -103,15 +103,6 @@ ARDOUR_UI::setup_windows ()
void
ARDOUR_UI::setup_tooltips ()
{
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"));
set_tip (click_button, _("Enable/Disable audio click"));
set_tip (solo_alert_button, _("When active, something is soloed.\nClick to de-solo everything"));
set_tip (auditioning_alert_button, _("When active, auditioning is taking place\nClick to stop the audition"));
set_tip (feedback_alert_button, _("When active, there is a feedback loop."));
set_tip (editor_meter_peak_display, _("Reset Level Meter"));
synchronize_sync_source_and_video_pullup ();
editor->setup_tooltips ();
@ -203,26 +194,12 @@ ARDOUR_UI::setup_transport ()
auto_return_dropdown.AddMenuElem (Gtk::Menu_Helpers::MenuElem (_("Disable/Enable All Options"), sigc::mem_fun (*this, &ARDOUR_UI::toggle_all_auto_return)));
follow_edits_button.set_text(_("Follow Edits"));
click_button.set_image (get_icon (X_("metronome")));
act = ActionManager::get_action ("Transport", "ToggleClick");
click_button.set_related_action (act);
click_button.signal_button_press_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::click_button_clicked), false);
follow_edits_button.set_name ("transport option button");
auto_input_button.set_name ("transport option button");
/* these have to provide a clear indication of active state */
click_button.set_name ("transport button");
editor->get_waves_button ("transport_stop_button").set_active (true);
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"));
editor->get_waves_button ("transport_stop_button").set_related_action (act);
@ -245,7 +222,6 @@ ARDOUR_UI::setup_transport ()
act = ActionManager::get_action (X_("Transport"), X_("PlaySelection"));
act = ActionManager::get_action (X_("MIDI"), X_("panic"));
midi_panic_button.set_related_action (act);
act = ActionManager::get_action (X_("Transport"), X_("ToggleExternalSync"));
/* clocks, etc. */
@ -259,25 +235,12 @@ ARDOUR_UI::setup_transport ()
big_clock->ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::big_clock_value_changed));
act = ActionManager::get_action (X_("Transport"), X_("ToggleFollowEdits"));
follow_edits_button.set_related_action (act);
act = ActionManager::get_action ("Transport", "ToggleAutoInput");
auto_input_button.set_related_action (act);
/* alerts */
/* CANNOT sigc::bind these to clicked or toggled, must use pressed or released */
solo_alert_button.set_name ("rude solo");
solo_alert_button.signal_button_press_event().connect (sigc::mem_fun(*this,&ARDOUR_UI::solo_alert_press), false);
auditioning_alert_button.set_name ("rude audition");
auditioning_alert_button.signal_button_press_event().connect (sigc::mem_fun(*this,&ARDOUR_UI::audition_alert_press), false);
feedback_alert_button.set_name ("feedback alert");
feedback_alert_button.signal_button_press_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::feedback_alert_press), false);
alert_box.pack_start (solo_alert_button, true, false);
alert_box.pack_start (auditioning_alert_button, true, false);
alert_box.pack_start (feedback_alert_button, true, false);
/* all transport buttons should be the same size vertically and
* horizontally
*/
@ -302,15 +265,11 @@ ARDOUR_UI::setup_transport ()
void
ARDOUR_UI::soloing_changed (bool onoff)
{
if (solo_alert_button.get_active() != onoff) {
solo_alert_button.set_active (onoff);
}
}
void
ARDOUR_UI::_auditioning_changed (bool onoff)
{
auditioning_alert_button.set_active (onoff);
set_transport_sensitivity (!onoff);
}
@ -354,16 +313,6 @@ ARDOUR_UI::solo_blink (bool onoff)
if (_session == 0) {
return;
}
if (_session->soloing() || _session->listening()) {
if (onoff) {
solo_alert_button.set_active (true);
} else {
solo_alert_button.set_active (false);
}
} else {
solo_alert_button.set_active (false);
}
}
void
@ -398,27 +347,15 @@ ARDOUR_UI::audition_blink (bool onoff)
if (_session->is_auditioning()) {
if (onoff) {
auditioning_alert_button.set_active (true);
} else {
auditioning_alert_button.set_active (false);
}
} else {
auditioning_alert_button.set_active (false);
}
}
void
ARDOUR_UI::feedback_blink (bool onoff)
{
if (_feedback_exists) {
if (onoff) {
feedback_alert_button.set_active (true);
} else {
feedback_alert_button.set_active (false);
}
} else {
feedback_alert_button.set_active (false);
}
}
void

40
gtk2_ardour/ardour_ui_dialogs.cc
View file

@ -140,8 +140,6 @@ ARDOUR_UI::set_session (Session *s)
editor->get_waves_button ("transport_record_button").set_sensitive (true);
solo_alert_button.set_active (_session->soloing());
setup_session_options ();
Blink.connect (sigc::mem_fun(*this, &ARDOUR_UI::transport_rec_enable_blink));
@ -197,44 +195,13 @@ ARDOUR_UI::set_session (Session *s)
_session->config.set_native_file_data_format (this->_sample_format);
_session->config.set_timecode_format(this->_timecode_format);
if (editor_meter) {
meter_box.remove(*editor_meter);
delete editor_meter;
editor_meter = 0;
editor_meter_peak_display.hide();
}
if (_session &&
_session->master_out() &&
_session->master_out()->n_outputs().n(DataType::AUDIO) > 0) {
if (!ARDOUR::Profile->get_trx()) {
editor_meter = new LevelMeterHBox(_session);
editor_meter->set_meter (_session->master_out()->shared_peak_meter().get());
editor_meter->clear_meters();
editor_meter->set_type (_session->master_out()->meter_type());
editor_meter->setup_meters (12, 6);
editor_meter->show();
meter_box.pack_start(*editor_meter);
}
ArdourMeter::ResetAllPeakDisplays.connect (sigc::mem_fun(*this, &ARDOUR_UI::reset_peak_display));
ArdourMeter::ResetRoutePeakDisplays.connect (sigc::mem_fun(*this, &ARDOUR_UI::reset_route_peak_display));
ArdourMeter::ResetGroupPeakDisplays.connect (sigc::mem_fun(*this, &ARDOUR_UI::reset_group_peak_display));
editor_meter_peak_display.set_name ("meterbridge peakindicator");
editor_meter_peak_display.set_elements((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body));
editor_meter_peak_display.unset_flags (Gtk::CAN_FOCUS);
editor_meter_peak_display.set_size_request(6, -1);
editor_meter_peak_display.set_corner_radius(2);
editor_meter_max_peak = -INFINITY;
editor_meter_peak_display.signal_button_release_event().connect (sigc::mem_fun(*this, &ARDOUR_UI::editor_meter_peak_button_release), false);
if (Config->get_show_editor_meter() && !ARDOUR::Profile->get_trx()) {
meter_box.show();
editor_meter_peak_display.show();
}
}
update_bit_depth_button ();
@ -292,13 +259,6 @@ ARDOUR_UI::unload_session (bool hide_stuff)
connection_with_session_config.disconnect();
fps_connection.disconnect();
if (editor_meter) {
meter_box.remove(*editor_meter);
delete editor_meter;
editor_meter = 0;
editor_meter_peak_display.hide();
}
ActionManager::set_sensitive (ActionManager::session_sensitive_actions, false);
editor->get_waves_button ("transport_record_button").set_sensitive (false);

7
gtk2_ardour/ardour_ui_options.cc
View file

@ -412,13 +412,6 @@ ARDOUR_UI::parameter_changed (std::string p)
ArdourCanvas::WaveView::set_global_gradient_depth (config()->get_waveform_gradient_depth());
} else if (p == "show-editor-meter") {
bool show = Config->get_show_editor_meter();
if (editor_meter) {
if (show) {
meter_box.show();
editor_meter_peak_display.show();
}
}
} else if (p == "output-auto-connect") {
update_output_operation_mode_buttons();
} else if (p == "waveform-scale") {