X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_streamview.cc;h=723b52220210e0b3e28e972af24e6a5632135a94;hb=7268bdb132c3dabed075c5e1302ce29815749a61;hp=09abaeb74971c62bee7236d9c98f0ff4ca3bc54c;hpb=2ff1cd99af1b32434819c9dc48f1c5459837eaa3;p=ardour.git diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc index 09abaeb749..723b522202 100644 --- a/gtk2_ardour/midi_streamview.cc +++ b/gtk2_ardour/midi_streamview.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2001-2007 Paul Davis + Copyright (C) 2001-2007 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -31,9 +31,11 @@ #include "ardour/midi_track.h" #include "ardour/region_factory.h" #include "ardour/smf_source.h" +#include "ardour/session.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" @@ -62,41 +64,36 @@ MidiStreamView::MidiStreamView (MidiTimeAxisView& tv) , _highest_note(71) , _data_note_min(60) , _data_note_max(71) + , _note_lines (0) { - 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 + /* 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->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 () @@ -109,7 +106,7 @@ 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)) { @@ -138,11 +135,11 @@ MidiStreamView::create_region_view (boost::shared_ptr r, bool /*wfd*/, b return 0; } - RegionView* region_view = new MidiRegionView (canvas_group, _trackview, region, + RegionView* region_view = new MidiRegionView (_canvas_group, _trackview, region, _samples_per_unit, region_color); - + region_view->init (region_color, false); - + return region_view; } @@ -157,11 +154,11 @@ MidiStreamView::add_region_view_internal (boost::shared_ptr r, bool wfd, for (list::iterator i = region_views.begin(); i != region_views.end(); ++i) { if ((*i)->region() == r) { - + /* great. we already have a MidiRegionView for this Region. use it again. */ (*i)->set_valid (true); - + display_region(dynamic_cast(*i), wfd); return 0; @@ -172,15 +169,15 @@ MidiStreamView::add_region_view_internal (boost::shared_ptr r, bool wfd, if (region_view == 0) { return 0; } - + region_views.push_front (region_view); - + /* display events and find note range */ display_region (region_view, wfd); /* catch regionview going away */ - region->GoingAway.connect (bind (mem_fun (*this, &MidiStreamView::remove_region_view), region)); - + region->DropReferences.connect (*this, invalidator (*this), boost::bind (&MidiStreamView::remove_region_view, this, region), gui_context()); + RegionViewAdded (region_view); return region_view; @@ -205,18 +202,20 @@ 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()); } 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(); } - + void MidiStreamView::update_contents_metrics(boost::shared_ptr r) { @@ -245,7 +244,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,7 +256,7 @@ MidiStreamView::redisplay_diskstream () _range_dirty = false; _data_note_min = 127; _data_note_max = 0; - _trackview.get_diskstream()->playlist()->foreach_region( + _trackview.track()->playlist()->foreach_region( sigc::mem_fun (*this, &StreamView::update_contents_metrics) ); @@ -266,13 +265,13 @@ MidiStreamView::redisplay_diskstream () _data_note_min = 60; _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,7 +279,7 @@ MidiStreamView::redisplay_diskstream () } // Add and display region views, and flag them as valid - _trackview.get_diskstream()->playlist()->foreach_region( + _trackview.track()->playlist()->foreach_region( sigc::hide_return (sigc::mem_fun (*this, &StreamView::add_region_view)) ); @@ -296,22 +295,31 @@ 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) { + return; + } + double y; double prev_y = contents_height(); uint32_t color; _note_lines->clear(); + + if (child_height() < 140){ + return; + } for (int i = lowest_note(); i <= highest_note(); ++i) { y = floor(note_to_y(i)); - + _note_lines->add_line(prev_y, 1.0, ARDOUR_UI::config()->canvasvar_PianoRollBlackOutline.get()); switch (i % 12) { @@ -356,91 +364,129 @@ MidiStreamView::apply_note_range(uint8_t lowest, uint8_t highest, bool to_region { _highest_note = highest; _lowest_note = lowest; + + 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 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 */ + 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(); + 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); + ((MidiRegionView*)(*i))->apply_note_range(_lowest_note, _highest_note); } } NoteRangeChanged(); } -void +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); } - + void 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()) { + if (!rec_active && + _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(); - // FIXME - boost::shared_ptr mds = boost::dynamic_pointer_cast(_trackview.get_diskstream()); - assert(mds); + 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 - - jack_nframes_t start = 0; + + framepos_t start = 0; if (rec_regions.size() > 0) { - start = rec_regions.back().first->position() + _trackview.get_diskstream()->get_captured_frames(rec_regions.size()-1); + 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); + plist.add (ARDOUR::Properties::name, string()); + plist.add (ARDOUR::Properties::layer, 0); + boost::shared_ptr region (boost::dynamic_pointer_cast - (RegionFactory::create (sources, start, 1 , "", 0, Region::DefaultFlags, false))); + (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 */ - boost::shared_ptr ds = mt->midi_diskstream(); - jack_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; @@ -448,29 +494,28 @@ MidiStreamView::setup_rec_box () rec_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_RecordingRect.get(); rec_rect->property_fill_color_rgba() = fill_color; rec_rect->lower_to_bottom(); - + 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)); + screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect ( + 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; - } - + } else { // cerr << "\tNOT rolling, rec_rects = " << rec_rects.size() << " rec_regions = " << rec_regions.size() << endl; @@ -479,20 +524,16 @@ 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; - + /* remove temp regions */ - + for (list,RegionView*> >::iterator iter = rec_regions.begin(); iter != rec_regions.end();) { list,RegionView*> >::iterator tmp; - + tmp = iter; ++tmp; @@ -500,7 +541,7 @@ MidiStreamView::setup_rec_box () iter = tmp; } - + rec_regions.clear(); // cerr << "\tclear " << rec_rects.size() << " rec rects\n"; @@ -510,158 +551,22 @@ MidiStreamView::setup_rec_box () RecBoxInfo &rect = (*iter); delete rect.rectangle; } - - rec_rects.clear(); - - } - } -} - -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; - - tmp = iter; - ++tmp; - - boost::shared_ptr region = boost::dynamic_pointer_cast(iter->first); - if (!region || !iter->second) { - iter = tmp; - continue; - } - - if (!canvas_item_visible (rec_rects[n].rectangle)) { - /* rect already hidden, this region is done */ - 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; - - /* draw events */ - MidiRegionView* mrv = (MidiRegionView*)iter->second; - for (size_t i=0; i < data->n_notes(); ++i) { - - // FIXME: slooooooooow! - - const boost::shared_ptr note = data->note_at(i); - - if (note->length() > 0 && note->end_time() + region->position() > start) - mrv->resolve_note(note->note(), note->end_time()); - - if (note->time() + region->position() < start) - continue; - - if (note->time() + 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(); - - } - } - } + rec_rects.clear(); - iter = tmp; } - - if (update_range) - update_contents_height(); } } -void -MidiStreamView::rec_data_range_ready (jack_nframes_t start, jack_nframes_t dur, 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, dur, weak_src)); - - boost::shared_ptr src (boost::dynamic_pointer_cast(weak_src.lock())); - - this->update_rec_regions (src->model(), start, dur); -} - 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();; } } @@ -693,3 +598,20 @@ 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 (); +} +