diff options
| author | David Robillard <d@drobilla.net> | 2013-01-20 08:56:00 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2013-01-20 08:56:00 +0000 |
| commit | 4e6d0c9e61b62931a4a2120b548f0ff02a966351 (patch) | |
| tree | 17c395d18338fb92d7af62fa635a8e957d523f93 /libs/midi++2/test | |
| parent | 0ebad4279b765d3fbe85649e9ef29e5b61c1d162 (diff) | |
Show matching controller name in automation lane header.
Completely eliminate static MIDI controller name code.
Reduce dependency on midnam_patch.h (which would have saved me several hours if I did it earlier).
Store controller name numbers as an integer.
Keep controller names in a map keyed by int instead of a list for fast lookup.
More cleanup of MIDI::Name code.
git-svn-id: svn://localhost/ardour2/branches/3.0@13927 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/midi++2/test')
| -rw-r--r-- | libs/midi++2/test/MidnamTest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/midi++2/test/MidnamTest.cpp b/libs/midi++2/test/MidnamTest.cpp index 5a3a991286..9a4ba04800 100644 --- a/libs/midi++2/test/MidnamTest.cpp +++ b/libs/midi++2/test/MidnamTest.cpp @@ -77,7 +77,7 @@ MidnamTest::protools_patchfile_test() bank = banks2.front(); CPPUNIT_ASSERT_EQUAL(string("Drum sets"), bank->name()); - const PatchBank::PatchNameList& plist2 = bank->patch_name_list(); + const PatchNameList& plist2 = bank->patch_name_list(); CPPUNIT_ASSERT(plist2.size() == 49); } @@ -136,9 +136,9 @@ MidnamTest::yamaha_PSRS900_patchfile_test() CPPUNIT_ASSERT(banks1.size() > 1); boost::shared_ptr<PatchBank> bank = banks1.front(); - const PatchBank::PatchNameList& list = bank->patch_name_list(); + const PatchNameList& list = bank->patch_name_list(); - for(PatchBank::PatchNameList::const_iterator p = list.begin(); p != list.end(); ++p) { + for(PatchNameList::const_iterator p = list.begin(); p != list.end(); ++p) { if (ns == string("GM+XG")) { cerr << "got Patch with name " << (*p)->name() << " bank " << (*p)->bank_number() << " program " << (int)(*p)->program_number() << endl; |