X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_streamview.cc;h=89ae7fa07980336203681efb56aaf1ed104599b1;hb=e0cb9efb003500fea319552a772364f00753a26f;hp=fa6a8248196b2714f2d6becb1ba71657cc283056;hpb=bcd65def7da197a6f88eb1c4adb375f2b639f783;p=ardour.git diff --git a/gtk2_ardour/automation_streamview.cc b/gtk2_ardour/automation_streamview.cc index fa6a824819..89ae7fa079 100644 --- a/gtk2_ardour/automation_streamview.cc +++ b/gtk2_ardour/automation_streamview.cc @@ -16,43 +16,51 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #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 "ardour_ui.h" #include "automation_region_view.h" +#include "automation_streamview.h" #include "automation_time_axis.h" -#include "region_selection.h" -#include "selection.h" +#include "global_signals.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" 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()), - new ArdourCanvas::Group (tv.canvas_background()), - new ArdourCanvas::Group (tv.canvas_display())) + 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 (); + + ColorsChanged.connect(sigc::mem_fun(*this, &AutomationStreamView::color_handler)); } AutomationStreamView::~AutomationStreamView () @@ -61,11 +69,11 @@ 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 (wfd) { + if (wait_for_data) { boost::shared_ptr mr = boost::dynamic_pointer_cast(region); if (mr) { mr->midi_source()->load_model(); @@ -95,7 +103,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; @@ -105,20 +113,20 @@ AutomationStreamView::add_region_view_internal (boost::shared_ptr region region_view = new AutomationRegionView ( _canvas_group, _automation_view, region, _automation_view.parameter (), list, - _frames_per_pixel, region_color + _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()); @@ -187,13 +195,11 @@ AutomationStreamView::setup_rec_box () void AutomationStreamView::color_handler () { - /*if (_trackview.is_midi_track()) { - canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiTrackBase.get(); + if (_trackview.is_midi_track()) { + canvas_rect->set_fill_color (ARDOUR_UI::config()->color_mod ("midi track base", "midi track base")); + } else { + canvas_rect->set_fill_color (ARDOUR_UI::config()->color ("midi bus base")); } - - if (!_trackview.is_midi_track()) { - canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiBusBase.get();; - }*/ } AutoState @@ -273,6 +279,9 @@ AutomationStreamView::clear () void AutomationStreamView::get_selectables (framepos_t start, framepos_t end, double botfrac, double topfrac, list& results) { + if (!_trackview.editor().internal_editing()) { + return; // TODO: selection of automation regions + } for (list::iterator i = region_views.begin(); i != region_views.end(); ++i) { AutomationRegionView* arv = dynamic_cast (*i); assert (arv); @@ -311,16 +320,16 @@ struct RegionPositionSorter { }; -/** @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 ()); @@ -338,11 +347,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; }