13
0
Commit Graph

1550 Commits

Author SHA1 Message Date
01b761bbaa Remove Session dependency from BeatsFramesConverter.
More constey TempoMap accessors.


git-svn-id: svn://localhost/ardour2/branches/3.0@5916 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-25 21:13:02 +00:00
cd1c58e031 search $TOP/build/default/gtk2_ardour BEFORE ../gtk2_ardour when looking for bindings files etc ; make debug tracing show the "debug option" the output relates to as a prefix
git-svn-id: svn://localhost/ardour2/branches/3.0@5915 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-25 20:36:10 +00:00
8f66b7978f do not sort MIDI regions by layer since they are all transparent
git-svn-id: svn://localhost/ardour2/branches/3.0@5913 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-25 15:59:02 +00:00
de5e463904 make per-region note-tracking in MidiPlaylist work correctly, or something very close to it. note that locking isssues remain when regions (and thus note trackers) are removed
git-svn-id: svn://localhost/ardour2/branches/3.0@5912 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-25 14:42:46 +00:00
e0a2d49869 Strip trailing whitespace.
git-svn-id: svn://localhost/ardour2/branches/3.0@5910 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-24 22:41:27 +00:00
74fc799497 Fix needlessley explodey MidiPlaylist constructor.
git-svn-id: svn://localhost/ardour2/branches/3.0@5909 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-24 22:39:11 +00:00
31416ab7b1 Fix tab width assumption used for alignment.
git-svn-id: svn://localhost/ardour2/branches/3.0@5908 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-24 15:47:48 +00:00
1716d75f9f Apply accurate copyright header.
Shrink.


git-svn-id: svn://localhost/ardour2/branches/3.0@5905 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-24 15:35:50 +00:00
0ac99a4236 debug-tracify current MIDI playlist debug output
git-svn-id: svn://localhost/ardour2/branches/3.0@5904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-24 13:51:33 +00:00
f8fe64a91e (FULL commit) start of a nominal debug tracing system, with 64 bits available for flags; track notes by region in MidiPlaylist, and resolve them if they are left hanging at region boundaries. note: MIDI playback is still not working 100% though its better now.
git-svn-id: svn://localhost/ardour2/branches/3.0@5903 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-24 13:26:56 +00:00
a532e7247c Move butler methods from Session to Butler.
Slay the dragon.  A lil' bit.


git-svn-id: svn://localhost/ardour2/branches/3.0@5901 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-24 00:39:28 +00:00
d56817e785 Split butler into separate object (partially, just data so far...)
git-svn-id: svn://localhost/ardour2/branches/3.0@5900 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-23 23:23:00 +00:00
a6b735abdb Remove unused Session::butler_mixdown_buffer and Session::butler_gain_buffer.
Odd...


git-svn-id: svn://localhost/ardour2/branches/3.0@5898 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-23 23:02:59 +00:00
Carl Hetherington
1f2a518ee2 Clean up and simplify code to find marks before and after a position, and hence improve snap to markers so that both start and end positions of a range marker are taken into account.
git-svn-id: svn://localhost/ardour2/branches/3.0@5897 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-23 22:28:27 +00:00
c3a2f704c9 Fix sketchy casts.
git-svn-id: svn://localhost/ardour2/branches/3.0@5893 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-23 20:11:56 +00:00
8340dcdd57 Unit test code coverage using lcov.
git-svn-id: svn://localhost/ardour2/branches/3.0@5892 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-23 17:30:11 +00:00
e76d325bd0 Fix crash on multiple record due to not initiating write on source.
Fixes it, but this seems a bit dirty... audio has the same problem (but lives)...


git-svn-id: svn://localhost/ardour2/branches/3.0@5887 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-23 04:49:25 +00:00
82a0c02af1 Fix controller iteration / linear interpolation.
Add unit test for controller iteration / linear interpolation.


git-svn-id: svn://localhost/ardour2/branches/3.0@5886 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-23 04:24:20 +00:00
653a487bbd Fix whitespace.
git-svn-id: svn://localhost/ardour2/branches/3.0@5885 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-23 03:58:11 +00:00
f68f8839a5 Sshh.
git-svn-id: svn://localhost/ardour2/branches/3.0@5884 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-23 03:57:52 +00:00
7524b90985 Fix compilation with DEBUG_SEQUENCE on.
git-svn-id: svn://localhost/ardour2/branches/3.0@5883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-23 03:32:54 +00:00
03b0d3f328 Testing how anal retentive I can be without anyone saying anything.
git-svn-id: svn://localhost/ardour2/branches/3.0@5882 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-23 02:53:47 +00:00
c78108a033 Fix yet more crazy tabs.
git-svn-id: svn://localhost/ardour2/branches/3.0@5881 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-23 02:49:12 +00:00
38a7cbfc3c More correct looking MidiSource::midi_read.
Testing seems to show the old way and this both working equally well, which is a bit weird since the old way really doesn't seem to make any sense whatsoever.
This way works as well as far as I can tell and actually makes sense, so hey, let's go with this one.


git-svn-id: svn://localhost/ardour2/branches/3.0@5879 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-23 01:39:40 +00:00
862bbd4569 Whitespace.
git-svn-id: svn://localhost/ardour2/branches/3.0@5876 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-22 22:38:53 +00:00
106b728d34 Fix crash on save of MIDI data.
git-svn-id: svn://localhost/ardour2/branches/3.0@5875 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-22 22:14:25 +00:00
3fd5f15e26 Indentation.
git-svn-id: svn://localhost/ardour2/branches/3.0@5874 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-22 22:05:49 +00:00
f3a510ce34 More spacey tabs.
Can we please stop with the spacey tabs?
Thanks.


git-svn-id: svn://localhost/ardour2/branches/3.0@5873 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-22 22:04:43 +00:00
7b46e9c57c Fix adding multiple notes with the same time stamp (geeze).
git-svn-id: svn://localhost/ardour2/branches/3.0@5872 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-22 21:54:32 +00:00
382a79eda5 Remove linear search when adding/removing a note from/to a Sequence.
git-svn-id: svn://localhost/ardour2/branches/3.0@5870 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-22 21:33:05 +00:00
78b00fa6dc Actually load MIDI data from disk on session load (kludgey, forces model to always be loaded, this needs fixing later).
Fix hilariously braindead non-lock in SMFSource::load_model.


git-svn-id: svn://localhost/ardour2/branches/3.0@5869 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-22 21:03:47 +00:00
11f448917f Fix deadlocks on MIDI record.
More locking than is strictly necessary, but the assertion in MidiModel::write_lock is a nice check, at least for now...


git-svn-id: svn://localhost/ardour2/branches/3.0@5868 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-22 20:37:24 +00:00
f820456bb7 Use info stream for infoey things.
git-svn-id: svn://localhost/ardour2/branches/3.0@5866 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-22 20:05:40 +00:00
7919491f27 Use a more reasonable default size for log window.
Only pop up log window if message level is not INFO (i.e. iff it is WARNING, ERROR, or FATAL).


git-svn-id: svn://localhost/ardour2/branches/3.0@5865 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-22 20:05:15 +00:00
02f2755e60 Fix colours of log window messages.
If anyone has a better way of making this actually work than the absurd kludge in gtk_ui.cc, feel free.


git-svn-id: svn://localhost/ardour2/branches/3.0@5864 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-22 19:53:22 +00:00
b3a80523d3 Fix whitespace.
git-svn-id: svn://localhost/ardour2/branches/3.0@5863 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-22 19:00:40 +00:00
7363b3cea0 Add log window to windows menu.
git-svn-id: svn://localhost/ardour2/branches/3.0@5861 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-22 18:11:22 +00:00
155338d168 Defer plugin discovery until actually needed (significant startup time improvement, especially with LV2).
git-svn-id: svn://localhost/ardour2/branches/3.0@5859 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-22 17:17:34 +00:00
d98c8e8fa4 Replace horribly error-prone Sequence/MidiModel/MidiSource locking API with scoped locks that automatically Do The Right Thing.
Make Sequence::read_lock const correct in the process (a read lock can be taken out on a const Sequence, but not a write lock).


git-svn-id: svn://localhost/ardour2/branches/3.0@5857 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-22 16:15:36 +00:00
2eed368c24 Sshh.
git-svn-id: svn://localhost/ardour2/branches/3.0@5856 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-22 16:14:00 +00:00
33da74c8e3 Fix MidiBuffer::merge_in_place and add aggressive correctness checking.
git-svn-id: svn://localhost/ardour2/branches/3.0@5854 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-22 14:46:47 +00:00
a7c37f6a2d Fix repeated linear search on read when cached model iterator reaches end.
git-svn-id: svn://localhost/ardour2/branches/3.0@5853 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-22 14:46:03 +00:00
7a2a37ad50 remember to reset inm1 each time around the interpolation loop
git-svn-id: svn://localhost/ardour2/branches/3.0@5852 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-22 13:29:09 +00:00
24035e24e8 Fix compilation with -DDEBUG_MIDI_CLOCK
git-svn-id: svn://localhost/ardour2/branches/3.0@5851 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-21 22:25:46 +00:00
4b01242df1 Fix failed assertion when end_write is called multiple times.
Bad logic, but oh well, doesn't hurt.


git-svn-id: svn://localhost/ardour2/branches/3.0@5850 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-21 22:21:44 +00:00
97c695735f Merge all BufferSet iterators using a single template (way less duplicatedish code).
git-svn-id: svn://localhost/ardour2/branches/3.0@5845 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-21 17:24:14 +00:00
046f802662 Fix unnecessarily type specific code, tidy, fix whitespace.
git-svn-id: svn://localhost/ardour2/branches/3.0@5844 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-21 16:56:58 +00:00
86a09c58e3 Fix O(n) search on MIDI rec region update (now O(log(n)) per update, but could be O(1) with caching...)
git-svn-id: svn://localhost/ardour2/branches/3.0@5843 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-21 16:39:39 +00:00
2c59ddede5 Fix MIDI rec regions.
git-svn-id: svn://localhost/ardour2/branches/3.0@5842 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-21 16:26:18 +00:00
20f7592fab Fix MIDI thru, though why this is any different from audio (monitoring) I don't know.
git-svn-id: svn://localhost/ardour2/branches/3.0@5837 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-21 00:53:26 +00:00