diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-08-28 16:06:08 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-08-28 16:06:08 +0000 |
| commit | e7e071db1a07ec6d66b71982f204c2cbaa70adee (patch) | |
| tree | 89bb307195d90c110fa7244a062397403390d21f /libs/ardour | |
| parent | 710ba02c70545e06ea57193c61bddba706a49dec (diff) | |
more MIDI editing tweaks ; flip mouse mode buttons around for MIDI so that "object" mode is the most likely mode for both region \& region editing ; frame handle events (from lincoln's region trimming patch) are now handled more explicitly
git-svn-id: svn://localhost/ardour2/branches/3.0@5600 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/midi_buffer.cc | 1 | ||||
| -rw-r--r-- | libs/ardour/midi_diskstream.cc | 18 | ||||
| -rw-r--r-- | libs/ardour/processor.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/route.cc | 1 |
4 files changed, 10 insertions, 12 deletions
diff --git a/libs/ardour/midi_buffer.cc b/libs/ardour/midi_buffer.cc index ae3071a53c..12b46e7f04 100644 --- a/libs/ardour/midi_buffer.cc +++ b/libs/ardour/midi_buffer.cc @@ -93,6 +93,7 @@ MidiBuffer::read_from (const Buffer& src, nframes_t nframes, nframes_t dst_offse const Evoral::MIDIEvent<TimeType> ev(*i, false); if (ev.time() >= src_offset && ev.time() < (nframes+src_offset)) { push_back (ev); + cerr << "got note " << ev << endl; } } diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc index 29b6ab4a4d..3d4b188a8b 100644 --- a/libs/ardour/midi_diskstream.cc +++ b/libs/ardour/midi_diskstream.cc @@ -1652,15 +1652,15 @@ MidiDiskstream::get_playback (MidiBuffer& dst, nframes_t start, nframes_t end) MidiBuffer::iterator this_cycle_start = dst.end(); // Translates stamps to be relative to start - #if 1 - _playback_buf->read(dst, start, end); - #else - const size_t events_read = _playback_buf->read(dst, start, end); - cout << "MDS events read = " << events_read - << " start = " << start << " end = " << end - << " readspace " << _playback_buf->read_space() - << " writespace " << _playback_buf->write_space() << endl; - #endif + + _playback_buf->read(dst, start, end); +#if 0 + const size_t events_read = _playback_buf->read(dst, start, end); + cout << _name << ": MDS events read = " << events_read + << " start = " << start << " end = " << end + << " readspace " << _playback_buf->read_space() + << " writespace " << _playback_buf->write_space() << endl; +#endif gint32 frames_read = end - start; g_atomic_int_add(&_frames_read_from_ringbuffer, frames_read); diff --git a/libs/ardour/processor.cc b/libs/ardour/processor.cc index 101bc29ab4..04706c0c2d 100644 --- a/libs/ardour/processor.cc +++ b/libs/ardour/processor.cc @@ -232,8 +232,6 @@ Processor::configure_io (ChanCount in, ChanCount out) _configured_output = out; _configured = true; - std::cerr << "******* CONF IN for " << _name << " set to " << in << std::endl; - ConfigurationChanged.emit (in, out); return true; diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index e922a2f33f..1cb7b84bc9 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -1341,7 +1341,6 @@ Route::configure_processors_unlocked (ProcessorStreams* err) // We can, so configure everything list< pair<ChanCount,ChanCount> >::iterator c = configuration.begin(); for (ProcessorList::iterator p = _processors.begin(); p != _processors.end(); ++p, ++c) { - cerr << _name << " Configure " << (*p)->name() << " for " << in << " + " << out << endl; (*p)->configure_io(c->first, c->second); processor_max_streams = ChanCount::max(processor_max_streams, c->first); processor_max_streams = ChanCount::max(processor_max_streams, c->second); |