13
0
Commit Graph

960 Commits

Author SHA1 Message Date
Sampo Savolainen
23a73ec682 Change redirectmenu to processormenu
git-svn-id: svn://localhost/ardour2/branches/3.0@3721 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-14 09:00:23 +00:00
da6e0a95bb get the notebook back again (or rather, realize that it can now be toggled and that the default is to hide it)
git-svn-id: svn://localhost/ardour2/branches/3.0@3720 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-12 11:03:51 +00:00
b0424889b3 make tracks visible again
git-svn-id: svn://localhost/ardour2/branches/3.0@3719 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-12 09:01:52 +00:00
823f44e50a Fix compilation w/ LV2.
git-svn-id: svn://localhost/ardour2/branches/3.0@3716 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-11 16:07:40 +00:00
4b27094a39 make link (rubberband) work
git-svn-id: svn://localhost/ardour2/branches/3.0@3715 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-11 06:24:57 +00:00
c86210a9d5 merge 2.0-ongoing into 3.0 @ 3581 - 3710
git-svn-id: svn://localhost/ardour2/branches/3.0@3712 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 21:27:39 +00:00
68e943265e merge from 2.0-ongoing @ 3581
git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 15:03:30 +00:00
Hans Baier
ed990de604 * first implementation of MIDI Clock Slave support
git-svn-id: svn://localhost/ardour2/branches/3.0@3652 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-08-04 22:37:24 +00:00
Sampo Savolainen
4898bfb981 Translations from Petter, now in the correct branch. Now only for €19.99.
git-svn-id: svn://localhost/ardour2/branches/3.0@3428 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-06-01 15:13:52 +00:00
Sampo Savolainen
4b77442d06 Updated translations from Petter
git-svn-id: svn://localhost/ardour2/branches/3.0@3415 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-26 14:31:06 +00:00
Sakari Bergen
5c60257b4a Changed Byte to uint8_t in some files (left out from drobilla's previous commit)
git-svn-id: svn://localhost/ardour2/branches/3.0@3411 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-24 16:07:33 +00:00
Hans Baier
8c743c2c0c *fix the bugfix: Input and Output Ports exchanged in Track/Bus inspector
*increased buffer sizes to get rid of overruns (PitchBender still doesnt work though....)


git-svn-id: svn://localhost/ardour2/branches/3.0@3403 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-23 02:13:31 +00:00
8b4eea3c77 Make absurdly slow MIDI selection rectangle slightly less absurd.
git-svn-id: svn://localhost/ardour2/branches/3.0@3401 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-22 23:14:19 +00:00
39b2e2b572 fix track selection sensitivity botch for Import action, should be toggle-waveform-visible instead
git-svn-id: svn://localhost/ardour2/branches/3.0@3393 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-22 20:56:56 +00:00
975d410930 Fix MIDI selection/tool issues (issue #0002415 and other bugs).
Fix selection preservation across MIDI model editing commands (for both note moving and resizing).
Fix selection breakage introduced by old selection preservation stuff (fix zombie selection).


git-svn-id: svn://localhost/ardour2/branches/3.0@3381 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-22 01:02:04 +00:00
Hans Baier
7a9b4a0aa2 * bugfix: Inputs and Outputs swapped in the Track/Bus Inspector
* bugfix: control_to_midi_event has no effect
* typo (track/bus inspector)


git-svn-id: svn://localhost/ardour2/branches/3.0@3379 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-21 23:01:40 +00:00
7666a4a5ff Don't create tracks for empty MIDI channels on import (i.e. make import look clean and sensible).
Remove no longer useful debugging output.


git-svn-id: svn://localhost/ardour2/branches/3.0@3365 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-16 22:40:35 +00:00
Hans Baier
0c25b2aa8e * Fixed crash on closing MIDI automation tracks, because ARDOUR::Parameter::operator< violated strict weak ordering,
which is necessary for std::set to work correctly
* few small style guide corrections


git-svn-id: svn://localhost/ardour2/branches/3.0@3363 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-16 20:54:24 +00:00
8ab37dd700 Fix region/track naming on MIDI import (remove ugly/unnecessary %a %b etc suffix).
git-svn-id: svn://localhost/ardour2/branches/3.0@3360 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-16 03:21:18 +00:00
cb94baf6f4 Fix invalid error message during MIDI recording (or files with stuck notes).
Handle stuck notes more gracefully in the view (probably should show up as a diamond though?).


git-svn-id: svn://localhost/ardour2/branches/3.0@3359 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-16 03:11:28 +00:00
f53baec2e4 Tidy up MIDI debugging output.
git-svn-id: svn://localhost/ardour2/branches/3.0@3358 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-16 02:50:19 +00:00
722b85e828 Fix crash on out of range MIDI events (though this shouldn't be possible at all....).
git-svn-id: svn://localhost/ardour2/branches/3.0@3357 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-16 02:35:37 +00:00
05801cc3d6 Eliminate excessive allocation (for every event) during MidiModel iteration.
git-svn-id: svn://localhost/ardour2/branches/3.0@3351 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-15 05:00:28 +00:00
Hans Baier
a65044d097 * formatting
* fixed corruption bugs due to allocation hell of MidiModel::const_iterator::_event: Changed it into boost::shared_ptr
* fixed  MidiModel::const_iterator bugs: 
	-First note on lost, if an automation event comes first
	-corrupt MidiEvent compared to automation event if there are no notes in the region
* (hopefully) fixed possible race condition 
* fixed range check in MidiDiskstream::set_state for channel mask
* treating notes with duration 0 more gently in MidiRegionView (warning instead of assertion)


git-svn-id: svn://localhost/ardour2/branches/3.0@3345 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-13 18:40:10 +00:00
Hans Baier
636f2184a5 * applied patch for ardour-3.0 to compile on OS X thanks to Sakari Bergen
git-svn-id: svn://localhost/ardour2/branches/3.0@3338 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-12 11:46:53 +00:00
Hans Baier
d467245152 * fixed various event size bugs
git-svn-id: svn://localhost/ardour2/branches/3.0@3336 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-12 10:03:53 +00:00
8ca72c4eca Fix various MIDI corruption bugs.
Re-enable MIDI CC controller bars and other immediate output (hans commented out, tsk tsk).
Write channel mode as textual enumeration instead of magic number.
Better atomic (almost) channel mode switching on MIDI ring buffer (was a possible, if unlikely, source of corruption).
Handle some cases of broken MIDI, and oversized events, more gracefully.


git-svn-id: svn://localhost/ardour2/branches/3.0@3335 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-12 02:40:48 +00:00
Hans Baier
4e745fc17c * formatting/style guide
* bugfix: midi_util.h only considered channel events up to E0, but had to be EF
* bugfix: parameter.h operator == should also compare channel (drobilla, correct me if I am wrong)
* added some assert() guards


git-svn-id: svn://localhost/ardour2/branches/3.0@3330 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-09 16:10:36 +00:00
Hans Baier
8d44391f4b * adjusted formatting a bit to style guide
* fixed: velocity value left on canvas
* fixed: end-of-track problem still showed up sometimes
* enabled heaps of debugging output in order to debug MidiModel corruption 


git-svn-id: svn://localhost/ardour2/branches/3.0@3329 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-09 11:28:14 +00:00
Hans Baier
f651190162 * fixed some valgrind issues (uninitialized instance vars)
* Added preliminary support for program changes flags from automation lists


git-svn-id: svn://localhost/ardour2/branches/3.0@3327 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-08 09:53:19 +00:00
Hans Baier
a42913736a * fixed crash bug in MidiModel::const_iterator::operator=: copied iterator from other which becomes invalid because
the container the iterator points into is destroyed
* fixed conditional jump from uninitialised value in CanvasNote


git-svn-id: svn://localhost/ardour2/branches/3.0@3326 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-06 22:54:06 +00:00
e55e3fde7c Comment out excessive terminal output.
Write all events (not just notes) to SMF file from MidiModel
	(just use iterator instead of hand-hacked MidiModel::write_to).
Various MIDI bug fixes.


git-svn-id: svn://localhost/ardour2/branches/3.0@3312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-03 21:55:43 +00:00
fb1fbf71af Fix range problems for pitch wheel controller.
git-svn-id: svn://localhost/ardour2/branches/3.0@3308 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-02 21:34:00 +00:00
ab2af5d185 Fix several crashes on MIDI recording.
Fix MIDI CC iterator infinite looping.
Only allocate Text widget for MIDI events if necessary.


git-svn-id: svn://localhost/ardour2/branches/3.0@3307 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-02 20:57:27 +00:00
e7e75e78c8 Fix range marker bar separator (colour is still off though, for some reason...).
git-svn-id: svn://localhost/ardour2/branches/3.0@3305 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-02 19:28:25 +00:00
Hans Baier
0e394fb66b * removed old implementation for Program Changes from MidiModel
* Added Automation based implementation for Program Changes, Pitch Bender and Channel Aftertouch

git-svn-id: svn://localhost/ardour2/branches/3.0@3304 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-02 19:09:32 +00:00
da45f489dd Fixes for GCC 4.3.
git-svn-id: svn://localhost/ardour2/branches/3.0@3303 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-05-02 18:35:05 +00:00
Hans Baier
38eb5f4539 * renamed canvas-midi-event.* into canvas-note-event.*
* make MidiModel keep track of its CanvasProgramChange instances

git-svn-id: svn://localhost/ardour2/branches/3.0@3297 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-29 21:58:05 +00:00
Hans Baier
d3cc2981b0 * added new defaults for program change ui gtk2_ardour/ardour3_ui_default.conf
* reverted involuntarily committed changes

git-svn-id: svn://localhost/ardour2/branches/3.0@3296 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-29 12:51:10 +00:00
Hans Baier
c0d467f461 * added defaults for program change ui gtk2_ardour/ardour3_ui_default.conf
git-svn-id: svn://localhost/ardour2/branches/3.0@3295 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-29 12:38:46 +00:00
Hans Baier
58e569c9e1 * Renamed CanvasMidiEvent into CanvasNoteEvent
* changed MidiModel::write_to to include note off handling *and* time sorting

git-svn-id: svn://localhost/ardour2/branches/3.0@3294 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-29 08:37:53 +00:00
Hans Baier
6d319e2132 * first prototype of program changes UI show up correctly (see http://www.flickr.com/photos/24012642@N02/2451596190/)
git-svn-id: svn://localhost/ardour2/branches/3.0@3293 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-29 07:28:24 +00:00
fee712f221 fix crash when popping up redirect/processor menu
git-svn-id: svn://localhost/ardour2/branches/3.0@3289 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-26 00:26:42 +00:00
Hans Baier
d9de6f2c4c * preliminary impl for PGM Change support in MidiModel
git-svn-id: svn://localhost/ardour2/branches/3.0@3283 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-24 15:04:56 +00:00
Hans Baier
b81fd9415e * disabled some debugging output
* make record buttons appear in MIDI mixer strips

git-svn-id: svn://localhost/ardour2/branches/3.0@3280 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-22 22:39:45 +00:00
Hans Baier
7afccaa9fe * fixed display bug: changing the height on tracks doesnt rescale CanvasHits
git-svn-id: svn://localhost/ardour2/branches/3.0@3278 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-21 16:42:55 +00:00
Hans Baier
c72bf18bf4 * persisting/restoring track channel settings works now
git-svn-id: svn://localhost/ardour2/branches/3.0@3276 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-21 15:10:13 +00:00
Hans Baier
f31abc5eaf * UI fixes for track channel selection
* implemented 'forcing midi events into a single channel'
* see http://www.flickr.com/photos/24012642@N02/2430165889/

git-svn-id: svn://localhost/ardour2/branches/3.0@3273 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-21 09:39:05 +00:00
Hans Baier
e8c2b6f371 * made notes whose channel is not selected in the track appear gray, see http://www.flickr.com/photos/24012642@N02/2429528120/
git-svn-id: svn://localhost/ardour2/branches/3.0@3272 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-20 22:33:13 +00:00
Hans Baier
20cfa08aea * gave the MIDI panic button a new home....
git-svn-id: svn://localhost/ardour2/branches/3.0@3270 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-19 11:49:05 +00:00
Hans Baier
d0cee9db09 * fixed display bug in track channel selector
git-svn-id: svn://localhost/ardour2/branches/3.0@3269 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-19 10:41:12 +00:00
Hans Baier
d8adfa49a6 * made channel selector look quite nice, see http://www.flickr.com/photos/24012642@N02/2425203856/ (still needs some work...)
git-svn-id: svn://localhost/ardour2/branches/3.0@3268 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-19 10:30:38 +00:00
Hans Baier
85c223da0d * first prototype for track based channel selection works
git-svn-id: svn://localhost/ardour2/branches/3.0@3267 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-19 02:11:11 +00:00
Hans Baier
accc73a8c1 * fixed missing get coordinate functions in CanvasHit
* Fixed crash bug when NoteMode = Percussive on MidiRegionView
* Fixed possible MemoryLeaks and added Signal in MidiMultipleChannelSelector

git-svn-id: svn://localhost/ardour2/branches/3.0@3263 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-17 21:27:33 +00:00
Hans Baier
7ba87f7672 * added All/None/Invert Buttons to MidiMultipleChannelSelector
* Added assertion at crash location introduced by latest merge in ProcessorBox::build_processor_menu: 

git-svn-id: svn://localhost/ardour2/branches/3.0@3260 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-17 10:27:03 +00:00
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
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
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
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
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
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
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
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
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
8fed7470f5 Merge with 2.0-ongoing R3077.
git-svn-id: svn://localhost/ardour2/branches/3.0@3078 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-17 17:49:38 +00:00
859e9106e7 Merge with 2.0-ongoing R3071.
git-svn-id: svn://localhost/ardour2/branches/3.0@3074 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-16 22:55:47 +00:00
8aa9508c82 Merge with 2.0-ongoing R3071.
git-svn-id: svn://localhost/ardour2/branches/3.0@3073 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-16 22:43:18 +00:00
1b65758557 Committed underlay support (from Audun).
git-svn-id: svn://localhost/ardour2/branches/3.0@3037 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-10 18:16:25 +00:00
b4b3278bd8 Update clearlooks to fancy new cairo version.
Twiddle colours and throw some gloss in there mostly just to show off.


git-svn-id: svn://localhost/ardour2/branches/3.0@3000 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-03 20:33:49 +00:00
bf687f5dc5 Fix compilation. Oops.
git-svn-id: svn://localhost/ardour2/branches/3.0@2993 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-02 17:58:24 +00:00
d747d82f65 Sort various things to reduce merge hell. No functional changes.
git-svn-id: svn://localhost/ardour2/branches/3.0@2992 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-02 17:46:56 +00:00
80c3677c83 Merge with 2.0-ongoing R2988
git-svn-id: svn://localhost/ardour2/branches/3.0@2991 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-02 17:22:04 +00:00
9f63ab9931 Merge with trunk R2978.
git-svn-id: svn://localhost/ardour2/branches/3.0@2988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-02 03:57:35 +00:00
Nick Mainsbridge
85ea9028b5 collapse filechooser widget initially in export dialog
git-svn-id: svn://localhost/ardour2/branches/3.0@2947 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-19 15:47:40 +00:00
a188851698 Fix audio region view height on track height adjustment.
git-svn-id: svn://localhost/ardour2/branches/3.0@2946 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-19 05:46:26 +00:00
3657677761 Comment out splash screen stuff for now (segfaults on every session load).
git-svn-id: svn://localhost/ardour2/branches/3.0@2945 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-19 05:38:54 +00:00
7295d8e9f6 Merge with 2.0-ongoing R2943.
git-svn-id: svn://localhost/ardour2/branches/3.0@2944 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-19 05:06:33 +00:00
4ca1fe7993 Merge with trunk R2935.
git-svn-id: svn://localhost/ardour2/branches/3.0@2943 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-19 03:49:52 +00:00
48ed9dc2c4 MIDI region stretching.
git-svn-id: svn://localhost/ardour2/trunk@2927 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-17 00:37:46 +00:00
ac1a255706 Merge with trunk R2920.
git-svn-id: svn://localhost/ardour2/trunk@2921 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-15 17:23:57 +00:00
b2e3b18dab Fix problem with notes occasionally not showing up at all.
git-svn-id: svn://localhost/ardour2/trunk@2919 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-15 03:32:51 +00:00
c4cec60d8f Fix track controls gap when showing/hiding editor meters.
git-svn-id: svn://localhost/ardour2/trunk@2916 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-15 00:46:54 +00:00
23f25ad808 Fix track controls width.
git-svn-id: svn://localhost/ardour2/trunk@2915 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-15 00:35:55 +00:00
5a1d3e851d Partially fix MIDI region trim and extend.
git-svn-id: svn://localhost/ardour2/trunk@2911 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-14 01:30:38 +00:00
794917fca7 Install everything to *ardour3* instead of *ardour2*.
Fix initial display of keys and scroomer on new MIDI tracks.
Remove console barf.


git-svn-id: svn://localhost/ardour2/trunk@2909 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-13 21:34:04 +00:00
2db91c126e Apply MIDI keyboard and "scroomer" patch.
git-svn-id: svn://localhost/ardour2/trunk@2908 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-13 17:45:17 +00:00
e92c1669c1 Merge with 2.0-ongoing R2885.
Fix loading of 2.0 sessions.


git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 23:45:50 +00:00
bf256c1681 Fix LD_PRELOAD hackery for cairomm.
git-svn-id: svn://localhost/ardour2/trunk@2890 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-11 00:54:08 +00:00
8a2e30816e Merge with 2.0-ongoing R2883.
git-svn-id: svn://localhost/ardour2/trunk@2885 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 22:22:29 +00:00
bb457bb960 Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837.
git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 21:20:59 +00:00
73dd9d37e7 Merge with 2.0-ongoing R2653.
git-svn-id: svn://localhost/ardour2/trunk@2837 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-07 21:12:29 +00:00
c4110b37f0 Fix meter colour names for consistency.
git-svn-id: svn://localhost/ardour2/trunk@2805 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-12-21 00:26:06 +00:00
cbb935c8d5 Fix crash when displaying LADSPA plugin UI.
git-svn-id: svn://localhost/ardour2/trunk@2804 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-12-21 00:08:02 +00:00
Doug McLain
b42213bb04 Port level meters to trunk
git-svn-id: svn://localhost/ardour2/trunk@2802 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-12-20 23:25:19 +00:00
6cb5ad00f1 Fix compile for when LIBLO=0
git-svn-id: svn://localhost/ardour2/trunk@2786 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-12-15 23:29:30 +00:00
f6d4ed862f Remove two unused files in gtk2_ardour
git-svn-id: svn://localhost/ardour2/trunk@2785 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-12-15 23:29:21 +00:00
375e555c89 Remove unused file gtk2_ardour/gtkscrolledwindow.c
git-svn-id: svn://localhost/ardour2/trunk@2784 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-12-15 23:29:02 +00:00
64a882d96b Fix include statements so they match all other files in gtk2_ardour
git-svn-id: svn://localhost/ardour2/trunk@2783 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-12-15 23:28:47 +00:00
2a391a677d Fix unused variable warning.
Consistently name canvas colours (was very messy and user exposed).


git-svn-id: svn://localhost/ardour2/trunk@2713 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-25 01:05:48 +00:00
Carl Hetherington
fde04925f1 Apply colinf's fix for bug #1913
git-svn-id: svn://localhost/ardour2/trunk@2689 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-17 21:02:05 +00:00
a39a9ea2d4 Rename Session::import_audiofile to Session::import_audiofiles now that it imports more than a single file
git-svn-id: svn://localhost/ardour2/trunk@2676 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-15 02:32:35 +00:00
Carl Hetherington
108e924ad5 Add cairomm to LD_LIBRARY_PATH
git-svn-id: svn://localhost/ardour2/trunk@2655 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-14 16:39:44 +00:00
76eb152745 Change the button order in the duplicate region dialog. Fixes bug 1877
git-svn-id: svn://localhost/ardour2/trunk@2651 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-13 13:21:11 +00:00
c660fd3129 Fix three minor memory leaks in the Editor by using Gtk::manage
git-svn-id: svn://localhost/ardour2/trunk@2642 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-13 06:41:23 +00:00
f9bc731186 Add missing files from tarball scons target
git-svn-id: svn://localhost/ardour2/trunk@2641 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-13 06:41:16 +00:00
7b8bfddca6 fixed bad merge
git-svn-id: svn://localhost/ardour2/trunk@2632 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-13 01:55:56 +00:00
Carl Hetherington
61c990dfba Upgrade gtkmm to 2.10.8, glibmm to 2.13.3 and add cairomm 1.2.4
git-svn-id: svn://localhost/ardour2/trunk@2630 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-12 23:44:49 +00:00
b01bdb7e70 merged with trunk revs 2605-2627
git-svn-id: svn://localhost/ardour2/trunk@2628 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-12 22:23:01 +00:00
Carl Hetherington
99d002dbdf Remove some debugging code which causes slow flashy screen updates.
git-svn-id: svn://localhost/ardour2/trunk@2616 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-10 12:23:19 +00:00
badc087263 merged with 2.0-ongoing changes 2582-2605 (not thoroughly tested but it compiles, start up, and creates a new session)
git-svn-id: svn://localhost/ardour2/trunk@2606 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-08 01:40:25 +00:00
df20e5935f stop auto-play from trying to play things that are not soundfiles
git-svn-id: svn://localhost/ardour2/trunk@2603 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-07 05:09:10 +00:00
8e73c9ee80 patch to prevent (mostly) CD marker being set for the start of the session
git-svn-id: svn://localhost/ardour2/trunk@2601 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-07 02:42:27 +00:00
Carl Hetherington
3069423106 Patch from jdavisp3 to further improve region gain line behaviour, as discussed in bug #1841
git-svn-id: svn://localhost/ardour2/trunk@2599 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-06 13:33:39 +00:00
Carl Hetherington
3594c3d80c Similar fix to previous commit for Mixer_UI::sync_order_keys()
git-svn-id: svn://localhost/ardour2/trunk@2598 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-06 13:27:25 +00:00
Carl Hetherington
6c923d7f60 Fix crash in Editor::sync_order_keys() when a route is removed.
git-svn-id: svn://localhost/ardour2/trunk@2597 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-06 12:53:04 +00:00
Carl Hetherington
95c0c53ab9 Fix pathname.
git-svn-id: svn://localhost/ardour2/trunk@2596 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-06 12:01:02 +00:00
Carl Hetherington
e64eae1eca Make pending state dialogue modal, and give it a more friendly (and translatable) name.
git-svn-id: svn://localhost/ardour2/trunk@2594 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-05 17:11:55 +00:00
Carl Hetherington
61fad5fd44 Patch from jdavisp3 to fix #1894
git-svn-id: svn://localhost/ardour2/trunk@2592 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-05 16:57:19 +00:00
Carl Hetherington
53d072a6d7 Patch from jdavisp3 to fix bug #1841.
git-svn-id: svn://localhost/ardour2/trunk@2590 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-05 15:38:19 +00:00
Carl Hetherington
5bf892728c Select another track when one is deleted, thereby allowing the editor mixer to stick around if it's displayed. Should fix #1542.
git-svn-id: svn://localhost/ardour2/trunk@2588 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-04 23:18:15 +00:00
Carl Hetherington
39bdbf5db9 Update region names in the region list when they change, to fix #1584
git-svn-id: svn://localhost/ardour2/trunk@2587 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-04 21:40:12 +00:00
Carl Hetherington
48b685dad1 Don't copy a naked pointer in the copy constructor, to prevent a double delete.
git-svn-id: svn://localhost/ardour2/trunk@2586 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-04 21:01:06 +00:00