13
0
Commit Graph

95 Commits

Author SHA1 Message Date
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
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
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
2db574ba6b More build fixes.
git-svn-id: svn://localhost/ardour2/trunk@2889 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-11 00:39:37 +00:00
bde575a8e8 Actually fix compilation w/ SYSLIBS=0.
Set version number to 3.0 (was 2.1).


git-svn-id: svn://localhost/ardour2/trunk@2888 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-11 00:07:40 +00:00
ed312acded (Possible) compile w/o SYSLIBS fix.
git-svn-id: svn://localhost/ardour2/trunk@2887 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 23:11:05 +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
8c2715ce2c Lower soundtouch version dependency to 1.2.1 w/ SYSLIBS=1. Compiles here...
git-svn-id: svn://localhost/ardour2/trunk@2798 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-12-19 05:05:52 +00:00
0e31c56591 Check for soundtouch library when using SYSLIBS
git-svn-id: svn://localhost/ardour2/trunk@2787 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-12-15 23:29:38 +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
f3cf31009a virtualize Port object; clean up automation tracks from track deletion
git-svn-id: svn://localhost/ardour2/trunk@2556 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-16 21:01:12 +00:00
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
51c0f6c442 Reading of MIDI CC from MIDI regions (MidiModel). UI still needs work though..
Various fixes for linear/integer AutomationList interpolation (for CC).


git-svn-id: svn://localhost/ardour2/trunk@2359 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-08-31 05:02:45 +00:00
aede0a6e15 Use scons to generate manual entities so the manual version is consistant with the Ardour version
git-svn-id: svn://localhost/ardour2/trunk@2309 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-08-16 01:53:44 +00:00
Taybin Rutkin
8756647ab9 - build fixes for OS X.
-- casts for vDSP in mix.cc
-- fix for PluginInsert::PluginControl usage
-- disable POWERMATE if POWERMATE=0



git-svn-id: svn://localhost/ardour2/trunk@2193 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-07-31 00:48:10 +00:00
e0f287045e set powermate env keys in SConstruct, so that POWERMATE is set even if SURFACES=false
git-svn-id: svn://localhost/ardour2/trunk@2101 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-07-03 22:22:04 +00:00
9decb3e027 remove static Pango::FontDescriptions, they cause glib errors because of initialization before Glib::thread_init() has been called
git-svn-id: svn://localhost/ardour2/trunk@2100 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-07-03 21:02:29 +00:00
f95aa76f4a add basic support for the griffin powermate (a control surface) (from ben loftis)
git-svn-id: svn://localhost/ardour2/trunk@2078 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-06-28 19:35:48 +00:00
Doug McLain
cdccec62fe removed redundant creation of a system rc file
git-svn-id: svn://localhost/ardour2/trunk@2033 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-06-25 22:58:57 +00:00
Doug McLain
c94583a81d make libsndfile build with or without flac support based on flac version checking
git-svn-id: svn://localhost/ardour2/trunk@2032 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-06-25 21:26:34 +00:00
Doug McLain
fde8d11d9d use different symbol for flac version check, the other one wasn't working correctly
git-svn-id: svn://localhost/ardour2/trunk@2031 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-06-25 18:29:44 +00:00
7bfe236ba7 maybe fix flac stuff
git-svn-id: svn://localhost/ardour2/trunk@1944 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-06-02 00:35:09 +00:00
01a780eb4d round 2 of denormal handling changes - detect DAZ support at runtime, and use accordingly. move all FPU feature detection into PBD::FPU
git-svn-id: svn://localhost/ardour2/trunk@1939 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-06-01 20:29:36 +00:00
38ed75ff97 merge denormal handling work from 2.0-ongoing
git-svn-id: svn://localhost/ardour2/trunk@1937 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-06-01 02:27:21 +00:00
Sampo Savolainen
64b3e3be80 Make DEBUG=1 default and make ardour.sh, ardev and ardbg dump cores by default
git-svn-id: svn://localhost/ardour2/trunk@1843 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-14 20:42:46 +00:00
da285fc57d Conditionally compile CMT additions, enabled by default.
git-svn-id: svn://localhost/ardour2/trunk@1833 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-11 02:54:43 +00:00
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
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
a9e06980c1 Merged with trunk R1769... apparently. (?)
git-svn-id: svn://localhost/ardour2/branches/midi@1770 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-04-30 17:50:43 +00:00
b3fe7cfc89 Merged with trunk R1761
git-svn-id: svn://localhost/ardour2/branches/midi@1762 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-04-29 17:23:11 +00:00
959a7909c1 Merged with trunk R1705.
Synced .po files with trunk.
Fixed more editor operations to be type agnostic (ie not audio only).


git-svn-id: svn://localhost/ardour2/branches/midi@1709 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-04-12 23:20:37 +00:00
96ca08b925 Updated Jack version number for MIDI API changes (jack_midi_get_event_count).
git-svn-id: svn://localhost/ardour2/branches/midi@1658 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-04-03 03:01:20 +00:00
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
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
f7563c2b15 Merged with trunk R1304
git-svn-id: svn://localhost/ardour2/branches/midi@1311 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-11 19:50:49 +00:00
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
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
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
7bd41538d9 Merged with trunk R920.
git-svn-id: svn://localhost/ardour2/branches/midi@921 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-09-19 03:29:16 +00:00
017e16c530 Merged with trunk R879
git-svn-id: svn://localhost/ardour2/branches/midi@880 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-31 19:17:00 +00:00
25d1670a61 Merged with trunk R846
Removed some overly verbose debug printing


git-svn-id: svn://localhost/ardour2/branches/midi@847 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-24 07:37:17 +00:00
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