Revert "Revert "patch for waflib internals to allow tarball to be created even when...

[ardour.git] / gtk2_ardour / automation_streamview.cc

diff --git a/gtk2_ardour/automation_streamview.cc b/gtk2_ardour/automation_streamview.cc
index e504d13931d551981194cb9748e67c946c81a1d9..8cb19c2e3980d0e95f123730f114c341b346b55c 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>
@@ -31,17 +30,18 @@
 #include "ardour/midi_region.h"
 #include "ardour/midi_source.h"
 
-#include "ardour_ui.h"
 #include "automation_region_view.h"
 #include "automation_streamview.h"
 #include "automation_time_axis.h"
-#include "global_signals.h"
 #include "gui_thread.h"
 #include "public_editor.h"
 #include "region_selection.h"
 #include "region_view.h"
 #include "rgb_macros.h"
 #include "selection.h"
+#include "ui_config.h"
+
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -60,7 +60,7 @@ AutomationStreamView::AutomationStreamView (AutomationTimeAxisView& tv)
 
        color_handler ();
 
-       ColorsChanged.connect(sigc::mem_fun(*this, &AutomationStreamView::color_handler));
+       UIConfiguration::instance().ColorsChanged.connect(sigc::mem_fun(*this, &AutomationStreamView::color_handler));
 }
 
 AutomationStreamView::~AutomationStreamView ()
@@ -71,7 +71,9 @@ 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);
@@ -88,7 +90,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;
@@ -197,9 +202,9 @@ void
 AutomationStreamView::color_handler ()
 {
        if (_trackview.is_midi_track()) {
-               canvas_rect->set_fill_color (ARDOUR_UI::config()->color_mod ("midi track base", "midi track base"));
+               canvas_rect->set_fill_color (UIConfiguration::instance().color_mod ("midi track base", "midi track base"));
        } else {
-               canvas_rect->set_fill_color (ARDOUR_UI::config()->color ("midi bus base"));
+               canvas_rect->set_fill_color (UIConfiguration::instance().color ("midi bus base"));
        }
 }
 
@@ -278,15 +283,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);
+               }
        }
 }
 
@@ -307,20 +310,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,
@@ -333,7 +330,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 ();