center, don't expand plugin widgets

[ardour.git] / gtk2_ardour / automation_streamview.cc

diff --git a/gtk2_ardour/automation_streamview.cc b/gtk2_ardour/automation_streamview.cc
index 89ae7fa07980336203681efb56aaf1ed104599b1..7eaec7cae461709ba62694a9b0a7d39460bbab46 100644 (file)
--- a/gtk2_ardour/automation_streamview.cc
+++ b/gtk2_ardour/automation_streamview.cc
@@ -16,7 +16,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <cassert>
 #include <cmath>
 #include <list>
 #include <utility>
@@ -43,6 +42,8 @@
 #include "rgb_macros.h"
 #include "selection.h"
 
+#include "i18n.h"
+
 using namespace std;
 using namespace ARDOUR;
 using namespace ARDOUR_UI_UTILS;
@@ -71,12 +72,15 @@ AutomationStreamView::~AutomationStreamView ()
 RegionView*
 AutomationStreamView::add_region_view_internal (boost::shared_ptr<Region> region, bool wait_for_data, bool /*recording*/)
 {
-       assert (region);
+       if (!region) {
+               return 0;
+       }
 
        if (wait_for_data) {
                boost::shared_ptr<MidiRegion> mr = boost::dynamic_pointer_cast<MidiRegion>(region);
                if (mr) {
-                       mr->midi_source()->load_model();
+                       Source::Lock lock(mr->midi_source()->mutex());
+                       mr->midi_source()->load_model(lock);
                }
        }
 
@@ -87,7 +91,10 @@ AutomationStreamView::add_region_view_internal (boost::shared_ptr<Region> region
        boost::shared_ptr<AutomationList> list;
        if (control) {
                list = boost::dynamic_pointer_cast<AutomationList>(control->list());
-               assert(!control->list() || list);
+               if (control->list() && !list) {
+                       error << _("unable to display automation region for control without list") << endmsg;
+                       return 0;
+               }
        }
 
        AutomationRegionView *region_view;
@@ -277,15 +284,13 @@ AutomationStreamView::clear ()
  *  confusing.
  */
 void
-AutomationStreamView::get_selectables (framepos_t start, framepos_t end, double botfrac, double topfrac, list<Selectable*>& results)
+AutomationStreamView::get_selectables (framepos_t start, framepos_t end, double botfrac, double topfrac, list<Selectable*>& results, bool /*within*/)
 {
-       if (!_trackview.editor().internal_editing()) {
-               return;  // TODO: selection of automation regions
-       }
        for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
                AutomationRegionView* arv = dynamic_cast<AutomationRegionView*> (*i);
-               assert (arv);
-               arv->line()->get_selectables (start, end, botfrac, topfrac, results);
+               if (arv) {
+                       arv->line()->get_selectables (start, end, botfrac, topfrac, results);
+               }
        }
 }
 
@@ -306,20 +311,14 @@ AutomationStreamView::get_lines () const
 
        for (list<RegionView*>::const_iterator i = region_views.begin(); i != region_views.end(); ++i) {
                AutomationRegionView* arv = dynamic_cast<AutomationRegionView*> (*i);
-               assert (arv);
-               lines.push_back (arv->line());
+               if (arv) {
+                       lines.push_back (arv->line());
+               }
        }
 
        return lines;
 }
 
-struct RegionPositionSorter {
-       bool operator() (RegionView* a, RegionView* b) {
-               return a->region()->position() < b->region()->position();
-       }
-};
-
-
 bool
 AutomationStreamView::paste (framepos_t                                pos,
                              unsigned                                  paste_count,
@@ -332,7 +331,7 @@ AutomationStreamView::paste (framepos_t                                pos,
                return false;
        }
 
-       region_views.sort (RegionPositionSorter ());
+       region_views.sort (RegionView::PositionOrder());
 
        list<RegionView*>::const_iterator prev = region_views.begin ();