add canvas-based Meter object

[ardour.git] / gtk2_ardour / editor.cc

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index fe274248449048e569642a1e791df411f4a8c1df..ccb839ccc18a7cc8ef3555d52562454b73d7d4c0 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -139,7 +139,7 @@
 #include "vca_time_axis.h"
 #include "verbose_cursor.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -572,7 +572,7 @@ Editor::Editor ()
 
        initialize_canvas ();
 
-       CairoWidget::set_focus_handler (sigc::mem_fun (*this, &Editor::reset_focus));
+       CairoWidget::set_focus_handler (sigc::mem_fun (ARDOUR_UI::instance(), &ARDOUR_UI::reset_focus));
 
        _summary = new EditorSummary (this);
 
@@ -805,9 +805,11 @@ Editor::Editor ()
        ControlProtocol::VerticalZoomInSelected.connect (*this, invalidator (*this), boost::bind (&Editor::control_vertical_zoom_in_selected, this), gui_context());
        ControlProtocol::VerticalZoomOutSelected.connect (*this, invalidator (*this), boost::bind (&Editor::control_vertical_zoom_out_selected, this), gui_context());
 
-       ControlProtocol::AddStripableSelection.connect (*this, invalidator (*this), boost::bind (&Editor::control_select, this, _1, Selection::Add), gui_context());
-       ControlProtocol::ToggleStripableSelection.connect (*this, invalidator (*this), boost::bind (&Editor::control_select, this, _1, Selection::Toggle), gui_context());
+       ControlProtocol::AddStripableToSelection.connect (*this, invalidator (*this), boost::bind (&Editor::control_select, this, _1, Selection::Add), gui_context());
+       ControlProtocol::RemoveStripableFromSelection.connect (*this, invalidator (*this), boost::bind (&Editor::control_select, this, _1, Selection::Toggle), gui_context());
        ControlProtocol::SetStripableSelection.connect (*this, invalidator (*this), boost::bind (&Editor::control_select, this, _1, Selection::Set), gui_context());
+       ControlProtocol::ToggleStripableSelection.connect (*this, invalidator (*this), boost::bind (&Editor::control_select, this, _1, Selection::Toggle), gui_context());
+       ControlProtocol::ClearStripableSelection.connect (*this, invalidator (*this), boost::bind (&Editor::control_unselect, this), gui_context());
 
        BasicUI::AccessAction.connect (*this, invalidator (*this), boost::bind (&Editor::access_action, this, _1, _2), gui_context());
 
@@ -859,12 +861,13 @@ Editor::Editor ()
 
 Editor::~Editor()
 {
-        delete button_bindings;
+       delete button_bindings;
        delete _routes;
        delete _route_groups;
        delete _track_canvas_viewport;
        delete _drags;
        delete nudge_clock;
+       delete _verbose_cursor;
        delete quantize_dialog;
        delete _summary;
        delete _group_tabs;
@@ -1011,27 +1014,9 @@ Editor::control_unselect ()
 }
 
 void
-Editor::control_select (PresentationInfo::order_t order, Selection::Operation op)
+Editor::control_select (boost::shared_ptr<Stripable> s, Selection::Operation op)
 {
-       /* handles the (static) signal from the ControlProtocol class that
-        * requests setting the selected track to a given RID
-        */
-
-       if (!_session) {
-               return;
-       }
-
-       boost::shared_ptr<Stripable> s = _session->get_remote_nth_stripable (order, PresentationInfo::AllStripables);
-
-       /* selected object may not be a Route */
-
-       boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (s);
-
-       if (!r) {
-               return;
-       }
-
-       TimeAxisView* tav = axis_view_from_route (r);
+       TimeAxisView* tav = axis_view_from_stripable (s);
 
        if (tav) {
                switch (op) {
@@ -1197,7 +1182,7 @@ Editor::generic_event_handler (GdkEvent* ev)
                        /* leaving window, so reset focus, thus ending any and
                           all text entry operations.
                        */
-                       reset_focus (&contents());
+                       ARDOUR_UI::instance()->reset_focus (&contents());
                        break;
                }
                break;
@@ -2849,55 +2834,55 @@ Editor::snap_to_internal (framepos_t& start, RoundMode direction, bool for_mark,
                break;
 
        case SnapToBeatDiv128:
-               start = _session->tempo_map().round_to_beat_subdivision (start, 128, direction);
+               start = _session->tempo_map().round_to_quarter_note_subdivision (start, 128, direction);
                break;
        case SnapToBeatDiv64:
-               start = _session->tempo_map().round_to_beat_subdivision (start, 64, direction);
+               start = _session->tempo_map().round_to_quarter_note_subdivision (start, 64, direction);
                break;
        case SnapToBeatDiv32:
-               start = _session->tempo_map().round_to_beat_subdivision (start, 32, direction);
+               start = _session->tempo_map().round_to_quarter_note_subdivision (start, 32, direction);
                break;
        case SnapToBeatDiv28:
-               start = _session->tempo_map().round_to_beat_subdivision (start, 28, direction);
+               start = _session->tempo_map().round_to_quarter_note_subdivision (start, 28, direction);
                break;
        case SnapToBeatDiv24:
-               start = _session->tempo_map().round_to_beat_subdivision (start, 24, direction);
+               start = _session->tempo_map().round_to_quarter_note_subdivision (start, 24, direction);
                break;
        case SnapToBeatDiv20:
-               start = _session->tempo_map().round_to_beat_subdivision (start, 20, direction);
+               start = _session->tempo_map().round_to_quarter_note_subdivision (start, 20, direction);
                break;
        case SnapToBeatDiv16:
-               start = _session->tempo_map().round_to_beat_subdivision (start, 16, direction);
+               start = _session->tempo_map().round_to_quarter_note_subdivision (start, 16, direction);
                break;
        case SnapToBeatDiv14:
-               start = _session->tempo_map().round_to_beat_subdivision (start, 14, direction);
+               start = _session->tempo_map().round_to_quarter_note_subdivision (start, 14, direction);
                break;
        case SnapToBeatDiv12:
-               start = _session->tempo_map().round_to_beat_subdivision (start, 12, direction);
+               start = _session->tempo_map().round_to_quarter_note_subdivision (start, 12, direction);
                break;
        case SnapToBeatDiv10:
-               start = _session->tempo_map().round_to_beat_subdivision (start, 10, direction);
+               start = _session->tempo_map().round_to_quarter_note_subdivision (start, 10, direction);
                break;
        case SnapToBeatDiv8:
-               start = _session->tempo_map().round_to_beat_subdivision (start, 8, direction);
+               start = _session->tempo_map().round_to_quarter_note_subdivision (start, 8, direction);
                break;
        case SnapToBeatDiv7:
-               start = _session->tempo_map().round_to_beat_subdivision (start, 7, direction);
+               start = _session->tempo_map().round_to_quarter_note_subdivision (start, 7, direction);
                break;
        case SnapToBeatDiv6:
-               start = _session->tempo_map().round_to_beat_subdivision (start, 6, direction);
+               start = _session->tempo_map().round_to_quarter_note_subdivision (start, 6, direction);
                break;
        case SnapToBeatDiv5:
-               start = _session->tempo_map().round_to_beat_subdivision (start, 5, direction);
+               start = _session->tempo_map().round_to_quarter_note_subdivision (start, 5, direction);
                break;
        case SnapToBeatDiv4:
-               start = _session->tempo_map().round_to_beat_subdivision (start, 4, direction);
+               start = _session->tempo_map().round_to_quarter_note_subdivision (start, 4, direction);
                break;
        case SnapToBeatDiv3:
-               start = _session->tempo_map().round_to_beat_subdivision (start, 3, direction);
+               start = _session->tempo_map().round_to_quarter_note_subdivision (start, 3, direction);
                break;
        case SnapToBeatDiv2:
-               start = _session->tempo_map().round_to_beat_subdivision (start, 2, direction);
+               start = _session->tempo_map().round_to_quarter_note_subdivision (start, 2, direction);
                break;
 
        case SnapToMark:
@@ -4101,10 +4086,11 @@ Editor::get_grid_type_as_beats (bool& success, framepos_t position)
 
        switch (_snap_type) {
        case SnapToBeat:
-               return Evoral::Beats(1.0);
+               return Evoral::Beats(4.0 / _session->tempo_map().meter_at_frame (position).note_divisor());
        case SnapToBar:
                if (_session) {
-                       return Evoral::Beats(_session->tempo_map().meter_at_frame (position).divisions_per_bar());
+                       const Meter& m = _session->tempo_map().meter_at_frame (position);
+                       return Evoral::Beats((4.0 * m.divisions_per_bar()) / m.note_divisor());
                }
                break;
        default:
@@ -4410,7 +4396,7 @@ Editor::current_visual_state (bool with_tracks)
        vs->zoom_focus = zoom_focus;
 
        if (with_tracks) {
-               *vs->gui_state = *ARDOUR_UI::instance()->gui_object_state;
+               vs->gui_state->set_state (ARDOUR_UI::instance()->gui_object_state->get_state());
        }
 
        return vs;
@@ -4475,7 +4461,7 @@ Editor::use_visual_state (VisualState& vs)
        reposition_and_zoom (vs.leftmost_frame, vs.samples_per_pixel);
 
        if (vs.gui_state) {
-               *ARDOUR_UI::instance()->gui_object_state = *vs.gui_state;
+               ARDOUR_UI::instance()->gui_object_state->set_state (vs.gui_state->get_state());
 
                for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
                        (*i)->clear_property_cache();
@@ -5046,7 +5032,7 @@ Editor::first_idle ()
                        true
                        );
                dialog->present ();
-               ARDOUR_UI::instance()->flush_pending ();
+               ARDOUR_UI::instance()->flush_pending (60);
        }
 
        for (TrackViewList::iterator t = track_views.begin(); t != track_views.end(); ++t) {
@@ -5182,16 +5168,13 @@ Editor::region_view_removed ()
        _summary->set_background_dirty ();
 }
 
-RouteTimeAxisView*
-Editor::axis_view_from_route (boost::shared_ptr<Route> r) const
+TimeAxisView*
+Editor::axis_view_from_stripable (boost::shared_ptr<Stripable> s) const
 {
-       TrackViewList::const_iterator j = track_views.begin ();
-       while (j != track_views.end()) {
-               RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (*j);
-               if (rtv && rtv->route() == r) {
-                       return rtv;
+       for (TrackViewList::const_iterator j = track_views.begin (); j != track_views.end(); ++j) {
+               if ((*j)->stripable() == s) {
+                       return *j;
                }
-               ++j;
        }
 
        return 0;
@@ -5204,7 +5187,7 @@ Editor::axis_views_from_routes (boost::shared_ptr<RouteList> r) const
        TrackViewList t;
 
        for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) {
-               TimeAxisView* tv = axis_view_from_route (*i);
+               TimeAxisView* tv = axis_view_from_stripable (*i);
                if (tv) {
                        t.push_back (tv);
                }