Skip to content

Commit 244b40e

Browse files
hagenwhagenw
committed
Merge branch 'master' into delayline
* master: Update license in missing files Change license to MIT (#80) Make direction_vector() work with matrix => vector add modal weighting to time-domain nfchoa (#77) Fix comment of tapering_window() Add automatic scaling to loudspeaker weights for plotting (#78) Update comment of interpolation() Conflicts: SFS_general/delayline.m
2 parents a46f9dd + 209cfa9 commit 244b40e

File tree

220 files changed

+5113
-6299
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

220 files changed

+5113
-6299
lines changed

‎COPYING

Lines changed: 0 additions & 674 deletions
This file was deleted.

‎LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2010-2016 SFS Toolbox Team
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ Changes in the Sound Field Synthesis-Toolbox. Recent changes on top.
22

33
2.2.0 ()
44
- fix impulse response interpolation for three points
5+
- add the ability to apply modal weighting window to NFC-HOA in time domain
6+
- change license to MIT
57

68
2.1.0 (10. March 2016)
79

‎README.md

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -758,11 +758,11 @@ script for plotting it.
758758
Credits and license
759759
-------------------
760760

761-
This is the source distribution of Sound Field Synthesis Toolbox (SFS) licensed
762-
under the GPLv3+. Please consult the file COPYING for more information about
761+
This is the source distribution of the SFS Toolbox (SFS) is licensed
762+
under MIT. Please consult the file LICENSE for more information about
763763
this license.
764764

765-
Website: http://github.com/sfstoolbox/sfs
765+
Website: http://sfstoolbox.org
766766

767767
If you have questions, bug reports or feature requests, please use the [Issue
768768
Section on the website](https://github.com/sfstoolbox/sfs/issues) to report them.
@@ -776,13 +776,4 @@ Audio Engineering Society*, 2012
776776
[ [pdf](http://audio.qu.tu-berlin.de/wp-content/uploads/publications/2012/wierstorf2012_SFS_toolbox_AES.pdf) ]
777777
[ [bibtex](doc/aes132_paper.bib) ]
778778

779-
Copyright (c) 2010-2016
780-
Quality & Usability Lab, together with
781-
Assessment of IP-based Applications
782-
Telekom Innovation Laboratories, TU Berlin
783-
Ernst-Reuter-Platz 7, 10587 Berlin, Germany
784-
785-
Copyright (c) 2013-2016
786-
Institut fuer Nachrichtentechnik
787-
Universitaet Rostock
788-
Richard-Wagner-Strasse 31, 18119 Rostock
779+
Copyright (c) 2010-2016 SFS Toolbox Team

‎SFS_HRTF_extrapolation/extrapolate_farfield_hrtfset.m

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,35 +23,32 @@
2323
% See also: get_ir, driving_function_imp_wfs
2424

2525
%*****************************************************************************
26-
% Copyright (c) 2010-2016 Quality & Usability Lab, together with *
27-
% Assessment of IP-based Applications *
28-
% Telekom Innovation Laboratories, TU Berlin *
29-
% Ernst-Reuter-Platz 7, 10587 Berlin, Germany *
26+
% The MIT License (MIT) *
3027
% *
31-
% Copyright (c) 2013-2016 Institut fuer Nachrichtentechnik *
32-
% Universitaet Rostock *
33-
% Richard-Wagner-Strasse 31, 18119 Rostock *
28+
% Copyright (c) 2010-2016 SFS Toolbox Team *
3429
% *
35-
% This file is part of the Sound Field Synthesis-Toolbox (SFS). *
30+
% Permission is hereby granted, free of charge, to any person obtaining a *
31+
% copy of this software and associated documentation files (the "Software"), *
32+
% to deal in the Software without restriction, including without limitation *
33+
% the rights to use, copy, modify, merge, publish, distribute, sublicense, *
34+
% and/or sell copies of the Software, and to permit persons to whom the *
35+
% Software is furnished to do so, subject to the following conditions: *
3636
% *
37-
% The SFS is free software: you can redistribute it and/or modify it under *
38-
% the terms of the GNU General Public License as published by the Free *
39-
% Software Foundation, either version 3 of the License, or (at your option) *
40-
% any later version. *
37+
% The above copyright notice and this permission notice shall be included in *
38+
% all copies or substantial portions of the Software. *
4139
% *
42-
% The SFS is distributed in the hope that it will be useful, but WITHOUT ANY *
43-
% WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS *
44-
% FOR A PARTICULAR PURPOSE. *
45-
% See the GNU General Public License for more details. *
40+
% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR *
41+
% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, *
42+
% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL *
43+
% THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER *
44+
% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING *
45+
% FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER *
46+
% DEALINGS IN THE SOFTWARE. *
4647
% *
47-
% You should have received a copy of the GNU General Public License along *
48-
% with this program. If not, see <http://www.gnu.org/licenses/>. *
48+
% The SFS Toolbox allows to simulate and investigate sound field synthesis *
49+
% methods like wave field synthesis or higher order ambisonics. *
4950
% *
50-
% The SFS is a toolbox for Matlab/Octave to simulate and investigate sound *
51-
% field synthesis methods like wave field synthesis or higher order *
52-
% ambisonics. *
53-
% *
54-
% http://github.com/sfstoolbox/sfs sfstoolbox@gmail.com *
51+
% http://sfstoolbox.org sfstoolbox@gmail.com *
5552
%*****************************************************************************
5653

5754

‎SFS_analysis/freq_response_localwfs.m

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -24,35 +24,32 @@
2424
% See also: sound_field_mono_wfs, sound_field_imp_wfs
2525

2626
%*****************************************************************************
27-
% Copyright (c) 2010-2016 Quality & Usability Lab, together with *
28-
% Assessment of IP-based Applications *
29-
% Telekom Innovation Laboratories, TU Berlin *
30-
% Ernst-Reuter-Platz 7, 10587 Berlin, Germany *
31-
% *
32-
% Copyright (c) 2013-2016 Institut fuer Nachrichtentechnik *
33-
% Universitaet Rostock *
34-
% Richard-Wagner-Strasse 31, 18119 Rostock *
35-
% *
36-
% This file is part of the Sound Field Synthesis-Toolbox (SFS). *
37-
% *
38-
% The SFS is free software: you can redistribute it and/or modify it under *
39-
% the terms of the GNU General Public License as published by the Free *
40-
% Software Foundation, either version 3 of the License, or (at your option) *
41-
% any later version. *
42-
% *
43-
% The SFS is distributed in the hope that it will be useful, but WITHOUT ANY *
44-
% WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS *
45-
% FOR A PARTICULAR PURPOSE. *
46-
% See the GNU General Public License for more details. *
47-
% *
48-
% You should have received a copy of the GNU General Public License along *
49-
% with this program. If not, see <http://www.gnu.org/licenses/>. *
50-
% *
51-
% The SFS is a toolbox for Matlab/Octave to simulate and investigate sound *
52-
% field synthesis methods like wave field synthesis or higher order *
53-
% ambisonics. *
54-
% *
55-
% http://github.com/sfstoolbox/sfs sfstoolbox@gmail.com *
27+
% The MIT License (MIT) *
28+
% *
29+
% Copyright (c) 2010-2016 SFS Toolbox Team *
30+
% *
31+
% Permission is hereby granted, free of charge, to any person obtaining a *
32+
% copy of this software and associated documentation files (the "Software"), *
33+
% to deal in the Software without restriction, including without limitation *
34+
% the rights to use, copy, modify, merge, publish, distribute, sublicense, *
35+
% and/or sell copies of the Software, and to permit persons to whom the *
36+
% Software is furnished to do so, subject to the following conditions: *
37+
% *
38+
% The above copyright notice and this permission notice shall be included in *
39+
% all copies or substantial portions of the Software. *
40+
% *
41+
% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR *
42+
% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, *
43+
% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL *
44+
% THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER *
45+
% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING *
46+
% FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER *
47+
% DEALINGS IN THE SOFTWARE. *
48+
% *
49+
% The SFS Toolbox allows to simulate and investigate sound field synthesis *
50+
% methods like wave field synthesis or higher order ambisonics. *
51+
% *
52+
% http://sfstoolbox.org sfstoolbox@gmail.com *
5653
%*****************************************************************************
5754

5855

‎SFS_analysis/freq_response_nfchoa.m

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -24,35 +24,32 @@
2424
% See also: sound_field_mono_nfchoa, sound_field_imp_nfchoa
2525

2626
%*****************************************************************************
27-
% Copyright (c) 2010-2016 Quality & Usability Lab, together with *
28-
% Assessment of IP-based Applications *
29-
% Telekom Innovation Laboratories, TU Berlin *
30-
% Ernst-Reuter-Platz 7, 10587 Berlin, Germany *
31-
% *
32-
% Copyright (c) 2013-2016 Institut fuer Nachrichtentechnik *
33-
% Universitaet Rostock *
34-
% Richard-Wagner-Strasse 31, 18119 Rostock *
35-
% *
36-
% This file is part of the Sound Field Synthesis-Toolbox (SFS). *
37-
% *
38-
% The SFS is free software: you can redistribute it and/or modify it under *
39-
% the terms of the GNU General Public License as published by the Free *
40-
% Software Foundation, either version 3 of the License, or (at your option) *
41-
% any later version. *
42-
% *
43-
% The SFS is distributed in the hope that it will be useful, but WITHOUT ANY *
44-
% WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS *
45-
% FOR A PARTICULAR PURPOSE. *
46-
% See the GNU General Public License for more details. *
47-
% *
48-
% You should have received a copy of the GNU General Public License along *
49-
% with this program. If not, see <http://www.gnu.org/licenses/>. *
50-
% *
51-
% The SFS is a toolbox for Matlab/Octave to simulate and investigate sound *
52-
% field synthesis methods like wave field synthesis or higher order *
53-
% ambisonics. *
54-
% *
55-
% http://github.com/sfstoolbox/sfs sfstoolbox@gmail.com *
27+
% The MIT License (MIT) *
28+
% *
29+
% Copyright (c) 2010-2016 SFS Toolbox Team *
30+
% *
31+
% Permission is hereby granted, free of charge, to any person obtaining a *
32+
% copy of this software and associated documentation files (the "Software"), *
33+
% to deal in the Software without restriction, including without limitation *
34+
% the rights to use, copy, modify, merge, publish, distribute, sublicense, *
35+
% and/or sell copies of the Software, and to permit persons to whom the *
36+
% Software is furnished to do so, subject to the following conditions: *
37+
% *
38+
% The above copyright notice and this permission notice shall be included in *
39+
% all copies or substantial portions of the Software. *
40+
% *
41+
% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR *
42+
% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, *
43+
% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL *
44+
% THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER *
45+
% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING *
46+
% FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER *
47+
% DEALINGS IN THE SOFTWARE. *
48+
% *
49+
% The SFS Toolbox allows to simulate and investigate sound field synthesis *
50+
% methods like wave field synthesis or higher order ambisonics. *
51+
% *
52+
% http://sfstoolbox.org sfstoolbox@gmail.com *
5653
%*****************************************************************************
5754

5855

0 commit comments

Comments
 (0)