AudioStreamView::~AudioStreamView ()
{
+ for (CrossfadeViewList::iterator xi = crossfade_views.begin(); xi != crossfade_views.end(); ++xi) {
+ delete xi->second;
+ }
}
int
if (recording) {
region_view = new AudioRegionView (_canvas_group, _trackview, region,
_samples_per_unit, region_color, recording, TimeAxisViewItem::Visibility(
- TimeAxisViewItem::ShowFrame |
+ TimeAxisViewItem::ShowFrame |
TimeAxisViewItem::HideFrameRight |
TimeAxisViewItem::HideFrameLeft |
TimeAxisViewItem::HideFrameTB));
AudioStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wait_for_waves, bool recording)
{
RegionView *region_view = create_region_view (r, wait_for_waves, recording);
-
+
if (region_view == 0) {
return 0;
}
region_views.push_front (region_view);
+ if (_trackview.editor().internal_editing()) {
+ region_view->hide_rect ();
+ } else {
+ region_view->show_rect ();
+ }
+
/* catch region going away */
r->DropReferences.connect (*this, invalidator (*this), boost::bind (&AudioStreamView::remove_region_view, this, boost::weak_ptr<Region> (r)), gui_context());
if (src) {
sources.push_back (src);
src->PeakRangeReady.connect (rec_data_ready_connections,
- invalidator (*this),
- ui_bind (&AudioStreamView::rec_peak_range_ready, this, _1, _2, boost::weak_ptr<Source>(src)),
- gui_context());
+ invalidator (*this),
+ ui_bind (&AudioStreamView::rec_peak_range_ready, this, _1, _2, boost::weak_ptr<Source>(src)),
+ gui_context());
}
}
// handle multi
- nframes_t start = 0;
+ framepos_t start = 0;
if (rec_regions.size() > 0) {
start = rec_regions.back().first->start()
+ _trackview.track()->get_captured_frames(rec_regions.size()-1);
}
- PropertyList plist;
-
+ PropertyList plist;
+
plist.add (Properties::start, start);
plist.add (Properties::length, 1);
plist.add (Properties::name, string());
boost::dynamic_pointer_cast<AudioRegion>(RegionFactory::create (sources, plist, false)));
assert(region);
- region->set_position (_trackview.session()->transport_frame(), this);
+ region->set_position (_trackview.session()->transport_frame());
rec_regions.push_back (make_pair(region, (RegionView*) 0));
}
}
void
-AudioStreamView::rec_peak_range_ready (nframes_t start, nframes_t cnt, boost::weak_ptr<Source> weak_src)
+AudioStreamView::rec_peak_range_ready (framepos_t start, framecnt_t cnt, boost::weak_ptr<Source> weak_src)
{
ENSURE_GUI_THREAD (*this, &AudioStreamView::rec_peak_range_ready, start, cnt, weak_src)
if (!Config->get_show_waveforms_while_recording ()) {
return;
}
-
+
uint32_t n = 0;
-
+
for (list<pair<boost::shared_ptr<Region>,RegionView*> >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); n++) {
-
+
list<pair<boost::shared_ptr<Region>,RegionView*> >::iterator tmp = iter;
++tmp;
-
+
+ assert (n < rec_rects.size());
+
if (!canvas_item_visible (rec_rects[n].rectangle)) {
/* rect already hidden, this region is done */
iter = tmp;
continue;
}
-
+
boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion>(iter->first);
-
+
if (!region) {
iter = tmp;
continue;
}
-
- nframes_t origlen = region->length();
+
+ framecnt_t origlen = region->length();
if (region == rec_regions.back().first && rec_active) {
-
+
if (last_rec_data_frame > region->start()) {
-
- nframes_t nlen = last_rec_data_frame - region->start();
-
+
+ framecnt_t nlen = last_rec_data_frame - region->start();
+
if (nlen != region->length()) {
region->suspend_property_changes ();
- region->set_position (_trackview.track()->get_capture_start_frame(n), this);
- region->set_length (nlen, this);
+ region->set_position (_trackview.track()->get_capture_start_frame(n));
+ region->set_length (nlen);
region->resume_property_changes ();
-
+
if (origlen == 1) {
/* our special initial length */
add_region_view_internal (region, false, true);
}
check_record_layers (region, (region->position() - region->start() + start + cnt));
-
+
/* also update rect */
ArdourCanvas::SimpleRect * rect = rec_rects[n].rectangle;
gdouble xend = _trackview.editor().frame_to_pixel (region->position() + region->length());
}
} else {
-
- nframes_t nlen = _trackview.track()->get_captured_frames(n);
-
+
+ framecnt_t nlen = _trackview.track()->get_captured_frames(n);
+
if (nlen != region->length()) {
-
+
if (region->source_length(0) >= region->start() + nlen) {
region->suspend_property_changes ();
- region->set_position (_trackview.track()->get_capture_start_frame(n), this);
- region->set_length (nlen, this);
+ region->set_position (_trackview.track()->get_capture_start_frame(n));
+ region->set_length (nlen);
region->resume_property_changes ();
if (origlen == 1) {
}
}
}
-
- iter = tmp;
}
+
+ iter = tmp;
}
}
void
AudioStreamView::update_content_height (CrossfadeView* cv)
{
- if (_layer_display == Overlaid) {
-
+ switch (_layer_display) {
+ case Overlaid:
cv->set_y (0);
- cv->set_height (height);
-
- } else {
+ cv->set_heights (height, height);
+ break;
+ case Stacked:
+ case Expanded:
layer_t const inl = cv->crossfade->in()->layer ();
layer_t const outl = cv->crossfade->out()->layer ();
const double h = child_height ();
- cv->set_y ((_layers - high - 1) * h);
- cv->set_height ((high - low + 1) * h);
-
+ if (_layer_display == Stacked) {
+ cv->set_y ((_layers - high - 1) * h);
+ cv->set_heights ((high - low + 1) * h, h);
+ } else {
+ cv->set_y (((_layers - high) * 2 - 1) * h);
+ cv->set_heights (((high - low) * 2 + 1) * h, h);
+ }
}
}
AudioStreamView::horizontal_position_changed ()
{
/* we only `draw' the bit of the curve that is visible, so we need to update here */
-
+
for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
i->second->horizontal_position_changed ();
}