X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_info_box.cc;h=d0d6871cbb0c07a3626e035b12e3e9b4f986c89e;hb=29b80725559c8fd60ae51bf33270963e647d0c1c;hp=cde7e97e51cce92c69c7857a99e557e612dd535e;hpb=b25fbc8a956528a7c648eb3960782aa31cc2a36e;p=ardour.git diff --git a/gtk2_ardour/time_info_box.cc b/gtk2_ardour/time_info_box.cc index cde7e97e51..d0d6871cbb 100644 --- a/gtk2_ardour/time_info_box.cc +++ b/gtk2_ardour/time_info_box.cc @@ -27,13 +27,16 @@ #include "gtkmm2ext/actions.h" #include "ardour/location.h" +#include "ardour/profile.h" #include "ardour/session.h" #include "time_info_box.h" #include "audio_clock.h" #include "editor.h" +#include "control_point.h" +#include "automation_line.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace Gtk; using namespace ARDOUR; @@ -46,6 +49,8 @@ TimeInfoBox::TimeInfoBox () , syncing_selection (false) , syncing_punch (false) { + set_name (X_("TimeInfoBox")); + selection_start = new AudioClock ("selection-start", false, "selection", false, false, false, false); selection_end = new AudioClock ("selection-end", false, "selection", false, false, false, false); selection_length = new AudioClock ("selection-length", false, "selection", false, false, true, false); @@ -53,21 +58,17 @@ TimeInfoBox::TimeInfoBox () 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 (6); + set_spacing (0); set_border_width (2); pack_start (left, true, true); - pack_start (right, true, true); + if (!ARDOUR::Profile->get_trx()) { + pack_start (right, true, true); + } left.set_homogeneous (false); left.set_spacings (0); @@ -82,7 +83,7 @@ TimeInfoBox::TimeInfoBox () Gtk::Label* l; selection_title.set_name ("TimeInfoSelectionTitle"); - left.attach (selection_title, 0, 2, 0, 1); + left.attach (selection_title, 1, 2, 0, 1); l = manage (new Label); l->set_text (_("Start")); l->set_alignment (1.0, 0.5); @@ -118,7 +119,7 @@ TimeInfoBox::TimeInfoBox () Gtkmm2ext::UI::instance()->set_tip (punch_out_button, _("Stop recording at auto-punch end")); punch_title.set_name ("TimeInfoSelectionTitle"); - right.attach (punch_title, 2, 4, 0, 1); + 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); @@ -142,7 +143,8 @@ TimeInfoBox::TimeInfoBox () 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)); - Editor::instance().MouseModeChanged.connect (editor_connections, invalidator(*this), ui_bind (&TimeInfoBox::track_mouse_mode, this), gui_context()); + Region::RegionPropertyChanged.connect (region_property_connections, invalidator (*this), boost::bind (&TimeInfoBox::region_property_change, this, _1, _2), gui_context()); + Editor::instance().MouseModeChanged.connect (editor_connections, invalidator(*this), boost::bind (&TimeInfoBox::track_mouse_mode, this), gui_context()); } TimeInfoBox::~TimeInfoBox () @@ -150,7 +152,7 @@ TimeInfoBox::~TimeInfoBox () delete selection_length; delete selection_end; delete selection_start; - + delete punch_start; delete punch_end; } @@ -161,6 +163,33 @@ TimeInfoBox::track_mouse_mode () selection_changed (); } +void +TimeInfoBox::region_property_change (boost::shared_ptr /* r */, const PBD::PropertyChange& what_changed) +{ + Selection& selection (Editor::instance().get_selection()); + + if (selection.regions.empty()) { + return; + } + + PBD::PropertyChange our_interests; + + our_interests.add (ARDOUR::Properties::position); + our_interests.add (ARDOUR::Properties::length); + our_interests.add (ARDOUR::Properties::start); + + if (!what_changed.contains (our_interests)) { + return; + } + + /* TODO: check if RegionSelection includes the given region. + * This is not straight foward because RegionSelection is done by + * RegionView (not Region itself). + */ + + //selection_changed (); +} + bool TimeInfoBox::clock_button_release_event (GdkEventButton* ev, AudioClock* src) { @@ -169,7 +198,9 @@ TimeInfoBox::clock_button_release_event (GdkEventButton* ev, AudioClock* src) } if (ev->button == 1) { - _session->request_locate (src->current_time ()); + if (!src->off()) { + _session->request_locate (src->current_time ()); + } return true; } @@ -198,7 +229,7 @@ TimeInfoBox::sync_punch_mode (AudioClock* src) syncing_punch = false; } } - + void TimeInfoBox::set_session (Session* s) @@ -214,14 +245,14 @@ TimeInfoBox::set_session (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, + _session->auto_punch_location_changed.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&TimeInfoBox::punch_location_changed, this, _1), gui_context()); } } @@ -234,37 +265,40 @@ TimeInfoBox::selection_changed () switch (Editor::instance().current_mouse_mode()) { + case Editing::MouseContent: + /* displaying MIDI note selection is tricky */ + selection_start->set_off (true); + selection_end->set_off (true); + selection_length->set_off (true); + break; + case Editing::MouseObject: - if (Editor::instance().internal_editing()) { - /* displaying MIDI note selection is tricky */ - - selection_start->set_off (true); - selection_end->set_off (true); - selection_length->set_off (true); + if (selection.regions.empty()) { + if (selection.points.empty()) { + Glib::RefPtr act = ActionManager::get_action ("MouseMode", "set-mouse-mode-object-range"); + Glib::RefPtr tact = Glib::RefPtr::cast_dynamic (act); - } else { - if (selection.regions.empty()) { - if (selection.points.empty()) { - selection_start->set_off (true); - selection_end->set_off (true); - selection_length->set_off (true); - } else { - s = max_framepos; - e = 0; - for (PointSelection::iterator i = selection.points.begin(); i != selection.points.end(); ++i) { - s = min (s, (framepos_t) i->start); - e = max (e, (framepos_t) i->end); - } + if (tact && tact->get_active() && !selection.time.empty()) { + /* show selected range */ selection_start->set_off (false); selection_end->set_off (false); selection_length->set_off (false); - selection_start->set (s); - selection_end->set (e); - selection_length->set (e - s + 1); + selection_start->set (selection.time.start()); + selection_end->set (selection.time.end_frame()); + selection_length->set (selection.time.length()); + } else { + selection_start->set_off (true); + selection_end->set_off (true); + selection_length->set_off (true); } } else { - s = selection.regions.start(); - e = selection.regions.end_frame(); + s = max_framepos; + e = 0; + for (PointSelection::iterator i = selection.points.begin(); i != selection.points.end(); ++i) { + framepos_t const p = (*i)->line().session_position ((*i)->model ()); + s = min (s, p); + e = max (e, p); + } selection_start->set_off (false); selection_end->set_off (false); selection_length->set_off (false); @@ -272,14 +306,38 @@ TimeInfoBox::selection_changed () selection_end->set (e); selection_length->set (e - s + 1); } + } else { + s = selection.regions.start(); + e = selection.regions.end_frame(); + selection_start->set_off (false); + selection_end->set_off (false); + selection_length->set_off (false); + selection_start->set (s); + selection_end->set (e); + selection_length->set (e - s + 1); } break; case Editing::MouseRange: if (selection.time.empty()) { - selection_start->set_off (true); - selection_end->set_off (true); - selection_length->set_off (true); + 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()) { + /* show selected regions */ + s = selection.regions.start(); + e = selection.regions.end_frame(); + selection_start->set_off (false); + selection_end->set_off (false); + selection_length->set_off (false); + selection_start->set (s); + selection_end->set (e); + selection_length->set (e - s + 1); + } else { + selection_start->set_off (true); + selection_end->set_off (true); + selection_length->set_off (true); + } } else { selection_start->set_off (false); selection_end->set_off (false); @@ -293,7 +351,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; } } @@ -303,7 +361,7 @@ TimeInfoBox::punch_location_changed (Location* loc) { if (loc) { watch_punch (loc); - } + } } void @@ -331,33 +389,5 @@ TimeInfoBox::punch_changed (Location* loc) punch_start->set (loc->start()); punch_end->set (loc->end()); -} - -bool -TimeInfoBox::on_expose_event (GdkEventExpose* ev) -{ - { - int x, y; - Gtk::Widget* window_parent; - Glib::RefPtr win = Gtkmm2ext::window_to_draw_on (*this, &window_parent); - - if (win) { - - Cairo::RefPtr context = win->create_cairo_context(); - -#if 0 - translate_coordinates (*window_parent, ev->area.x, ev->area.y, x, y); - context->rectangle (x, y, ev->area.width, ev->area.height); - context->clip (); -#endif - translate_coordinates (*window_parent, 0, 0, x, y); - context->set_source_rgba (0.149, 0.149, 0.149, 1.0); - Gtkmm2ext::rounded_rectangle (context, x, y, get_allocation().get_width(), get_allocation().get_height(), 9); - context->fill (); - } - } - - HBox::on_expose_event (ev); - - return false; } +