X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_streamview.cc;h=90e6147763ab95827af368850550763c030d2f57;hb=25eb9f406960aa8e36ccd90e2cd4397f372bd0fa;hp=537c4cb725427a43bd8d37cc2e9ac6a0f9ad6d55;hpb=2c59ddede5a4b6c1b9227e2a0288561b38f0763f;p=ardour.git diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc index 537c4cb725..90e6147763 100644 --- a/gtk2_ardour/midi_streamview.cc +++ b/gtk2_ardour/midi_streamview.cc @@ -17,23 +17,23 @@ */ #include -#include #include #include #include -#include "ardour/midi_diskstream.h" -#include "ardour/midi_playlist.h" #include "ardour/midi_region.h" #include "ardour/midi_source.h" #include "ardour/midi_track.h" +#include "ardour/operations.h" #include "ardour/region_factory.h" +#include "ardour/session.h" #include "ardour/smf_source.h" #include "ardour_ui.h" #include "canvas-simplerect.h" +#include "global_signals.h" #include "gui_thread.h" #include "lineset.h" #include "midi_region_view.h" @@ -48,6 +48,8 @@ #include "simplerect.h" #include "utils.h" +#include "i18n.h" + using namespace std; using namespace ARDOUR; using namespace PBD; @@ -62,73 +64,45 @@ MidiStreamView::MidiStreamView (MidiTimeAxisView& tv) , _highest_note(71) , _data_note_min(60) , _data_note_max(71) + , _note_lines (0) + , _updates_suspended (false) { - if (tv.is_track()) { - stream_base_color = ARDOUR_UI::config()->canvasvar_MidiTrackBase.get(); - } else { - stream_base_color = ARDOUR_UI::config()->canvasvar_MidiBusBase.get(); - } - - use_rec_regions = tv.editor().show_waveforms_recording (); - /* 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 = new ArdourCanvas::Group (*_canvas_group); midi_underlay_group->lower_to_bottom(); /* put the note lines in the timeaxisview's group, so it can be put below ghost regions from MIDI underlays*/ - _note_lines = new ArdourCanvas::LineSet(*canvas_group, ArdourCanvas::LineSet::Horizontal); + _note_lines = new ArdourCanvas::LineSet(*_canvas_group, + ArdourCanvas::LineSet::Horizontal); _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(bind( - mem_fun(_trackview.editor(), &PublicEditor::canvas_stream_view_event), - _note_lines, &_trackview)); + _note_lines->signal_event().connect( + sigc::bind(sigc::mem_fun(_trackview.editor(), + &PublicEditor::canvas_stream_view_event), + _note_lines, &_trackview)); _note_lines->lower_to_bottom(); - ColorsChanged.connect(mem_fun(*this, &MidiStreamView::draw_note_lines)); + color_handler (); + + ColorsChanged.connect(sigc::mem_fun(*this, &MidiStreamView::color_handler)); note_range_adjustment.set_page_size(_highest_note - _lowest_note); note_range_adjustment.set_value(_lowest_note); note_range_adjustment.signal_value_changed().connect( - mem_fun(*this, &MidiStreamView::note_range_adjustment_changed)); + sigc::mem_fun(*this, &MidiStreamView::note_range_adjustment_changed)); } MidiStreamView::~MidiStreamView () { } -static void -veto_note_range(uint8_t& min, uint8_t& max) -{ - /* Legal notes, thanks */ - clamp_to_0_127(min); - clamp_to_0_127(max); - - /* Always display at least one octave in [0, 127] */ - if (max == 127) { - if (min > (127 - 11)) { - min = 127 - 11; - } - } else if (max < min + 11) { - uint8_t d = 11 - (max - min); - if (max + d/2 > 127) { - min -= d; - } else { - min -= d / 2; - max += d / 2; - } - } - assert(max - min >= 11); - assert(max <= 127); - assert(min <= 127); -} - RegionView* MidiStreamView::create_region_view (boost::shared_ptr r, bool /*wfd*/, bool) { @@ -138,8 +112,8 @@ MidiStreamView::create_region_view (boost::shared_ptr r, bool /*wfd*/, b return 0; } - RegionView* region_view = new MidiRegionView (canvas_group, _trackview, region, - _samples_per_unit, region_color); + RegionView* region_view = new MidiRegionView (_canvas_group, _trackview, region, + _samples_per_unit, region_color); region_view->init (region_color, false); @@ -175,11 +149,23 @@ 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); + /* fit note range if we are importing */ + if (_trackview.session()->operation_in_progress (Operations::insert_file)) { + set_note_range (ContentsRange); + } + /* catch regionview going away */ - region->GoingAway.connect (bind (mem_fun (*this, &MidiStreamView::remove_region_view), region)); + boost::weak_ptr wr (region); // make this explicit + region->DropReferences.connect (*this, invalidator (*this), boost::bind (&MidiStreamView::remove_region_view, this, wr), gui_context()); RegionViewAdded (region_view); @@ -189,8 +175,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); @@ -201,19 +188,21 @@ MidiStreamView::display_region(MidiRegionView* region_view, bool load_model) } _range_dirty = update_data_note_range( - source->model()->lowest_note(), - source->model()->highest_note()); + source->model()->lowest_note(), + source->model()->highest_note()); // Display region contents - region_view->set_height(height); + region_view->set_height (child_height()); region_view->display_model(source->model()); } void -MidiStreamView::display_diskstream (boost::shared_ptr ds) +MidiStreamView::display_track (boost::shared_ptr tr) { - StreamView::display_diskstream(ds); + StreamView::display_track (tr); + draw_note_lines(); + NoteRangeChanged(); } @@ -224,8 +213,8 @@ MidiStreamView::update_contents_metrics(boost::shared_ptr r) if (mr) { mr->midi_source(0)->load_model(); _range_dirty = update_data_note_range( - mr->model()->lowest_note(), - mr->model()->highest_note()); + mr->model()->lowest_note(), + mr->model()->highest_note()); } } @@ -245,7 +234,7 @@ MidiStreamView::update_data_note_range(uint8_t min, uint8_t max) } void -MidiStreamView::redisplay_diskstream () +MidiStreamView::redisplay_track () { if (!_trackview.is_midi_track()) { return; @@ -257,9 +246,8 @@ MidiStreamView::redisplay_diskstream () _range_dirty = false; _data_note_min = 127; _data_note_max = 0; - _trackview.get_diskstream()->playlist()->foreach_region( - sigc::mem_fun (*this, &StreamView::update_contents_metrics) - ); + _trackview.track()->playlist()->foreach_region( + sigc::mem_fun (*this, &StreamView::update_contents_metrics)); // No notes, use default range if (!_range_dirty) { @@ -267,12 +255,6 @@ MidiStreamView::redisplay_diskstream () _data_note_max = 71; } - // Extend visible range to show newly recorded data, if necessary - _lowest_note = std::min(_lowest_note, _data_note_min); - _highest_note = std::max(_highest_note, _data_note_max); - - veto_note_range(_lowest_note, _highest_note); - // Flag region views as invalid and disable drawing for (i = region_views.begin(); i != region_views.end(); ++i) { (*i)->set_valid(false); @@ -280,9 +262,8 @@ MidiStreamView::redisplay_diskstream () } // Add and display region views, and flag them as valid - _trackview.get_diskstream()->playlist()->foreach_region( - sigc::hide_return (sigc::mem_fun (*this, &StreamView::add_region_view)) - ); + _trackview.track()->playlist()->foreach_region( + sigc::hide_return (sigc::mem_fun (*this, &StreamView::add_region_view))); // Stack regions by layer, and remove invalid regions layer_regions(); @@ -296,19 +277,29 @@ void MidiStreamView::update_contents_height () { StreamView::update_contents_height(); - _note_lines->property_y2() = height; - draw_note_lines(); + _note_lines->property_y2() = child_height (); + + apply_note_range (lowest_note(), highest_note(), true); } void MidiStreamView::draw_note_lines() { + if (!_note_lines || _updates_suspended) { + return; + } + double y; double prev_y = contents_height(); uint32_t color; _note_lines->clear(); + if (child_height() < 140 || note_height() < 3) { + /* track is too small for note lines, or there are too many */ + return; + } + for (int i = lowest_note(); i <= highest_note(); ++i) { y = floor(note_to_y(i)); @@ -356,23 +347,60 @@ MidiStreamView::apply_note_range(uint8_t lowest, uint8_t highest, bool to_region { _highest_note = highest; _lowest_note = lowest; + + int const max_note_height = 20; // This should probably be based on text size... + 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 > max_note_height) { + + int const available_note_range = floor (child_height() / max_note_height); + int additional_notes = available_note_range - range; + + /* distribute additional notes to higher and lower ranges, clamp at 0 and 127 */ + for (int i = 0; i < additional_notes; i++){ + + if (i % 2 && _highest_note < 127){ + _highest_note++; + } + else if (i % 2) { + _lowest_note--; + } + else if (_lowest_note > 0){ + _lowest_note--; + } + else { + _highest_note++; + } + } + } + note_range_adjustment.set_page_size(_highest_note - _lowest_note); note_range_adjustment.set_value(_lowest_note); + draw_note_lines(); if (to_region_views) { - for (list::iterator i = region_views.begin(); i != region_views.end(); ++i) { - ((MidiRegionView*)(*i))->apply_note_range(lowest, highest); - } + apply_note_range_to_regions (); } NoteRangeChanged(); } +void +MidiStreamView::apply_note_range_to_regions () +{ + if (!_updates_suspended) { + for (list::iterator i = region_views.begin(); i != region_views.end(); ++i) { + ((MidiRegionView*)(*i))->apply_note_range(_lowest_note, _highest_note); + } + } +} + void MidiStreamView::update_note_range(uint8_t note_num) { - assert(note_num <= 127); _data_note_min = min(_data_note_min, note_num); _data_note_max = max(_data_note_max, note_num); } @@ -382,68 +410,87 @@ MidiStreamView::setup_rec_box () { // cerr << _trackview.name() << " streamview SRB\n"; - if (_trackview.session().transport_rolling()) { + if (_trackview.session()->transport_rolling()) { if (!rec_active && - _trackview.session().record_status() == Session::Recording && - _trackview.get_diskstream()->record_enabled()) { + _trackview.session()->record_status() == Session::Recording && + _trackview.track()->record_enabled()) { - if (use_rec_regions && rec_regions.size() == rec_rects.size()) { + if (Config->get_show_waveforms_while_recording() && rec_regions.size() == rec_rects.size()) { - /* add a new region, but don't bother if they set use_rec_regions mid-record */ + /* add a new region, but don't bother if they set show-waveforms-while-recording mid-record */ MidiRegion::SourceList sources; - for (list::iterator prc = rec_data_ready_connections.begin(); - prc != rec_data_ready_connections.end(); ++prc) { - (*prc).disconnect(); - } - rec_data_ready_connections.clear(); - - boost::shared_ptr mds = _trackview.midi_track()->midi_diskstream(); + rec_data_ready_connections.drop_connections (); - sources.push_back(mds->write_source()); - - rec_data_ready_connections.push_back (mds->write_source()->ViewDataRangeReady.connect (bind ( - mem_fun (*this, &MidiStreamView::rec_data_range_ready), - boost::weak_ptr(mds->write_source())))); + sources.push_back (_trackview.midi_track()->write_source()); // handle multi - nframes_t start = 0; + framepos_t start = 0; if (rec_regions.size() > 0) { start = rec_regions.back().first->start() - + _trackview.get_diskstream()->get_captured_frames(rec_regions.size()-1); + + _trackview.track()->get_captured_frames(rec_regions.size()-1); } - boost::shared_ptr region (boost::dynamic_pointer_cast - (RegionFactory::create (sources, start, 1 , "", 0, Region::DefaultFlags, false))); - - assert(region); - region->block_property_changes (); - region->set_position (_trackview.session().transport_frame(), this); - rec_regions.push_back (make_pair(region, (RegionView*)0)); + if (!rec_regions.empty()) { + MidiRegionView* mrv = dynamic_cast (rec_regions.back().second); + mrv->end_write (); + } - // rec regions are destroyed in setup_rec_box + 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); - /* we add the region later */ + boost::shared_ptr region (boost::dynamic_pointer_cast + (RegionFactory::create (sources, plist, false))); + if (region) { + region->set_start (_trackview.track()->current_capture_start() + - _trackview.track()->get_capture_start_frame (0)); + region->set_position (_trackview.track()->current_capture_start()); + RegionView* rv = add_region_view_internal (region, false); + MidiRegionView* mrv = dynamic_cast (rv); + mrv->begin_write (); + + + /* rec region will be destroyed in setup_rec_box */ + rec_regions.push_back (make_pair (region, rv)); + + /* we add the region later */ + setup_new_rec_layer_time (region); + } else { + error << _("failed to create MIDI region") << endmsg; + } } /* start a new rec box */ boost::shared_ptr mt = _trackview.midi_track(); /* we know what it is already */ - boost::shared_ptr ds = mt->midi_diskstream(); - nframes_t frame_pos = ds->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); + ArdourCanvas::SimpleRect * rec_rect = new Gnome::Canvas::SimpleRect (*_canvas_group); rec_rect->property_x1() = xstart; rec_rect->property_y1() = 1.0; rec_rect->property_x2() = xend; @@ -454,20 +501,20 @@ MidiStreamView::setup_rec_box () RecBoxInfo recbox; recbox.rectangle = rec_rect; - recbox.start = _trackview.session().transport_frame(); + recbox.start = _trackview.session()->transport_frame(); recbox.length = 0; rec_rects.push_back (recbox); screen_update_connection.disconnect(); screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect ( - mem_fun (*this, &MidiStreamView::update_rec_box)); + sigc::mem_fun (*this, &MidiStreamView::update_rec_box)); rec_updating = true; rec_active = true; } else if (rec_active && - (_trackview.session().record_status() != Session::Recording || - !_trackview.get_diskstream()->record_enabled())) { + (_trackview.session()->record_status() != Session::Recording || + !_trackview.track()->record_enabled())) { screen_update_connection.disconnect(); rec_active = false; rec_updating = false; @@ -481,12 +528,7 @@ MidiStreamView::setup_rec_box () /* disconnect rapid update */ screen_update_connection.disconnect(); - - for (list::iterator prc = rec_data_ready_connections.begin(); - prc != rec_data_ready_connections.end(); ++prc) { - (*prc).disconnect(); - } - rec_data_ready_connections.clear(); + rec_data_ready_connections.drop_connections (); rec_updating = false; rec_active = false; @@ -520,165 +562,15 @@ MidiStreamView::setup_rec_box () } } -void -MidiStreamView::update_rec_regions (boost::shared_ptr data, nframes_t start, nframes_t dur) -{ - ENSURE_GUI_THREAD (bind (mem_fun (*this, &MidiStreamView::update_rec_regions), data, start, dur)); - - if (use_rec_regions) { - - 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->freeze (); - region->set_position (_trackview.get_diskstream()->get_capture_start_frame(n), this); - region->set_length (start + dur - region->position(), this); - region->thaw ("updated"); - - 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(), region->position()); - - /* draw events */ - MidiRegionView* mrv = (MidiRegionView*)iter->second; - - // FIXME: this is offensively slow (linear search) - for (MidiModel::Notes::const_iterator i = data->notes().begin(); - 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.get_diskstream()->get_captured_frames(n); - - if (nlen != region->length()) { - - if (region->source_length(0) >= region->position() + nlen) { - - region->freeze (); - region->set_position (_trackview.get_diskstream()->get_capture_start_frame(n), this); - region->set_length (nlen, this); - region->thaw ("updated"); - - 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(bind (mem_fun (*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 () { - //case cMidiTrackBase: - if (_trackview.is_midi_track()) { - //canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiTrackBase.get(); - } + draw_note_lines (); - //case cMidiBusBase: - if (!_trackview.is_midi_track()) { - //canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiBusBase.get();; + if (_trackview.is_midi_track()) { + canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiTrackBase.get(); + } else { + canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiBusBase.get();; } } @@ -710,3 +602,67 @@ 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()); + + 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; +} + +/** Suspend updates to the regions' note ranges and our + * note lines until resume_updates() is called. + */ +void +MidiStreamView::suspend_updates () +{ + _updates_suspended = true; +} + +/** Resume updates to region note ranges and note lines, + * and update them now. + */ +void +MidiStreamView::resume_updates () +{ + _updates_suspended = false; + + draw_note_lines (); + apply_note_range_to_regions (); +} + +void +MidiStreamView::leave_internal_edit_mode () +{ + StreamView::leave_internal_edit_mode (); + for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) { + MidiRegionView* mrv = dynamic_cast (*i); + if (mrv) { + mrv->clear_selection (); + } + } +}