13
0
Commit Graph

1371 Commits

Author SHA1 Message Date
caf103c0af Fix warnings.
git-svn-id: svn://localhost/ardour2/branches/3.0@4653 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 17:39:19 +00:00
77a71ac3e0 Fix empty for loop warning in RingBuffer constructor... and scary indentation... this is what was intended here, yes?
git-svn-id: svn://localhost/ardour2/branches/3.0@4652 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 17:23:15 +00:00
09f87d4f9f Upgrade to waf 1.5.3.
git-svn-id: svn://localhost/ardour2/branches/3.0@4651 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 16:41:27 +00:00
c9e5903e73 Clean up xml++.h and xml++.cc in Ardour style.
No functional changes.
(We've diverged far enough for it to not matter, and are about to diverge even more, so might as well).


git-svn-id: svn://localhost/ardour2/branches/3.0@4649 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-22 20:52:34 +00:00
5b04ddf424 Make commands noncopyable (they are definitely not copy safe).
memento_command.h style.


git-svn-id: svn://localhost/ardour2/branches/3.0@4648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-22 17:37:33 +00:00
df4e6f2341 Fix recording of the last disk chunk's worth of MIDI data.
git-svn-id: svn://localhost/ardour2/branches/3.0@4645 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-20 01:20:03 +00:00
c9582da233 Make source length a dynamic thing.
Update MIDI region length (actually and visually) when position changes.


git-svn-id: svn://localhost/ardour2/branches/3.0@4644 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-20 00:30:42 +00:00
bed0d89337 Clean up Region interface, remove Readable stub kludge.
git-svn-id: svn://localhost/ardour2/branches/3.0@4643 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-19 21:06:56 +00:00
75c15679bf Only create a Curve for an AutomationList if we need it.
Fix crash on crossfade editor show (ticket 2442).


git-svn-id: svn://localhost/ardour2/branches/3.0@4641 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-19 19:42:25 +00:00
8a28ea6154 Introduce new time for session-relative frame time, and make source interface capable of handling 64-bit long sessions.
sframes_t is "session frames".  The rules for time stamps are:
 - Anything relative to transport time, session position, etc, should be sframes_t
 - Anything relative to jack cycles, including the length thereof, should be nframes_t

To support sessions which exceed UINT32_MAX frames, we need to replace all the uses of
nframes_t for session time with sframes_t, and make sure the conversions are sound.
This does not depend on jack's nframes_t; that we are using the same type at all right now was an oops.

This is also be kinda nice for readability since the two different time bases have different types...


git-svn-id: svn://localhost/ardour2/branches/3.0@4636 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-19 05:45:11 +00:00
0f71728a92 Interpret tempo time based on read position (not source timeline position which is more or less meaningless).
Move time conversion into the region view rather than the source.
Adapt MIDI (including controllers) regions to the destination tempo when moved (e.g. dragging a region to a location with half the tempo will make the notes twice as long).


git-svn-id: svn://localhost/ardour2/branches/3.0@4635 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-19 04:12:54 +00:00
8f572c3d3f Readable is not as generic as its name implies ;)
git-svn-id: svn://localhost/ardour2/branches/3.0@4634 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-19 01:56:58 +00:00
067faeca62 Remove unused Session::curves.
git-svn-id: svn://localhost/ardour2/branches/3.0@4633 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-19 01:24:34 +00:00
e209e0d471 Remove empty files.
git-svn-id: svn://localhost/ardour2/branches/3.0@4629 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-18 23:58:21 +00:00
cbb59ddbce Fix 'sticky' sliders when MIDI control feedback is enabled.
git-svn-id: svn://localhost/ardour2/branches/3.0@4628 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-18 23:54:41 +00:00
9cfa3e2bf6 Fix MIDI control parameter mapping to work with controls that aren't [0..1] like gain (fix ticket #0002553).
git-svn-id: svn://localhost/ardour2/branches/3.0@4627 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-18 22:30:06 +00:00
3ccd34ec7e Style.
git-svn-id: svn://localhost/ardour2/branches/3.0@4626 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-18 20:57:58 +00:00
1f9c3f34d9 Fix MIDI controller feedback.
Make control surfaces menu less weird.


git-svn-id: svn://localhost/ardour2/branches/3.0@4625 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-18 20:53:54 +00:00
22088e77a7 Fix ardour2 -> ardour3 stuff in po files.
git-svn-id: svn://localhost/ardour2/branches/3.0@4623 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-18 18:51:50 +00:00
227eca4054 Fix ardour2 -> ardour3 issues.
git-svn-id: svn://localhost/ardour2/branches/3.0@4622 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-18 18:32:13 +00:00
2463be97f7 Make sure Evoral::MIDIEvent XML stuff is entirely unused in midi++ for now (resolve ticket #0002491).
Remove empty midi++ README etc files (and ancient nearly-empty midi++ ChangeLog).


git-svn-id: svn://localhost/ardour2/branches/3.0@4621 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-18 18:04:54 +00:00
Hans Baier
96d62ba6b4 * FIXME in midi_util.h
git-svn-id: svn://localhost/ardour2/branches/3.0@4615 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-17 16:42:17 +00:00
f219a53744 Fix deadlock and potential race condition when editing MIDI.
git-svn-id: svn://localhost/ardour2/branches/3.0@4614 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-17 06:09:37 +00:00
3f24977735 Make a bunch of stuff boost::noncopyable.
Clean up.


git-svn-id: svn://localhost/ardour2/branches/3.0@4613 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-17 03:49:32 +00:00
4fced02c0b Fix crazy spacey tabs, width, other super relevant rocket scientist type things.
git-svn-id: svn://localhost/ardour2/branches/3.0@4612 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-17 02:45:58 +00:00
022818b4a7 Fix the horrible mess that was anything related to sources and paths.
Most significant changes:

 - Factor out FileSource from AudioFileSource, use for SMFSource too
 - Explicitly pass embedded rather than mysterious name mangling or whatever
 - Destroy a ton of duplicated or very-nearly-duplicated code
 - Clean up and document all that weird source stuff in session.cc


git-svn-id: svn://localhost/ardour2/branches/3.0@4609 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-17 02:11:49 +00:00
Carl Hetherington
4565b73a39 Fix for visual glitch due to race between Editor::update_current_screen being called and a locate event being processed.
git-svn-id: svn://localhost/ardour2/branches/3.0@4608 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-17 00:12:22 +00:00
Sampo Savolainen
87c7b62103 Fix memory leak.
git-svn-id: svn://localhost/ardour2/branches/3.0@4606 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-16 19:06:27 +00:00
900309993c Move duplicated AudioFileSource::Flags and SMFSource::Flags into Source.
Clean up source stuff.


git-svn-id: svn://localhost/ardour2/branches/3.0@4605 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-16 18:08:22 +00:00
64bf6f004a Fix a bunch of the ol' trivial audio-specific-for-no-particular-reason things.
Re-addition of this sort of thing is now officially punishable by death ;)


git-svn-id: svn://localhost/ardour2/branches/3.0@4603 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-16 07:04:27 +00:00
f12cfb3d87 Fix crash iterating over sequences with no controls (and Sequence iterator sanity in general).
git-svn-id: svn://localhost/ardour2/branches/3.0@4602 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-16 07:02:28 +00:00
458c588e2c Don't bind playlist_modified with a shared_ptr<Playlist> parameter.
Clean up.


git-svn-id: svn://localhost/ardour2/branches/3.0@4599 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-16 05:13:05 +00:00
5f7b4de024 Time unit translation for AutomationLine (correctly display MIDI controller data).
git-svn-id: svn://localhost/ardour2/branches/3.0@4597 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-16 04:46:45 +00:00
0ef53a2d34 Fix crash on iteration over an empty sequence and/or recording controllers only.
git-svn-id: svn://localhost/ardour2/branches/3.0@4596 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-16 04:46:06 +00:00
93d7040d04 Fix deadlock issues.
Add IdentityConverter for when no conversion is actually needed.


git-svn-id: svn://localhost/ardour2/branches/3.0@4595 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-16 04:39:34 +00:00
3963d2b0b2 Move all beats <-> frames time conversion into a single object that can be passed around.
This has 3 main benefits:
 - All conversion code is in one place (less duplication, potential bugs)
 - The conversion method can be passed to things that are ignorant
   of the actual time units involved, information required, etc.
   (In the future it would be nice to have user selectable tempo/frame time)
 - It should be relatively simple now to support tempo changes part-way
   through a MIDI region (at least architecturally speaking)


git-svn-id: svn://localhost/ardour2/branches/3.0@4594 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-16 02:51:16 +00:00
fd1a3cfa4c Gracefully ignore illegal MIDI events at the buffer level (i.e. from Jack).
Ardour should now be able to more or less tolerate crazy incoming MIDI (except for SYSEX).


git-svn-id: svn://localhost/ardour2/branches/3.0@4592 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-16 00:53:26 +00:00
85ab341795 Gracefully ignore illegal MIDI events.
git-svn-id: svn://localhost/ardour2/branches/3.0@4591 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-16 00:36:11 +00:00
473170200d Rewrite Sequence::const_iterator.
Fixes crash bug when seeking back and forth from start to end of session.
Not sure about other things, but it makes a lot more sense now anyway...


git-svn-id: svn://localhost/ardour2/branches/3.0@4590 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-16 00:16:28 +00:00
1380f4fafb Trim include dependency tree (particularly on evoral/Sequence.hpp).
git-svn-id: svn://localhost/ardour2/branches/3.0@4589 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-15 23:47:09 +00:00
72f2f6e47e Clean up fugly debug printing stuff.
git-svn-id: svn://localhost/ardour2/branches/3.0@4588 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-15 22:10:32 +00:00
3cfb9126af Fix crash on reading meta event.
git-svn-id: svn://localhost/ardour2/branches/3.0@4586 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-15 20:50:20 +00:00
59972b5550 Factor out region layering.
Correctly layer automation regions to match the stacking of their 'real' counterparts.


git-svn-id: svn://localhost/ardour2/branches/3.0@4585 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-15 20:31:05 +00:00
166395c96b Fix genererally retarded and broken note range / diskstream display / etc. related things (correctly display region contents on initial session load).
git-svn-id: svn://localhost/ardour2/branches/3.0@4583 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-15 19:44:27 +00:00
ecaf107ed3 The Big Change: Store time in MidiModel as tempo time, not frame time.
The time stamp of an event is now always tempo, from file to model and
back again.  Frame time is only relevant at playback or recording time,
in the audio thread (MidiModel and MidiBuffer).

I think perhaps we don't need to change the actual time from double (which is
convenient for math), it is the time base conversion that caused problems.
Using a correct equality comparison (i.e.  not == which is not correct for
floating point) should probably make the undo issues go away, in 99.99% of
cases anyway.

There's almost certainly some regressions in here somewhere, but they do not
seem to be time related.  The bugs I'm hitting in testing are old ones that
seem unrelated now, so it's checkpoint time.

This sets us up for fancy things like tempo map import and tempo/meter changes
halfway through MIDI regions, but for now it's still assumed that the tempo
at the start of the region is valid for the duration of the entire region.


git-svn-id: svn://localhost/ardour2/branches/3.0@4582 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-15 17:30:42 +00:00
425966a696 Make smf_track_get_next_event gracefully handle empty tracks.
git-svn-id: svn://localhost/ardour2/branches/3.0@4581 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-15 17:16:58 +00:00
4c9ec5c9c0 Commit of the century, right here.
git-svn-id: svn://localhost/ardour2/branches/3.0@4580 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-15 03:51:49 +00:00
64e69c36da Oops. Fix XML stuff in GUI as well.
git-svn-id: svn://localhost/ardour2/branches/3.0@4579 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-15 03:45:00 +00:00
9462374e29 Session XML style consistency (tag names are capitalized).
One thing left, this weird "end-marker-is-free" in <Config>.  Is this really a config option?  Anyone?


git-svn-id: svn://localhost/ardour2/branches/3.0@4577 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-15 03:21:30 +00:00
74ff55f835 Tidy, remove dead code.
git-svn-id: svn://localhost/ardour2/branches/3.0@4576 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-15 03:00:04 +00:00
4b3b7fa952 Tidy.
git-svn-id: svn://localhost/ardour2/branches/3.0@4575 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-15 02:36:15 +00:00
67ce82c9b4 Shutup.
git-svn-id: svn://localhost/ardour2/branches/3.0@4574 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-15 02:14:23 +00:00
0d7936d823 Cache file position in SMFSource::read_unlocked (i.e. don't seek to start and search every single time).
git-svn-id: svn://localhost/ardour2/branches/3.0@4573 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-15 02:09:58 +00:00
41ac4afff5 Clean up.
git-svn-id: svn://localhost/ardour2/branches/3.0@4572 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-15 01:53:06 +00:00
5d519f8bb1 De-templatify Evoral::SMF which has no concept of time other than SMF time.
git-svn-id: svn://localhost/ardour2/branches/3.0@4571 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-15 01:32:41 +00:00
5a48f99f72 Use nframes_t for timestamps of real (jack) time MIDI events (i.e. in MidiBuffer and MidiRingBuffer).
Use iterator interface of Sequence to read events in a MIDISource rather than Sequence::read, avoiding timestamp confusion.
Disable no longer useful Sequence::read.


git-svn-id: svn://localhost/ardour2/branches/3.0@4570 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-15 01:24:26 +00:00
aefa9f0938 Tidy.
git-svn-id: svn://localhost/ardour2/branches/3.0@4569 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-14 23:48:18 +00:00
de2681f7cd Remove superfluous typedefs.
Don't set range on sysex parameters (fix warning).


git-svn-id: svn://localhost/ardour2/branches/3.0@4568 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-14 23:41:05 +00:00
d0cc3120ae Make SMF::append_event_delta take a buffer and a size rather than an Event (no point, more generic, etc.).
git-svn-id: svn://localhost/ardour2/branches/3.0@4567 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-14 22:52:38 +00:00
ea37584cac Const correctness.
git-svn-id: svn://localhost/ardour2/branches/3.0@4566 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-14 22:49:25 +00:00
f8d171d297 Remove unused (and timestamp type nasty) last_event_time() from SMF.
I swear I already did this.


git-svn-id: svn://localhost/ardour2/branches/3.0@4564 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-14 22:40:55 +00:00
3d4d0477f6 While I'm doing trivial prettification things and not giving a damn about superficial divergence:
- Remove tab width assumption in struct members that looked atrocious at ts=4
- Line up function names for easier/faster readability


git-svn-id: svn://localhost/ardour2/branches/3.0@4563 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-14 22:32:36 +00:00
1fd221ed1c Line wrap at 100 lines so I can read things :).
Formatting changes only.


git-svn-id: svn://localhost/ardour2/branches/3.0@4562 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-14 22:27:17 +00:00
cdbb1f898e Update for libsmf API changes.
git-svn-id: svn://localhost/ardour2/branches/3.0@4561 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-14 22:23:40 +00:00
8249cfb6a7 Fix types to be warning clean on 64 bit.
git-svn-id: svn://localhost/ardour2/branches/3.0@4560 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-14 22:22:55 +00:00
464d3d3ab4 Update autowaf (fix mandatory header check).
git-svn-id: svn://localhost/ardour2/branches/3.0@4559 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-14 20:53:51 +00:00
80e54c6ea0 MIDI robustness.
- Separate SMF::open and SMF::create, more powerful interface for both.
- Correctly handle note ons with velocity 0 as note offs in sequence.
- Use SMF (i.e. libsmf) for MIDI import


git-svn-id: svn://localhost/ardour2/branches/3.0@4558 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-14 20:52:15 +00:00
Carl Hetherington
9a3734a6bd Make DnD copy processors using their XML representations. Remove unused
copy constructors from the Processor hierarchy, and declare them private
to explicitly disallow copy construction.


git-svn-id: svn://localhost/ardour2/branches/3.0@4556 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-14 19:45:30 +00:00
b35f308894 Fix most absurd function name I've seen in a while.
git-svn-id: svn://localhost/ardour2/branches/3.0@4555 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-14 17:59:58 +00:00
b2a051f6c6 More powerful SMF::open interface.
git-svn-id: svn://localhost/ardour2/branches/3.0@4554 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-14 17:54:45 +00:00
d439459589 Remove abstract MIDIFile interface (maintaining interface with old crap was getting annoying).
git-svn-id: svn://localhost/ardour2/branches/3.0@4553 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-14 17:39:49 +00:00
5ffdf1857e LibSMF -> SMF
git-svn-id: svn://localhost/ardour2/branches/3.0@4552 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-14 17:35:34 +00:00
6314c69971 SMF -> OldSMF
git-svn-id: svn://localhost/ardour2/branches/3.0@4551 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-14 17:28:57 +00:00
Carl Hetherington
50d7d19614 Fix send copying by paste and drag n drop.
git-svn-id: svn://localhost/ardour2/branches/3.0@4550 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-14 17:28:01 +00:00
Hans Baier
e9fde9baa7 * second part of the last fix
git-svn-id: svn://localhost/ardour2/branches/3.0@4549 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-14 07:21:01 +00:00
Hans Baier
90ee153fc1 * fix concerning a comment on issue 2541: Go back to the last MIDI beat on stop
git-svn-id: svn://localhost/ardour2/branches/3.0@4548 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-14 07:18:38 +00:00
ef172d7ad6 Less weak plugin preset system (maybe AU preset stuff can use the 'normal' thing instead of being all weird now?).
LV2 preset support as implemented in svn calf plugins (experimental extension).


git-svn-id: svn://localhost/ardour2/branches/3.0@4547 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-14 03:28:12 +00:00
f609d97ccd Mandatory check for boost headers.
git-svn-id: svn://localhost/ardour2/branches/3.0@4546 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-14 01:00:15 +00:00
Hans Baier
92243228be *session.h whitespace
git-svn-id: svn://localhost/ardour2/branches/3.0@4545 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-13 08:29:23 +00:00
Hans Baier
0800b59f61 * MIDIClock_Slave: fixed bugs:
- not synced to session.audible_frame() but to session.transport_frame()
	- failed asserts in song position


git-svn-id: svn://localhost/ardour2/branches/3.0@4543 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-13 08:29:01 +00:00
Hans Baier
bb1aa327f8 * MIDIClock_Slave: Fix for devices that always send MIDI clock (not just between start/stop)
git-svn-id: svn://localhost/ardour2/branches/3.0@4542 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-13 08:28:54 +00:00
Hans Baier
328691c9d1 * disabled debugging output
git-svn-id: svn://localhost/ardour2/branches/3.0@4541 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-12 23:28:58 +00:00
Hans Baier
e7c7c33563 * Evoral: SMFTest: added createNewFileTest (passes)
git-svn-id: svn://localhost/ardour2/branches/3.0@4540 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-12 23:28:51 +00:00
Hans Baier
9d33176b49 * Swapped MidiSource to LibSMF
* integrated libsmf into scons


git-svn-id: svn://localhost/ardour2/branches/3.0@4539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-12 23:28:32 +00:00
Hans Baier
b1cd183511 * MIDI clock slave: issues 2541 and 2542 ready for testing (cant test myself due to lack of hardware)
* tempo.cc/tempo.h: formatting / whitespace


git-svn-id: svn://localhost/ardour2/branches/3.0@4538 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-12 10:14:22 +00:00
550613a898 verbosity--
git-svn-id: svn://localhost/ardour2/branches/3.0@4536 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-11 20:47:40 +00:00
3d1b648130 Remove unused (and weirdly typed) time parameter from begin_write.
Fix append_event_unlocked shadowing.


git-svn-id: svn://localhost/ardour2/branches/3.0@4535 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-11 20:37:22 +00:00
43c9e2a121 verbosity--
git-svn-id: svn://localhost/ardour2/branches/3.0@4534 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-11 20:20:41 +00:00
9579ea0801 StandardMIDIFile -> MIDIFile.
git-svn-id: svn://localhost/ardour2/branches/3.0@4533 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-11 20:15:25 +00:00
33bbc5cd84 Detect libsmf error and throw exceptions.
git-svn-id: svn://localhost/ardour2/branches/3.0@4532 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-11 17:59:33 +00:00
13bcd43423 Include stripped down libsmf code internally.
git-svn-id: svn://localhost/ardour2/branches/3.0@4531 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-11 17:38:40 +00:00
Hans Baier
947077c12e * introduced dependency: libsmf-1.2
* extracted Interface from SMF: StandardMIDIFile
* first implementation of StandardMIDIFile based on libsmf that passes basic test


git-svn-id: svn://localhost/ardour2/branches/3.0@4529 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-11 09:54:31 +00:00
Carl Hetherington
567f37f8eb Offer routes on mixer strip IO menus. Fixes to these menus on MIDI routes.
git-svn-id: svn://localhost/ardour2/branches/3.0@4528 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-11 02:14:01 +00:00
Carl Hetherington
a192ccaebc Add connected_to ()
git-svn-id: svn://localhost/ardour2/branches/3.0@4527 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-11 02:13:15 +00:00
Carl Hetherington
9b6d5a9361 Remove declaration of undefined method.
git-svn-id: svn://localhost/ardour2/branches/3.0@4526 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-11 02:12:41 +00:00
Carl Hetherington
d469cc3e3a Remove internal ports.
git-svn-id: svn://localhost/ardour2/branches/3.0@4525 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-11 00:58:24 +00:00
Hans Baier
fe4e98a729 *Evoral: Sequence: forgot to commit that
git-svn-id: svn://localhost/ardour2/branches/3.0@4524 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-11 00:00:41 +00:00
Hans Baier
dcc25d795b * Evoral: Added Unit test for SMF
git-svn-id: svn://localhost/ardour2/branches/3.0@4523 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-10 23:58:02 +00:00
Hans Baier
ce8065fea8 * Evoral::Sequence: conditional compile for debugging output
git-svn-id: svn://localhost/ardour2/branches/3.0@4522 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-10 23:57:52 +00:00
Hans Baier
494e7feec6 * Code readability: Template parameter <T> -> <Time>
git-svn-id: svn://localhost/ardour2/branches/3.0@4521 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-10 22:06:56 +00:00
Hans Baier
d9b7f2f245 * fix MIDI playback
git-svn-id: svn://localhost/ardour2/branches/3.0@4518 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-10 08:43:43 +00:00
Hans Baier
1872d48507 *Evoral::SMF fix reading/writing of SysEx Events
git-svn-id: svn://localhost/ardour2/branches/3.0@4517 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-10 08:43:35 +00:00
Carl Hetherington
6f14394c95 Fixes to port inserts.
git-svn-id: svn://localhost/ardour2/branches/3.0@4514 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-10 01:31:53 +00:00
Carl Hetherington
bd66734a59 Remove some debug code.
git-svn-id: svn://localhost/ardour2/branches/3.0@4513 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-10 01:30:57 +00:00
Carl Hetherington
dc78d4c241 Use slightly cleaner Port API in a few places.
git-svn-id: svn://localhost/ardour2/branches/3.0@4511 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-10 00:49:19 +00:00
Hans Baier
705698d5b4 * filename conventions (second part of it)
git-svn-id: svn://localhost/ardour2/branches/3.0@4510 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-09 22:34:09 +00:00
Hans Baier
1c043e3304 * filename conventions
* added (blank) SMFTest.cpp/hpp: To be implemented


git-svn-id: svn://localhost/ardour2/branches/3.0@4509 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-09 22:32:38 +00:00
Carl Hetherington
a44a244cba Fix fade outs on split regions.
git-svn-id: svn://localhost/ardour2/branches/3.0@4508 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-09 21:31:16 +00:00
03fe04cc2a Shrink exposed SMF API.
Fix warning.


git-svn-id: svn://localhost/ardour2/branches/3.0@4507 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-09 21:11:32 +00:00
Hans Baier
b0f94c111b * fixed test
git-svn-id: svn://localhost/ardour2/branches/3.0@4506 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-09 19:59:45 +00:00
406efbd535 Warning.
git-svn-id: svn://localhost/ardour2/branches/3.0@4505 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-09 17:48:23 +00:00
Hans Baier
9734fa3e93 * Sequence: added asserts
* sequence.cpp completed first test


git-svn-id: svn://localhost/ardour2/branches/3.0@4504 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-09 08:49:57 +00:00
Carl Hetherington
fcfe073b00 Apply fix for 2546 from lincoln. Many thanks.
git-svn-id: svn://localhost/ardour2/branches/3.0@4503 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-09 03:34:48 +00:00
Carl Hetherington
ee42a6dd97 Fixes to bundle manager to make it vaguely usable.
Rework signal handling for bundles so that all changes should now be noticed by port matrices.


git-svn-id: svn://localhost/ardour2/branches/3.0@4501 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-09 03:18:10 +00:00
e569121526 Fix warnings.
git-svn-id: svn://localhost/ardour2/branches/3.0@4499 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-07 07:22:25 +00:00
424b38790a Revert redundant kludge.
git-svn-id: svn://localhost/ardour2/branches/3.0@4498 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-07 07:19:02 +00:00
Hans Baier
446b214b46 * Evoral: first successful read from Sequence
*Evoral: added debug option to wscript


git-svn-id: svn://localhost/ardour2/branches/3.0@4497 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-07 06:57:02 +00:00
Hans Baier
21c85e79af * added run-tests.sh to libs/evoral
git-svn-id: svn://localhost/ardour2/branches/3.0@4496 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-07 02:22:17 +00:00
Hans Baier
d1f9f35d31 * evoral: First productive test environment
git-svn-id: svn://localhost/ardour2/branches/3.0@4495 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-07 00:52:19 +00:00
Hans Baier
43fdd21557 * introduced CppUnit into libs/Evoral
git-svn-id: svn://localhost/ardour2/branches/3.0@4494 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-07 00:11:17 +00:00
Hans Baier
cb745dbb9b * Evoral: waf and unit test compile and run now
git-svn-id: svn://localhost/ardour2/branches/3.0@4493 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-06 20:31:12 +00:00
Hans Baier
3d594b460b * Add SysEx Support to MidiModel / SMF
git-svn-id: svn://localhost/ardour2/branches/3.0@4492 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-06 20:31:00 +00:00
Hans Baier
b6daa2d643 * fix comment
git-svn-id: svn://localhost/ardour2/branches/3.0@4488 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-03 08:47:13 +00:00
Hans Baier
db77cb9212 * more pleasant template parameter names in (MIDI)Event
git-svn-id: svn://localhost/ardour2/branches/3.0@4487 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-03 08:46:44 +00:00
Hans Baier
5c73fc42c4 * midi_event_size(uchar status): return size including status / handle sysex
git-svn-id: svn://localhost/ardour2/branches/3.0@4486 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-03 08:46:24 +00:00
Carl Hetherington
762b02bc95 Fix auto-return, hopefully not at the expense of anything else.
git-svn-id: svn://localhost/ardour2/branches/3.0@4482 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-02 22:35:50 +00:00
Carl Hetherington
54afc94e62 Re-enable creation of stereo bundles for system IO, so that the mixer strip
connection menus for stereo tracks are populated again.
Also enable disconnection via these menus.


git-svn-id: svn://localhost/ardour2/branches/3.0@4481 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-02 22:17:06 +00:00
Carl Hetherington
633629b2b1 Fix a couple of bugs causing unexpected movements of the playhead.
git-svn-id: svn://localhost/ardour2/branches/3.0@4480 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-02 17:11:51 +00:00
2f6327c113 Disable excessive console output (please comment this stuff before committing...).
git-svn-id: svn://localhost/ardour2/branches/3.0@4479 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-02 15:51:19 +00:00
Hans Baier
018fff15ef * fix misleading/wrong comment
git-svn-id: svn://localhost/ardour2/branches/3.0@4477 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-02 09:10:26 +00:00
Hans Baier
858f0cb5ab * debugging output
* style guide


git-svn-id: svn://localhost/ardour2/branches/3.0@4476 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-02 08:50:36 +00:00
Hans Baier
ae2e090e74 * fixed crash: MidiBuffer::reserve returned wrong write location
git-svn-id: svn://localhost/ardour2/branches/3.0@4475 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-02 08:50:28 +00:00
Hans Baier
eaada01925 * added assertions to MidiBuffer::iterator_base in order to avoid offset corruption
git-svn-id: svn://localhost/ardour2/branches/3.0@4474 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-02 07:59:03 +00:00
166ef64e3d Make (MIDI) event time stamp type a template parameter.
git-svn-id: svn://localhost/ardour2/branches/3.0@4473 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-02 02:36:05 +00:00
ead5dd4568 Tidy.
git-svn-id: svn://localhost/ardour2/branches/3.0@4472 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-02 00:20:18 +00:00
44ac5f5097 Removed fixed/maximum event size assumption/limitation from MIDI buffer.
git-svn-id: svn://localhost/ardour2/branches/3.0@4471 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-01 21:04:12 +00:00
554d46896b Style.
git-svn-id: svn://localhost/ardour2/branches/3.0@4470 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-01 19:39:24 +00:00
e666c8e98f Templateify MidiBuffer iterators (avoid code duplication since they're about to get less trivial).
Clean up MidiBuffer code.


git-svn-id: svn://localhost/ardour2/branches/3.0@4469 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-01 03:15:31 +00:00
aaa91db6d9 Trim include dependency graph, especially for io.h and session.h.
Clean up some stuff and other such gruntwork in the process.


git-svn-id: svn://localhost/ardour2/branches/3.0@4468 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-30 20:18:31 +00:00
Carl Hetherington
a384dab130 More port matrix re-working. Global matrix now has separate visibility buttons
for ins and outs.  The matrix will now be arranged so that more ports are labelled
horizontally than vertically, to aid readability.


git-svn-id: svn://localhost/ardour2/branches/3.0@4467 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-30 15:08:09 +00:00
Sakari Bergen
24aab941eb Track import is now working. Also, IO bundle setup/creation is safer.
git-svn-id: svn://localhost/ardour2/branches/3.0@4466 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-30 11:50:24 +00:00
15554385d6 add forgotten files
git-svn-id: svn://localhost/ardour2/branches/3.0@4465 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-30 09:01:02 +00:00
70b939da4f first pass at internal sends. this is a very tentative work in progress, and it is possible that major changes may follow in the near future. it is certainly not complete, but the fundamental changes to Port/Buffer operation merit a commit at this point
git-svn-id: svn://localhost/ardour2/branches/3.0@4464 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-30 07:40:13 +00:00
ee62ee07d3 Um... we can't use 128 bytes for every single MIDI event, Hans.
git-svn-id: svn://localhost/ardour2/branches/3.0@4463 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-30 06:56:17 +00:00
Hans Baier
6fe0dc459e * enlage MidiBuffer size to 128 bytes to allow for sysex events
git-svn-id: svn://localhost/ardour2/branches/3.0@4462 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-30 06:21:14 +00:00
Hans Baier
582555c337 * re-enable assertion about controller values (probably corrupt data in my Session)
git-svn-id: svn://localhost/ardour2/branches/3.0@4461 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-30 00:27:02 +00:00
Hans Baier
eeabac94d1 * fixed bug: channel and id swapped for PitchBener, ChannelPressure and ProgramChanges
git-svn-id: svn://localhost/ardour2/branches/3.0@4460 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-30 00:09:47 +00:00
Hans Baier
f55b902c73 * set right interpolation on MidiModel controls after recording too
git-svn-id: svn://localhost/ardour2/branches/3.0@4459 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-29 00:18:26 +00:00
Hans Baier
a1234aa21e * loosened assertion about controller to UINT8_MAX allow for (real-world) nonstandard events
git-svn-id: svn://localhost/ardour2/branches/3.0@4458 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-29 00:18:20 +00:00
a5a3d39366 Remove nonsense comment.
git-svn-id: svn://localhost/ardour2/branches/3.0@4457 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-28 19:30:42 +00:00
Hans Baier
b04ead74ff * Set Discrete mode as default until Linear mode works properly
git-svn-id: svn://localhost/ardour2/branches/3.0@4455 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-28 09:49:42 +00:00
Hans Baier
d9416a3a6a * Fixed bug: Discrete control lists are generally not played back
git-svn-id: svn://localhost/ardour2/branches/3.0@4454 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-28 07:52:40 +00:00
Hans Baier
3705a2d630 * MIDI control lanes: Set Interpolationtype according to Parameter
git-svn-id: svn://localhost/ardour2/branches/3.0@4452 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-28 04:55:31 +00:00
Hans Baier
6c538ab719 * more user friendly MIDI automation lane names
git-svn-id: svn://localhost/ardour2/branches/3.0@4451 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-28 04:55:14 +00:00
Carl Hetherington
948034f15a Make track sends etc. appear in the same bundle as the track. Tidy up bundle channel naming a bit.
git-svn-id: svn://localhost/ardour2/branches/3.0@4448 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-27 18:36:40 +00:00
Carl Hetherington
49510ba1d7 Some refactoring. Add port group headers to the port matrix.
git-svn-id: svn://localhost/ardour2/branches/3.0@4443 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-25 06:47:11 +00:00
Carl Hetherington
a9d67a2cc9 Do not take into account sends when computing the required number of buffers, as they're presence should not affect anything.
git-svn-id: svn://localhost/ardour2/branches/3.0@4442 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-24 16:45:13 +00:00
Carl Hetherington
dbf05a6b0f Copy diskstream data to all output buffers.
git-svn-id: svn://localhost/ardour2/branches/3.0@4441 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-24 16:44:00 +00:00
Carl Hetherington
6ccf29fb53 Update actual gain when declick has been applied.
git-svn-id: svn://localhost/ardour2/branches/3.0@4440 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-24 16:43:23 +00:00
Carl Hetherington
4cd47cf253 Gather all ardour: ports so that a few more things are found to put in the port matrix.
git-svn-id: svn://localhost/ardour2/branches/3.0@4439 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-24 15:21:22 +00:00
Carl Hetherington
e4fbf1c48e Only create mono bundles for physical I/O to avoid crowding the
port matrix with duplicate entries.


git-svn-id: svn://localhost/ardour2/branches/3.0@4435 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-24 00:57:34 +00:00
Carl Hetherington
f6652f07ae Add global port matrix dialogs.
git-svn-id: svn://localhost/ardour2/branches/3.0@4434 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-23 21:24:11 +00:00
Carl Hetherington
76b7356802 Fix crash on using sends with no MIDI
git-svn-id: svn://localhost/ardour2/branches/3.0@4432 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-22 14:41:11 +00:00
Carl Hetherington
6e04b4381c Fix port rename problems.
git-svn-id: svn://localhost/ardour2/branches/3.0@4431 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-22 13:51:36 +00:00
Carl Hetherington
1d0da13500 Some more full / short name confusions.
git-svn-id: svn://localhost/ardour2/branches/3.0@4428 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-22 03:13:34 +00:00
7593f104ab Fix incorrect/useless forward declaration and associated torrent of warnings.
git-svn-id: svn://localhost/ardour2/branches/3.0@4425 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-21 18:48:03 +00:00
Carl Hetherington
90ac43a8d8 Fix some confusion about relative / non-relative port names. Add some asserts to keep track of what is happening.
git-svn-id: svn://localhost/ardour2/branches/3.0@4424 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-21 17:44:41 +00:00
Hans Baier
5309c327ec * make MIDI-specific menu show up on all MIDI lanes
* style guide, comments and a little refactoring (remove duplication)


git-svn-id: svn://localhost/ardour2/branches/3.0@4422 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-21 10:20:27 +00:00
Hans Baier
33852a0728 * Added Menu to add a Program change parameter lane
* made adding automation lanes add them for every active channel on the track
* Evoral::Parameter.hpp: Strict weak ordering again: make the proof a bit easier to read
                         Make the implementation conform to the proof
                         order Parameters according to type, then channel, then id


git-svn-id: svn://localhost/ardour2/branches/3.0@4421 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-21 08:32:23 +00:00
Carl Hetherington
d6637dad5a Rework Port class hierarchy a bit. Hopefully now simpler, and should
support connection of JACK ports with internal ones.


git-svn-id: svn://localhost/ardour2/branches/3.0@4417 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-21 02:27:21 +00:00
Carl Hetherington
61db2175eb New matrix-based editor for connections and bundles, based on thorwil's design.
Add Bundle Manager dialog.


git-svn-id: svn://localhost/ardour2/branches/3.0@4415 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-20 14:46:00 +00:00
b3c6c4a6d5 remove "Use OSC" from options menu; make OSC optional rather than a mandatory protocol
git-svn-id: svn://localhost/ardour2/branches/3.0@4412 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-15 22:37:18 +00:00
16556bb182 OSC becomes a control protocol object; make ardev_common.sh(.in) look for surfaces in the right place(s)
git-svn-id: svn://localhost/ardour2/branches/3.0@4411 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-15 22:09:23 +00:00
13e40db5e5 Add apparently missing include...
git-svn-id: svn://localhost/ardour2/branches/3.0@4410 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-15 03:40:55 +00:00
Hans Baier
625507fc1a * extend MIDNAM support (PatchBanks containing the bank select MIDI Commands)
git-svn-id: svn://localhost/ardour2/branches/3.0@4409 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-15 03:13:24 +00:00
Carl Hetherington
bed58e9f37 Make Bundles work a bit better. A few include optimisations.
git-svn-id: svn://localhost/ardour2/branches/3.0@4408 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-14 23:54:46 +00:00
6254083184 Revert magic mystery changed from r4396 (trailing whitespace).
git-svn-id: svn://localhost/ardour2/branches/3.0@4398 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-10 14:54:23 +00:00
Hans Baier
b7715419f2 * wrong calculation of frames_moved in Session::process_*, resulting in drift against any Slaves when transport speed != 1.0
git-svn-id: svn://localhost/ardour2/branches/3.0@4397 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-10 08:42:07 +00:00
Hans Baier
bfbae251be * Extracted method void AudioDiskstream::process_varispeed_playback(nframes_t nframes, boost::shared_ptr<ChannelList> c)
from AudioDiskstream::process


git-svn-id: svn://localhost/ardour2/branches/3.0@4396 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-10 08:41:51 +00:00
Hans Baier
3d2c1ba3e6 * add comments / improve readability of varispeed playback code
git-svn-id: svn://localhost/ardour2/branches/3.0@4395 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-09 09:54:38 +00:00
Hans Baier
799b6ec97d * changed transport speed in session and slaves from float to double
* added some comments


git-svn-id: svn://localhost/ardour2/branches/3.0@4394 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-09 09:18:24 +00:00
Hans Baier
780b753639 * corrected copyright information
git-svn-id: svn://localhost/ardour2/branches/3.0@4388 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-05 23:58:48 +00:00
Hans Baier
ea54d26111 *fixed typo
* set copyright to Hans Baier for midi_clock_slave.cc


git-svn-id: svn://localhost/ardour2/branches/3.0@4387 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-05 18:43:22 +00:00
Hans Baier
598b412e6b * further reduce the spaghettiness of Session::follow_slave
git-svn-id: svn://localhost/ardour2/branches/3.0@4386 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-05 09:22:27 +00:00
Hans Baier
5f5a570e50 * MIDI clock slave implementation with delay locked loop (DLL) seems to work well
* added option to class Slave / Session::process that a slave can have total control over transport speed


git-svn-id: svn://localhost/ardour2/branches/3.0@4385 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-05 09:15:08 +00:00
be668e55e8 Fix midi note max colour typo (miri -> midi).
git-svn-id: svn://localhost/ardour2/branches/3.0@4384 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-04 04:43:12 +00:00
Carl Hetherington
9935b950ee Ports say when they're going away.
git-svn-id: svn://localhost/ardour2/branches/3.0@4380 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-02 19:38:43 +00:00
cdb391d1f1 install/uninstall to ardour3 not ardour2
git-svn-id: svn://localhost/ardour2/branches/3.0@4377 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-02 15:13:40 +00:00
455f686e09 save/restore meter point from carl for #1748
git-svn-id: svn://localhost/ardour2/branches/3.0@4376 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-02 12:55:30 +00:00
Hans Baier
69ed2a3c27 * removed field Session::_desired_transport_speed since it is never used anywhere
git-svn-id: svn://localhost/ardour2/branches/3.0@4373 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-01 22:01:53 +00:00
Hans Baier
fa51acb211 * cosmetic change
git-svn-id: svn://localhost/ardour2/branches/3.0@4372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-01 22:01:47 +00:00
Hans Baier
495585db93 *fixed bug in MidiClock_Slave: Use current framerate for speed calculations
git-svn-id: svn://localhost/ardour2/branches/3.0@4371 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-01 21:26:28 +00:00
Hans Baier
5ee4d2bb24 * refactor Session::follow_slave to be easier to read and understand
git-svn-id: svn://localhost/ardour2/branches/3.0@4370 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-01 21:26:23 +00:00
Hans Baier
d39b425a6a * radically cleaned up / refactored midi_clock_slave.cc
* debug statements in session_process.cc and midi_clock_slave.cc as
  conditional compilation instead of comments


git-svn-id: svn://localhost/ardour2/branches/3.0@4366 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-01 11:00:18 +00:00
Hans Baier
b1f8caa54f * made MidiClock_Slave conform more to to the Spec by starting transport
on the first MidiClock Message after the start Message
* removed debugging output from session_process.c
* fixed bug: calculate a more sensible speed value on transport start
* fixed typos in Slave docs
* refactored MidiClock_Slave for better readability
* made MidiClock_Slave react to continue messages


git-svn-id: svn://localhost/ardour2/branches/3.0@4365 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-01 06:52:18 +00:00
Hans Baier
2e61c9c034 * fix broken MidiClockTicker (introduced by revision 4361)
* fix missing -DWITH_JACK_MIDI in SConstruct when using JACK MIDI


git-svn-id: svn://localhost/ardour2/branches/3.0@4364 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-01 04:14:50 +00:00
Carl Hetherington
cc677d5c87 Flip stacked regions order so that the highest layer is at the top of the pile. Colour areas of stacked regions according to what will be played.
git-svn-id: svn://localhost/ardour2/branches/3.0@4363 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-31 18:44:32 +00:00
Carl Hetherington
538cf8609a Bug fixes to find_next_region_boundary (), unless I'm missing something.
git-svn-id: svn://localhost/ardour2/branches/3.0@4362 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-31 18:43:38 +00:00
Sakari Bergen
ca21a5ac7b Wrap some Jack_MidiPort stuff in #ifdefs to solve dylib errors on OS X
git-svn-id: svn://localhost/ardour2/branches/3.0@4361 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-30 19:44:24 +00:00
Sakari Bergen
3d239bb9d5 Fix some compiling warnings and errors in OS X
git-svn-id: svn://localhost/ardour2/branches/3.0@4358 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-29 19:50:19 +00:00
Hans Baier
22d73333c6 * fixed missing track color mode persistence
git-svn-id: svn://localhost/ardour2/branches/3.0@4357 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-29 01:02:41 +00:00
Hans Baier
cca4f22141 * fixed bug introduced in revision 3335: Hibyte lost in channel mask when restoring state from XML
git-svn-id: svn://localhost/ardour2/branches/3.0@4356 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-29 00:19:18 +00:00
Hans Baier
fa71e0e12a * added a bit of documentation in an effort to understand the code
git-svn-id: svn://localhost/ardour2/branches/3.0@4355 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-29 00:19:12 +00:00
8cbbfa4159 Fix immediate event delivery (panic button, controller sliders, etc).
git-svn-id: svn://localhost/ardour2/branches/3.0@4353 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-27 19:52:02 +00:00
487de9741b Move MidiRingBuffer::read into .cc file to avoid the 2 hour dev cycle (no functional changes).
git-svn-id: svn://localhost/ardour2/branches/3.0@4352 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-27 18:39:11 +00:00
Hans Baier
6650ebdca9 * fix the fix: note velocity editing works now without duplicating the edited note on each step
* removed debugging output


git-svn-id: svn://localhost/ardour2/branches/3.0@4350 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-26 06:52:49 +00:00
Hans Baier
be75d43bd0 * first prototype implementation of playing back MIDI notes when selected
git-svn-id: svn://localhost/ardour2/branches/3.0@4348 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-25 23:08:57 +00:00
Hans Baier
e2147fbc5b * implemented three coloring modes for MIDI tracks (untested yet)
git-svn-id: svn://localhost/ardour2/branches/3.0@4344 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-24 01:24:49 +00:00
Carl Hetherington
7ddbc547d5 Bug fixes so that region split does not clobber region gain envelopes.
git-svn-id: svn://localhost/ardour2/branches/3.0@4340 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-23 11:56:37 +00:00
Hans Baier
e9a9fe30cf * added comments to midi_region_view.h
* implemented choosing patches with context menu on the program change flag
* added convenience method and a little refactoring in midi_patch_manager.h

Conflicts:

	.cproject
	build-tmp.sh


git-svn-id: svn://localhost/ardour2/branches/3.0@4338 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-23 06:03:45 +00:00
Carl Hetherington
d724837a44 Fix uninitialized value _self_managed spotted by valgrind.
git-svn-id: svn://localhost/ardour2/branches/3.0@4336 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-22 21:12:53 +00:00
c5aa717828 Sync with http://svn.drobilla.net/lad/trunk/evoral r1891.
(Only change: use #include "" instead of #include <> for local include paths).


git-svn-id: svn://localhost/ardour2/branches/3.0@4335 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-21 20:36:15 +00:00
Carl Hetherington
4e1f451520 Remove unnecessary 0 checks before delete; see http://www.parashift.com/c++-faq-lite/freestore-mgmt.html#faq-16.8 Apologies for the big commit.
git-svn-id: svn://localhost/ardour2/branches/3.0@4332 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-18 19:31:00 +00:00
Carl Hetherington
be655cc5af Couple of bug fixes which show up when undoing solo state. Also a few comments.
git-svn-id: svn://localhost/ardour2/branches/3.0@4331 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-18 18:23:33 +00:00
Carl Hetherington
058e7f2c01 Fix #2478; deref of 0 pointer if jack_port_register fails.
git-svn-id: svn://localhost/ardour2/branches/3.0@4328 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-17 00:44:08 +00:00
Carl Hetherington
2ebb1af299 Implement #2425: option for automation to follow region moves.
git-svn-id: svn://localhost/ardour2/branches/3.0@4326 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-16 23:21:01 +00:00
Hans Baier
5e7ae490c1 * first working prototype of changing program changes by scroll wheel (still some automation points issues)
git-svn-id: svn://localhost/ardour2/branches/3.0@4324 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-15 11:05:41 +00:00
Hans Baier
bf7e792e3e * some refactoring of patch name stuff in preparation for altering program changes events
git-svn-id: svn://localhost/ardour2/branches/3.0@4323 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-14 22:56:44 +00:00
Sampo Savolainen
60f9ee3052 Added evoral dependency
git-svn-id: svn://localhost/ardour2/branches/3.0@4320 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-13 15:23:31 +00:00
493339e969 fix up java-style expression to have correct C++ semantics
git-svn-id: svn://localhost/ardour2/branches/3.0@4318 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-13 14:02:28 +00:00
dcc8f688cd fix use of deprecated gtk toolbar tooltips API when GTK_NEW_TOOLTIP_API is defined
git-svn-id: svn://localhost/ardour2/branches/3.0@4317 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-13 13:28:44 +00:00
51625b2474 "merge" (i.e. wholesale import) 2.0-ongoing Mackie code and then fix to compile in 3.0 context
git-svn-id: svn://localhost/ardour2/branches/3.0@4315 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-12 22:55:03 +00:00
bc89fe0147 most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas.cc; builds and runs and does a few specific things but expect it to be buggy for a while yet
git-svn-id: svn://localhost/ardour2/branches/3.0@4313 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-12 14:43:24 +00:00
Hans Baier
30daaebaa2 * fixed memory allocation bugs
* commented out a crash line in ardour_ui2.cc (added a warning message).
  (I thought, it may be fairly efficient to keep issues as code instead of putting
  them in the tracker where hardly ever one would notice the needle in the haystack)
* forgot to clear two other collections on MidiPatchManager::refresh()


git-svn-id: svn://localhost/ardour2/branches/3.0@4312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-12 06:57:38 +00:00
Hans Baier
6c1f365515 * reenabled assertions after irc-ing with drobilla
git-svn-id: svn://localhost/ardour2/branches/3.0@4311 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-12 05:21:06 +00:00
Hans Baier
2c017baa4a * fixed memory management bugs for midi patchname handling
git-svn-id: svn://localhost/ardour2/branches/3.0@4310 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-12 05:17:53 +00:00
Hans Baier
ddbd296698 * converted two especially obnoxious assertions into warnings since they hinder my work and nobody seems to care about those issues anyway
git-svn-id: svn://localhost/ardour2/branches/3.0@4309 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-12 03:34:36 +00:00
Hans Baier
e009016b03 * added myself to about.cc
* created ArdourCanvas::CanvasFlag as a base class for flags
* removed obsolete cruft from midi_model
* made MidiTimeAxisView and MidiRegionView work together to display program changes as
  names by means of MidiPatchManager


git-svn-id: svn://localhost/ardour2/branches/3.0@4307 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-11 08:06:27 +00:00
Hans Baier
dfed4965b7 * make patch selection appear only when there are patches loaded
* add combobox to select CustomDeviceMode
* add code to resolve patch names by their msb, lsb and program change number


git-svn-id: svn://localhost/ardour2/branches/3.0@4306 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-10 10:54:45 +00:00
Hans Baier
f8480d6392 * moved /midi_patch_manager.* to libs/ardour
* GUI improvement: do away with the midi channel expander


git-svn-id: svn://localhost/ardour2/branches/3.0@4305 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-09 08:35:02 +00:00
Hans Baier
457f06855e * first working prototype of selecting instruments in the MIDI track header
* parsing patchfiles works


git-svn-id: svn://localhost/ardour2/branches/3.0@4304 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-09 07:42:19 +00:00
42db44c193 merge 3870-3890 from 2.0-ongoing into 3.X (compiles, runs, no other promises
git-svn-id: svn://localhost/ardour2/branches/3.0@4303 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-08 18:16:12 +00:00
3be16e8afb partial patch/partial by-hand merge of 2.X commits 3169&3170 to 3.X codebase
git-svn-id: svn://localhost/ardour2/branches/3.0@4300 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-08 16:07:28 +00:00
Hans Baier
a9bb336fc4 * first primitive implementation of MidiPatchManager
* some cosmetic changes
* added midi_patch_path() to libs/ardour/ardour/session_directory.h


git-svn-id: svn://localhost/ardour2/branches/3.0@4299 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-08 09:50:19 +00:00
Sakari Bergen
6974dbdcd2 Improve svn revision handling and make srctar "work". (The tarball is created, but it doesn't build...)
git-svn-id: svn://localhost/ardour2/branches/3.0@4298 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-08 09:03:36 +00:00
Hans Baier
72f55cd8b6 * completed MIDI::Name::MIDINameDocument and implemented its set_state-Method, added constructor
git-svn-id: svn://localhost/ardour2/branches/3.0@4295 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-06 05:00:20 +00:00
Hans Baier
c61283d35e * changed all lists in midnam_patch.h to std::list
git-svn-id: svn://localhost/ardour2/branches/3.0@4294 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-06 04:43:11 +00:00
Hans Baier
fc73f748b5 * completed MIDI::Name::MasterDeviceNames and implemented its set_state-Method
git-svn-id: svn://localhost/ardour2/branches/3.0@4293 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-06 04:38:44 +00:00
Hans Baier
110170db95 * Added MIDI::Name::Note
git-svn-id: svn://localhost/ardour2/branches/3.0@4292 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-06 00:07:07 +00:00
Hans Baier
4f185b3f36 * made MidiClockTicker Singleton
git-svn-id: svn://localhost/ardour2/branches/3.0@4281 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-04 09:09:50 +00:00
Hans Baier
fbc248d70c * minor cleanup
git-svn-id: svn://localhost/ardour2/branches/3.0@4277 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-01 03:51:17 +00:00
Hans Baier
4c1aa58846 * reduced debugging output
git-svn-id: svn://localhost/ardour2/branches/3.0@4276 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-01 03:49:50 +00:00
Hans Baier
a1c1199713 * Sending MIDI Clock while looping works now
git-svn-id: svn://localhost/ardour2/branches/3.0@4275 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-01 03:07:11 +00:00
Sakari Bergen
a8cc30be5f First revision with working track import
git-svn-id: svn://localhost/ardour2/branches/3.0@4270 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-11-29 20:16:16 +00:00
Hans Baier
4af523ca38 * fixed potential crash
git-svn-id: svn://localhost/ardour2/branches/3.0@4269 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-11-29 06:37:06 +00:00
Hans Baier
d746b78319 * sending MIDI clock works, hooray\!
git-svn-id: svn://localhost/ardour2/branches/3.0@4268 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-11-29 05:40:17 +00:00
Hans Baier
5ed141cd14 * added Menu for sending midi clock
* hooked up MidiClockTicker to the session


git-svn-id: svn://localhost/ardour2/branches/3.0@4267 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-11-26 23:32:55 +00:00
Sakari Bergen
38382b7921 More work on track import and some cleaning up of ElementImporter interface
git-svn-id: svn://localhost/ardour2/branches/3.0@4265 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-11-26 17:13:50 +00:00
Hans Baier
95a86871c0 * the very humble beginnings of sending MIDI clock
git-svn-id: svn://localhost/ardour2/branches/3.0@4263 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-11-26 09:50:29 +00:00
Sakari Bergen
23b1ff94b9 A bit more of track import done...
git-svn-id: svn://localhost/ardour2/branches/3.0@4241 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-11-24 22:25:57 +00:00