AudioStreamView::AudioStreamView (AudioTimeAxisView& tv)
: StreamView (tv)
{
- crossfades_visible = true;
+ crossfades_visible = tv.session()->config.get_xfades_visible ();
color_handler ();
_amplitude_above_axis = 1.0;
if (recording) {
region_view = new AudioRegionView (_canvas_group, _trackview, region,
_samples_per_unit, region_color, recording, TimeAxisViewItem::Visibility(
- TimeAxisViewItem::ShowFrame | TimeAxisViewItem::HideFrameRight));
+ TimeAxisViewItem::ShowFrame |
+ TimeAxisViewItem::HideFrameRight |
+ TimeAxisViewItem::HideFrameLeft |
+ TimeAxisViewItem::HideFrameTB));
} else {
region_view = new AudioRegionView (_canvas_group, _trackview, region,
_samples_per_unit, region_color);
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;
}
cv->set_valid (true);
crossfade->Invalidated.connect (*this, invalidator (*this), ui_bind (&AudioStreamView::remove_crossfade, this, _1), gui_context());
crossfade_views[cv->crossfade] = cv;
- if (!_trackview.session()->config.get_xfades_visible() || !crossfades_visible) {
+ if (!crossfades_visible) {
cv->hide ();
}
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());
}
}
boost::dynamic_pointer_cast<AudioRegion>(RegionFactory::create (sources, plist, false)));
assert(region);
- region->block_property_changes ();
region->set_position (_trackview.session()->transport_frame(), this);
- rec_regions.push_back (make_pair(region, (RegionView*)0));
+ rec_regions.push_back (make_pair(region, (RegionView*) 0));
}
/* start a new rec box */
boost::shared_ptr<AudioTrack> at;
at = _trackview.audio_track(); /* we know what it is already */
- nframes_t frame_pos = at->current_capture_start ();
+ framepos_t const frame_pos = at->current_capture_start ();
gdouble xstart = _trackview.editor().frame_to_pixel (frame_pos);
gdouble xend;
uint32_t fill_color;
rec_rect->property_y1() = 1.0;
rec_rect->property_x2() = xend;
rec_rect->property_y2() = child_height ();
+ rec_rect->property_outline_what() = 0x0;
rec_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeAxisFrame.get();
- rec_rect->property_outline_what() = 0x1 | 0x2 | 0x4 | 0x8;
rec_rect->property_fill_color_rgba() = fill_color;
rec_rect->lower_to_bottom();
rec_data_ready_map[src] = true;
if (rec_data_ready_map.size() == _trackview.track()->n_channels().n_audio()) {
- this->update_rec_regions ();
+ update_rec_regions (start, cnt);
rec_data_ready_map.clear();
}
}
void
-AudioStreamView::update_rec_regions ()
+AudioStreamView::update_rec_regions (framepos_t start, framecnt_t cnt)
{
- if (Config->get_show_waveforms_while_recording ()) {
- 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;
-
- 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();
-
- if (region == rec_regions.back().first && rec_active) {
-
- if (last_rec_data_frame > region->start()) {
-
- nframes_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->resume_property_changes ();
+ 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();
- if (origlen == 1) {
- /* our special initial length */
- add_region_view_internal (region, false, true);
- }
+ if (region == rec_regions.back().first && rec_active) {
+
+ if (last_rec_data_frame > region->start()) {
+
+ nframes_t nlen = last_rec_data_frame - region->start();
+
+ if (nlen != region->length()) {
- /* also update rect */
- ArdourCanvas::SimpleRect * rect = rec_rects[n].rectangle;
- gdouble xend = _trackview.editor().frame_to_pixel (region->position() + region->length());
- rect->property_x2() = xend;
+ region->suspend_property_changes ();
+ region->set_position (_trackview.track()->get_capture_start_frame(n), this);
+ region->set_length (nlen, this);
+ region->resume_property_changes ();
+
+ if (origlen == 1) {
+ /* our special initial length */
+ add_region_view_internal (region, false, true);
+ setup_new_rec_layer_time (region);
}
+
+ 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());
+ rect->property_x2() = xend;
}
} else {
-
+
nframes_t nlen = _trackview.track()->get_captured_frames(n);
-
+
if (nlen != region->length()) {
-
+
if (region->source_length(0) >= region->start() + nlen) {
region->suspend_property_changes ();
}
}
}
-
- iter = tmp;
}
+
+ iter = tmp;
}
}
void
AudioStreamView::update_content_height (CrossfadeView* cv)
{
- cv->show ();
-
if (_layer_display == Overlaid) {
cv->set_y (0);
set_waveform_shape (Config->get_waveform_shape ());
}
}
+
+void
+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 ();
+ }
+}
+
projects / ardour.git / blobdiff