using namespace PBD;
using namespace Editing;
-StreamView::StreamView (RouteTimeAxisView& tv)
+StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* group)
: _trackview (tv)
- , canvas_group(new ArdourCanvas::Group(*_trackview.canvas_display))
- , canvas_rect(new ArdourCanvas::SimpleRect (*canvas_group))
- , _samples_per_unit(_trackview.editor.get_current_zoom())
+ , owns_canvas_group(group == 0)
+ , _background_group (new ArdourCanvas::Group (*_trackview.canvas_background()))
+ , canvas_group(group ? group : new ArdourCanvas::Group(*_trackview.canvas_display()))
+ , _samples_per_unit (_trackview.editor().get_current_zoom ())
, rec_updating(false)
, rec_active(false)
- , use_rec_regions(tv.editor.show_waveforms_recording())
+ , use_rec_regions (tv.editor().show_waveforms_recording ())
, region_color(_trackview.color())
, stream_base_color(0xFFFFFFFF)
- , layers(1)
+ , _layers (1)
, height(tv.height)
- , layer_display(Overlaid)
+ , _layer_display (Overlaid)
, last_rec_data_frame(0)
{
/* set_position() will position the group */
- canvas_rect = new ArdourCanvas::SimpleRect (*canvas_group);
+ canvas_rect = new ArdourCanvas::SimpleRect (*_background_group);
canvas_rect->property_x1() = 0.0;
canvas_rect->property_y1() = 0.0;
- canvas_rect->property_x2() = _trackview.editor.frame_to_pixel (max_frames);
- canvas_rect->property_y2() = (double) tv.height;
- canvas_rect->property_outline_what() = (guint32) (0x1|0x2|0x8); // outline ends and bottom
+ canvas_rect->property_x2() = _trackview.editor().get_physical_screen_width ();
+ canvas_rect->property_y2() = (double) tv.current_height();
+ canvas_rect->raise(1); // raise above tempo lines
+
+ // DR-way
+ canvas_rect->property_outline_what() = (guint32) (0x2|0x8); // outline RHS and bottom
+ // 2.0 way
+ //canvas_rect->property_outline_what() = (guint32) (0x1|0x2|0x8); // outline ends and bottom
// (Fill/Outline colours set in derived classes)
- canvas_rect->signal_event().connect (bind (mem_fun (_trackview.editor, &PublicEditor::canvas_stream_view_event), canvas_rect, &_trackview));
+ canvas_rect->signal_event().connect (bind (mem_fun (_trackview.editor(), &PublicEditor::canvas_stream_view_event), canvas_rect, &_trackview));
if (_trackview.is_track()) {
_trackview.track()->DiskstreamChanged.connect (mem_fun (*this, &StreamView::diskstream_changed));
StreamView::~StreamView ()
{
undisplay_diskstream ();
- delete canvas_group;
+
+ delete canvas_rect;
+
+ if (owns_canvas_group) {
+ delete canvas_group;
+ }
}
void
}
height = h;
- update_contents_y_position_and_height ();
+ update_contents_height ();
return 0;
}
for (vector<RecBoxInfo>::iterator xi = rec_rects.begin(); xi != rec_rects.end(); ++xi) {
RecBoxInfo &recbox = (*xi);
- gdouble xstart = _trackview.editor.frame_to_pixel ( recbox.start );
- gdouble xend = _trackview.editor.frame_to_pixel ( recbox.start + recbox.length );
+ gdouble xstart = _trackview.editor().frame_to_pixel (recbox.start);
+ gdouble xend = _trackview.editor().frame_to_pixel (recbox.start + recbox.length);
recbox.rectangle->property_x1() = xstart;
recbox.rectangle->property_x2() = xend;
}
+ update_coverage_frames ();
+
return 0;
}
void
StreamView::add_region_view (boost::shared_ptr<Region> r)
{
- add_region_view_internal (r, false);
+ // ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::add_region_view), r));
+
+ add_region_view_internal (r, true);
+ update_contents_height ();
}
void
for (list<RegionView *>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
if (((*i)->region()) == r) {
- delete *i;
+ RegionView* rv = *i;
region_views.erase (i);
+ delete rv;
break;
}
}
void
StreamView::undisplay_diskstream ()
{
- for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) {
+ for (RegionViewList::iterator i = region_views.begin(); i != region_views.end() ; ) {
+ RegionViewList::iterator next = i;
+ ++next;
delete *i;
+ i = next;
}
region_views.clear();
ENSURE_GUI_THREAD (bind (mem_fun (*this, &StreamView::playlist_modified_weak), ds));
/* update layers count and the y positions and heights of our regions */
- layers = ds->playlist()->top_layer() + 1;
- update_contents_y_position_and_height ();
-
- redisplay_diskstream ();
+ if (ds->playlist()) {
+ _layers = ds->playlist()->top_layer() + 1;
+ update_contents_height ();
+ update_coverage_frames ();
+ redisplay_diskstream ();
+ }
}
void
playlist_connections.clear();
undisplay_diskstream ();
- /* draw it */
+ /* update layers count and the y positions and heights of our regions */
+ _layers = ds->playlist()->top_layer() + 1;
+ update_contents_height ();
+ update_coverage_frames ();
+
+ /* draw it */
redisplay_diskstream ();
/* catch changes */
playlist_connections.push_back (ds->playlist()->Modified.connect (bind (mem_fun (*this, &StreamView::playlist_modified_weak), ds)));
-
- /* update layers count and the y positions and heights of our regions */
- layers = ds->playlist()->top_layer() + 1;
- update_contents_y_position_and_height ();
}
void
void
StreamView::region_layered (RegionView* rv)
{
- rv->get_canvas_group()->lower_to_bottom();
-
/* don't ever leave it at the bottom, since then it doesn't
get events - the parent group does instead ...
*/
-
- /* this used to be + 1, but regions to the left ended up below
- ..something.. and couldn't receive events. why? good question.
- */
- rv->get_canvas_group()->raise (rv->region()->layer() + 2);
+ rv->get_canvas_group()->raise (rv->region()->layer());
}
void
switch (_trackview.track()->mode()) {
case Normal:
rect.length = at - rect.start;
- xstart = _trackview.editor.frame_to_pixel (rect.start);
- xend = _trackview.editor.frame_to_pixel (at);
+ xstart = _trackview.editor().frame_to_pixel (rect.start);
+ xend = _trackview.editor().frame_to_pixel (at);
break;
case Destructive:
rect.length = 2;
- xstart = _trackview.editor.frame_to_pixel (_trackview.get_diskstream()->current_capture_start());
- xend = _trackview.editor.frame_to_pixel (at);
+ xstart = _trackview.editor().frame_to_pixel (_trackview.get_diskstream()->current_capture_start());
+ xend = _trackview.editor().frame_to_pixel (at);
break;
}
{
bool selected;
- // cerr << _trackview.name() << " (selected = " << regions.size() << ")" << endl;
for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
selected = false;
for (RegionSelection::iterator ii = regions.begin(); ii != regions.end(); ++ii) {
if (*i == *ii) {
selected = true;
+ break;
}
}
-
- // cerr << "\tregion " << (*i)->region().name() << " selected = " << selected << endl;
+
(*i)->set_selected (selected);
}
}
}
}
+/** @return height of a child region view, depending on stacked / overlaid mode */
+double
+StreamView::child_height () const
+{
+ if (_layer_display == Stacked) {
+ return height / _layers;
+ }
+
+ return height;
+}
+
void
-StreamView::update_contents_y_position_and_height ()
+StreamView::update_contents_height ()
{
canvas_rect->property_y2() = height;
- const double lh = height / layers;
+ const double h = child_height ();
for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) {
- switch (layer_display) {
+ switch (_layer_display) {
case Overlaid:
- (*i)->set_y_position_and_height (0, height);
+ (*i)->set_y (0);
break;
case Stacked:
- double const y = (*i)->region()->layer() * lh;
- (*i)->set_y_position_and_height (y, lh);
+ (*i)->set_y (height - ((*i)->region()->layer() + 1) * h);
break;
}
+
+ (*i)->set_height (h);
}
for (vector<RecBoxInfo>::iterator i = rec_rects.begin(); i != rec_rects.end(); ++i) {
void
StreamView::set_layer_display (LayerDisplay d)
{
- layer_display = d;
- update_contents_y_position_and_height ();
+ _layer_display = d;
+ update_contents_height ();
+ update_coverage_frames ();
+}
+
+void
+StreamView::update_coverage_frames ()
+{
+ for (RegionViewList::iterator i = region_views.begin (); i != region_views.end (); ++i) {
+ (*i)->update_coverage_frames (_layer_display);
+ }
}
projects / ardour.git / blobdiff