13
0
Commit Graph

3666 Commits

Author SHA1 Message Date
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
370752bf24 Make deferred plugin stuff work with old compiler or different sigc version or whatever.
git-svn-id: svn://localhost/ardour2/branches/3.0@5878 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-23 01:00:13 +00:00
bcf885b4be Fix crash when adding automation tracks caused by route ordering.
I have no idea what caused this, or whether this is a kludge or not, but it's certainly less crap than not being able to display automation whatsoever.


git-svn-id: svn://localhost/ardour2/branches/3.0@5877 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-23 00:05:50 +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
b61e7ad5de Disable canvas verbose cursor for notes, which locks up on note adding sometimes.
The backtrace ain't pretty :/


git-svn-id: svn://localhost/ardour2/branches/3.0@5871 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-22 21:54:00 +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
20eb826764 Use info stream for infoey things.
git-svn-id: svn://localhost/ardour2/branches/3.0@5867 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-22 20:36:38 +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
abe1834724 Fix whitespace.
git-svn-id: svn://localhost/ardour2/branches/3.0@5862 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-22 18:55:39 +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
c19c39362d Fix whitespace.
git-svn-id: svn://localhost/ardour2/branches/3.0@5860 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-22 17:33:36 +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
525da32816 Use line comments.
git-svn-id: svn://localhost/ardour2/branches/3.0@5858 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-22 16:24:47 +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
8dd776347d Fix occasional crash on startup with MIDI tracks (race?).
git-svn-id: svn://localhost/ardour2/branches/3.0@5855 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-22 16:10:21 +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
Carl Hetherington
516048882c Tidy up region gain line drawing slightly so that it doesn't overhang its region.
git-svn-id: svn://localhost/ardour2/branches/3.0@5839 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-21 12:32:46 +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
Carl Hetherington
e1980eb495 Fix creation of plugin presets.
git-svn-id: svn://localhost/ardour2/branches/3.0@5836 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-21 00:21:02 +00:00
bc56eb8bd7 Fix unused parameter warnings since GCC apparently doesn't feel like listening to -Wno-unused-parameter
git-svn-id: svn://localhost/ardour2/branches/3.0@5835 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-21 00:15:42 +00:00
af8c16cfe0 Disable excessive debug printing.
git-svn-id: svn://localhost/ardour2/branches/3.0@5834 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-21 00:00:56 +00:00
214a31bb98 Fix various MIDI control and installation issues:
* Install ardour3_ui_default.conf to system config dir

 * Set -DDATA_DIR etc. defines to proper absolute paths

 * Set default MIDI control port name to "control"
   (it was "control" some places, "default" other, so the generic MIDI
   control surface didn't work.  The real problem here is probably that
   the name is hardcoded in the surface code, ick)

 * Install surfaces to correct system directory

 * Generate and install ardour_system.rc

User POV:

 * Installed versions not run from the source directory discover configuration
   files and surfaces, and generally work

 * Building and/or starting a fresh copy of ardour3 with no pre-existing
   configuration will run an ardour with a single MIDI "control" port, which
   you can plug a surface into and control MMC and controllers and such
   (after turning on the generic MIDI surface, which IMO should be loaded
    by default anyway, especially since it's no longer in a menu)


git-svn-id: svn://localhost/ardour2/branches/3.0@5833 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-20 23:43:19 +00:00
Carl Hetherington
0849685f85 Delete comment window in destructor to close mantis 1870.
git-svn-id: svn://localhost/ardour2/branches/3.0@5831 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-20 22:58:50 +00:00
6bef95806e Fix crash with input (not duplex) control MIDI ports.
git-svn-id: svn://localhost/ardour2/branches/3.0@5829 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-20 22:33:08 +00:00
Carl Hetherington
c206cad638 Ensure that the loop/punch ruler is always visible when punch in/out is enabled; closes mantis 1294.
git-svn-id: svn://localhost/ardour2/branches/3.0@5828 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-20 21:58:46 +00:00
Carl Hetherington
960efd79a3 Fixes to pointer constraints when copying in lock edit mode; make them behave the same as when just dragging regions. Fixes some or all of mantis 2573.
git-svn-id: svn://localhost/ardour2/branches/3.0@5825 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-20 20:43:23 +00:00
Carl Hetherington
271f298635 Since add_property creates new XMLProperty objects, remove_property should probably delete them. Although remove_property is only used in one place in Ardour that I can see.
git-svn-id: svn://localhost/ardour2/branches/3.0@5824 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-20 18:44:44 +00:00
Carl Hetherington
2898c4fa70 Make the behaviour zoom to region more intuitive (IMHO); ie always zoom to the selected region. Not quite sure what the zoomed_to_region flag was intended to achieve. Fixes mantis 2154.
git-svn-id: svn://localhost/ardour2/branches/3.0@5823 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-20 18:20:38 +00:00
b488867f32 handle searching for a note in an empty note list
git-svn-id: svn://localhost/ardour2/branches/3.0@5822 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-20 12:16:30 +00:00
0def2d2d82 Tidy.
git-svn-id: svn://localhost/ardour2/branches/3.0@5821 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-20 02:26:25 +00:00
958fe26790 Tidy.
git-svn-id: svn://localhost/ardour2/branches/3.0@5820 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-20 02:17:28 +00:00
ed3b46e03b Factor out more duplicated code.
git-svn-id: svn://localhost/ardour2/branches/3.0@5819 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-20 02:14:53 +00:00