X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_streamview.cc;h=b79a6dc6d0a61940f533bb5b80b8df69f959592f;hb=b502bbc61895d61c39bf240b47e8a3664be2c541;hp=44551d73f133a51d9d3c4e8d85b5b7aa1dd01e4e;hpb=806a22fefe8bc79c0307a6c3f6bfbde1185e7574;p=ardour.git diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc index 44551d73f1..b79a6dc6d0 100644 --- a/gtk2_ardour/midi_streamview.cc +++ b/gtk2_ardour/midi_streamview.cc @@ -35,6 +35,7 @@ #include "ardour_ui.h" #include "canvas-simplerect.h" +#include "global_signals.h" #include "gui_thread.h" #include "lineset.h" #include "midi_region_view.h" @@ -63,9 +64,8 @@ MidiStreamView::MidiStreamView (MidiTimeAxisView& tv) , _highest_note(71) , _data_note_min(60) , _data_note_max(71) + , _note_lines (0) { - color_handler (); - /* use a group dedicated to MIDI underlays. Audio underlays are not in this group. */ midi_underlay_group = new ArdourCanvas::Group (*_canvas_group); midi_underlay_group->lower_to_bottom(); @@ -76,7 +76,7 @@ MidiStreamView::MidiStreamView (MidiTimeAxisView& tv) _note_lines->property_x1() = 0; _note_lines->property_y1() = 0; - _note_lines->property_x2() = trackview().editor().frame_to_pixel (max_frames); + _note_lines->property_x2() = DBL_MAX; _note_lines->property_y2() = 0; _note_lines->signal_event().connect(sigc::bind( @@ -85,6 +85,8 @@ MidiStreamView::MidiStreamView (MidiTimeAxisView& tv) _note_lines->lower_to_bottom(); + color_handler (); + ColorsChanged.connect(sigc::mem_fun(*this, &MidiStreamView::color_handler)); note_range_adjustment.set_page_size(_highest_note - _lowest_note); @@ -135,7 +137,7 @@ MidiStreamView::create_region_view (boost::shared_ptr r, bool /*wfd*/, b RegionView* region_view = new MidiRegionView (_canvas_group, _trackview, region, _samples_per_unit, region_color); - + region_view->init (region_color, false); return region_view; @@ -170,6 +172,12 @@ MidiStreamView::add_region_view_internal (boost::shared_ptr r, bool wfd, region_views.push_front (region_view); + if (_trackview.editor().internal_editing()) { + region_view->hide_rect (); + } else { + region_view->show_rect (); + } + /* display events and find note range */ display_region (region_view, wfd); @@ -184,8 +192,9 @@ MidiStreamView::add_region_view_internal (boost::shared_ptr r, bool wfd, void MidiStreamView::display_region(MidiRegionView* region_view, bool load_model) { - if ( ! region_view) + if (!region_view) { return; + } region_view->enable_display(true); @@ -200,7 +209,7 @@ MidiStreamView::display_region(MidiRegionView* region_view, bool load_model) source->model()->highest_note()); // Display region contents - region_view->set_height(height); + region_view->set_height (child_height()); region_view->display_model(source->model()); } @@ -293,7 +302,7 @@ void MidiStreamView::update_contents_height () { StreamView::update_contents_height(); - _note_lines->property_y2() = height; + _note_lines->property_y2() = child_height (); apply_note_range (lowest_note(), highest_note(), true); } @@ -311,7 +320,7 @@ MidiStreamView::draw_note_lines() _note_lines->clear(); - if(height < 140){ + if (child_height() < 140){ return; } @@ -363,13 +372,13 @@ MidiStreamView::apply_note_range(uint8_t lowest, uint8_t highest, bool to_region _highest_note = highest; _lowest_note = lowest; - int range = _highest_note - _lowest_note; - int pixels_per_note = floor (height/range); + int const range = _highest_note - _lowest_note; + int const pixels_per_note = floor (child_height () / range); /* do not grow note height beyond 10 pixels */ if (pixels_per_note > 10) { - int available_note_range = floor ((height)/10); + int const available_note_range = floor (child_height() / 10); int additional_notes = available_note_range - range; /* distribute additional notes to higher and lower ranges, clamp at 0 and 127 */ @@ -433,24 +442,36 @@ MidiStreamView::setup_rec_box () sources.push_back (_trackview.midi_track()->write_source()); - _trackview.midi_track()->write_source()->ViewDataRangeReady.connect - (rec_data_ready_connections, - invalidator (*this), - ui_bind (&MidiStreamView::rec_data_range_ready, this, _1, _2, boost::weak_ptr(_trackview.midi_track()->write_source())), - 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); } + + if (!rec_regions.empty()) { + MidiRegionView* mrv = dynamic_cast (rec_regions.back().second); + mrv->end_write (); + } PropertyList plist; plist.add (ARDOUR::Properties::start, start); plist.add (ARDOUR::Properties::length, 1); + /* Just above we're setting this nascent region's length to 1. I think this + is so that the RegionView gets created with a non-zero width, as apparently + creating a RegionView with a zero width causes it never to be displayed + (there is a warning in TimeAxisViewItem::init about this). However, we + must also set length_beats to something non-zero, otherwise the frame length + of 1 causes length_beats to be set to some small quantity << 1. Then + when the position is set up below, this length_beats is used to recompute + length using BeatsFramesConverter::to, which is slightly innacurate for small + beats values because it converts floating point beats to bars, beats and + integer ticks. The upshot of which being that length gets set back to 0, + meaning no region view is ever seen, meaning no MIDI notes during record (#3820). + */ + plist.add (ARDOUR::Properties::length_beats, 1); plist.add (ARDOUR::Properties::name, string()); plist.add (ARDOUR::Properties::layer, 0); @@ -458,26 +479,31 @@ MidiStreamView::setup_rec_box () (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)); + region->set_start (_trackview.track()->current_capture_start() - _trackview.track()->get_capture_start_frame (0), this); + region->set_position (_trackview.track()->current_capture_start(), this); + RegionView* rv = add_region_view_internal (region, false); + MidiRegionView* mrv = dynamic_cast (rv); + mrv->begin_write (); + + rec_regions.push_back (make_pair (region, rv)); // rec regions are destroyed in setup_rec_box /* we add the region later */ + + setup_new_rec_layer_time (region); } /* start a new rec box */ boost::shared_ptr mt = _trackview.midi_track(); /* we know what it is already */ - nframes_t frame_pos = mt->current_capture_start (); - gdouble xstart = _trackview.editor().frame_to_pixel (frame_pos); - gdouble xend; + framepos_t const frame_pos = mt->current_capture_start (); + gdouble const xstart = _trackview.editor().frame_to_pixel (frame_pos); + gdouble const xend = xstart; uint32_t fill_color; assert(_trackview.midi_track()->mode() == Normal); - xend = xstart; fill_color = ARDOUR_UI::config()->canvasvar_RecordingRect.get(); ArdourCanvas::SimpleRect * rec_rect = new Gnome::Canvas::SimpleRect (*_canvas_group); @@ -552,154 +578,6 @@ MidiStreamView::setup_rec_box () } } -void -MidiStreamView::update_rec_regions (boost::shared_ptr data, nframes_t start, nframes_t dur) -{ - ENSURE_GUI_THREAD (*this, &MidiStreamView::update_rec_regions, data, start, dur) - - if (Config->get_show_waveforms_while_recording ()) { - - uint32_t n = 0; - bool update_range = false; - - for (list,RegionView*> >::iterator iter = rec_regions.begin(); - iter != rec_regions.end(); n++) { - - list,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 region = boost::dynamic_pointer_cast(iter->first); - if (!region) { - iter = tmp; - continue; - } - - nframes_t origlen = region->length(); - - if (region == rec_regions.back().first && rec_active) { - - if (start >= region->midi_source(0)->timeline_position()) { - - nframes_t nlen = start + dur - region->position(); - - if (nlen != region->length()) { - - region->suspend_property_changes (); - region->set_position (_trackview.track()->get_capture_start_frame(n), this); - region->set_length (start + dur - region->position(), this); - region->resume_property_changes (); - - if (origlen == 1) { - /* our special initial length */ - iter->second = add_region_view_internal (region, false); - ((MidiRegionView*)iter->second)->begin_write(); - } - - /* 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; - - ARDOUR::BeatsFramesConverter tconv(_trackview.session()->tempo_map(), region->position()); - const MidiModel::TimeType start_beats = tconv.from(start); - - /* draw events */ - MidiRegionView* mrv = (MidiRegionView*)iter->second; - - for (MidiModel::Notes::const_iterator i = data->note_lower_bound(start_beats); - i != data->notes().end(); ++i) { - - const boost::shared_ptr& note = *i; - - nframes_t note_start_frames = tconv.to(note->time()); - nframes_t note_end_frames = tconv.to(note->end_time()); - - if (note->length() > 0 && note_end_frames + region->position() > start) - mrv->resolve_note(note->note(), note_end_frames); - - if (note_start_frames + region->position() < start) { - continue; - } - - if (note_start_frames + region->position() > start + dur) { - break; - } - - if (note->note() < _lowest_note) { - _lowest_note = note->note(); - update_range = true; - } else if (note->note() > _highest_note) { - _highest_note = note->note(); - update_range = true; - } - - mrv->add_note (note, !update_range); - } - - mrv->extend_active_notes(); - } - } - - } else { - - nframes_t nlen = _trackview.track()->get_captured_frames(n); - - if (nlen != region->length()) { - - if (region->source_length(0) >= region->position() + nlen) { - - 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 */ - iter->second = add_region_view_internal (region, false); - } - - /* also hide rect */ - ArdourCanvas::Item * rect = rec_rects[n].rectangle; - rect->hide(); - - } - } - } - - iter = tmp; - } - - if (update_range) - update_contents_height(); - } -} - -void -MidiStreamView::rec_data_range_ready (nframes_t start, nframes_t cnt, boost::weak_ptr weak_src) -{ - // this is called from the butler thread for now - - ENSURE_GUI_THREAD (*this, &MidiStreamView::rec_data_range_ready, start, cnt, weak_src) - - boost::shared_ptr src (boost::dynamic_pointer_cast(weak_src.lock())); - - if (!src) { - return; - } - - if (start + cnt > last_rec_data_frame) { - last_rec_data_frame = start + cnt; - } - - this->update_rec_regions (src->model(), start, cnt); -} - void MidiStreamView::color_handler () { @@ -740,3 +618,34 @@ MidiStreamView::note_range_adjustment_changed() apply_note_range(lowest, highest, true); } +void +MidiStreamView::update_rec_box () +{ + StreamView::update_rec_box (); + + if (rec_regions.empty()) { + return; + } + + /* Update the region being recorded to reflect where we currently are */ + boost::shared_ptr region = rec_regions.back().first; + region->set_length (_trackview.track()->current_capture_end () - _trackview.track()->current_capture_start(), this); + + MidiRegionView* mrv = dynamic_cast (rec_regions.back().second); + mrv->extend_active_notes (); +} + +uint8_t +MidiStreamView::y_to_note (double y) const +{ + int const n = ((contents_height() - y - 1) / contents_height() * (double)contents_note_range()) + + lowest_note(); + + if (n < 0) { + return 0; + } else if (n > 127) { + return 127; + } + + return n; +}