Remove wavread and wavwrite (#81)

* Replace wavread with audioread
* Replace wavwrite with savewav()

Author: hagenw

INSTALL

@@ -10,5 +10,5 @@ subpathes.
 
 If you are using Octave you will need the following additional packages from 
 octave-forge (http://octave.sourceforge.net/):
-* audio (e.g. for wavwrite)
+* audio
 * signal (e.g. for firls)

NEWS

@@ -6,6 +6,7 @@ Changes in the Sound Field Synthesis-Toolbox. Recent changes on top.
     - change license to MIT
     - update delayline() config settings
     - add Lagrange and Thiran filters to delayline()
+    - replace wavread and warwrite by audioread and savewav
 
 2.1.0 (10. March 2016)
 

README.md

@@ -59,7 +59,7 @@ directory.
 You need Octave version 3.6 or newer to run the Toolbox. In addition,
 you will need the following additional packages from
 [octave-forge](http://octave.sourceforge.net/):
-* audio (e.g. for wavwrite)
+* audio
 * signal (e.g. for firls)
 
 **Impulse responses**
@@ -591,7 +591,7 @@ function.
 conf = SFS_config;
 hrtf = SOFAload('QU_KEMAR_anechoic_3m.sofa');
 ir = get_ir(hrtf,[0 0 0],[0 0],[rad(30) 0 3],'spherical',conf);
-cello = wavread('anechoic_cello.wav');
+cello = audioread('anechoic_cello.wav');
 sig = auralize_ir(ir,cello,1,conf);
 sound(sig,conf.fs);
 ```
@@ -608,7 +608,7 @@ conf.dimension = '2.5D';
 hrtf = SOFAload('QU_KEMAR_anechoic_3m.sofa');
 % ir = ir_wfs(X,phi,xs,src,hrtf,conf);
 ir = ir_wfs([0 0 0],pi/2,[0 3 0],'ps',hrtf,conf);
-cello = wavread('anechoic_cello.wav');
+cello = audioread('anechoic_cello.wav');
 sig = auralize_ir(ir,cello,1,conf);
 ```
 
@@ -651,7 +651,7 @@ conf.secondary_sources.geometry = 'custom';
 conf.secondary_sources.x0 = brir;
 conf.N = 44100;
 ir = ir_wfs([0 0 0],0,[3 0 0],'ps',brir,conf);
-cello = wavread('anechoic_cello.wav');
+cello = audioread('anechoic_cello.wav');
 sig = auralize_ir(ir,cello,1,conf);
 ```
 
@@ -725,7 +725,7 @@ All functions regarding the SSR are stored in <code>SFS_ssr</code>.
 ```Matlab
 conf = SFS_config;
 brs = ssr_brs_wfs(X,phi,xs,src,hrtf,conf);
-wavwrite(brs,fs,16,'brs_set_for_SSR.wav');
+savewav(brs,'brs_set_for_SSR.wav',fs);
 ```
 
 

SFS_binaural_synthesis/auralize_ir.m

@@ -71,7 +71,7 @@
 if isnumeric(content)
     contentfs = conf.fs;
 elseif ~exist(content,'file')
-    [content,contentfs] = wavread(contentfile);
+    [content,contentfs] = audioread(contentfile);
 else
     error('%s: %s file was not found.',upper(mfilename),content);
 end

SFS_binaural_synthesis/compensate_headphone.m

@@ -63,7 +63,7 @@
 if(usehcomp)
     lenir = size(ir,1);
     % Read headphone compensation filter
-    hcomp = wavread(conf.ir.hcompfile);
+    hcomp = audioread(conf.ir.hcompfile);
     % Check if the IR has the right length for the filter
     if lenir<length(hcomp)
         warning(['The length of the used IR is shorter than the headphone ', ...

SFS_general/savewav.m

@@ -0,0 +1,92 @@
+function savewav(y,filename,fs)
+%SAVEWAV saves floating point audio data in a *.wav with 32bit precision
+%
+%   Usage: savewav(y,filename,fs)
+%
+%   Input parameters:
+%       y         - audio data in floating point [NFrames x NChannels] 
+%       filename  - name of *.wav file (file extension will NOT be added
+%                   automatically)
+%       fs        - sample rate / Hz 
+%
+%   Since wavwrite has been removed in MATLAB 2015b and audiowrite does not
+%   support audio data with a channel number higher than 256, this is an 
+%   alternative to save massive multichannel. This function does only support
+%   floating point data and saves it 32bit floating point precision.
+%   
+%   See also: audiowrite, audioread, fwrite
+
+% Copyright (c) 2015 Fiete Winter
+% 
+% Permission is hereby granted, free of charge, to any person obtaining a copy
+% of this software and associated documentation files (the "Software"), to deal
+% in the Software without restriction, including without limitation the rights
+% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+% copies of the Software, and to permit persons to whom the Software is
+% furnished to do so, subject to the following conditions:
+% 
+% The above copyright notice and this permission notice shall be included in
+% all copies or substantial portions of the Software.
+% 
+% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+% THE SOFTWARE.
+
+%% Input Check
+narginchk(3,3);
+if ~isfloat(y)
+  error('%s: only floating point supported', upper(mfilename));
+end
+if ~ndims(y) > 2
+  error('%s: only audio data with [NFrames x NChannels] supported', ...
+    upper(mfilename));
+end
+
+%%
+[NFrames, NChannels] = size(y);  % Number of Frames and Channels
+NSamples = NFrames*NChannels;  % total Samples
+Nbits = 32;  % 32 floating point
+Nbyte = 4;  % bytes per Samples
+
+fileID = fopen(filename,'w', 'ieee-le');  % open wav-file (little Endian)
+
+fwrite(fileID, 'RIFF', 	'char*1');  % RIFF header
+% number of bytes following (chunk size)
+Noverallbytes = 4 + 4; % for 'WAVE' and 'fmt '
+Noverallbytes = Noverallbytes + 4;  % for the number of bytes in 'fmt '
+Noverallbytes = Noverallbytes + 16; % bytes in 'fmt '
+Noverallbytes = Noverallbytes + 12; % for 'fact'
+Noverallbytes = Noverallbytes + 8 + Nbyte*NSamples;  % 'data' chunk
+fwrite(fileID, Noverallbytes, 'uint32');  
+
+fwrite(fileID, 'WAVE', 	'char*1');  % WAVE header
+
+%% fmt chunk
+fwrite(fileID, 'fmt ', 	'char*1');  % mind the whitespace!
+fwrite(fileID, 16, 	'uint32');  % number of bytes following (chunk size)
+fwrite(fileID, 3, 'uint16');  % data type (3 for float)
+fwrite(fileID, NChannels, 'uint16');  % number of channels
+fwrite(fileID, fs, 'uint32');  % samplerate
+fwrite(fileID, fs * NChannels * Nbyte, 'uint32');  % bytes per second
+fwrite(fileID, NChannels * Nbyte, 'uint16');  % frame size
+fwrite(fileID, Nbits, 'uint16');  % bits per sample
+
+%% fact chunk (floating point only)
+fwrite(fileID, 'fact', 	'char*1');
+fwrite(fileID, 4, 	'uint32');  % number of bytes following (chunk size)
+fwrite(fileID, NFrames, 	'uint32');  % number of frames
+
+%% data chunk
+fwrite(fileID, 'data', 	'char*1');
+fwrite(fileID, Nbyte*NSamples, 'uint32');  % number of bytes following (chunk size)
+y = y.';  % prepare data for interlacing
+fwrite(fileID, y(:), 'float32');  % interlaced data
+
+%%
+fclose(fileID);
+
+end