X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_streamview.cc;h=60c8912114cc732613dd91200507eafbdc437aec;hb=c2652437da8786e1a1803486fddf131f20af98d3;hp=53c643c0270ff4990007fccc00f27b855ef64081;hpb=e5e12acc5698090f2c0c614385e457cc0b46fbb0;p=ardour.git diff --git a/gtk2_ardour/automation_streamview.cc b/gtk2_ardour/automation_streamview.cc index 53c643c027..60c8912114 100644 --- a/gtk2_ardour/automation_streamview.cc +++ b/gtk2_ardour/automation_streamview.cc @@ -17,7 +17,7 @@ */ #include -#include +#include #include #include @@ -30,33 +30,37 @@ #include "ardour/midi_region.h" #include "ardour/midi_source.h" -#include "automation_streamview.h" -#include "region_view.h" #include "automation_region_view.h" +#include "automation_streamview.h" #include "automation_time_axis.h" -#include "region_selection.h" -#include "selection.h" +#include "gui_thread.h" #include "public_editor.h" -#include "ardour_ui.h" +#include "region_selection.h" +#include "region_view.h" #include "rgb_macros.h" -#include "gui_thread.h" +#include "selection.h" +#include "ui_config.h" + +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; using namespace PBD; using namespace Editing; AutomationStreamView::AutomationStreamView (AutomationTimeAxisView& tv) : StreamView (*dynamic_cast(tv.get_parent()), - tv.canvas_display()) + tv.canvas_display()) , _automation_view(tv) , _pending_automation_state (Off) { CANVAS_DEBUG_NAME (_canvas_group, string_compose ("SV canvas group auto %1", tv.name())); CANVAS_DEBUG_NAME (canvas_rect, string_compose ("SV canvas rectangle auto %1", tv.name())); - canvas_rect->set_fill (false); - canvas_rect->set_outline_color (RGBA_BLACK); + color_handler (); + + UIConfiguration::instance().ColorsChanged.connect(sigc::mem_fun(*this, &AutomationStreamView::color_handler)); } AutomationStreamView::~AutomationStreamView () @@ -67,12 +71,15 @@ AutomationStreamView::~AutomationStreamView () RegionView* AutomationStreamView::add_region_view_internal (boost::shared_ptr region, bool wait_for_data, bool /*recording*/) { - assert (region); + if (!region) { + return 0; + } if (wait_for_data) { boost::shared_ptr mr = boost::dynamic_pointer_cast(region); if (mr) { - mr->midi_source()->load_model(); + Source::Lock lock(mr->midi_source()->mutex()); + mr->midi_source()->load_model(lock); } } @@ -83,7 +90,10 @@ AutomationStreamView::add_region_view_internal (boost::shared_ptr region boost::shared_ptr list; if (control) { list = boost::dynamic_pointer_cast(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; @@ -191,13 +201,11 @@ AutomationStreamView::setup_rec_box () void AutomationStreamView::color_handler () { - /*if (_trackview.is_midi_track()) { - canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->get_canvasvar_MidiTrackBase(); + if (_trackview.is_midi_track()) { + canvas_rect->set_fill_color (UIConfiguration::instance().color_mod ("midi track base", "midi track base")); + } else { + canvas_rect->set_fill_color (UIConfiguration::instance().color ("midi bus base")); } - - if (!_trackview.is_midi_track()) { - canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->get_canvasvar_MidiBusBase();; - }*/ } AutoState @@ -267,20 +275,21 @@ AutomationStreamView::clear () } } -/** @param start Start position in session frames. - * @param end End position in session frames. +/** @param start Start position in session samples. + * @param end End position in session samples. * @param bot Bottom position expressed as a fraction of track height where 0 is the bottom of the track. * @param top Top position expressed as a fraction of track height where 0 is the bottom of the track. * NOTE: this y system is different to that for the StreamView method that this overrides, which is a little * confusing. */ void -AutomationStreamView::get_selectables (framepos_t start, framepos_t end, double botfrac, double topfrac, list& results) +AutomationStreamView::get_selectables (samplepos_t start, samplepos_t end, double botfrac, double topfrac, list& results, bool /*within*/) { for (list::iterator i = region_views.begin(); i != region_views.end(); ++i) { AutomationRegionView* arv = dynamic_cast (*i); - assert (arv); - arv->line()->get_selectables (start, end, botfrac, topfrac, results); + if (arv) { + arv->line()->get_selectables (start, end, botfrac, topfrac, results); + } } } @@ -301,33 +310,27 @@ AutomationStreamView::get_lines () const for (list::const_iterator i = region_views.begin(); i != region_views.end(); ++i) { AutomationRegionView* arv = dynamic_cast (*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(); - } -}; - - -/** @param pos Position, in session frames. - * @return AutomationLine to paste to for that position, or 0 if there is none appropriate. - */ -boost::shared_ptr -AutomationStreamView::paste_line (framepos_t pos) +bool +AutomationStreamView::paste (samplepos_t pos, + unsigned paste_count, + float times, + boost::shared_ptr alist) { /* XXX: not sure how best to pick this; for now, just use the last region which starts before pos */ if (region_views.empty()) { - return boost::shared_ptr (); + return false; } - region_views.sort (RegionPositionSorter ()); + region_views.sort (RegionView::PositionOrder()); list::const_iterator prev = region_views.begin (); @@ -342,11 +345,9 @@ AutomationStreamView::paste_line (framepos_t pos) /* If *prev doesn't cover pos, it's no good */ if (r->position() > pos || ((r->position() + r->length()) < pos)) { - return boost::shared_ptr (); + return false; } AutomationRegionView* arv = dynamic_cast (*prev); - assert (arv); - - return arv->line (); + return arv ? arv->paste(pos, paste_count, times, alist) : false; }