X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui2.cc;h=6162ef22d9ff87ca98979905e1954262235c22d3;hb=d1630219500305397e1608e09508872f0ab2f836;hp=92fadd198bae6c881ab8c0ddbe00bc06fb8c52af;hpb=015fc7b39fab97cee1875231694adce43155ceb5;p=ardour.git diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 92fadd198b..6162ef22d9 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 1999 Paul Davis + Copyright (C) 1999 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -32,6 +32,7 @@ #include #include +#include "ardour/session.h" #include "ardour/audioengine.h" #include "ardour/ardour.h" #include "ardour/profile.h" @@ -53,9 +54,8 @@ using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; using namespace Glib; -using namespace sigc; -int +int ARDOUR_UI::setup_windows () { if (create_editor ()) { @@ -72,35 +72,68 @@ ARDOUR_UI::setup_windows () we_have_dependents (); - setup_clock (); - setup_transport(); - build_menu_bar (); - - theme_manager->signal_unmap().connect (bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("/Common/ToggleThemeManager"))); + theme_manager->signal_unmap().connect (sigc::bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("/Common/ToggleThemeManager"))); #ifdef TOP_MENUBAR HBox* status_bar_packer = manage (new HBox); - + status_bar_label.set_size_request (300, -1); status_bar_packer->pack_start (status_bar_label, true, true, 6); status_bar_packer->pack_start (error_log_button, false, false); - - error_log_button.signal_clicked().connect (mem_fun (*this, &UI::toggle_errors)); + + error_log_button.signal_clicked().connect (sigc::mem_fun (*this, &UI::toggle_errors)); editor->get_status_bar_packer().pack_start (*status_bar_packer, true, true); editor->get_status_bar_packer().pack_start (menu_bar_base, false, false, 6); #else - top_packer.pack_start (menu_bar_base, false, false); -#endif + top_packer.pack_start (menu_bar_base, false, false); +#endif - top_packer.pack_start (transport_frame, false, false); + top_packer.pack_start (transport_frame, false, false); editor->add_toplevel_controls (top_packer); + setup_clock (); + setup_transport(); + build_menu_bar (); + + setup_tooltips (); + return 0; } - void +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 (join_play_range_button, _("Always 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 (auto_return_button, _("Return to last playback start when stopped")); + set_tip (auto_play_button, _("Start playback after any locate")); + set_tip (auto_input_button, _("Be sensible about input monitoring")); + set_tip (punch_in_button, _("Start recording at auto-punch start")); + set_tip (punch_out_button, _("Stop recording at auto-punch end")); + set_tip (click_button, _("Enable/Disable audio click")); + set_tip (sync_button, _("Enable/Disable external positional sync")); + set_tip (time_master_button, string_compose (_("Does %1 control the time?"), PROGRAM_NAME)); + set_tip (shuttle_box, _("Shuttle speed control")); + set_tip (shuttle_units_button, _("Select semitones or %%-age for speed display")); + set_tip (speed_display_box, _("Current transport speed")); + 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 (primary_clock, _("Primary clock")); + set_tip (secondary_clock, _("secondary clock")); + + editor->setup_tooltips (); +} + +void ARDOUR_UI::display_message (const char *prefix, gint prefix_len, RefPtr ptag, RefPtr mtag, const char *msg) { ustring text; @@ -126,64 +159,35 @@ ARDOUR_UI::display_message (const char *prefix, gint prefix_len, RefPtrget_play_range()) { - play_selection_button.set_visual_state (1); - roll_button.set_visual_state (0); - auto_loop_button.set_visual_state (0); - - } else if (session->get_play_loop ()) { - auto_loop_button.set_visual_state (1); - play_selection_button.set_visual_state (0); - roll_button.set_visual_state (0); - - } else { - - roll_button.set_visual_state (1); - play_selection_button.set_visual_state (0); - auto_loop_button.set_visual_state (0); - } - - /* reset shuttle controller */ - - shuttle_fract = SHUTTLE_FRACT_SPEED1; /* speed = 1.0, believe it or not */ - shuttle_box.queue_draw (); + w.signal_enter_notify_event().connect (sigc::ptr_fun (null_crossing), false); + w.signal_leave_notify_event().connect (sigc::ptr_fun (null_crossing), false); } +#endif -void -ARDOUR_UI::transport_rewinding () +XMLNode* +ARDOUR_UI::tearoff_settings (const char* name) const { - stop_button.set_visual_state (0); - roll_button.set_visual_state (1); - play_selection_button.set_visual_state (0); - auto_loop_button.set_visual_state (0); -} + XMLNode* ui_node = Config->extra_xml(X_("UI")); + + if (ui_node) { + XMLNode* tearoff_node = ui_node->child (X_("Tearoffs")); + if (tearoff_node) { + XMLNode* mnode = tearoff_node->child (name); + return mnode; + } + } -void -ARDOUR_UI::transport_forwarding () -{ - stop_button.set_visual_state (0); - roll_button.set_visual_state (1); - play_selection_button.set_visual_state (0); - auto_loop_button.set_visual_state (0); + return 0; } void @@ -191,6 +195,7 @@ ARDOUR_UI::setup_transport () { transport_tearoff = manage (new TearOff (transport_tearoff_hbox)); transport_tearoff->set_name ("TransportBase"); + transport_tearoff->tearoff_window().signal_key_press_event().connect (sigc::bind (sigc::ptr_fun (relay_key_press), &transport_tearoff->tearoff_window()), false); if (Profile->get_sae()) { transport_tearoff->set_can_be_torn_off (false); @@ -205,15 +210,15 @@ ARDOUR_UI::setup_transport () transport_frame.set_name ("BaseFrame"); transport_frame.add (transport_base); - transport_tearoff->Detach.connect (bind (mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast(&top_packer), + transport_tearoff->Detach.connect (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast(&top_packer), static_cast(&transport_frame))); - transport_tearoff->Attach.connect (bind (mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast (&top_packer), + transport_tearoff->Attach.connect (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast (&top_packer), static_cast (&transport_frame), 1)); - transport_tearoff->Hidden.connect (bind (mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast(&top_packer), + transport_tearoff->Hidden.connect (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast(&top_packer), static_cast(&transport_frame))); - transport_tearoff->Visible.connect (bind (mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast (&top_packer), + transport_tearoff->Visible.connect (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast (&top_packer), static_cast (&transport_frame), 1)); - + shuttle_box.set_name ("TransportButton"); goto_start_button.set_name ("TransportButton"); goto_end_button.set_name ("TransportButton"); @@ -222,6 +227,7 @@ ARDOUR_UI::setup_transport () play_selection_button.set_name ("TransportButton"); rec_button.set_name ("TransportRecButton"); auto_loop_button.set_name ("TransportButton"); + join_play_range_button.set_name ("TransportButton"); auto_return_button.set_name ("TransportButton"); auto_play_button.set_name ("TransportButton"); @@ -230,6 +236,7 @@ ARDOUR_UI::setup_transport () punch_out_button.set_name ("TransportButton"); click_button.set_name ("TransportButton"); time_master_button.set_name ("TransportButton"); + sync_button.set_name ("TransportSyncButton"); stop_button.set_size_request(29, -1); roll_button.set_size_request(29, -1); @@ -238,11 +245,11 @@ ARDOUR_UI::setup_transport () goto_start_button.set_size_request(29, -1); goto_end_button.set_size_request(29, -1); rec_button.set_size_request(29, -1); - + Widget* w; stop_button.set_visual_state (1); - + w = manage (new Image (get_icon (X_("transport_start")))); w->show(); goto_start_button.add (*w); @@ -264,6 +271,9 @@ ARDOUR_UI::setup_transport () w = manage (new Image (get_icon (X_("transport_loop")))); w->show(); auto_loop_button.add (*w); + w = manage (new Image (get_icon (X_("join_tools")))); + w->show (); + join_play_range_button.add (*w); RefPtr act; @@ -283,47 +293,27 @@ ARDOUR_UI::setup_transport () act->connect_proxy (play_selection_button); act = ActionManager::get_action (X_("Transport"), X_("ToggleTimeMaster")); act->connect_proxy (time_master_button); + act = ActionManager::get_action (X_("Transport"), X_("ToggleExternalSync")); + act->connect_proxy (sync_button); - ARDOUR_UI::instance()->tooltips().set_tip (roll_button, _("Play from playhead")); - ARDOUR_UI::instance()->tooltips().set_tip (stop_button, _("Stop playback")); - ARDOUR_UI::instance()->tooltips().set_tip (play_selection_button, _("Play range/selection")); - ARDOUR_UI::instance()->tooltips().set_tip (goto_start_button, _("Go to start of session")); - ARDOUR_UI::instance()->tooltips().set_tip (goto_end_button, _("Go to end of session")); - ARDOUR_UI::instance()->tooltips().set_tip (auto_loop_button, _("Play loop range")); - - ARDOUR_UI::instance()->tooltips().set_tip (auto_return_button, _("Return to last playback start when stopped")); - ARDOUR_UI::instance()->tooltips().set_tip (auto_play_button, _("Start playback after any locate")); - ARDOUR_UI::instance()->tooltips().set_tip (auto_input_button, _("Be sensible about input monitoring")); - ARDOUR_UI::instance()->tooltips().set_tip (punch_in_button, _("Start recording at auto-punch start")); - ARDOUR_UI::instance()->tooltips().set_tip (punch_out_button, _("Stop recording at auto-punch end")); - ARDOUR_UI::instance()->tooltips().set_tip (click_button, _("Enable/Disable audio click")); - ARDOUR_UI::instance()->tooltips().set_tip (sync_option_combo, _("Positional sync source")); - ARDOUR_UI::instance()->tooltips().set_tip (time_master_button, _("Does Ardour control the time?")); - ARDOUR_UI::instance()->tooltips().set_tip (shuttle_box, _("Shuttle speed control")); - ARDOUR_UI::instance()->tooltips().set_tip (shuttle_units_button, _("Select semitones or %%-age for speed display")); - ARDOUR_UI::instance()->tooltips().set_tip (speed_display_box, _("Current transport speed")); - shuttle_box.set_flags (CAN_FOCUS); shuttle_box.add_events (Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::BUTTON_PRESS_MASK|Gdk::POINTER_MOTION_MASK|Gdk::SCROLL_MASK); shuttle_box.set_size_request (100, 15); - shuttle_box.signal_button_press_event().connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_button_press)); - shuttle_box.signal_button_release_event().connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_button_release)); - shuttle_box.signal_scroll_event().connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_scroll)); - shuttle_box.signal_motion_notify_event().connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_motion)); - shuttle_box.signal_expose_event().connect (mem_fun(*this, &ARDOUR_UI::shuttle_box_expose)); + shuttle_box.signal_button_press_event().connect (sigc::mem_fun(*this, &ARDOUR_UI::shuttle_box_button_press)); + shuttle_box.signal_button_release_event().connect (sigc::mem_fun(*this, &ARDOUR_UI::shuttle_box_button_release)); + shuttle_box.signal_scroll_event().connect (sigc::mem_fun(*this, &ARDOUR_UI::shuttle_box_scroll)); + shuttle_box.signal_motion_notify_event().connect (sigc::mem_fun(*this, &ARDOUR_UI::shuttle_box_motion)); + shuttle_box.signal_expose_event().connect (sigc::mem_fun(*this, &ARDOUR_UI::shuttle_box_expose)); /* clocks, etc. */ - ARDOUR_UI::Clock.connect (bind (mem_fun (primary_clock, &AudioClock::set), 'p')); - ARDOUR_UI::Clock.connect (bind (mem_fun (secondary_clock, &AudioClock::set), 's')); - - primary_clock.ValueChanged.connect (mem_fun(*this, &ARDOUR_UI::primary_clock_value_changed)); - secondary_clock.ValueChanged.connect (mem_fun(*this, &ARDOUR_UI::secondary_clock_value_changed)); - big_clock.ValueChanged.connect (mem_fun(*this, &ARDOUR_UI::big_clock_value_changed)); + ARDOUR_UI::Clock.connect (sigc::bind (sigc::mem_fun (primary_clock, &AudioClock::set), 'p')); + ARDOUR_UI::Clock.connect (sigc::bind (sigc::mem_fun (secondary_clock, &AudioClock::set), 's')); - ARDOUR_UI::instance()->tooltips().set_tip (primary_clock, _("Primary clock")); - ARDOUR_UI::instance()->tooltips().set_tip (secondary_clock, _("secondary clock")); + primary_clock.ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::primary_clock_value_changed)); + secondary_clock.ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::secondary_clock_value_changed)); + big_clock.ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::big_clock_value_changed)); ActionManager::get_action ("Transport", "ToggleAutoReturn")->connect_proxy (auto_return_button); ActionManager::get_action ("Transport", "ToggleAutoPlay")->connect_proxy (auto_play_button); @@ -342,15 +332,12 @@ ARDOUR_UI::setup_transport () /* alerts */ - /* CANNOT bind these to clicked or toggled, must use pressed or released */ + /* CANNOT sigc::bind these to clicked or toggled, must use pressed or released */ solo_alert_button.set_name ("TransportSoloAlert"); - solo_alert_button.signal_pressed().connect (mem_fun(*this,&ARDOUR_UI::solo_alert_toggle)); + solo_alert_button.signal_button_press_event().connect (sigc::mem_fun(*this,&ARDOUR_UI::solo_alert_press), false); auditioning_alert_button.set_name ("TransportAuditioningAlert"); - auditioning_alert_button.signal_pressed().connect (mem_fun(*this,&ARDOUR_UI::audition_alert_toggle)); - - tooltips().set_tip (solo_alert_button, _("When active, something is soloed.\nClick to de-solo everything")); - tooltips().set_tip (auditioning_alert_button, _("When active, auditioning is taking place\nClick to stop the audition")); + auditioning_alert_button.signal_button_press_event().connect (sigc::mem_fun(*this,&ARDOUR_UI::audition_alert_press), false); alert_box.pack_start (solo_alert_button, false, false); alert_box.pack_start (auditioning_alert_button, false, false); @@ -374,41 +361,44 @@ ARDOUR_UI::setup_transport () set_size_request_to_display_given_text (speed_display_label, X_("> 24.0"), 2, 2); shuttle_units_button.set_name (X_("ShuttleButton")); - shuttle_units_button.signal_clicked().connect (mem_fun(*this, &ARDOUR_UI::shuttle_unit_clicked)); - + shuttle_units_button.signal_clicked().connect (sigc::mem_fun(*this, &ARDOUR_UI::shuttle_unit_clicked)); + shuttle_style_button.set_name (X_("ShuttleStyleButton")); vector shuttle_strings; shuttle_strings.push_back (_("sprung")); shuttle_strings.push_back (_("wheel")); set_popdown_strings (shuttle_style_button, shuttle_strings, true); - shuttle_style_button.signal_changed().connect (mem_fun (*this, &ARDOUR_UI::shuttle_style_changed)); + shuttle_style_button.signal_changed().connect (sigc::mem_fun (*this, &ARDOUR_UI::shuttle_style_changed)); Frame* sdframe = manage (new Frame); sdframe->set_shadow_type (SHADOW_IN); sdframe->add (speed_display_box); - mtc_port_changed (); - sync_option_combo.signal_changed().connect (mem_fun (*this, &ARDOUR_UI::sync_option_changed)); - // XXX HOW TO USE set_popdown_strings() and combo_fudge with this when we don't know - // the real strings till later? - set_size_request_to_display_given_text (sync_option_combo, X_("Igternal"), 4+COMBO_FUDGE, 10); + /* translators: Egternal is "External" with a descender character */ + set_size_request_to_display_given_text (sync_button, X_("Egternal"), 4, 10); shbox->pack_start (*sdframe, false, false); shbox->pack_start (shuttle_units_button, true, true); shbox->pack_start (shuttle_style_button, false, false); - + svbox->pack_start (*sframe, false, false); svbox->pack_start (*shbox, false, false); transport_tearoff_hbox.pack_start (*svbox, false, false, 3); - transport_tearoff_hbox.pack_start (auto_loop_button, false, false); - if (!Profile->get_sae()) { - transport_tearoff_hbox.pack_start (play_selection_button, false, false); + if (Profile->get_sae()) { + transport_tearoff_hbox.pack_start (auto_loop_button); + transport_tearoff_hbox.pack_start (roll_button); + } else { + transport_tearoff_hbox.pack_start (auto_loop_button, false, false); + play_range_hbox.pack_start (play_selection_button, false, false); + play_range_hbox.pack_start (roll_button, false, false); + play_range_vbox.pack_start (play_range_hbox, false, false); + play_range_vbox.pack_start (join_play_range_button, false, false); + transport_tearoff_hbox.pack_start (play_range_vbox, false, false); } - transport_tearoff_hbox.pack_start (roll_button, false, false); transport_tearoff_hbox.pack_start (stop_button, false, false); transport_tearoff_hbox.pack_start (rec_button, false, false, 6); @@ -420,7 +410,7 @@ ARDOUR_UI::setup_transport () if (!Profile->get_sae()) { VBox* time_controls_box = manage (new VBox); - time_controls_box->pack_start (sync_option_combo, false, false); + time_controls_box->pack_start (sync_button, false, false); time_controls_box->pack_start (time_master_button, false, false); clock_box->pack_start (*time_controls_box, false, false, 1); } @@ -428,7 +418,7 @@ ARDOUR_UI::setup_transport () transport_tearoff_hbox.pack_start (*clock_box, false, false, 0); HBox* toggle_box = manage(new HBox); - + VBox* punch_box = manage (new VBox); punch_box->pack_start (punch_in_button, false, false); punch_box->pack_start (punch_out_button, false, false); @@ -438,12 +428,12 @@ ARDOUR_UI::setup_transport () auto_box->pack_start (auto_play_button, false, false); auto_box->pack_start (auto_return_button, false, false); toggle_box->pack_start (*auto_box, false, false); - + VBox* io_box = manage (new VBox); io_box->pack_start (auto_input_button, false, false); io_box->pack_start (click_button, false, false); toggle_box->pack_start (*io_box, false, false); - + /* desensitize */ set_transport_sensitivity (false); @@ -456,19 +446,24 @@ ARDOUR_UI::setup_transport () transport_tearoff_hbox.pack_start (*toggle_box, false, false, 4); transport_tearoff_hbox.pack_start (alert_box, false, false); - + if (Profile->get_sae()) { Image* img = manage (new Image ((::get_icon (X_("sae"))))); transport_tearoff_hbox.pack_end (*img, false, false, 6); } + + XMLNode* tnode = tearoff_settings ("transport"); + if (tnode) { + transport_tearoff->set_state (*tnode); + } } void ARDOUR_UI::manage_window (Window& win) { - win.signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), &win)); - win.signal_enter_notify_event().connect (bind (mem_fun (Keyboard::the_keyboard(), &Keyboard::enter_window), &win)); - win.signal_leave_notify_event().connect (bind (mem_fun (Keyboard::the_keyboard(), &Keyboard::leave_window), &win)); + win.signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), &win)); + win.signal_enter_notify_event().connect (sigc::bind (sigc::mem_fun (Keyboard::the_keyboard(), &Keyboard::enter_window), &win)); + win.signal_leave_notify_event().connect (sigc::bind (sigc::mem_fun (Keyboard::the_keyboard(), &Keyboard::leave_window), &win)); } void @@ -505,33 +500,39 @@ ARDOUR_UI::_auditioning_changed (bool onoff) void ARDOUR_UI::auditioning_changed (bool onoff) { - UI::instance()->call_slot(bind (mem_fun(*this, &ARDOUR_UI::_auditioning_changed), onoff)); + UI::instance()->call_slot (boost::bind (&ARDOUR_UI::_auditioning_changed, this, onoff)); } -void -ARDOUR_UI::audition_alert_toggle () +bool +ARDOUR_UI::audition_alert_press (GdkEventButton* ev) { - if (session) { - session->cancel_audition(); + if (_session) { + _session->cancel_audition(); } + return true; } -void -ARDOUR_UI::solo_alert_toggle () +bool +ARDOUR_UI::solo_alert_press (GdkEventButton* ev) { - if (session) { - session->set_all_solo (!session->soloing()); - } + if (_session) { + if (_session->soloing()) { + _session->set_solo (_session->get_routes(), false); + } else if (_session->listening()) { + _session->set_listen (_session->get_routes(), false); + } + } + return true; } void ARDOUR_UI::solo_blink (bool onoff) { - if (session == 0) { + if (_session == 0) { return; } - - if (session->soloing()) { + + if (_session->soloing() || _session->listening()) { if (onoff) { solo_alert_button.set_state (STATE_ACTIVE); } else { @@ -543,14 +544,37 @@ ARDOUR_UI::solo_blink (bool onoff) } } +void +ARDOUR_UI::sync_blink (bool onoff) +{ + if (_session == 0 || !_session->config.get_external_sync()) { + /* internal sync */ + sync_button.set_visual_state (0); + return; + } + + if (!_session->transport_locked()) { + /* not locked, so blink on and off according to the onoff argument */ + + if (onoff) { + sync_button.set_visual_state (1); // "-active" + } else { + sync_button.set_visual_state (0); // normal + } + } else { + /* locked */ + sync_button.set_visual_state (1); // "-active" + } +} + void ARDOUR_UI::audition_blink (bool onoff) { - if (session == 0) { + if (_session == 0) { return; } - - if (session->is_auditioning()) { + + if (_session->is_auditioning()) { if (onoff) { auditioning_alert_button.set_state (STATE_ACTIVE); } else { @@ -575,29 +599,29 @@ ARDOUR_UI::build_shuttle_context_menu () RadioMenuItem::Group group; - speed_items.push_back (RadioMenuElem (group, "8", bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 8.0f))); + speed_items.push_back (RadioMenuElem (group, "8", sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 8.0f))); if (shuttle_max_speed == 8.0) { - static_cast(&speed_items.back())->set_active (); + static_cast(&speed_items.back())->set_active (); } - speed_items.push_back (RadioMenuElem (group, "6", bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 6.0f))); + speed_items.push_back (RadioMenuElem (group, "6", sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 6.0f))); if (shuttle_max_speed == 6.0) { - static_cast(&speed_items.back())->set_active (); + static_cast(&speed_items.back())->set_active (); } - speed_items.push_back (RadioMenuElem (group, "4", bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 4.0f))); + speed_items.push_back (RadioMenuElem (group, "4", sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 4.0f))); if (shuttle_max_speed == 4.0) { - static_cast(&speed_items.back())->set_active (); + static_cast(&speed_items.back())->set_active (); } - speed_items.push_back (RadioMenuElem (group, "3", bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 3.0f))); + speed_items.push_back (RadioMenuElem (group, "3", sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 3.0f))); if (shuttle_max_speed == 3.0) { - static_cast(&speed_items.back())->set_active (); + static_cast(&speed_items.back())->set_active (); } - speed_items.push_back (RadioMenuElem (group, "2", bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 2.0f))); + speed_items.push_back (RadioMenuElem (group, "2", sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 2.0f))); if (shuttle_max_speed == 2.0) { - static_cast(&speed_items.back())->set_active (); + static_cast(&speed_items.back())->set_active (); } - speed_items.push_back (RadioMenuElem (group, "1.5", bind (mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 1.5f))); + speed_items.push_back (RadioMenuElem (group, "1.5", sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 1.5f))); if (shuttle_max_speed == 1.5) { - static_cast(&speed_items.back())->set_active (); + static_cast(&speed_items.back())->set_active (); } items.push_back (MenuElem (_("Maximum speed"), *speed_menu)); @@ -622,7 +646,7 @@ ARDOUR_UI::set_shuttle_max_speed (float speed) gint ARDOUR_UI::shuttle_box_button_press (GdkEventButton* ev) { - if (!session) { + if (!_session) { return true; } @@ -654,33 +678,33 @@ ARDOUR_UI::shuttle_box_button_press (GdkEventButton* ev) gint ARDOUR_UI::shuttle_box_button_release (GdkEventButton* ev) { - if (!session) { + if (!_session) { return true; } - + switch (ev->button) { case 1: mouse_shuttle (ev->x, true); shuttle_grabbed = false; shuttle_box.remove_modal_grab (); if (Config->get_shuttle_behaviour() == Sprung) { - if (session->config.get_auto_play() || roll_button.get_visual_state()) { - shuttle_fract = SHUTTLE_FRACT_SPEED1; - session->request_transport_speed (1.0); + if (_session->config.get_auto_play() || roll_button.get_visual_state()) { + shuttle_fract = SHUTTLE_FRACT_SPEED1; + _session->request_transport_speed (1.0); stop_button.set_visual_state (0); roll_button.set_visual_state (1); } else { shuttle_fract = 0; - session->request_transport_speed (0.0); + _session->request_transport_speed (0.0); } shuttle_box.queue_draw (); } return true; case 2: - if (session->transport_rolling()) { + if (_session->transport_rolling()) { shuttle_fract = SHUTTLE_FRACT_SPEED1; - session->request_transport_speed (1.0); + _session->request_transport_speed (1.0); stop_button.set_visual_state (0); roll_button.set_visual_state (1); } else { @@ -703,12 +727,12 @@ ARDOUR_UI::shuttle_box_button_release (GdkEventButton* ev) gint ARDOUR_UI::shuttle_box_scroll (GdkEventScroll* ev) { - if (!session) { + if (!_session) { return true; } - + switch (ev->direction) { - + case GDK_SCROLL_UP: shuttle_fract += 0.005; break; @@ -728,7 +752,7 @@ ARDOUR_UI::shuttle_box_scroll (GdkEventScroll* ev) gint ARDOUR_UI::shuttle_box_motion (GdkEventMotion* ev) { - if (!session || !shuttle_grabbed) { + if (!_session || !shuttle_grabbed) { return true; } @@ -763,7 +787,7 @@ void ARDOUR_UI::use_shuttle_fract (bool force) { microseconds_t now = get_microseconds(); - + /* do not attempt to submit a motion-driven transport speed request more than once per process cycle. */ @@ -771,7 +795,7 @@ ARDOUR_UI::use_shuttle_fract (bool force) if (!force && (last_shuttle_request - now) < (microseconds_t) engine->usecs_per_cycle()) { return; } - + last_shuttle_request = now; if (Config->get_shuttle_units() == Semitones) { @@ -783,13 +807,13 @@ ARDOUR_UI::use_shuttle_fract (bool force) semitones = round (shuttle_fract / step); speed = pow (2.0, (semitones / 12.0)); - session->request_transport_speed (speed); + _session->request_transport_speed (speed); } else { bool neg; double fract; - + neg = (shuttle_fract < 0.0); fract = 1 - sqrt (1 - (shuttle_fract * shuttle_fract)); // Formula A1 @@ -798,7 +822,7 @@ ARDOUR_UI::use_shuttle_fract (bool force) fract = -fract; } - session->request_transport_speed (shuttle_max_speed * fract); + _session->request_transport_speed (shuttle_max_speed * fract); } shuttle_box.queue_draw (); @@ -854,7 +878,7 @@ ARDOUR_UI::shuttle_style_changed () void ARDOUR_UI::update_speed_display () { - if (!session) { + if (!_session) { if (last_speed_displayed != 0) { speed_display_label.set_text (_("stop")); last_speed_displayed = 0; @@ -863,7 +887,7 @@ ARDOUR_UI::update_speed_display () } char buf[32]; - float x = session->transport_speed (); + float x = _session->transport_speed (); if (x != last_speed_displayed) { @@ -885,8 +909,8 @@ ARDOUR_UI::update_speed_display () last_speed_displayed = x; } -} - +} + void ARDOUR_UI::set_transport_sensitivity (bool yn) { @@ -897,22 +921,11 @@ ARDOUR_UI::set_transport_sensitivity (bool yn) void ARDOUR_UI::editor_realized () { - Config->map_parameters (mem_fun (*this, &ARDOUR_UI::parameter_changed)); + boost::function pc (boost::bind (&ARDOUR_UI::parameter_changed, this, _1)); + Config->map_parameters (pc); set_size_request_to_display_given_text (speed_display_box, _("-0.55"), 2, 2); - cerr << "I commented out line line 889 in ardour_ui2.cc, because it made ardour crash somewhere in Gnome::Canvas::Text" << endl; - //reset_dpi(); -} - -void -ARDOUR_UI::sync_option_changed () -{ - if (session) { - ustring txt = sync_option_combo.get_active_text (); - if (txt.length()) { - session->request_slave_source (string_to_slave_source (txt)); - } - } + reset_dpi (); } void