X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_streamview.cc;h=8cb19c2e3980d0e95f123730f114c341b346b55c;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=a1ba99a2b444db5e1990748cc56fe3ec25f557f8;hpb=fa22520fd257f166c00615e7e40ec10c9e29b948;p=ardour.git diff --git a/gtk2_ardour/automation_streamview.cc b/gtk2_ardour/automation_streamview.cc index a1ba99a2b4..8cb19c2e39 100644 --- a/gtk2_ardour/automation_streamview.cc +++ b/gtk2_ardour/automation_streamview.cc @@ -17,40 +17,50 @@ */ #include -#include +#include #include #include -#include +#include "gtkmm2ext/gtk_ui.h" + +#include "pbd/compose.h" +#include "canvas/debug.h" #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 "utils.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())) + : StreamView (*dynamic_cast(tv.get_parent()), + tv.canvas_display()) , _automation_view(tv) , _pending_automation_state (Off) { - //canvas_rect->property_fill_color_rgba() = stream_base_color; - canvas_rect->set_outline_color (RGBA_BLACK); + 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())); + + color_handler (); + + UIConfiguration::instance().ColorsChanged.connect(sigc::mem_fun(*this, &AutomationStreamView::color_handler)); } AutomationStreamView::~AutomationStreamView () @@ -59,14 +69,17 @@ AutomationStreamView::~AutomationStreamView () RegionView* -AutomationStreamView::add_region_view_internal (boost::shared_ptr region, bool wfd, bool /*recording*/) +AutomationStreamView::add_region_view_internal (boost::shared_ptr region, bool wait_for_data, bool /*recording*/) { - assert (region); + if (!region) { + return 0; + } - if (wfd) { + 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); } } @@ -77,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; @@ -93,7 +109,7 @@ AutomationStreamView::add_region_view_internal (boost::shared_ptr region arv->line()->set_list (list); } (*i)->set_valid (true); - (*i)->enable_display(wfd); + (*i)->enable_display (wait_for_data); display_region(arv); return 0; @@ -106,17 +122,17 @@ AutomationStreamView::add_region_view_internal (boost::shared_ptr region _samples_per_pixel, region_color ); - region_view->init (region_color, false); + region_view->init (false); region_views.push_front (region_view); /* follow global waveform setting */ - if (wfd) { + if (wait_for_data) { region_view->enable_display(true); - //region_view->midi_region()->midi_source(0)->load_model(); + // region_view->midi_region()->midi_source(0)->load_model(); } - display_region(region_view); + display_region (region_view); /* catch regionview going away */ region->DropReferences.connect (*this, invalidator (*this), boost::bind (&AutomationStreamView::remove_region_view, this, boost::weak_ptr(region)), gui_context()); @@ -185,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 @@ -269,12 +283,13 @@ AutomationStreamView::clear () * confusing. */ void -AutomationStreamView::get_selectables (framepos_t start, framepos_t end, double botfrac, double topfrac, list& results) +AutomationStreamView::get_selectables (framepos_t start, framepos_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); + } } } @@ -295,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 (framepos_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 (); @@ -336,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; }