meterbridge: don't include disk/input buttons on busses; fixes #5935

[ardour.git] / gtk2_ardour / editor_ops.cc

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index c0d26b7b14748437163a24552aeaf1a45126e393..08d6297faae3162c388f7a76b9cf411307d224b1 100644 (file)
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -512,6 +512,60 @@ Editor::nudge_backward_capture_offset ()
        commit_reversible_command ();
 }
 
+struct RegionSelectionPositionSorter {
+        bool operator() (RegionView* a, RegionView* b) {
+                return a->region()->position() < b->region()->position();
+        }
+};
+
+void
+Editor::sequence_regions ()
+{
+       framepos_t r_end;
+       framepos_t r_end_prev;
+
+       int iCount=0;
+
+       if (!_session) {
+               return;
+       }
+
+       RegionSelection rs = get_regions_from_selection_and_entered ();
+       rs.sort(RegionSelectionPositionSorter());
+
+       if (!rs.empty()) {
+
+               begin_reversible_command (_("sequence regions"));
+               for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) {
+                       boost::shared_ptr<Region> r ((*i)->region());
+
+                       r->clear_changes();
+
+                       if(r->locked())
+                       {
+                               continue;
+                       }
+                       if(r->position_locked())
+                       {
+                               continue;
+                       }
+                       if(iCount>0)
+                       {
+                               r_end_prev=r_end;
+                               r->set_position(r_end_prev);
+                       }
+
+                       _session->add_command (new StatefulDiffCommand (r));
+
+                       r_end=r->position() + r->length();
+
+                       iCount++;
+               }
+               commit_reversible_command ();
+       } 
+} 
+
+
 /* DISPLAY MOTION */
 
 void
@@ -1276,6 +1330,69 @@ Editor::scroll_tracks_up_line ()
        reset_y_origin (vertical_adjustment.get_value() - 60);
 }
 
+bool
+Editor::scroll_down_one_track ()
+{
+       double vertical_pos = vertical_adjustment.get_value () + vertical_adjustment.get_page_size() - 1.0; 
+
+       TrackViewList::reverse_iterator next = track_views.rend();
+       std::pair<TimeAxisView*,double> res;
+
+       for (TrackViewList::reverse_iterator t = track_views.rbegin(); t != track_views.rend(); ++t) {
+               if ((*t)->hidden()) {
+                       continue;
+               }
+               
+               res = (*t)->covers_y_position (vertical_pos);
+
+               if (res.first) {
+                       break;
+               }
+
+               next = t;
+       }
+
+       /* move to the track below the first one that covers the */
+       
+       if (next != track_views.rend()) {
+               ensure_track_visible (*next);
+               return true;
+       }
+
+       return false;
+}      
+
+bool
+Editor::scroll_up_one_track ()
+{
+       double vertical_pos = vertical_adjustment.get_value ();
+
+       TrackViewList::iterator prev = track_views.end();
+       std::pair<TimeAxisView*,double> res;
+
+       for (TrackViewList::iterator t = track_views.begin(); t != track_views.end(); ++t) {
+
+               if ((*t)->hidden()) {
+                       continue;
+               }
+
+               res = (*t)->covers_y_position(vertical_pos);
+               
+               if (res.first) {
+                       break;
+               }
+
+               prev = t;
+       }
+       
+       if (prev != track_views.end()) {
+               ensure_track_visible (*prev);
+               return true;
+       }
+
+       return false;
+}
+
 /* ZOOM */
 
 void
@@ -4755,12 +4872,17 @@ Editor::fork_region ()
                MidiRegionView* const mrv = dynamic_cast<MidiRegionView*>(*r);
 
                if (mrv) {
-                       boost::shared_ptr<Playlist> playlist = mrv->region()->playlist();
-                       boost::shared_ptr<MidiRegion> newregion = mrv->midi_region()->clone ();
-
-                       playlist->clear_changes ();
-                       playlist->replace_region (mrv->region(), newregion, mrv->region()->position());
-                       _session->add_command(new StatefulDiffCommand (playlist));
+                       try {
+                               boost::shared_ptr<Playlist> playlist = mrv->region()->playlist();
+                               boost::shared_ptr<MidiSource> new_source = _session->create_midi_source_by_stealing_name (mrv->midi_view()->track());
+                               boost::shared_ptr<MidiRegion> newregion = mrv->midi_region()->clone (new_source);
+                               
+                               playlist->clear_changes ();
+                               playlist->replace_region (mrv->region(), newregion, mrv->region()->position());
+                               _session->add_command(new StatefulDiffCommand (playlist));
+                       } catch (...) {
+                               error << string_compose (_("Could not unlink %1"), mrv->region()->name()) << endmsg;
+                       }
                }
 
                r = tmp;
@@ -6432,12 +6554,13 @@ Editor::remove_tracks ()
 
        for (TrackSelection::iterator x = ts.begin(); x != ts.end(); ++x) {
                RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (*x);
-               if (rtv) {
-                       if (rtv->is_track()) {
-                               ntracks++;
-                       } else {
-                               nbusses++;
-                       }
+               if (!rtv) {
+                       continue;
+               }
+               if (rtv->is_track()) {
+                       ntracks++;
+               } else {
+                       nbusses++;
                }
                routes.push_back (rtv->_route);