diff options
author | David Robillard <d@drobilla.net> | 2007-05-31 21:37:20 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2007-05-31 21:37:20 +0000 |
commit | 0f2f4d8efc7f3e1144c6f51fd17c1ab309056c3e (patch) | |
tree | 5f3b9c752aafcd9874ae55197d678d4b17bbc442 /gtk2_ardour | |
parent | 52a8242a1158426caeed4757bbc3f7f71091e351 (diff) |
Rewrote MidiRingBuffer to more efficiently pack data (flat pack stamps, sizes, and event data into a single buffer).
Eliminate a double-copy on MIDI playback (MidiRingBuffer -> MidiBuffer).
Various MIDI diskstream/source/SMF fixes (only write when appropriate, handle transport locates, etc).
Fix MIDI rec region size/offset problems.
Code cleanups.
git-svn-id: svn://localhost/ardour2/trunk@1934 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/audio_streamview.cc | 32 | ||||
-rw-r--r-- | gtk2_ardour/audio_streamview.h | 4 | ||||
-rw-r--r-- | gtk2_ardour/midi_streamview.cc | 90 | ||||
-rw-r--r-- | gtk2_ardour/midi_streamview.h | 7 | ||||
-rw-r--r-- | gtk2_ardour/streamview.h | 14 |
5 files changed, 78 insertions, 69 deletions
diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc index 09510e8d42..87f895d977 100644 --- a/gtk2_ardour/audio_streamview.cc +++ b/gtk2_ardour/audio_streamview.cc @@ -18,6 +18,7 @@ #include <cmath> #include <cassert> +#include <utility> #include <gtkmm.h> @@ -50,6 +51,7 @@ #include "i18n.h" +using namespace std; using namespace ARDOUR; using namespace PBD; using namespace Editing; @@ -111,17 +113,15 @@ AudioStreamView::set_amplitude_above_axis (gdouble app) return 0; } -void +RegionView* AudioStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wait_for_waves) { AudioRegionView *region_view = 0; - ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::add_region_view), r)); - boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion> (r); if (region == 0) { - return; + return NULL; } for (list<RegionView *>::iterator i = region_views.begin(); i != region_views.end(); ++i) { @@ -138,7 +138,7 @@ AudioStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wai arv->set_waveform_shape (_waveform_shape); } - return; + return NULL; } } @@ -199,6 +199,8 @@ AudioStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wai region->GoingAway.connect (bind (mem_fun (*this, &AudioStreamView::remove_region_view), boost::weak_ptr<Region> (r))); RegionViewAdded (region_view); + + return region_view; } void @@ -493,7 +495,7 @@ AudioStreamView::setup_rec_box () nframes_t start = 0; if (rec_regions.size() > 0) { - start = rec_regions.back()->start() + _trackview.get_diskstream()->get_captured_frames(rec_regions.size()-1); + start = rec_regions.back().first->start() + _trackview.get_diskstream()->get_captured_frames(rec_regions.size()-1); } boost::shared_ptr<AudioRegion> region (boost::dynamic_pointer_cast<AudioRegion> @@ -501,7 +503,7 @@ AudioStreamView::setup_rec_box () assert(region); region->set_position (_trackview.session().transport_frame(), this); - rec_regions.push_back (region); + rec_regions.push_back (make_pair(region, (RegionView*)0)); } /* start a new rec box */ @@ -538,6 +540,7 @@ AudioStreamView::setup_rec_box () rec_rect->property_y2() = (double) _trackview.height - 1; rec_rect->property_outline_color_rgba() = color_map[cRecordingRectOutline]; rec_rect->property_fill_color_rgba() = fill_color; + rec_rect->lower_to_bottom(); RecBoxInfo recbox; recbox.rectangle = rec_rect; @@ -577,17 +580,16 @@ AudioStreamView::setup_rec_box () rec_updating = false; rec_active = false; - last_rec_data_frame = 0; /* remove temp regions */ - for (list<boost::shared_ptr<Region> >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); ) { - list<boost::shared_ptr<Region> >::iterator tmp; + for (list<pair<boost::shared_ptr<Region>,RegionView*> >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); ) { + list<pair<boost::shared_ptr<Region>,RegionView*> >::iterator tmp; tmp = iter; ++tmp; - (*iter)->drop_references (); + (*iter).first->drop_references (); iter = tmp; } @@ -648,9 +650,9 @@ AudioStreamView::update_rec_regions () uint32_t n = 0; - for (list<boost::shared_ptr<Region> >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); n++) { + for (list<pair<boost::shared_ptr<Region>,RegionView*> >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); n++) { - list<boost::shared_ptr<Region> >::iterator tmp; + list<pair<boost::shared_ptr<Region>,RegionView*> >::iterator tmp; tmp = iter; ++tmp; @@ -661,14 +663,14 @@ AudioStreamView::update_rec_regions () continue; } - boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion>(*iter); + boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion>(iter->first); if (!region) { continue; } nframes_t origlen = region->length(); - if (region == rec_regions.back() && rec_active) { + if (region == rec_regions.back().first && rec_active) { if (last_rec_data_frame > region->start()) { diff --git a/gtk2_ardour/audio_streamview.h b/gtk2_ardour/audio_streamview.h index 0f51889ca2..2baf1a6f66 100644 --- a/gtk2_ardour/audio_streamview.h +++ b/gtk2_ardour/audio_streamview.h @@ -83,7 +83,7 @@ class AudioStreamView : public StreamView void rec_peak_range_ready (nframes_t start, nframes_t cnt, boost::weak_ptr<ARDOUR::Source> src); void update_rec_regions (); - void add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_waves); + RegionView* add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_waves); void remove_region_view (boost::weak_ptr<ARDOUR::Region> ); void remove_audio_region_view (boost::shared_ptr<ARDOUR::AudioRegion> ); @@ -109,6 +109,8 @@ class AudioStreamView : public StreamView WaveformShape _waveform_shape; WaveformScale _waveform_scale; + + map<boost::shared_ptr<ARDOUR::Source>, bool> rec_data_ready_map; }; #endif /* __ardour_audio_streamview_h__ */ diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc index 47fae246e0..be3a1007c6 100644 --- a/gtk2_ardour/midi_streamview.cc +++ b/gtk2_ardour/midi_streamview.cc @@ -18,6 +18,7 @@ #include <cmath> #include <cassert> +#include <utility> #include <gtkmm.h> @@ -45,6 +46,7 @@ #include "utils.h" #include "color.h" +using namespace std; using namespace ARDOUR; using namespace PBD; using namespace Editing; @@ -69,15 +71,13 @@ MidiStreamView::~MidiStreamView () } -void +RegionView* MidiStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wait_for_waves) { - ENSURE_GUI_THREAD (bind (mem_fun (*this, &MidiStreamView::add_region_view), r)); - boost::shared_ptr<MidiRegion> region = boost::dynamic_pointer_cast<MidiRegion> (r); if (region == 0) { - return; + return NULL; } MidiRegionView *region_view; @@ -89,7 +89,7 @@ MidiStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wait /* great. we already have a MidiRegionView for this Region. use it again. */ (*i)->set_valid (true); - return; + return NULL; } } @@ -112,6 +112,8 @@ MidiStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wait region->GoingAway.connect (bind (mem_fun (*this, &MidiStreamView::remove_region_view), region)); RegionViewAdded (region_view); + + return region_view; } // FIXME: code duplication with AudioStreamVIew @@ -164,6 +166,11 @@ MidiStreamView::setup_rec_box () /* add a new region, but don't bother if they set use_rec_regions mid-record */ MidiRegion::SourceList sources; + + for (list<sigc::connection>::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<MidiDiskstream> mds = boost::dynamic_pointer_cast<MidiDiskstream>(_trackview.get_diskstream()); @@ -171,20 +178,20 @@ MidiStreamView::setup_rec_box () 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), 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<Source>(mds->write_source())))); // handle multi jack_nframes_t start = 0; if (rec_regions.size() > 0) { - start = rec_regions.back()->start() + _trackview.get_diskstream()->get_captured_frames(rec_regions.size()-1); + start = rec_regions.back().first->start() + _trackview.get_diskstream()->get_captured_frames(rec_regions.size()-1); } boost::shared_ptr<MidiRegion> region (boost::dynamic_pointer_cast<MidiRegion> (RegionFactory::create (sources, start, 1 , "", 0, (Region::Flag)(Region::DefaultFlags | Region::DoNotSaveState), false))); assert(region); region->set_position (_trackview.session().transport_frame(), this); - rec_regions.push_back (region); + rec_regions.push_back (make_pair(region, (RegionView*)0)); // rec regions are destroyed in setup_rec_box @@ -212,6 +219,7 @@ MidiStreamView::setup_rec_box () rec_rect->property_y2() = (double) _trackview.height - 1; rec_rect->property_outline_color_rgba() = color_map[cRecordingRectOutline]; rec_rect->property_fill_color_rgba() = fill_color; + rec_rect->lower_to_bottom(); RecBoxInfo recbox; recbox.rectangle = rec_rect; @@ -251,15 +259,17 @@ MidiStreamView::setup_rec_box () rec_updating = false; rec_active = false; - last_rec_data_frame = 0; /* remove temp regions */ - for (list<boost::shared_ptr<Region> >::iterator iter = rec_regions.begin(); iter != rec_regions.end();) { - list<boost::shared_ptr<Region> >::iterator tmp; + for (list<pair<boost::shared_ptr<Region>,RegionView*> >::iterator iter = rec_regions.begin(); iter != rec_regions.end();) { + list<pair<boost::shared_ptr<Region>,RegionView*> >::iterator tmp; + tmp = iter; ++tmp; - (*iter)->drop_references (); + + (*iter).first->drop_references (); + iter = tmp; } @@ -280,16 +290,17 @@ MidiStreamView::setup_rec_box () } void -MidiStreamView::update_rec_regions () +MidiStreamView::update_rec_regions (boost::shared_ptr<MidiBuffer> data, nframes_t start, nframes_t dur) { - if (use_rec_regions) { + ENSURE_GUI_THREAD (bind (mem_fun (*this, &MidiStreamView::update_rec_regions), data, start, dur)); + if (use_rec_regions) { uint32_t n = 0; - for (list<boost::shared_ptr<Region> >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); n++) { + for (list<pair<boost::shared_ptr<Region>,RegionView*> >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); n++) { - list<boost::shared_ptr<Region> >::iterator tmp; + list<pair<boost::shared_ptr<Region>,RegionView*> >::iterator tmp; tmp = iter; ++tmp; @@ -300,16 +311,21 @@ MidiStreamView::update_rec_regions () continue; } - boost::shared_ptr<MidiRegion> region = boost::dynamic_pointer_cast<MidiRegion>(*iter); - assert(region); + boost::shared_ptr<MidiRegion> region = boost::dynamic_pointer_cast<MidiRegion>(iter->first); + if (!region) { + continue; + } - jack_nframes_t origlen = region->length(); + nframes_t origlen = region->length(); + + //cerr << "MIDI URR: " << start << " * " << dur + // << " (origlen " << origlen << ")" << endl; - if (region == rec_regions.back() && rec_active) { + if (region == rec_regions.back().first && rec_active) { - if (last_rec_data_frame > region->start()) { + if (start >= region->start()) { - jack_nframes_t nlen = last_rec_data_frame - region->start(); + nframes_t nlen = start + dur - region->start(); if (nlen != region->length()) { @@ -320,7 +336,7 @@ MidiStreamView::update_rec_regions () if (origlen == 1) { /* our special initial length */ - add_region_view_internal (region, false); + iter->second = add_region_view_internal (region, false); } /* also update rect */ @@ -332,7 +348,7 @@ MidiStreamView::update_rec_regions () } else { - jack_nframes_t nlen = _trackview.get_diskstream()->get_captured_frames(n); + nframes_t nlen = _trackview.get_diskstream()->get_captured_frames(n); if (nlen != region->length()) { @@ -345,7 +361,7 @@ MidiStreamView::update_rec_regions () if (origlen == 1) { /* our special initial length */ - add_region_view_internal (region, false); + iter->second = add_region_view_internal (region, false); } /* also hide rect */ @@ -362,26 +378,18 @@ MidiStreamView::update_rec_regions () } void -MidiStreamView::rec_data_range_ready (jack_nframes_t start, jack_nframes_t cnt, boost::shared_ptr<Source> src) +MidiStreamView::rec_data_range_ready (boost::shared_ptr<MidiBuffer> data, jack_nframes_t start, jack_nframes_t dur, boost::weak_ptr<Source> weak_src) { // this is called from the butler thread for now - // yeah we need a "peak" building thread or something, though there's not really any - // work for it to do... whatever. :) - ENSURE_GUI_THREAD(bind (mem_fun (*this, &MidiStreamView::rec_data_range_ready), start, cnt, src)); + ENSURE_GUI_THREAD(bind (mem_fun (*this, &MidiStreamView::rec_data_range_ready), data, start, dur, weak_src)); - //cerr << "REC DATA: " << start << " --- " << cnt << endl; - - if (rec_data_ready_map.size() == 0 || start+cnt > last_rec_data_frame) { - last_rec_data_frame = start + cnt; - } - - rec_data_ready_map[src] = true; - - if (rec_data_ready_map.size() == _trackview.get_diskstream()->n_channels().n_midi()) { - this->update_rec_regions (); - rec_data_ready_map.clear(); - } + boost::shared_ptr<SMFSource> src (boost::dynamic_pointer_cast<SMFSource>(weak_src.lock())); + + //cerr << src.get() << " MIDI READY: " << start << " * " << dur + // << " -- " << data->size() << " events!" << endl; + + this->update_rec_regions (data, start, dur); } void diff --git a/gtk2_ardour/midi_streamview.h b/gtk2_ardour/midi_streamview.h index 39ae510ed8..d2885b4391 100644 --- a/gtk2_ardour/midi_streamview.h +++ b/gtk2_ardour/midi_streamview.h @@ -20,7 +20,6 @@ #define __ardour_midi_streamview_h__ #include <list> -#include <map> #include <cmath> #include <ardour/location.h> @@ -62,10 +61,10 @@ class MidiStreamView : public StreamView private: void setup_rec_box (); - void rec_data_range_ready (jack_nframes_t start, jack_nframes_t cnt, boost::shared_ptr<ARDOUR::Source> src); - void update_rec_regions (); + void rec_data_range_ready (boost::shared_ptr<ARDOUR::MidiBuffer> data, jack_nframes_t start, jack_nframes_t dur, boost::weak_ptr<ARDOUR::Source> src); + void update_rec_regions (boost::shared_ptr<ARDOUR::MidiBuffer> data, jack_nframes_t start, jack_nframes_t dur); - void add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_waves); + RegionView* add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_waves); void redisplay_diskstream (); diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h index 365f2d4edf..f83b35191d 100644 --- a/gtk2_ardour/streamview.h +++ b/gtk2_ardour/streamview.h @@ -20,7 +20,6 @@ #define __ardour_streamview_h__ #include <list> -#include <map> #include <cmath> #include <ardour/location.h> @@ -107,9 +106,9 @@ protected: void sess_rec_enable_changed(); virtual void setup_rec_box () = 0; void update_rec_box (); - virtual void update_rec_regions () = 0; + //virtual void update_rec_regions () = 0; - virtual void add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_waves) = 0; + virtual RegionView* add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_waves) = 0; virtual void remove_region_view (boost::weak_ptr<ARDOUR::Region> ); //void remove_rec_region (boost::shared_ptr<ARDOUR::Region>); (unused) @@ -137,7 +136,7 @@ protected: sigc::connection screen_update_connection; vector<RecBoxInfo> rec_rects; - list<boost::shared_ptr<ARDOUR::Region> > rec_regions; + list< std::pair<boost::shared_ptr<ARDOUR::Region>,RegionView* > > rec_regions; bool rec_updating; bool rec_active; bool use_rec_regions; @@ -151,10 +150,9 @@ protected: int layers; double height; LayerDisplay layer_display; - - list<sigc::connection> rec_data_ready_connections; - jack_nframes_t last_rec_data_frame; - map<boost::shared_ptr<ARDOUR::Source>, bool> rec_data_ready_map; + + list<sigc::connection> rec_data_ready_connections; + jack_nframes_t last_rec_data_frame; }; #endif /* __ardour_streamview_h__ */ |