13
0
Commit Graph

103 Commits

Author SHA1 Message Date
ab6f1ed9ba Merged with trunk R776
git-svn-id: svn://localhost/ardour2/branches/midi@777 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-10 01:22:45 +00:00
0565c75ce8 Merged up to trunk R732
git-svn-id: svn://localhost/ardour2/branches/midi@735 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-01 19:18:12 +00:00
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
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
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
13532c8500 Merged with trunk
git-svn-id: svn://localhost/ardour2/branches/midi@628 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-21 18:14:45 +00:00
b5db1f624d Merged with trunk revision 600
git-svn-id: svn://localhost/ardour2/branches/midi@601 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-15 01:34:54 +00:00
a8f44b1556 (Messy merge fixes)
- (Re) added Jack MIDI configure stuff to build script
- Fixed MIDI initialization (pass Jack client to MIDI::Manager)


git-svn-id: svn://localhost/ardour2/branches/midi@582 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-14 02:27:09 +00:00
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
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
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
b7757ddd70 changes to autoscroll behaviour. not perfect, but probably better
git-svn-id: svn://localhost/trunk/ardour2@533 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-25 20:30:32 +00:00
ba7888d6d1 compile certain control protocol things regardless of SURFACES setting
git-svn-id: svn://localhost/trunk/ardour2@524 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-23 21:33:33 +00:00
2fba6d0925 breakout control protocol code into LGPL library; fix panner buttons even more than nick did, plus some other bits and pieces
git-svn-id: svn://localhost/trunk/ardour2@522 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-23 19:54:52 +00:00
00a106197a moved OSC into libardour
git-svn-id: svn://localhost/trunk/ardour2@510 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-18 16:44:07 +00:00
60fbeedb5f a) basic prototype of OSC control
b) various changes to ControlProtocol model/implementation
c) more attempts to get autoscroll to work nicely (unfinished)
d) move editor item types into their own header


git-svn-id: svn://localhost/trunk/ardour2@506 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-18 02:19:27 +00:00
Taybin Rutkin
c67a576d61 Improved sfdb API.
Eliminated some warnings on Darwin.
Added libxslt to scons.


git-svn-id: svn://localhost/trunk/ardour2@494 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-07 17:17:38 +00:00
5e6703c481 dmalloc link support
git-svn-id: svn://localhost/trunk/ardour2@491 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-03 20:51:08 +00:00
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
028e1ebc4a a) completely refactor abstract UI code
b) single-thread Tranzport implementation
c) implement BasicUI to share functionality across multiple
     controllers
d) various minor fixes here and there


git-svn-id: svn://localhost/trunk/ardour2@468 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-24 22:45:19 +00:00
9ae0f6cbee a) dynamically loadable control surface support
b) move tranzport and generic midi into separate dirs under "surfaces"


git-svn-id: svn://localhost/trunk/ardour2@442 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-05 00:21:43 +00:00
f7c82c6911 a) start at creating ControlProtocol objects
b) basic support for Frontier Design Tranzport
c) probably broke some aspect of existing generic MIDI feedback


git-svn-id: svn://localhost/trunk/ardour2@441 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-04 03:26:08 +00:00
066a68699a install into ardour2 dirs, not ardour (translations not included, yet)
git-svn-id: svn://localhost/trunk/ardour2@425 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-29 19:29:15 +00:00
1abcdd831c remove the pitiful Pix class
git-svn-id: svn://localhost/trunk/ardour2@396 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-15 02:16:22 +00:00
1dee60510a Make the FFT Anaylsis optional and disabled by default until further discussion.
git-svn-id: svn://localhost/trunk/ardour2@386 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-13 03:27:58 +00:00
Sampo Savolainen
3891c733af First commit on FFT analysis window. Still some functionality missing,
but it's mostly done.


git-svn-id: svn://localhost/trunk/ardour2@383 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-12 21:58:52 +00:00
Taybin Rutkin
1ed64a7842 Added powerpc target.
git-svn-id: svn://localhost/trunk/ardour2@378 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-12 15:01:26 +00:00
Taybin Rutkin
1e668dfaf2 ExternalSource refactoring.
git-svn-id: svn://localhost/trunk/ardour2@373 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-10 17:09:59 +00:00
0d2c8771a7 fix for deferred saves by StateManager-derivatives; changes to new/copy/clear playlist ops (not finished), TRUE/FALSE -> true/false in editor_mouse.cc
git-svn-id: svn://localhost/trunk/ardour2@358 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-08 02:50:53 +00:00
874ba08fb4 2006-03-04 Tim Mayberry <mojofunk@gmail.com>
* Enable linking to system soundtouch library if SYSLIBS=1, soundtouch-1.3.1 needed for pkgconfig support
	* Fix to allow compiling against libgnomecanvasmm library when SYSLIBS=1


git-svn-id: svn://localhost/trunk/ardour2@354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-07 06:23:12 +00:00
Taybin Rutkin
aed3483e14 SConstruct rethink.
git-svn-id: svn://localhost/trunk/ardour2@351 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-06 02:32:49 +00:00
Taybin Rutkin
caeb564748 Build correctly on mactel systems.
git-svn-id: svn://localhost/trunk/ardour2@348 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-05 15:51:04 +00:00
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
Sampo Savolainen
748b1413c0 Quick'n'dirty port of the scons fixes in ardour1 to ardour2, please
test.


git-svn-id: svn://localhost/trunk/ardour2@314 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-02-07 22:25:36 +00:00
Sampo Savolainen
483548cc13 64 bit SSE mod
git-svn-id: svn://localhost/trunk/ardour2@308 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-02-02 20:55:26 +00:00
a726bca73b fix template generation
git-svn-id: svn://localhost/trunk/ardour2@296 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-24 12:41:00 +00:00
Taybin Rutkin
9a951bcd20 Use compiler provided __BIG_ENDIAN__ instead of WORD_BIGENDIAN
Auditioning in sfdb_ui works.
CoreAudioSource updates.


git-svn-id: svn://localhost/trunk/ardour2@263 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-11 21:27:59 +00:00
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
Taybin Rutkin
422f290094 removed some unnecessary items.
git-svn-id: svn://localhost/trunk/ardour2@238 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-04 05:52:23 +00:00
Nick Mainsbridge
7aee3d6fbf get SYSLIBS=1 kind of working, use stock HAND2 cursor
git-svn-id: svn://localhost/trunk/ardour2@159 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-02 09:20:03 +00:00
00d7dde42e doug's export dialog changes and fix libsoundtouch link issues
git-svn-id: svn://localhost/trunk/ardour2@154 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-30 20:30:44 +00:00
Taybin Rutkin
0f5dc81541 Fixed veclib support on OSX.
git-svn-id: svn://localhost/trunk/ardour2@150 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-29 18:02:29 +00:00
Jesse Chappell
d9b463178f committed fix for cross-endian native wave files
git-svn-id: svn://localhost/trunk/ardour2@146 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-29 06:49:00 +00:00
b373ef6a24 fix for CVS sigc++ build
git-svn-id: svn://localhost/trunk/ardour2@96 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-14 21:38:10 +00:00
49e5424126 modified SConstruct so libglade gets built
git-svn-id: svn://localhost/trunk/ardour2@79 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-11 05:56:52 +00:00
f34ef3c93a small fixes to editor.cc
git-svn-id: svn://localhost/trunk/ardour2@77 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-02 20:33:47 +00:00
Taybin Rutkin
494ecdd0d3 Updated for flowcanvas.
git-svn-id: svn://localhost/trunk/ardour2@63 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-10-21 23:12:25 +00:00
Taybin Rutkin
81817543bd lame thinko fixed.
git-svn-id: svn://localhost/trunk/ardour2@34 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-26 02:02:34 +00:00
Taybin Rutkin
077ed4c462 cross-platform template building.
git-svn-id: svn://localhost/trunk/ardour2@33 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-26 02:00:22 +00:00
Taybin Rutkin
0b850523c2 Updated.
git-svn-id: svn://localhost/trunk/ardour2@20 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-24 19:53:16 +00:00
Taybin Rutkin
90dff30cf4 Updated to soundtouch-1.3 (plus modifications)
git-svn-id: svn://localhost/trunk/ardour2@12 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-05-18 14:45:19 +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