Fix uninitialized variable

[ardour.git] / gtk2_ardour / editor_canvas.cc

diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index a60d3eab9ced61220b320ea8b5b0981b6b841491..2e92a374804a99ad06e6624d7296ac38b29f0d3a 100644 (file)
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -306,7 +306,7 @@ Editor::track_canvas_viewport_size_allocated ()
        }
 
        update_fixed_rulers();
-       redisplay_tempo (false);
+       redisplay_grid (false);
        _summary->set_overlays_dirty ();
 }
 
@@ -373,6 +373,9 @@ Editor::track_canvas_drag_data_received (const RefPtr<Gdk::DragContext>& context
                                         const SelectionData& data,
                                         guint info, guint time)
 {
+       if (!ARDOUR_UI_UTILS::engine_is_running ()) {
+               return;
+       }
        if (data.get_target() == "regions") {
                drop_regions (context, x, y, data, info, time);
        } else {
@@ -584,24 +587,25 @@ Editor::autoscroll_active () const
 }
 
 std::pair <samplepos_t,samplepos_t>
-Editor::session_gui_extents ( bool use_extra ) const
+Editor::session_gui_extents (bool use_extra) const
 {
        if (!_session) {
                return std::pair <samplepos_t,samplepos_t>(max_samplepos,0);
        }
-       
+
        samplecnt_t session_extent_start = _session->current_start_sample();
        samplecnt_t session_extent_end = _session->current_end_sample();
 
-       //calculate the extents of all regions in every playlist
-       //NOTE:  we should listen to playlists, and cache these values so we don't calculate them every time.
+       /* calculate the extents of all regions in every playlist
+        * NOTE: we should listen to playlists, and cache these values so we don't calculate them every time.
+        */
        {
                boost::shared_ptr<RouteList> rl = _session->get_routes();
                for (RouteList::iterator r = rl->begin(); r != rl->end(); ++r) {
                        boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*r);
                        if (tr) {
                                boost::shared_ptr<Playlist> pl = tr->playlist();
-                               if ( pl && !pl->all_regions_empty() ) {
+                               if (pl && !pl->all_regions_empty()) {
                                        pair<samplepos_t, samplepos_t> e;
                                        e = pl->get_extent();
                                        if (e.first < session_extent_start) {
@@ -615,23 +619,23 @@ Editor::session_gui_extents ( bool use_extra ) const
                }
        }
 
-       //ToDo: also incorporate automation regions (in case the session has no audio/midi but is just used for automating plugins or the like)
+       /* ToDo: also incorporate automation regions (in case the session has no audio/midi but is just used for automating plugins or the like) */
 
-       //add additional time to the ui extents ( user-defined in config )
+       /* add additional time to the ui extents (user-defined in config) */
        if (use_extra) {
                samplecnt_t const extra = UIConfiguration::instance().get_extra_ui_extents_time() * 60 * _session->nominal_sample_rate();
                session_extent_end += extra;
                session_extent_start -= extra;
        }
-                       
-       //range-check
+
+       /* range-check */
        if (session_extent_end > max_samplepos) {
                session_extent_end = max_samplepos;
        }
        if (session_extent_start < 0) {
                session_extent_start = 0;
        }
-       
+
        std::pair <samplepos_t,samplepos_t> ret (session_extent_start, session_extent_end);
        return ret;
 }
@@ -667,7 +671,7 @@ Editor::autoscroll_canvas ()
                        dx += 10 + (2 * (autoscroll_cnt/2));
 
                        dx = pixel_to_sample (dx);
-                       
+
                        dx *= UIConfiguration::instance().get_draggable_playhead_speed();
 
                        if (_leftmost_sample < max_samplepos - dx) {
@@ -1044,7 +1048,7 @@ Editor::color_handler()
        _track_canvas->queue_draw ();
 
 /*
-       redisplay_tempo (true);
+       redisplay_grid (true);
 
        if (_session)
              _session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); // redraw metric markers
@@ -1148,26 +1152,6 @@ Editor::pop_canvas_cursor ()
        }
 }
 
-Gdk::Cursor*
-Editor::which_grabber_cursor () const
-{
-       Gdk::Cursor* c = _cursors->grabber;
-
-       switch (_edit_point) {
-       case EditAtMouse:
-               c = _cursors->grabber_edit_point;
-               break;
-       default:
-               boost::shared_ptr<Movable> m = _movable.lock();
-               if (m && m->locked()) {
-                       c = _cursors->speaker;
-               }
-               break;
-       }
-
-       return c;
-}
-
 Gdk::Cursor*
 Editor::which_trim_cursor (bool left) const
 {
@@ -1267,7 +1251,7 @@ Editor::which_track_cursor () const
        switch (_join_object_range_state) {
        case JOIN_OBJECT_RANGE_NONE:
        case JOIN_OBJECT_RANGE_OBJECT:
-               cursor = which_grabber_cursor ();
+               cursor = _cursors->grabber;
                break;
        case JOIN_OBJECT_RANGE_RANGE:
                cursor = _cursors->selector;
@@ -1314,14 +1298,7 @@ Editor::which_canvas_cursor(ItemType type) const
                        cursor = which_track_cursor ();
                        break;
                case PlayheadCursorItem:
-                       switch (_edit_point) {
-                       case EditAtMouse:
-                               cursor = _cursors->grabber_edit_point;
-                               break;
-                       default:
-                               cursor = _cursors->grabber;
-                               break;
-                       }
+                       cursor = _cursors->grabber;
                        break;
                case SelectionItem:
                        cursor = _cursors->selector;
@@ -1363,13 +1340,13 @@ Editor::which_canvas_cursor(ItemType type) const
                        cursor = _cursors->cross_hair;
                        break;
                case LeftFrameHandle:
-                       if ( effective_mouse_mode() == MouseObject )  // (smart mode): if the user is in the btm half, show the trim cursor
+                       if (effective_mouse_mode() == MouseObject) // (smart mode): if the user is in the btm half, show the trim cursor
                                cursor = which_trim_cursor (true);
                        else
-                               cursor = _cursors->selector;  // (smart mode): in the top half, just show the selection (range) cursor
+                               cursor = _cursors->selector; // (smart mode): in the top half, just show the selection (range) cursor
                        break;
                case RightFrameHandle:
-                       if ( effective_mouse_mode() == MouseObject )  //see above
+                       if (effective_mouse_mode() == MouseObject) // see above
                                cursor = which_trim_cursor (false);
                        else
                                cursor = _cursors->selector;
@@ -1431,7 +1408,7 @@ Editor::which_canvas_cursor(ItemType type) const
        case VideoBarItem:
        case TransportMarkerBarItem:
        case DropZoneItem:
-               cursor = which_grabber_cursor();
+               cursor = _cursors->grabber;
                break;
 
        default: