smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-23 13:47:24 +01:00
Code Issues Projects Releases Wiki Activity
2797 commits 104 branches 145 tags 330 MiB
Commit graph

2797 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Robillard
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
David Robillard
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
David Robillard
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
David Robillard
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
David Robillard
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
David Robillard
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
f5e9ba21c3 * .gitignore 
git-svn-id: svn://localhost/ardour2/branches/3.0@4616 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-17 16:42:22 +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
David Robillard
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
David Robillard
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
David Robillard
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
Carl Hetherington
deb2033a34 Make range selection context menu work again. 
git-svn-id: svn://localhost/ardour2/branches/3.0@4611 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-17 02:34:38 +00:00
David Robillard
b857756f60 Remove unnecessary/unused template parameter from canvas sysex flags. 
Add license headers to canvas sysex files (tsk, tsk).


git-svn-id: svn://localhost/ardour2/branches/3.0@4610 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-17 02:19:16 +00:00
David Robillard
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
David Robillard
3e1eb6bcbd Fix crash on audio record (time converter segfault wackiness). 
git-svn-id: svn://localhost/ardour2/branches/3.0@4607 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-16 23:32:59 +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
David Robillard
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
Hans Baier
80e3845982 * First prototype of SysEx GUI 
git-svn-id: svn://localhost/ardour2/branches/3.0@4604 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-16 09:51:40 +00:00
David Robillard
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
David Robillard
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
David Robillard
31a6e0b254 Fix time / positioning of PC flags (beat time). 
Fix needless string copying in flag stuff.
Clean up.


git-svn-id: svn://localhost/ardour2/branches/3.0@4601 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-16 05:54:12 +00:00
David Robillard
de88640598 Don't do a linear search through controls for program change for no reason. 
Clean up.


git-svn-id: svn://localhost/ardour2/branches/3.0@4600 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-16 05:33:23 +00:00
David Robillard
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
David Robillard
fb254fb2fc Fix crash when NullAutomation is created (which shouldn't be happening, but hey...). 
git-svn-id: svn://localhost/ardour2/branches/3.0@4598 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-16 04:53:01 +00:00
David Robillard
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
David Robillard
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
David Robillard
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
David Robillard
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
David Robillard
beb3eea62b Fix horizontal positioning of PC flags. 
git-svn-id: svn://localhost/ardour2/branches/3.0@4593 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-16 01:12:49 +00:00
David Robillard
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
David Robillard
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
David Robillard
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
David Robillard
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
David Robillard
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
David Robillard
5b71b9333a Bring the note mode menu back from the dead. 
Fix percussive note (diamonds) placement.


git-svn-id: svn://localhost/ardour2/branches/3.0@4587 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-15 21:19:01 +00:00
David Robillard
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
David Robillard
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
David Robillard
9c89a93e4f Remove dead code. 
git-svn-id: svn://localhost/ardour2/branches/3.0@4584 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-15 19:56:06 +00:00
David Robillard
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
David Robillard
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
David Robillard
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
David Robillard
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
David Robillard
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
David Robillard
789bd1d007 More contrast for MIDI notes. 
git-svn-id: svn://localhost/ardour2/branches/3.0@4578 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-15 03:37:08 +00:00
David Robillard
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
David Robillard
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
David Robillard
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
David Robillard
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
David Robillard
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