Commit Graph

2151 Commits

Author SHA1 Message Date
Hans Baier
0c66131fea * bugfix in midi editing: adding notes impossible after delete
git-svn-id: svn://localhost/ardour2/branches/3.0@3255 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-16 02:30:37 +00:00
Hans Baier
c4bdcb82af * fixed bug: crash because of invalidated iterator while removing midi notes from model
git-svn-id: svn://localhost/ardour2/branches/3.0@3253 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-15 23:00:06 +00:00
Hans Baier
8b3d298f6b * first working version of editing MIDI channels of individual notes, see: http://www.flickr.com/photos/24012642@N02/2412142661/
git-svn-id: svn://localhost/ardour2/branches/3.0@3252 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-14 06:23:11 +00:00
2656e0a43b (3.0) fix compile error related to Controllable/shared_ptr confusion post-merge
git-svn-id: svn://localhost/ardour2/branches/3.0@3251 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-12 14:02:00 +00:00
Hans Baier
aae8262a36 * persistent undo for MIDI edits works now
* fixed bug: dragging of notes beyond left region bounds made it disappear (unsigned int wrap around)

git-svn-id: svn://localhost/ardour2/branches/3.0@3249 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-11 15:49:52 +00:00
cb41314642 merge 3.0 from 2.0-ongoing@3243
git-svn-id: svn://localhost/ardour2/branches/3.0@3248 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-11 14:06:50 +00:00
Hans Baier
9aa8af5a28 * refactored (un)marshalling of DeltaCommand into cleaner code using sigc
git-svn-id: svn://localhost/ardour2/branches/3.0@3245 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-10 07:30:10 +00:00
Hans Baier
1a0044b35d * implemented persistent undo for MidiModel::DeltaCommand. Deserializing works, but weirdly has no effect when undo/redo is applied in the editor
git-svn-id: svn://localhost/ardour2/branches/3.0@3240 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-09 15:33:01 +00:00
Hans Baier
f39606f985 * fixed bug: MIDI region did not sound if its position was less than its start offset
git-svn-id: svn://localhost/ardour2/branches/3.0@3239 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-08 23:57:59 +00:00
Hans Baier
9228d5dc23 * removed possible memory leak / cause of crashes for midi editing
* fixed bug: after adding new notes, notes above/below region bounds appear

git-svn-id: svn://localhost/ardour2/branches/3.0@3237 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-08 21:44:13 +00:00
Hans Baier
a606a83d2e * bugfix from http://tracker.ardour.org/view.php?id=2155 thanks to kristian: fix glibmm include issues with newer glib
git-svn-id: svn://localhost/ardour2/branches/3.0@3222 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-07 16:32:14 +00:00
Hans Baier
e534334dce * bugfix: creating notes not sample accurate
* bugfix: resizing notes not sample accurate
* bugfix: resizing notes broken due to region resizing patch

git-svn-id: svn://localhost/ardour2/branches/3.0@3221 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-06 20:03:41 +00:00
Hans Baier
c1d5a721d2 * fixed broken note resizing and creation since region starts can be adjusted, moving notes still broken
git-svn-id: svn://localhost/ardour2/branches/3.0@3220 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-05 13:56:20 +00:00
Hans Baier
4ee42dc455 * Bugfix: resizing beginnings of MIDI regions did not work correctly (it shifted the region content right)
* Bugfix: resizing ends of MIDI tracks did not hide noted beyond region boundaries (in the moment only all notes with note_on >= region end are hidden, their note offs still may exceed region boundaries, but so much for now.....)

git-svn-id: svn://localhost/ardour2/branches/3.0@3219 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-05 09:47:07 +00:00
Hans Baier
549a8cb88b * bugfix: invisible midi ports in port matrix shown
git-svn-id: svn://localhost/ardour2/branches/3.0@3218 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-05 03:49:31 +00:00
Hans Baier
c2b802c6e2 * bugfix: Connecting/disconnecting MIDI ports did not work: http://tracker.ardour.org/view.php?id=2141
git-svn-id: svn://localhost/ardour2/branches/3.0@3216 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-04 16:36:30 +00:00
Hans Baier
f960405614 * fixed segfault on MIDI Panic button
git-svn-id: svn://localhost/ardour2/branches/3.0@3212 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-03 22:12:25 +00:00
Hans Baier
fbfe9a7983 * implemented editing velocities (http://tracker.ardour.org/view.php?id=2148)
* added MIDI panic button (http://tracker.ardour.org/view.php?id=2118)
* bugfix: moving notes above midi 127 or below 0 does not wrap around anymore
* bugfix: deadlock on editing notes after playback (http://tracker.ardour.org/view.php?id=2140) due to unbalanced lock acquire/release
* bugfix: First note off lost in playback (http://tracker.ardour.org/view.php?id=2132)
* bugfix: Last note off lost in saving MIDI files (http://tracker.ardour.org/view.php?id=2132)
* bandaid fix for http://tracker.ardour.org/view.php?id=1985 (Cannot reopen session because jack ports are not unregistered on session close)
* bandaid fix: replaced conf.CheckPKGExists ('\"slv2 >= 0.6.0\"') by conf.CheckPKGExists ('slv2') in SConstruct, because the former would fail, 
  even if SLV 0.6.0 was installed
* added/enabled debugging output for debugging MIDI model (might be removed later)


git-svn-id: svn://localhost/ardour2/branches/3.0@3211 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-03 21:47:47 +00:00
6554200e66 hans' patches for MIDI note resizing++
git-svn-id: svn://localhost/ardour2/branches/3.0@3184 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-26 11:11:47 +00:00
022c45361e fix up delivery of MTC & MMC; add zero=last_timestamp semantics to JACK midi port write call; setup parser execution for JACK MIDI ports
git-svn-id: svn://localhost/ardour2/branches/3.0@3159 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-19 21:15:28 +00:00
4808f7fe8b fix up and re-enable MTC transmission
git-svn-id: svn://localhost/ardour2/branches/3.0@3158 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-19 18:10:51 +00:00
d9faaed2c1 reduce (from 5k to 512) the number of events that non-process() threads may write into a JACK_MidiPort per process cycle
git-svn-id: svn://localhost/ardour2/branches/3.0@3157 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-19 17:30:42 +00:00
3a29796405 reinstate Ye Olde MIDI (input) thread; fix up a few startup warnings
git-svn-id: svn://localhost/ardour2/branches/3.0@3156 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-19 17:25:37 +00:00
eb4a1fdbb8 refactor JACK MIDI port to allow writing from a non-process() thread, and move ARDOUR::MidiEvent into MIDI namespace along with midi_events.h header
git-svn-id: svn://localhost/ardour2/branches/3.0@3155 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-18 03:42:32 +00:00
d69f4e9e3d band-aid fix for wrong-thread-MIDI-writes
git-svn-id: svn://localhost/ardour2/branches/3.0@3154 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-18 00:58:36 +00:00
4ca4a8e237 added back glibmm2/Makefile.am
git-svn-id: svn://localhost/ardour2/branches/3.0@3153 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-17 20:54:43 +00:00
997e4b1f9c merge with 2.0-ongoing @ rev 3147
git-svn-id: svn://localhost/ardour2/branches/3.0@3152 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-17 20:54:03 +00:00
19a4b99032 cleanup to build glibmm the way we actually want
git-svn-id: svn://localhost/ardour2/branches/3.0@3148 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-17 14:30:05 +00:00
8bd2ee92fa Add canvas-note.cc that probably shouldn't exist anyway :)
git-svn-id: svn://localhost/ardour2/branches/3.0@3146 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-15 00:47:30 +00:00
2aad191440 Apply note resizing patch from hans.
git-svn-id: svn://localhost/ardour2/branches/3.0@3145 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-15 00:37:17 +00:00
704e5b809b Clear selection in MidiRegionView::clear_events (can't select what isn't there....).
git-svn-id: svn://localhost/ardour2/branches/3.0@3141 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-12 01:01:27 +00:00
bdbe392325 Remove redundant MidiRegionView::start_remove_command.
git-svn-id: svn://localhost/ardour2/branches/3.0@3140 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-10 22:32:36 +00:00
ff5709e895 Fix selection issues.
git-svn-id: svn://localhost/ardour2/branches/3.0@3120 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-25 01:33:30 +00:00
318c213062 Fix weird formatting in lineset.cc to match conventions.
git-svn-id: svn://localhost/ardour2/branches/3.0@3112 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-23 02:14:17 +00:00
884f08ef50 Remove SMF file name print for every opened source.
Fix crash on startup when installed (splash.png not found).


git-svn-id: svn://localhost/ardour2/branches/3.0@3108 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-22 04:13:44 +00:00
b03676f9a6 Hopefully fix missing meter/fader on mixer.
git-svn-id: svn://localhost/ardour2/branches/3.0@3106 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-22 01:49:33 +00:00
faf4e1d8e8 Clean up weird formatting from underlays patch.
Fix several memory (valgrind) errors in a vain attempt to fix crash on session close.


git-svn-id: svn://localhost/ardour2/branches/3.0@3105 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-22 01:45:29 +00:00
2921166139 Fix key stealing on MIDI region views.
git-svn-id: svn://localhost/ardour2/branches/3.0@3102 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-21 20:20:40 +00:00
4b5ee47d44 Fix ruler scale on initial view (apply patch from nick_m).
git-svn-id: svn://localhost/ardour2/branches/3.0@3101 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-21 19:51:41 +00:00
4afabf43e5 Steal n key for note tool, normalize be damned.
git-svn-id: svn://localhost/ardour2/branches/3.0@3100 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-21 19:43:42 +00:00
4d94305cc9 Fix install path problems (s/ardour2/ardour3).
Fix finding of keybindings file when running from source tree (via ardev/ardbg).
Fix clashing keybindings for zoom stuff.
Add note tool keybinding and menu entry.


git-svn-id: svn://localhost/ardour2/branches/3.0@3099 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-21 19:30:01 +00:00
0d0bd81a75 Fix timing on MIDI import.
git-svn-id: svn://localhost/ardour2/branches/3.0@3093 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-21 00:15:20 +00:00
68bfed0a46 Some work towards MIDI plugins (LV2 plugins with (MIDI supporting) event ports shown in plugin selector).
git-svn-id: svn://localhost/ardour2/branches/3.0@3092 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-20 23:24:51 +00:00
a2a6cc0404 Merge with 2.0-ongoing R3082.
Superficial generification of export stuff.


git-svn-id: svn://localhost/ardour2/branches/3.0@3088 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-19 22:10:27 +00:00
4cbd7f0eab Added missing file.
git-svn-id: svn://localhost/ardour2/branches/3.0@3087 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-19 03:40:25 +00:00
012292b4bd Less crash-happy MIDI reading on weird MIDI files.
Make "show existing automation" create/show automation tracks for all contained CC in MIDI tracks.
Fix staggered time when importing multi-track MIDI files.


git-svn-id: svn://localhost/ardour2/branches/3.0@3086 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-19 03:24:44 +00:00
b79d5bfad3 'Channel safe' MIDI:
Resolve note on/off pairs in MidiModel.
Add channel field to Parameter (for associating a channel with a CC list).
Add channel selector to 'add controller automation' dialog.
Write out note and CC MIDI events with proper channel.


git-svn-id: svn://localhost/ardour2/branches/3.0@3085 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-19 01:31:24 +00:00
466500fdaf Channel-aware note recording in MidiModel (i.e. multi-channel note input doesn't cause stuck notes).
Fix MIDI regions randomly displaying 100% stuck notes (uninitialized MidiPlaylist::_note_mode).


git-svn-id: svn://localhost/ardour2/branches/3.0@3084 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-18 23:30:27 +00:00
fbfb26b45c Preliminary (read: kludgey) MIDI import support.
Only really works when tracks contain only channel 1 data for now.


git-svn-id: svn://localhost/ardour2/branches/3.0@3083 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-18 19:45:52 +00:00
1b2fe7bf34 Update export dialog to match the new fancy one from 2.0-ongoing.
git-svn-id: svn://localhost/ardour2/branches/3.0@3082 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-17 23:12:35 +00:00