13
0
Commit Graph

9793 Commits

Author SHA1 Message Date
511d68000c Tidy.
git-svn-id: svn://localhost/ardour2/branches/3.0@13914 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-20 02:49:07 +00:00
f7ada4b323 Add General MIDI drum note names and patch names.
Support loading note names per ChannelNameSet (like GM) in addition to per Patch (like DM5).


git-svn-id: svn://localhost/ardour2/branches/3.0@13913 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-20 02:41:27 +00:00
411dd7566f Fix completely wrong MidiRegionView::get_patch_key_at().
This fixes the note name displayed at a given time to be based on the correct program at that time, and not one in the future.

git-svn-id: svn://localhost/ardour2/branches/3.0@13912 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-20 02:31:41 +00:00
4a47edeaf0 Fix MIDI note number off by one error.
Bloody one-based indices...


git-svn-id: svn://localhost/ardour2/branches/3.0@13911 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-20 01:12:12 +00:00
230c4e080e Fix midnam warning messages.
git-svn-id: svn://localhost/ardour2/branches/3.0@13910 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-20 00:58:19 +00:00
4cdcacb6b3 Fix ever expanding bank selector in add patch change dialog when changing channel number.
git-svn-id: svn://localhost/ardour2/branches/3.0@13909 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-20 00:52:05 +00:00
88de45b7cc Support note names from midnam files (tested with the DM5).
Do this via a simple MasterDeviceNames::note_name() function.  The same really
needs to be done for program names, this stuff is absolutely brutal to use.

Store note names in a vector indexed by number instead of a list with string
"numbers" for reasonable lookup time.

Make some references const that should be.


git-svn-id: svn://localhost/ardour2/branches/3.0@13908 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-20 00:46:55 +00:00
448c156b4b Update patchfiles/README and remove executable bit from all midnam files.
git-svn-id: svn://localhost/ardour2/branches/3.0@13907 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-19 21:42:54 +00:00
13d34afa01 Add midnam file for Roland JV-2080.
git-svn-id: svn://localhost/ardour2/branches/3.0@13906 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-19 21:35:08 +00:00
aaef1f13cb Merge Standard MIDI and General MIDI midnam files.
git-svn-id: svn://localhost/ardour2/branches/3.0@13905 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-19 21:32:27 +00:00
85d9fa3b25 Gracefully handle errors parsing midnam documents instead of crashing.
git-svn-id: svn://localhost/ardour2/branches/3.0@13904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-19 21:31:21 +00:00
444d89b669 Set MIDI device mode to the first by default if unset.
Give up trying to hide mode selector when it's useless.
Fix display of program names for default mode.
Abstract out (non-crashy) MidiTimeAxisView::get_device_names().


git-svn-id: svn://localhost/ardour2/branches/3.0@13903 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-19 20:15:15 +00:00
2d9a15087b Use a std::set for MIDI device models so the combo is sorted and the user can find things.
git-svn-id: svn://localhost/ardour2/branches/3.0@13902 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-19 19:25:06 +00:00
ca41354e46 Add instructions for adding midnam files.
git-svn-id: svn://localhost/ardour2/branches/3.0@13901 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-19 19:21:57 +00:00
cc8b42f167 Set MIDI device model to "Generic" by default (previously was unset).
Perhaps it should be "Standard MIDI" though?


git-svn-id: svn://localhost/ardour2/branches/3.0@13900 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-19 19:06:21 +00:00
fe980b5c99 fix MIDI track channel selector etc. visibility after show_all()=>show() changes in recent commit
git-svn-id: svn://localhost/ardour2/branches/3.0@13899 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-19 16:05:06 +00:00
f4f0dd6637 completely revisit how track name editing works in the editor
git-svn-id: svn://localhost/ardour2/branches/3.0@13898 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-19 15:27:04 +00:00
c779251a3e fix midnam-related crash introduced around 13892
git-svn-id: svn://localhost/ardour2/branches/3.0@13897 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-19 13:15:10 +00:00
051b81494c slightly more informational debug message
git-svn-id: svn://localhost/ardour2/branches/3.0@13896 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-19 13:14:50 +00:00
b1bc353f0d Add standard MIDI midnam file and remove hard coded equivalent.
Accordingly, make "generic" MIDI truly generic, just numbered controllers.
Break up MIDI name UI stuff into manageable functions of reasonable size.
Add convenient method to MIDINameDocument for getting the names for a device.
Tolerate comments in MIDINameDocument ControlNameList.

Can't remove the MIDI name code just yet, since it's still erroneously used by
Automatable::describe_parameter().  This is the cause of a bug where the name
on the automation lane does not match that in the menu.

The plan is to make a very simple pure abstract interface for getting MIDI
names, and make it possible to set one for Automatable (or perhaps pass it to
describe_parameter()).  Thus we'll be on the way to supporting names from
sources other than midnam files, namely plugins.


git-svn-id: svn://localhost/ardour2/branches/3.0@13895 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-19 10:02:00 +00:00
05a397b20c Unfortunately it seems that MIDINameDocument can not express control groups, so remove this.
We will have to embrace and extend the format to provide that.  I think it's the only feasible way to present up to 127 controllers in the UI in a decently usable way, so it's probably a good idea to do so.

git-svn-id: svn://localhost/ardour2/branches/3.0@13894 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-19 09:31:37 +00:00
0d5b79bd1f Fix undefined return value.
git-svn-id: svn://localhost/ardour2/branches/3.0@13893 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-19 08:55:19 +00:00
fc77ae0738 Replace a bunch of potential crashes with graceful handling of the situation.
We really need some kind of more sophisticated assert macro that can be
switched to non-fatal logging mode for release builds.  A log message, which is
often all that would happen, is a lot better than a trainwrecked performance...


git-svn-id: svn://localhost/ardour2/branches/3.0@13892 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-19 07:00:43 +00:00
d251c68d76 Avoid some copy overhead and sprinkle in some const for good measure.
git-svn-id: svn://localhost/ardour2/branches/3.0@13891 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-19 06:17:02 +00:00
9b2dad56d1 Reflow ridiculously wide code.
Sorry.


git-svn-id: svn://localhost/ardour2/branches/3.0@13890 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-19 05:54:44 +00:00
94c7798712 Hide MIDI device mode selector unless there is actually more than one mode.
Since this is usually not the case, showing this all the time as before was so
confusing everyone thought it was broken (myself included).

Changing that show_all() to a show() might have consequences, but it seems to
work fine and we really shouldn't be using show_all() anyway.


git-svn-id: svn://localhost/ardour2/branches/3.0@13889 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-19 05:36:43 +00:00
458b5c1d48 Clean up midnam author data.
git-svn-id: svn://localhost/ardour2/branches/3.0@13888 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-19 02:49:59 +00:00
341082ba7d Ram all midnam files through xmllint --format and get something halfway respectable out the other side.
... and voila, decent data.  Good grief, what a mess that was.

git-svn-id: svn://localhost/ardour2/branches/3.0@13887 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-19 02:37:06 +00:00
078145252b Fix invalid XML. All midnam files now pass validation by xmllint.
git-svn-id: svn://localhost/ardour2/branches/3.0@13886 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-19 02:33:28 +00:00
1f5c686979 Use consistent naming scheme for midnam files.
git-svn-id: svn://localhost/ardour2/branches/3.0@13885 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-19 01:52:51 +00:00
c4a68db0d2 Use civilized line endings.
git-svn-id: svn://localhost/ardour2/branches/3.0@13884 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-19 01:23:01 +00:00
79babd3ee6 Use the standard doctype for this motley crew of midnam files.
By "standard" I mean "actually hosted by the MMA at midi.org".  Where the heck
this broken DTD link to sonosphere.org came from is anyone's guess.  Either
midi.org wasn't doing things correctly back in the day, or somebody is insane.
Probably both.

As a hint to the legacy of this data, some of these documents referred to
version 0.7, and some have mac newlines.  Mac newlines!  Remember those?


git-svn-id: svn://localhost/ardour2/branches/3.0@13883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-19 01:19:57 +00:00
fb03c5d5fd Valid midnam file for Moog Minitaur
git-svn-id: svn://localhost/ardour2/branches/3.0@13882 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-19 01:14:46 +00:00
ee71553180 new take on getting SVN revision number
git-svn-id: svn://localhost/ardour2/branches/3.0@13881 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-19 01:11:48 +00:00
49a722d3d2 more debugging output for failed LXVST opens, and drop use of NULL
git-svn-id: svn://localhost/ardour2/branches/3.0@13880 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-18 20:25:13 +00:00
347c4f9779 fix crash when copy-n-pasting plugins, caused by work done to allow copy-n-paste of aux sends: non-send processors do not have a "role" node in their XML state
git-svn-id: svn://localhost/ardour2/branches/3.0@13879 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-18 17:35:34 +00:00
17cbb458e7 fix restore of snap mode (confusion caused by existence of internal/preinternal snap modes)
git-svn-id: svn://localhost/ardour2/branches/3.0@13878 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-18 15:56:41 +00:00
b4abc10f71 fix issue with color and position of mixer strip plugin control sliders (#5275)
git-svn-id: svn://localhost/ardour2/branches/3.0@13876 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-17 22:33:08 +00:00
d0272c4558 cache cairo_pattern_t's for PixFader so that we don't generate one per fader, but rather one per size+color combination
git-svn-id: svn://localhost/ardour2/branches/3.0@13874 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-17 15:36:35 +00:00
a3bd17970e fix size of FaderOption's fader
git-svn-id: svn://localhost/ardour2/branches/3.0@13873 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-17 15:34:55 +00:00
b02e2cd25b fix problem with size of patterns used by pixfaders when they get re-size-allocated
git-svn-id: svn://localhost/ardour2/branches/3.0@13871 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-17 15:00:44 +00:00
5adcb61f60 a few small fixes that help pitchbend control of things, notably the shuttle controller. but note that basically, teh shuttle controller is completely and hopelessly broken through excess complexity and incorrect design
git-svn-id: svn://localhost/ardour2/branches/3.0@13870 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-17 14:48:17 +00:00
4ecb07aaee fix up Location::first_location_(after|before) to do the right thing when marks + ranges are interleaved (functions renamed)
git-svn-id: svn://localhost/ardour2/branches/3.0@13869 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-17 13:19:16 +00:00
53f162f921 prevent button1/2 clicks on pixfaders from being used to drive event processing in parent containers (#5272)
git-svn-id: svn://localhost/ardour2/branches/3.0@13868 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-17 02:41:11 +00:00
a52fb39969 fix up various issues with sizing now that we have the basic idea that pixfaders can dynamically resize themselves (#5273)
git-svn-id: svn://localhost/ardour2/branches/3.0@13867 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-17 02:35:06 +00:00
15078e5a6d fix up handling of size allocation + setting
git-svn-id: svn://localhost/ardour2/branches/3.0@13866 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-17 02:32:48 +00:00
db3da02446 add copyright comments
git-svn-id: svn://localhost/ardour2/branches/3.0@13865 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-16 18:51:39 +00:00
d592b2cc5b add copyright comments
git-svn-id: svn://localhost/ardour2/branches/3.0@13864 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-16 18:45:47 +00:00
c9b65921d3 add copyright comments
git-svn-id: svn://localhost/ardour2/branches/3.0@13863 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-16 18:37:48 +00:00
22cb8bfb34 add copyright comments
git-svn-id: svn://localhost/ardour2/branches/3.0@13862 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-16 18:27:41 +00:00