smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-17 12:16:30 +01:00
Code Issues Projects Releases Wiki Activity
8188 commits 101 branches 144 tags 312 MiB
Commit graph

58 commits

Author SHA1 Message Date
Paul Davis
55c59504ca 3.0-SG catchup merge after git changeover and merge with master (more to do) 2013-04-01 14:59:17 -04:00
Paul Davis
2acc37e38d merged with 3.0, probably finished 2013-03-12 17:36:51 -04:00
Paul Davis
97e042663c various tweaks that among other things seem to finally get audio flowing fully through a sensibly-configured SG 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13629 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-10 14:37:18 +00:00
Paul Davis
26741db3c4 merge -r 13414:13599 svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0 ; plus a few tweaks that will be cleaned up soon 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13600 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-12-05 14:33:11 +00:00
Paul Davis
8bb2a5b241 merge 13363:13398 svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0, plus further work on SG (forgot to commit right after the merge, thus confusing things a bit 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13409 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-11-09 13:28:54 +00:00
Paul Davis
2659be95c5 improve the user experience when starting up 3.0-SG with SG as the driver 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13385 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-11-05 21:57:06 +00:00
Paul Davis
7b995e773e code cleanup, fix process group bug, move to more advanced topology, avoid bug with multi-assignment, tweaks for new SG SDK 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13383 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-11-05 16:03:56 +00:00
Paul Davis
4fd63d89ce first pass at getting a more complex (real-world) mixer topology to work. mixer gets configured as intended, but audio does not flow at present 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13372 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-10-31 15:52:31 +00:00
Paul Davis
00d891e347 more adaptations to the latest changes in SG API 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13198 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-09-26 18:40:44 +00:00
Paul Davis
989830fb7e get initialization, skeletonmixer-style connections working, add incomplete fader control 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13170 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-09-07 18:05:53 +00:00
Paul Davis
f8199976ea various changes in how we map between the SG matrix and JACK (really, coreaudio) 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13164 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-09-05 20:21:50 +00:00
Paul Davis
491fe9d01a latest changes to sync up with SG API, and actually start doing SG plumbing the right way 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13129 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-08-15 20:36:56 +00:00
Paul Davis
7ab1c35327 add initial use of WSCommands for adding/removing SG racks - locks up on first test 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13110 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-08-03 20:40:29 +00:00
Paul Davis
3bb7d368a8 merge 12791:13034 from 3.0 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13105 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-08-02 00:04:51 +00:00
Paul Davis
6e824e7797 merge 12717:12954 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12955 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-28 13:30:03 +00:00
Paul Davis
19006a42b3 start handling surface display update callbacks, so that we can see changes, and a few other minor tweaks 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12725 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-14 14:54:17 +00:00
Paul Davis
e392b271d5 get soundgrid initialization running in its own thread, with a hand-holding GUI pulsing progress bar, and make first call into mixer core to get LAN id's 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12615 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-08 19:12:06 +00:00
Paul Davis
f228d2c68e merge 12436:12607 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12608 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-08 14:03:30 +00:00
Paul Davis
a2bb5c1feb merge 12389:12436 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12437 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-05-24 19:01:24 +00:00
Paul Davis
9c8b57aab0 SG: merge 3.0 from 11783-12096 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12097 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-26 17:06:21 +00:00
Paul Davis
85a27910cb more work on getting SG config pane into shape 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@11783 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-03 14:34:13 +00:00
Paul Davis
6a1bb2fca8 bits and pieces of very basic stub support for soundgrid 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@11781 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-04-02 16:54:29 +00:00
Paul Davis
da13032eda fixes for 64 bit OS X build (c/o david robillard); tested on Lion & Tiger 
git-svn-id: svn://localhost/ardour2/branches/3.0@11585 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-03-02 22:53:00 +00:00
Paul Davis
3db29c3a8c minor tweaks for engine dialog (remove channel counts, tweak sensitivity) 
git-svn-id: svn://localhost/ardour2/branches/3.0@11281 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-20 15:35:24 +00:00
Paul Davis
a4578d02b0 heuristic to workaround over-eager translation of NN000Hz as NN kHz 
git-svn-id: svn://localhost/ardour2/branches/3.0@11279 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-20 15:08:44 +00:00
Carl Hetherington
39442ef386 Separate visual and audio interfaces for translation. 
git-svn-id: svn://localhost/ardour2/branches/3.0@10765 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-11-22 12:04:21 +00:00
Paul Davis
74330533b8 remove needless message from log window when a system has no ALSA-capable devices 
git-svn-id: svn://localhost/ardour2/branches/3.0@10032 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-08-30 13:41:36 +00:00
Carl Hetherington
cd17e05e3a Fix some set-but-not-used variable warnings from gcc 4.6 
git-svn-id: svn://localhost/ardour2/branches/3.0@9783 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-07-02 17:16:46 +00:00
David Robillard
ed626628b5 Delete trailing whitespace 
git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-06-01 17:00:29 +00:00
Paul Davis
603d07a80b forward port EPA changes from 2.X 
git-svn-id: svn://localhost/ardour2/branches/3.0@8473 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-01-07 16:25:57 +00:00
Paul Davis
8e228bf344 lincoln's patch to fix audio setup dialog/jack startup when used with FFADO (#3485) 
git-svn-id: svn://localhost/ardour2/branches/3.0@7964 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-11-04 18:07:58 +00:00
Carl Hetherington
157895dc3b Provide both FreeBoB and FFADO options in the engine dialogue. Fixes #3457. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7799 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-09-18 20:01:54 +00:00
Paul Davis
4400489f15 patch from Johan Mattson to make -I/-O options in engine dialog actually work (fixes #2975 
git-svn-id: svn://localhost/ardour2/branches/3.0@7795 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-09-17 20:43:38 +00:00
Paul Davis
da8eec7a83 remove Glib::ustring from gtk2_ardour 
git-svn-id: svn://localhost/ardour2/branches/3.0@7774 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-09-14 16:51:02 +00:00
Carl Hetherington
ecb5201332 Save and restore MIDI driver option state, and tidy up a couple of things. Fixes #3349. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7497 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-26 01:54:51 +00:00
Carl Hetherington
6a61c1d3ff HIG-ify engine dialogue and add midi driver option. Fixes #3349. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7479 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-23 23:29:19 +00:00
Paul Davis
fde289fe36 use -r argument with JACK if realtime is not requested in engine dialog (also applied to 2.X) 
git-svn-id: svn://localhost/ardour2/branches/3.0@7476 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-23 01:04:47 +00:00
Carl Hetherington
9a6042dbc8 Speculative tweak to offer non-duplex as well as full-duplex ALSA cards in the engine dialogue. Should fix #3327. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7447 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-07-20 00:57:43 +00:00
Sakari Bergen
6ae418e5f5 Fix ordering issue with loading engine settings to the startup dialog 
git-svn-id: svn://localhost/ardour2/branches/3.0@6850 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-04-02 22:58:05 +00:00
Paul Davis
6ef5d85ae1 changes from 2.X starting in march 2009 through oct 20 2009 (5826 inclusive) 
git-svn-id: svn://localhost/ardour2/branches/3.0@6761 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-03-16 15:33:04 +00:00
Paul Davis
44f4b84551 finalize PROGRAM_NAME change for ardour3 
git-svn-id: svn://localhost/ardour2/branches/3.0@6759 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-03-15 02:31:27 +00:00
Paul Davis
64dc5427e4 make all use of bind/mem_fun be explicitly sigc:: 
git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-12-11 23:29:48 +00:00
Paul Davis
e98b3c1ec6 make 3.0 catch up with transport and other changes in 2.X (hand applied, not merged) 
git-svn-id: svn://localhost/ardour2/branches/3.0@5989 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-30 18:14:25 +00:00
David Robillard
bb9cc45cd2 Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. 
Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red.  I don't know the emacs equivalent...


git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-14 16:10:01 +00:00
Paul Davis
b893b9a2be three recent fixes from 2.0-ongoing (RT on by default, Mackie port name nonsense; processor box no-redisplay flag reset on set_route() 
git-svn-id: svn://localhost/ardour2/branches/3.0@5762 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-08 21:56:16 +00:00
Carl Hetherington
b65f8073ba Fix some unused parameter warnings. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5403 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-07-21 15:55:17 +00:00
Paul Davis
0513474072 farewell NSD, we loved you sometimes, almost never 
git-svn-id: svn://localhost/ardour2/branches/3.0@4992 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-04-20 18:41:46 +00:00
David Robillard
e0aaed6d65 *** NEW CODING POLICY *** 
All #include statements that include a header that is a part of a library
bundled with ardour MUST use quotes, not angle brackets.

Do this:

#include "ardour/types.h"

NOT this:

#include <ardour/types.h>

Rationale:

This is best practice in general, to ensure we include the local version
and not the system version.  That quotes mean "local" (in some sense)
and angle brackets mean "system" (in some sense) is a ubiquitous
convention and IIRC right in the C spec somewhere.

More pragmatically, this is required by (my) waf (stuff) for dependencies
to work correctly.  That is:

!!! FAILURE TO DO THIS CAN RESULT IN BROKEN BUILDS !!!

Failure to comply is punishable by death by torture. :)

P.S. It's not that dramatic in all cases, but this (in combination with some
GCC flags specific to the include type) is the best way I have found to be
absolutely 100% positive the local ones are being used (and we definitely
want to be absolutely 100% positive on that one).


git-svn-id: svn://localhost/ardour2/branches/3.0@4655 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-02-25 18:26:51 +00:00
Paul Davis
b12bedfe8a initialize jack timeout parameter correctly (not doing this breaks JackOSX, maybe JACK too) 
git-svn-id: svn://localhost/ardour2/branches/3.0@4077 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2008-11-01 12:26:53 +00:00
Paul Davis
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