Commit Graph

395 Commits

Author SHA1 Message Date
Hans Baier f41f334be6 * forgot to commit this last time
git-svn-id: svn://localhost/ardour2/branches/3.0@3291 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-26 09:07:32 +00:00
Hans Baier f91006d8d2 * added methods for pich bender/pgm change/aftertouch to MidiEvent
git-svn-id: svn://localhost/ardour2/branches/3.0@3282 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-23 02:27:27 +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 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
Paul Davis 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
Paul Davis 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
Paul Davis 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
Paul Davis 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
Paul Davis 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
Paul Davis 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
Paul Davis 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
David Robillard 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
David Robillard 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
Paul Davis f7f9d6fdc4 merge from 2.0-ongoing by hand, minus key binding editor
git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-11 22:07:47 +00:00
Paul Davis b9b6ba8be4 merge changes to libmidi++ API from 2.0-ongoing
git-svn-id: svn://localhost/ardour2/trunk@2256 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-08-06 14:19:19 +00:00
Taybin Rutkin 91b67c1d98 fix for linking midi++ on MacOSX.
git-svn-id: svn://localhost/ardour2/trunk@1879 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-18 03:01:52 +00:00
Paul Davis 5183f9b772 require new JACK API; fix inheritance bug in AudioRegion::verify_*()
git-svn-id: svn://localhost/ardour2/branches/midi@1789 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-07 03:26:43 +00:00
David Robillard ebe4fc9d88 Update Jack system port names to reflect new Jack naming scheme.
git-svn-id: svn://localhost/ardour2/branches/midi@1787 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-07 00:06:07 +00:00
David Robillard 7c9db826bc Use Jack trunk MIDI. This needs proper fixing..
git-svn-id: svn://localhost/ardour2/branches/midi@1784 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-04 23:57:01 +00:00
David Robillard b8e9b3f071 Real fix for Jack MIDI crash. Maybe!
git-svn-id: svn://localhost/ardour2/branches/midi@1782 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-04 02:50:31 +00:00
David Robillard acdfe9857a Possible fix for Jack MIDI crash on jack_get_buffer_size some are seeing.
git-svn-id: svn://localhost/ardour2/branches/midi@1780 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-04 01:47:13 +00:00
Paul Davis 0c7b7216ef initial fixes to get build to work without new JACK MIDI, and to get it running with an older session, at least somewhat
git-svn-id: svn://localhost/ardour2/branches/midi@1773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-01 23:26:14 +00:00
David Robillard 2e8f80e37a Merged with trunk R1719.
Updated for Jack MIDI SVN branch (required for now).


git-svn-id: svn://localhost/ardour2/branches/midi@1720 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-04-14 18:39:01 +00:00
David Robillard 99904735e0 Merged with trunk R1612.
git-svn-id: svn://localhost/ardour2/branches/midi@1614 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-03-18 06:07:08 +00:00
David Robillard eb270e70a1 Compilation fix.
git-svn-id: svn://localhost/ardour2/branches/midi@1430 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-02-07 15:19:34 +00:00
David Robillard f9f5ec85fb Merged with trunk R1393.
git-svn-id: svn://localhost/ardour2/branches/midi@1395 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-28 17:44:13 +00:00
David Robillard 532f6aad4a Merged with trunk R1283.
NOTE: Compiles, but broken (crash on adding MIDI track).


git-svn-id: svn://localhost/ardour2/branches/midi@1292 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-09 23:24:54 +00:00
David Robillard ef6b25432d Merged with trunk R1141
git-svn-id: svn://localhost/ardour2/branches/midi@1142 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-11-19 16:45:16 +00:00
David Robillard fedf3d34f3 Merged with trunk R992.
Completely untested other than it compiles, runs, and records somewhat (need to merge again).


git-svn-id: svn://localhost/ardour2/branches/midi@999 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-10-21 19:01:50 +00:00
David Robillard 8277d134b9 Merged with trunk R708
git-svn-id: svn://localhost/ardour2/branches/midi@712 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-07-28 01:08:57 +00:00
David Robillard 22c20ab6f2 Merged with trunk, and a few trivial GUI updates etc.
git-svn-id: svn://localhost/ardour2/branches/midi@664 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-07-05 19:47:25 +00:00
David Robillard fe13d08874 Large nasty commit in the form of a 5000 line patch chock-full of completely
unecessary changes.  (Sorry, doing a "sprint" based thing, this is the end of the first one)

Achieved MIDI track and bus creation, associated Jack port and diskstream creation, and minimal GUI stuff for creating them.  Should be set to start work on actually recording and playing midi to/from disk now.

Relevant (significant) changes:

- Creation of a Buffer class.  Base class is type agnostic so things can point to a buffer but not care what kind it is (otherwise it'd be a template).  Derived into AudioBuffer and MidiBuffer, with a type tag because checking type is necessary in parts of the code where dynamic_cast wouldn't be wise.  Originally I considered this a hack, but passing around a type proved to be a very good solution to all the other problems (below).  There is a 1:1 mapping between jack port data types and ardour Buffer types (with a conversion function), but that's easily removed if it ever becomes necessary.  Having the type scoped in the Buffer class is maybe not the best spot for it, but whatever (this is proof of concept kinda stuff right now...)

- IO now has a "default" port type (passed to the constructor and stored as a member), used by ensure_io (and similar) to create n ports.  IO::register_***_port has a type argument that defaults to the default type if not passed.  Rationale:  previous IO API is identical, no changes needed to existing code, but path is paved for multiple port types in one IO, which we will need for eg synth plugin inserts, among other things.  This is not quite ideal (best would be to only have the two port register functions and have them take a type), but the alternative is a lot of work (namely destroying the 'ensure' functions and everything that uses them) for very little gain.  (I am convinced after quite a few tries at the whiteboard that subclassing IO in any way is not a feasible option, look at it's inheritance diagram in Doxygen and you can see why)

- AudioEngine::register_audio_input_port is now register_input_port and takes a type argument.  Ditto for output.

- (Most significant change) AudioDiskstream abstracted into Distream, and sibling MidiDiskstream created.  Very much still a work in progress, but Diskstream is there to switch references over to (most already are), which is the important part.  It is still unclear what the MIDI diskstream's relation to channels is, but I'm pretty sure they will be single channel only (so SMF Type 0) since noone can come up with a reason otherwise.

- MidiTrack creation.  Same thing as AudioTrack but with a different default type basically.  No big deal here.

- Random cleanups and variable renamings etc. because I have OCD and can't help myself. :)

Known broken:  Loading of sessions containing MIDI tracks.




git-svn-id: svn://localhost/ardour2/branches/midi@641 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-26 16:01:34 +00:00
David Robillard 868f557f26 Merged with trunk (painfully)
git-svn-id: svn://localhost/ardour2/branches/midi@581 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-13 07:27:52 +00:00
David Robillard 2f4392f043 Removed excessive debug printing, added missing files for SMPTE namespace and Jack libmidi++ ports
git-svn-id: svn://localhost/ardour2/branches/midi@577 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-09 01:48:38 +00:00
David Robillard 74dd5bd706 Committed filthy mess of a working copy solely for moving between machines.
Nothing to see here, move along now...


git-svn-id: svn://localhost/trunk/ardour2midi@575 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-08 23:46:42 +00:00
David Robillard 0c1b9afc63 - Documentation fixes
- Fixed boolean return values in libmidi++ to return bool instead of int


git-svn-id: svn://localhost/trunk/ardour2midi@538 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-26 22:30:54 +00:00
Paul Davis 1da9bb0c26 Install ardour as a binary, a script and a set of shared
libraries. Libraries are discovered via {LD,DYLD}_LIBRARY_PATH


git-svn-id: svn://localhost/trunk/ardour2@481 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-26 00:45:27 +00:00
Taybin Rutkin 49ab3aa0b3 All included libraries now link dynamically instead of statically.
Moved items from gtk2_ardour/utils to pbd3/convert.
Various cleanups.


git-svn-id: svn://localhost/trunk/ardour2@475 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-25 20:23:50 +00:00
Tim Mayberry 7df20e1166 2006-03-04 Tim Mayberry <mojofunk@gmail.com>
* Remove debug output preventing compilation on x86_64.
	* Build shared libraries for all libs/* when DEVBUILD=1 to fix linking for x86_64/non-x86.
	* Simplify/consolidate the dev scripts a bit.
	* Export ARDOUR_COLORS variable in dev scripts.
	* Remove G_DISABLE_DEPRECATED from glibmm CXXFLAGS to allow compilation with newer versions of glib.
	* Build soundtouch with SYSLIBS=1, hopefully we can link to system soundtouch soon.


git-svn-id: svn://localhost/trunk/ardour2@344 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-04 11:26:25 +00:00
Paul Davis cf0da62ff0 miscellaneous fixes post-jesse's 24 bit file format changes
git-svn-id: svn://localhost/trunk/ardour2@317 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-02-11 02:34:03 +00:00
Paul Davis 4e2d99fd21 fix computation of MMC base track for MMC rec enable (Ben Loftis)
git-svn-id: svn://localhost/trunk/ardour2@301 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-28 13:35:31 +00:00
Paul Davis 81ef56fba9 fix (mostly) measure lines and click box text and meter markings
git-svn-id: svn://localhost/trunk/ardour2@300 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-28 13:33:54 +00:00
Paul Davis a9e38032a3 route list + edit group list now pretty much functional, plus preparations for ardour2.0-alpha1
git-svn-id: svn://localhost/trunk/ardour2@253 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-10 04:25:47 +00:00
Jesse Chappell bd21c474e5 committed RWlock fixes to libardour. added hw monitoring fixes from nick_m. minor alsa midi fix and update rate settings.
git-svn-id: svn://localhost/trunk/ardour2@244 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-06 04:59:17 +00:00
Taybin Rutkin d09f6b3016 Initial revision
git-svn-id: svn://localhost/trunk/ardour2@4 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-05-13 20:47:18 +00:00