X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_info_box.cc;h=ceda41e90c16246f325788dcb103c81098e772eb;hb=7f280e2bed51cfa56fedeaf08f28b6040c93b5b1;hp=a384ae5ed8db594ef7ba47f1ff5531fd71886742;hpb=01d99870ffdefa1a76093c95250f355db11609d1;p=ardour.git diff --git a/gtk2_ardour/time_info_box.cc b/gtk2_ardour/time_info_box.cc index a384ae5ed8..ceda41e90c 100644 --- a/gtk2_ardour/time_info_box.cc +++ b/gtk2_ardour/time_info_box.cc @@ -36,18 +36,20 @@ #include "control_point.h" #include "automation_line.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace Gtk; using namespace ARDOUR; using std::min; using std::max; -TimeInfoBox::TimeInfoBox () - : left (2, 4) - , right (2, 4) +TimeInfoBox::TimeInfoBox (bool with_punch) + : table (3, 3) + , punch_start (0) + , punch_end (0) , syncing_selection (false) , syncing_punch (false) + , with_punch_clock (with_punch) { set_name (X_("TimeInfoBox")); @@ -55,96 +57,73 @@ TimeInfoBox::TimeInfoBox () selection_end = new AudioClock ("selection-end", false, "selection", false, false, false, false); selection_length = new AudioClock ("selection-length", false, "selection", false, false, true, false); - punch_start = new AudioClock ("punch-start", false, "punch", false, false, false, false); - punch_end = new AudioClock ("punch-end", false, "punch", false, false, false, false); - - selection_start->set_draw_background (false); - selection_end->set_draw_background (false); - selection_length->set_draw_background (false); - punch_start->set_draw_background (false); - punch_end->set_draw_background (false); - selection_title.set_text (_("Selection")); - punch_title.set_text (_("Punch")); set_homogeneous (false); set_spacing (0); set_border_width (2); - pack_start (left, true, true); - if (!ARDOUR::Profile->get_trx()) { - pack_start (right, true, true); - } - - left.set_homogeneous (false); - left.set_spacings (0); - left.set_border_width (2); - left.set_col_spacings (2); + pack_start (table, false, false); - right.set_homogeneous (false); - right.set_spacings (0); - right.set_border_width (2); - right.set_col_spacings (2); + table.set_homogeneous (false); + table.set_spacings (0); + table.set_border_width (2); + table.set_col_spacings (2); Gtk::Label* l; selection_title.set_name ("TimeInfoSelectionTitle"); - left.attach (selection_title, 1, 2, 0, 1); + if (with_punch_clock) { + table.attach (selection_title, 1, 2, 0, 1); + } l = manage (new Label); l->set_text (_("Start")); l->set_alignment (1.0, 0.5); l->set_name (X_("TimeInfoSelectionLabel")); - left.attach (*l, 0, 1, 1, 2, FILL); - left.attach (*selection_start, 1, 2, 1, 2); + table.attach (*l, 0, 1, 1, 2, FILL); + table.attach (*selection_start, 1, 2, 1, 2); l = manage (new Label); l->set_text (_("End")); l->set_alignment (1.0, 0.5); l->set_name (X_("TimeInfoSelectionLabel")); - left.attach (*l, 0, 1, 2, 3, FILL); - left.attach (*selection_end, 1, 2, 2, 3); + table.attach (*l, 0, 1, 2, 3, FILL); + table.attach (*selection_end, 1, 2, 2, 3); l = manage (new Label); l->set_text (_("Length")); l->set_alignment (1.0, 0.5); l->set_name (X_("TimeInfoSelectionLabel")); - left.attach (*l, 0, 1, 3, 4, FILL); - left.attach (*selection_length, 1, 2, 3, 4); - - punch_in_button.set_name ("punch button"); - punch_out_button.set_name ("punch button"); - punch_in_button.set_text (_("In")); - punch_out_button.set_text (_("Out")); - - Glib::RefPtr act = ActionManager::get_action ("Transport", "TogglePunchIn"); - punch_in_button.set_related_action (act); - act = ActionManager::get_action ("Transport", "TogglePunchOut"); - punch_out_button.set_related_action (act); - - Gtkmm2ext::UI::instance()->set_tip (punch_in_button, _("Start recording at auto-punch start")); - Gtkmm2ext::UI::instance()->set_tip (punch_out_button, _("Stop recording at auto-punch end")); - - punch_title.set_name ("TimeInfoSelectionTitle"); - right.attach (punch_title, 3, 4, 0, 1); - right.attach (punch_in_button, 2, 3, 1, 2, FILL, SHRINK); - right.attach (*punch_start, 3, 4, 1, 2); - right.attach (punch_out_button, 2, 3, 2, 3, FILL, SHRINK); - right.attach (*punch_end, 3, 4, 2, 3); + table.attach (*l, 0, 1, 3, 4, FILL); + table.attach (*selection_length, 1, 2, 3, 4); + + if (with_punch_clock) { + punch_start = new AudioClock ("punch-start", false, "punch", false, false, false, false); + punch_end = new AudioClock ("punch-end", false, "punch", false, false, false, false); + punch_title.set_text (_("Punch")); + + punch_title.set_name ("TimeInfoSelectionTitle"); + table.attach (punch_title, 2, 3, 0, 1); + table.attach (*punch_start, 2, 3, 1, 2); + table.attach (*punch_end, 2, 3, 2, 3); + } - show_all (); + show_all (); selection_start->mode_changed.connect (sigc::bind (sigc::mem_fun (*this, &TimeInfoBox::sync_selection_mode), selection_start)); selection_end->mode_changed.connect (sigc::bind (sigc::mem_fun (*this, &TimeInfoBox::sync_selection_mode), selection_end)); selection_length->mode_changed.connect (sigc::bind (sigc::mem_fun (*this, &TimeInfoBox::sync_selection_mode), selection_length)); - punch_start->mode_changed.connect (sigc::bind (sigc::mem_fun (*this, &TimeInfoBox::sync_punch_mode), punch_start)); - punch_end->mode_changed.connect (sigc::bind (sigc::mem_fun (*this, &TimeInfoBox::sync_punch_mode), punch_end)); - selection_start->signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &TimeInfoBox::clock_button_release_event), selection_start), true); selection_end->signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &TimeInfoBox::clock_button_release_event), selection_end), true); - punch_start->signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &TimeInfoBox::clock_button_release_event), punch_start), true); - punch_end->signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &TimeInfoBox::clock_button_release_event), punch_end), true); + if (with_punch_clock) { + punch_start->mode_changed.connect (sigc::bind (sigc::mem_fun (*this, &TimeInfoBox::sync_punch_mode), punch_start)); + punch_end->mode_changed.connect (sigc::bind (sigc::mem_fun (*this, &TimeInfoBox::sync_punch_mode), punch_end)); + + punch_start->signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &TimeInfoBox::clock_button_release_event), punch_start), true); + punch_end->signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &TimeInfoBox::clock_button_release_event), punch_end), true); + } Editor::instance().get_selection().TimeChanged.connect (sigc::mem_fun (*this, &TimeInfoBox::selection_changed)); Editor::instance().get_selection().RegionsChanged.connect (sigc::mem_fun (*this, &TimeInfoBox::selection_changed)); @@ -155,12 +134,12 @@ TimeInfoBox::TimeInfoBox () TimeInfoBox::~TimeInfoBox () { - delete selection_length; - delete selection_end; - delete selection_start; - - delete punch_start; - delete punch_end; + delete selection_length; + delete selection_end; + delete selection_start; + + delete punch_start; + delete punch_end; } void @@ -193,7 +172,7 @@ TimeInfoBox::region_property_change (boost::shared_ptr /* r */, * RegionView (not Region itself). */ - selection_changed (); + //selection_changed (); } bool @@ -228,6 +207,9 @@ TimeInfoBox::sync_selection_mode (AudioClock* src) void TimeInfoBox::sync_punch_mode (AudioClock* src) { + if (!with_punch_clock) { + return; + } if (!syncing_punch) { syncing_punch = true; punch_start->set_mode (src->mode()); @@ -235,7 +217,7 @@ TimeInfoBox::sync_punch_mode (AudioClock* src) syncing_punch = false; } } - + void TimeInfoBox::set_session (Session* s) @@ -246,20 +228,24 @@ TimeInfoBox::set_session (Session* s) selection_end->set_session (s); selection_length->set_session (s); + if (!with_punch_clock) { + return; + } + punch_start->set_session (s); punch_end->set_session (s); if (s) { Location* punch = s->locations()->auto_punch_location (); - + if (punch) { watch_punch (punch); } - + punch_changed (punch); - _session->auto_punch_location_changed.connect (_session_connections, MISSING_INVALIDATOR, - boost::bind (&TimeInfoBox::punch_location_changed, this, _1), gui_context()); + _session->auto_punch_location_changed.connect (_session_connections, MISSING_INVALIDATOR, + boost::bind (&TimeInfoBox::punch_location_changed, this, _1), gui_context()); } } @@ -329,7 +315,7 @@ TimeInfoBox::selection_changed () Glib::RefPtr act = ActionManager::get_action ("MouseMode", "set-mouse-mode-object-range"); Glib::RefPtr tact = Glib::RefPtr::cast_dynamic (act); - if (tact && tact->get_active() && !selection.regions.empty()) { + if (tact && tact->get_active() && !selection.regions.empty()) { /* show selected regions */ s = selection.regions.start(); e = selection.regions.end_frame(); @@ -357,7 +343,7 @@ TimeInfoBox::selection_changed () default: selection_start->set_off (true); selection_end->set_off (true); - selection_length->set_off (true); + selection_length->set_off (true); break; } } @@ -365,14 +351,15 @@ TimeInfoBox::selection_changed () void TimeInfoBox::punch_location_changed (Location* loc) { - if (loc) { + if (loc && with_punch_clock) { watch_punch (loc); - } + } } void TimeInfoBox::watch_punch (Location* punch) { + assert (with_punch_clock); punch_connections.drop_connections (); punch->start_changed.connect (punch_connections, MISSING_INVALIDATOR, boost::bind (&TimeInfoBox::punch_changed, this, _1), gui_context()); @@ -384,6 +371,7 @@ TimeInfoBox::watch_punch (Location* punch) void TimeInfoBox::punch_changed (Location* loc) { + assert (with_punch_clock); if (!loc) { punch_start->set_off (true); punch_end->set_off (true); @@ -395,5 +383,4 @@ TimeInfoBox::punch_changed (Location* loc) punch_start->set (loc->start()); punch_end->set (loc->end()); -} - +}