working but still confusing fix for ensuring that playlist shared-with data is correc...

[ardour.git] / gtk2_ardour / route_time_axis.cc

diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 47f74489e1fae3c28c9c7756a9a48bda7ec99130..4d74f0cc7fb04af77746d1ffec1938a86c1a5e85 100644 (file)
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -109,8 +109,6 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, ArdourCan
        , plugins_submenu_item (0)
        , route_group_menu (0)
        , playlist_action_menu (0)
-       , mode_menu (0)
-       , color_mode_menu (0)
        , gm (sess, true, 75, 14)
        , _ignore_set_layer_display (false)
        , pan_automation_item(NULL)
@@ -339,7 +337,7 @@ RouteTimeAxisView::~RouteTimeAxisView ()
        }
 
        delete playlist_action_menu;
-       playlist_action_menu = 0;
+       delete automation_action_menu;
 
        delete _view;
        _view = 0;
@@ -788,6 +786,7 @@ RouteTimeAxisView::build_display_menu ()
 
                } else {
                        /* show nothing */
+                       delete alignment_menu;
                }
 
                items.push_back (SeparatorElem());
@@ -867,7 +866,7 @@ RouteTimeAxisView::build_display_menu ()
 }
 
 void
-RouteTimeAxisView::show_timestretch (framepos_t start, framepos_t end, int layers, int layer)
+RouteTimeAxisView::show_timestretch (samplepos_t start, samplepos_t end, int layers, int layer)
 {
        TimeAxisView::show_timestretch (start, end, layers, layer);
 
@@ -1022,17 +1021,11 @@ RouteTimeAxisView::route_color_changed ()
 void
 RouteTimeAxisView::set_samples_per_pixel (double fpp)
 {
-       double speed = 1.0;
-
-       if (track()) {
-               speed = track()->speed();
-       }
-
        if (_view) {
-               _view->set_samples_per_pixel (fpp * speed);
+               _view->set_samples_per_pixel (fpp);
        }
 
-       StripableTimeAxisView::set_samples_per_pixel (fpp * speed);
+       StripableTimeAxisView::set_samples_per_pixel (fpp);
 }
 
 void
@@ -1082,7 +1075,7 @@ RouteTimeAxisView::rename_current_playlist ()
                }
                prompter.get_result (name);
                if (name.length()) {
-                       if (_session->playlists->by_name (name)) {
+                       if (_session->playlists()->by_name (name)) {
                                MessageDialog msg (_("Given playlist name is not unique."));
                                msg.run ();
                                prompter.set_initial_text (Playlist::bump_name (name, *_session));
@@ -1150,7 +1143,7 @@ RouteTimeAxisView::use_new_playlist (bool prompt, vector<boost::shared_ptr<Playl
                name = resolve_new_group_playlist_name(name,playlists_before_op);
        }
 
-       while (_session->playlists->by_name(name)) {
+       while (_session->playlists()->by_name(name)) {
                name = Playlist::bump_name (name, *_session);
        }
 
@@ -1178,7 +1171,7 @@ RouteTimeAxisView::use_new_playlist (bool prompt, vector<boost::shared_ptr<Playl
                        }
                        prompter.get_result (name);
                        if (name.length()) {
-                               if (_session->playlists->by_name (name)) {
+                               if (_session->playlists()->by_name (name)) {
                                        MessageDialog msg (_("Given playlist name is not unique."));
                                        msg.run ();
                                        prompter.set_initial_text (Playlist::bump_name (name, *_session));
@@ -1193,7 +1186,7 @@ RouteTimeAxisView::use_new_playlist (bool prompt, vector<boost::shared_ptr<Playl
                if (copy) {
                        tr->use_copy_playlist ();
                } else {
-                       tr->use_new_playlist ();
+                       tr->use_default_new_playlist ();
                }
                tr->playlist()->set_name (name);
        }
@@ -1298,23 +1291,18 @@ RouteTimeAxisView::set_selected_regionviews (RegionSelection& regions)
  * @param results List to add things to.
  */
 void
-RouteTimeAxisView::get_selectables (framepos_t start, framepos_t end, double top, double bot, list<Selectable*>& results, bool within)
+RouteTimeAxisView::get_selectables (samplepos_t start, samplepos_t end, double top, double bot, list<Selectable*>& results, bool within)
 {
-       double speed = 1.0;
-
-       if (track() != 0) {
-               speed = track()->speed();
-       }
-
-       framepos_t const start_adjusted = session_frame_to_track_frame(start, speed);
-       framepos_t const end_adjusted   = session_frame_to_track_frame(end, speed);
-
        if ((_view && ((top < 0.0 && bot < 0.0))) || touched (top, bot)) {
-               _view->get_selectables (start_adjusted, end_adjusted, top, bot, results, within);
+               _view->get_selectables (start, end, top, bot, results, within);
        }
 
        /* pick up visible automation tracks */
-       StripableTimeAxisView::get_selectables (start_adjusted, end_adjusted, top, bot, results, within);
+       for (Children::iterator i = children.begin(); i != children.end(); ++i) {
+               if (!(*i)->hidden()) {
+                       (*i)->get_selectables (start, end, top, bot, results, within);
+               }
+       }
 }
 
 void
@@ -1371,7 +1359,7 @@ RouteTimeAxisView::name_entry_changed (string const& str)
 }
 
 boost::shared_ptr<Region>
-RouteTimeAxisView::find_next_region (framepos_t pos, RegionPoint point, int32_t dir)
+RouteTimeAxisView::find_next_region (samplepos_t pos, RegionPoint point, int32_t dir)
 {
        boost::shared_ptr<Playlist> pl = playlist ();
 
@@ -1382,8 +1370,8 @@ RouteTimeAxisView::find_next_region (framepos_t pos, RegionPoint point, int32_t
        return boost::shared_ptr<Region> ();
 }
 
-framepos_t
-RouteTimeAxisView::find_next_region_boundary (framepos_t pos, int32_t dir)
+samplepos_t
+RouteTimeAxisView::find_next_region_boundary (samplepos_t pos, int32_t dir)
 {
        boost::shared_ptr<Playlist> pl = playlist ();
 
@@ -1409,13 +1397,6 @@ RouteTimeAxisView::fade_range (TimeSelection& selection)
        playlist = tr->playlist();
 
        TimeSelection time (selection);
-       float const speed = tr->speed();
-       if (speed != 1.0f) {
-               for (TimeSelection::iterator i = time.begin(); i != time.end(); ++i) {
-                       (*i).start = session_frame_to_track_frame((*i).start, speed);
-                       (*i).end   = session_frame_to_track_frame((*i).end,   speed);
-               }
-       }
 
        playlist->clear_changes ();
        playlist->clear_owned_changes ();
@@ -1444,13 +1425,6 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
        playlist = tr->playlist();
 
        TimeSelection time (selection.time);
-       float const speed = tr->speed();
-       if (speed != 1.0f) {
-               for (TimeSelection::iterator i = time.begin(); i != time.end(); ++i) {
-                       (*i).start = session_frame_to_track_frame((*i).start, speed);
-                       (*i).end   = session_frame_to_track_frame((*i).end,   speed);
-               }
-       }
 
        playlist->clear_changes ();
        playlist->clear_owned_changes ();
@@ -1510,7 +1484,7 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
 }
 
 bool
-RouteTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteContext& ctx, const int32_t sub_num)
+RouteTimeAxisView::paste (samplepos_t pos, const Selection& selection, PasteContext& ctx, const int32_t sub_num)
 {
        if (!is_track()) {
                return false;
@@ -1527,21 +1501,16 @@ RouteTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteConte
 
        DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("paste to %1\n", pos));
 
-       if (track()->speed() != 1.0f) {
-               pos = session_frame_to_track_frame (pos, track()->speed());
-               DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("modified paste to %1\n", pos));
-       }
-
        /* add multi-paste offset if applicable */
-       std::pair<framepos_t, framepos_t> extent   = (*p)->get_extent();
-       const framecnt_t                  duration = extent.second - extent.first;
+       std::pair<samplepos_t, samplepos_t> extent   = (*p)->get_extent();
+       const samplecnt_t                  duration = extent.second - extent.first;
        pos += _editor.get_paste_offset(pos, ctx.count, duration);
 
        pl->clear_changes ();
        pl->clear_owned_changes ();
        if (Config->get_edit_mode() == Ripple) {
-               std::pair<framepos_t, framepos_t> extent = (*p)->get_extent_with_endspace();
-               framecnt_t amount = extent.second - extent.first;
+               std::pair<samplepos_t, samplepos_t> extent = (*p)->get_extent_with_endspace();
+               samplecnt_t amount = extent.second - extent.first;
                pl->ripple(pos, amount * ctx.times, boost::shared_ptr<Region>());
        }
        pl->paste (*p, pos, ctx.times, sub_num);
@@ -1582,7 +1551,7 @@ RouteTimeAxisView::build_playlist_menu ()
        RadioMenuItem::Group playlist_group;
        boost::shared_ptr<Track> tr = track ();
 
-       vector<boost::shared_ptr<Playlist> > playlists_tr = _session->playlists->playlists_for_track (tr);
+       vector<boost::shared_ptr<Playlist> > playlists_tr = _session->playlists()->playlists_for_track (tr);
 
        /* sort the playlists */
        PlaylistSorter cmp;
@@ -1677,10 +1646,10 @@ RouteTimeAxisView::use_playlist (RadioMenuItem *item, boost::weak_ptr<Playlist>
                                continue;
                        }
 
-                       boost::shared_ptr<Playlist> ipl = session()->playlists->by_name(playlist_name);
+                       boost::shared_ptr<Playlist> ipl = session()->playlists()->by_name(playlist_name);
                        if (!ipl) {
                                // No playlist for this track for this take yet, make it
-                               track->use_new_playlist();
+                               track->use_default_new_playlist();
                                track->playlist()->set_name(playlist_name);
                        } else {
                                track->use_playlist(track->data_type(), ipl);