projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add mixbus profile which removes the tearoffs
[ardour.git]
/
gtk2_ardour
/
automation_streamview.cc
diff --git
a/gtk2_ardour/automation_streamview.cc
b/gtk2_ardour/automation_streamview.cc
index a1ba99a2b444db5e1990748cc56fe3ec25f557f8..53c643c0270ff4990007fccc00f27b855ef64081 100644
(file)
--- a/
gtk2_ardour/automation_streamview.cc
+++ b/
gtk2_ardour/automation_streamview.cc
@@
-22,7
+22,10
@@
#include <gtkmm.h>
#include <gtkmm.h>
-#include <gtkmm2ext/gtk_ui.h>
+#include "gtkmm2ext/gtk_ui.h"
+
+#include "pbd/compose.h"
+#include "canvas/debug.h"
#include "ardour/midi_region.h"
#include "ardour/midi_source.h"
#include "ardour/midi_region.h"
#include "ardour/midi_source.h"
@@
-37,7
+40,6
@@
#include "ardour_ui.h"
#include "rgb_macros.h"
#include "gui_thread.h"
#include "ardour_ui.h"
#include "rgb_macros.h"
#include "gui_thread.h"
-#include "utils.h"
using namespace std;
using namespace ARDOUR;
using namespace std;
using namespace ARDOUR;
@@
-45,11
+47,15
@@
using namespace PBD;
using namespace Editing;
AutomationStreamView::AutomationStreamView (AutomationTimeAxisView& tv)
using namespace Editing;
AutomationStreamView::AutomationStreamView (AutomationTimeAxisView& tv)
- : StreamView (*dynamic_cast<RouteTimeAxisView*>(tv.get_parent()))
+ : StreamView (*dynamic_cast<RouteTimeAxisView*>(tv.get_parent()),
+ tv.canvas_display())
, _automation_view(tv)
, _pending_automation_state (Off)
{
, _automation_view(tv)
, _pending_automation_state (Off)
{
- //canvas_rect->property_fill_color_rgba() = stream_base_color;
+ 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);
}
canvas_rect->set_outline_color (RGBA_BLACK);
}
@@
-59,11
+65,11
@@
AutomationStreamView::~AutomationStreamView ()
RegionView*
RegionView*
-AutomationStreamView::add_region_view_internal (boost::shared_ptr<Region> region, bool w
fd
, bool /*recording*/)
+AutomationStreamView::add_region_view_internal (boost::shared_ptr<Region> region, bool w
ait_for_data
, bool /*recording*/)
{
assert (region);
{
assert (region);
- if (w
fd
) {
+ if (w
ait_for_data
) {
boost::shared_ptr<MidiRegion> mr = boost::dynamic_pointer_cast<MidiRegion>(region);
if (mr) {
mr->midi_source()->load_model();
boost::shared_ptr<MidiRegion> mr = boost::dynamic_pointer_cast<MidiRegion>(region);
if (mr) {
mr->midi_source()->load_model();
@@
-93,7
+99,7
@@
AutomationStreamView::add_region_view_internal (boost::shared_ptr<Region> region
arv->line()->set_list (list);
}
(*i)->set_valid (true);
arv->line()->set_list (list);
}
(*i)->set_valid (true);
- (*i)->enable_display
(wfd
);
+ (*i)->enable_display
(wait_for_data
);
display_region(arv);
return 0;
display_region(arv);
return 0;
@@
-106,17
+112,17
@@
AutomationStreamView::add_region_view_internal (boost::shared_ptr<Region> region
_samples_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 */
region_views.push_front (region_view);
/* follow global waveform setting */
- if (w
fd
) {
+ if (w
ait_for_data
) {
region_view->enable_display(true);
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>(region)), gui_context());
/* catch regionview going away */
region->DropReferences.connect (*this, invalidator (*this), boost::bind (&AutomationStreamView::remove_region_view, this, boost::weak_ptr<Region>(region)), gui_context());