ce2feeac56
even though man alloca says to include <alloca.h>, it apparently isn't necessary and no such header exists in the msvc world
2014-01-30 11:18:58 -05:00
2ba58dfe65
Merge branch 'master' into cairocanvas
2014-01-29 16:08:52 -05:00
66d0241118
move check for n_speakers so that we avoid needless work
2014-01-29 15:50:17 -05:00
2d8352123a
fix vbap-speaker calculations to work with alloca()
2014-01-29 21:45:13 +01:00
a754a7cc0d
fix up the abomination caused by moving from variable length (multidimensional) arrays to alloca'ed arrays, specifically access to arr[a][b].
...
This needs checking by an actual VBAP+multispeaker user.
2014-01-27 20:37:17 -05:00
10d577146a
replace standards-wobbling variable-length-arrays with alloca()
2014-01-27 14:20:19 -05:00
7000afdc66
fix merge conflict with master
2014-01-23 13:41:20 -05:00
40d8c5ae01
change VBAP visual parameter name again :)
2014-01-23 15:32:26 +01:00
b0b71782e9
VBAP change visual parameter name. Diffusion -> Spread
2014-01-23 14:57:19 +01:00
9aacefc170
merge with master
2014-01-15 14:29:32 -05:00
c8f9405386
stereo-panner: clamp width during processing to valid range
2014-01-15 14:07:02 +01:00
abb75d4a2e
prevent stackoverflow when pannable changes to fewer params
...
endless loop: e.g. 2in2out -> balance (or 1in1out)
#23 0xb7ab5c17 in ARDOUR::Pannable::value_as_string
#24 0xb2ebb206 in ARDOUR::Pannerbalance::value_as_string
#25 0xb7ab5c17 in ARDOUR::Pannable::value_as_string
#26 0xb2ebb206 in ARDOUR::Pannerbalance::value_as_string
ad infinitum
2014-01-15 10:38:32 +01:00
a4dc05f603
fix invalid width when swiching to 2in2out
2014-01-15 09:45:02 +01:00
58def58bf5
VBAP GUI convention: top == front ^= azimuth == .5
...
This allows to move from stereo,mono panners to VBAP and back
and also facilitates sharing pannables of all currently
existing panners with semantically similar results.
(somewhat dirty solution, this retains PBD::spherical_to_cartesian
and maps angles pretty much everywhere else)
2014-01-15 09:37:20 +01:00
37b1f5017e
merge with master
2014-01-14 21:13:21 -05:00
813ead6d8b
cont'd backend work on panner-linking
2014-01-15 02:51:52 +01:00
cf806123ca
merge (with conflict fixes) with master (even against rgareus' recommendation)
2014-01-14 10:56:17 -05:00
b9c389eac5
fix botched merge of vbap changes
2014-01-13 09:47:20 -05:00
e10bfb8054
VBAP backend re-work (part one):
...
* fix azimuth, don't clamp but map to [0,1]
* prepare elevation (10+ speakers)
2014-01-13 09:40:41 -05:00
28470af5f7
swap channel VBAP channel
2014-01-13 09:38:24 -05:00
dd4c0e040f
VBAP rework (part III): fix position computation backend & GUI
2014-01-13 09:37:35 -05:00
60fe9606f4
VBAP GUI depends on signal-position (not parameter changes)
2014-01-13 09:37:35 -05:00
1bf9c4c990
VBAP backend re-work (part two): speaker positioning
...
* clean up source (whitespace)
* fix speaker 3x3 matrix iteration
* update math to go along with Ardour Cartesian -- fixes rounding errors
* fix division by zero in cross_prod()
* disable old debug output
(NB PBD::spherical_to_cartesian() returns
3.7494e-33, 6.12323e-17, 1 for azimuth 90 elevation 90 distance 1
while it should return
0.000000, 0.000000, 1 for azimuth 90 elevation 90 distance 1
IOW cos(90.0 * 2.0 * M_PI / 360.0) != 0
Cause unknown. This is currently worked around check in vec_length()
)
2014-01-13 09:37:34 -05:00
112de00841
VBAP backend re-work (part one):
...
* fix azimuth, don't clamp but map to [0,1]
* prepare elevation (10+ speakers)
2014-01-13 09:35:57 -05:00
26a9e28922
add export visibility macro
2014-01-12 15:40:48 -05:00
f9b8300ec6
swap channel VBAP channel
2014-01-12 03:36:20 +01:00
72cec05d46
VBAP rework (part III): fix position computation backend & GUI
2014-01-11 23:38:28 +01:00
0669bb455b
VBAP GUI depends on signal-position (not parameter changes)
2014-01-11 23:38:28 +01:00
d3e1d54280
VBAP backend re-work (part two): speaker positioning
...
* clean up source (whitespace)
* fix speaker 3x3 matrix iteration
* update math to go along with Ardour Cartesian -- fixes rounding errors
* fix division by zero in cross_prod()
* disable old debug output
(NB PBD::spherical_to_cartesian() returns
3.7494e-33, 6.12323e-17, 1 for azimuth 90 elevation 90 distance 1
while it should return
0.000000, 0.000000, 1 for azimuth 90 elevation 90 distance 1
IOW cos(90.0 * 2.0 * M_PI / 360.0) != 0
Cause unknown. This is currently worked around check in vec_length()
)
2014-01-11 23:38:27 +01:00
80127f9cca
VBAP backend re-work (part one):
...
* fix azimuth, don't clamp but map to [0,1]
* prepare elevation (10+ speakers)
2014-01-11 23:38:27 +01:00
3020b224fa
Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there
2014-01-10 16:07:57 -05:00
d15fda6d75
fix merge errors with master
2014-01-10 14:53:03 -05:00
8d64665ce1
add a fixed priority to panner modules
2014-01-10 12:13:22 +01:00
21ca6a10a9
rework panning -- Squashed commit of the following:
...
commit 6f4f4f161b00cb36252727f67ecc4913eb944fd7
Author: Robin Gareus <robin@gareus.org>
Date: Wed Jan 8 22:13:09 2014 +0100
fix panner plugin discovery (prev commit)
commit 26e514f4a80af9192cae3cbd62fde0ae95474dfc
Author: Robin Gareus <robin@gareus.org>
Date: Wed Jan 8 18:56:59 2014 +0100
update panner plugin discovery
* recurse dirs in 'PANNER_PATH' and 'panner_dir_name' up to 1 level.
* don't look in ardour_dll_directory() -- no panners are supposed to be in there
* use .dylib on OSX exclusively.
commit a514c3f1c425dccf3d42eee9d2b183b44fd26a03
Author: Robin Gareus <robin@gareus.org>
Date: Wed Jan 8 16:48:34 2014 +0100
remove debug/devel printf()s
commit d863742ddc69af493ee6a8817bc778968d9b0800
Author: Robin Gareus <robin@gareus.org>
Date: Wed Jan 8 16:17:13 2014 +0100
panner-type: session backward/forward compatibility
commit 25d5e4c663ada34129451b0f9045ab047d6cc2f0
Author: Robin Gareus <robin@gareus.org>
Date: Wed Jan 8 16:09:07 2014 +0100
update URIs -> URLs
commit 00a606a43d9456cfbaf43cae4fb598549326ba71
Merge: 0f1cec1 382eb0fc4cdf61cec3116
2014-01-09 00:18:45 +01:00
f85c67501c
reverse the visibility.h files assumptions that we don't build shared libs by default
...
This avoids having to define define LIBFOO_DLL=1 all over the place. If we ever go with static libs we will
need to define LIBFOO_STATIC=1 but hopefully in some central location like the top level wscript.
Oh, and I also dropped support for gcc older than version 4.x because ardour will already not build
on such an old version.
2013-10-18 11:50:44 -04:00
b855e5f322
Merge remote-tracking branch 'remotes/origin/exportvis' into windows+cc
...
Conflicts (hopefully resolved):
gtk2_ardour/wscript
libs/ardour/ardour/audioregion.h
libs/ardour/ardour/debug.h
libs/ardour/ardour/directory_names.h
libs/ardour/ardour/filesystem_paths.h
libs/ardour/ardour/session_event.h
libs/gtkmm2ext/gtkmm2ext/utils.h
libs/panners/1in2out/wscript
libs/panners/2in2out/wscript
libs/panners/vbap/wscript
libs/pbd/pbd/debug.h
libs/pbd/pbd/file_utils.h
libs/pbd/pbd/pathexpand.h
libs/pbd/pbd/ringbuffer.h
libs/pbd/pbd/ringbufferNPT.h
libs/pbd/pbd/search_path.h
libs/pbd/pbd/stacktrace.h
libs/pbd/pbd/uuid.h
libs/pbd/pbd/uuid_boost.h
libs/surfaces/control_protocol/control_protocol/basic_ui.h
libs/surfaces/control_protocol/control_protocol/control_protocol.h
2013-10-18 10:03:22 +01:00
61c1956ef9
add -fvisibility=hidden to evoral, and make things work
2013-10-17 15:02:20 -04:00
55bf10abb8
include (probably) necessary stuff in panner compilation flags
2013-10-17 13:16:27 -04:00
8216eac044
fix for unconditional use of #include <malloc.h> which doesn't work on OS X
...
alloca() is defined in stdlib on most *nix systems
2013-09-06 10:55:35 -04:00
6f1cd7b04a
'libs/panners' - Remove the temporary export specifiers that were only used for testing
2013-09-03 15:53:24 +01:00
f43dcd2d91
'libs/panners' - Disable a compiler-specific warning
2013-09-03 14:50:56 +01:00
4aa9152e8b
'libs/panners' - Fix a typo in 'vbap/vbap.cc'
2013-09-03 14:49:49 +01:00
65a4f8c2ba
'libs/panners' - Use 'std::vector' to implement arrays whose size is unknown (required to be buildable with MSVC)
2013-09-03 14:47:46 +01:00
86a3910814
'libs/panners' - Use 'alloca()' for a stack based array whose size is unknown (required to be buildable with MSVC)
2013-09-03 14:46:01 +01:00
a431e73ccd
replace recently added attempt to use visibility macros with one based on gcc guidelines
...
I can see no reason to define the "C API Call Type", but perhaps it really is needed for some reason.
I have tested this on Linux only.
2013-09-02 16:41:56 -04:00
c8de67d7a5
'libs/panners' - Streamline my previous API changes and include Tim's additions to support the GCC compiler
2013-09-02 16:54:17 +01:00
a6c85286fe
'libs/panners' - Add a conventional 'C' API call type to test building with MSVC
2013-08-31 16:19:36 +01:00
4a8cd4375d
'libs/panners' - A small test (before going too far) to see if these changes have any detrimental affect on the non-MSVC builds.
2013-08-30 19:51:45 +01:00
2eb43c8310
add copyright comments
...
git-svn-id: svn://localhost/ardour2/branches/3.0@13859 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-16 18:22:15 +00:00
Carl Hetherington
46e448252f
Provide dialogs to edit pan values numerically, at least for
...
mono and stereo panners.
git-svn-id: svn://localhost/ardour2/branches/3.0@12577 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-06 11:47:09 +00:00
0b958b7f15
allow alt-drag on stereo panner to move just one side of the stereo field. this wiggles a bit, possibly because of rounding, and that probably needs to be addressed
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12500 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-31 13:58:59 +00:00
8f7fa7d93b
MCP: timeout display of value when altering with fader or pot; range ops on strip buttons should work; select logic may be broken
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11959 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-13 16:11:55 +00:00
Carl Hetherington
195c735181
Implement reset() in panners, and use it from the GUI ( fixes #4196 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10282 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-22 16:19:27 +00:00
4aeebb914e
changes for OS X support: change waf config define to COREAUDIO_SUPPORT, remove PluginInsert call to IO::PortCountChanged, remove use of explicit Carbon linkage, fix up AudioUnit internals to actually work (Cocoa GUIs still currently broken)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10224 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-18 15:08:42 +00:00
0938a42440
fixes for 98% of all the warnings/errors reported by OS X gcc on tiger
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10179 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-30 17:55:14 +00:00
c1ef7b14a3
Remove use of waf compat15 tool.
...
Always load waf tools first (prevent smashing of --debug, DATADIR, etc).
git-svn-id: svn://localhost/ardour2/branches/3.0@10163 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-29 19:58:05 +00:00
723ab60b39
Upgrade to waf 1.6.7 and autowaf r52.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10162 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-29 19:17:54 +00:00
Carl Hetherington
48de21b120
Move panner bypass state up to the PannerShell so that it is preserved even when new Panners are dropped in (refixes #4185 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9877 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-14 22:17:43 +00:00
1961051416
monitor send gets access to the (shared) pannable of the track/bus, thus ensuring that the monitor feed is panned. required a few fixes along the way
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9731 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-14 19:00:08 +00:00
Carl Hetherington
110311e186
Re-fix compile failure with --no-nls ( #3111 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9415 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-23 03:34:42 +00:00
4769db412d
Fix Python whitespace (follow PEP8 guidelines, reformatted by Python Reindent)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9409 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-22 22:15:21 +00:00
9850407bd9
Indent python files with spaces as per style guide.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9158 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-16 16:32:56 +00:00
b69b903433
fix width handling in vbap panner
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9013 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-01 21:53:54 +00:00
6dcb20af78
take reverse width into account when labelling signals in panner2d ; better way to draw the width arc
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8956 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-25 03:20:47 +00:00
5ad82b1e6d
switch cartesian/spherical function names and make them use length. still a tweak needed here
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8952 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-24 18:55:33 +00:00
0193803126
prettification of vbap/2d panner GUI. lots of details still to fix. also signal placement is now more correct although width is still not handled correctly
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8948 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-24 04:28:48 +00:00
2daa616e02
add scroll event handling to the vbap panner GUI; clamp vbap pos+width values (but not via clamp_*())
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8932 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-22 21:55:25 +00:00
2bee25b447
do not use "width" in VBAP panner when working with a single input channel
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8925 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-22 18:57:26 +00:00
3bed0850ba
fix bug when interpolating VBAP gains, and remove debug output from that code
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8922 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-22 02:38:29 +00:00
c77d116703
first pass at full output & gain coefficient interpolation for VBAP panning
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8902 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-19 17:42:38 +00:00
b25f334207
prevent VBAP from silencing an output buffer that it actually used
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8901 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-18 14:57:34 +00:00
4145bfc33c
somewhat working VBAP panning (no interpolation, and some outputs don't get output)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8898 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-17 23:41:45 +00:00
e9e1800d86
GUI for VBAP panner actually does something (not the right thing, though)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8892 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-17 20:15:26 +00:00
1b8e8303b2
draw speaker positions in 2d panner
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8891 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-17 19:47:53 +00:00
96cc6c3410
draw pucks (signal positions) on vbap panner
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8890 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-17 18:54:13 +00:00
da144ab5ed
more progress on speakers/vbap etc. etc (still a work in progress)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8887 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-17 16:43:55 +00:00
466cc57416
why use fabs?
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8747 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-07 17:34:19 +00:00
4e40ac9358
make reversed width for the 2in/2out panner actually do something
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8744 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-07 17:21:11 +00:00
d116af22db
virtualize the way that AutomationController gets strings to display values, so that we can callback through the owner of an AutomationControl, not just rely on the value from the AutomationControl; make pan automation tracks use this to display more audio-centric values
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8590 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-27 18:48:33 +00:00
15b5fce904
merge 3.0-panexp (pan experiments) branch, revisions 8534-8585 into 3.0, thus ending 3.0-panexp. THIS COMMIT WILL BREAK ALL EXISTING 3.0 SESSIONS IN SOME WAY (possibly not fatally).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8586 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-27 01:31:03 +00:00
2a8629d11c
tentative commit of new panners subtree
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8521 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-17 17:51:44 +00:00
