From: yomguy Date: Fri, 21 Mar 2008 16:51:32 +0000 (+0000) Subject: * Translate all fields into english X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=28c7b97eebeaa1cea4f0eae3d3aeb87123d8e3aa;p=cnaq.git * Translate all fields into english * Add white and pink noise generation (thanks to Etienne Corteel) * Add /lib folder, move tools git-svn-id: http://svn.parisson.org/svn/CNAQ/trunk@150 5fc3e0e6-29bc-4d03-b52b-c088cb822bde --- diff --git a/CNAQ.fig b/CNAQ.fig index 26618f3..ccc3771 100644 Binary files a/CNAQ.fig and b/CNAQ.fig differ diff --git a/CNAQ.m b/CNAQ.m index 387d276..646b178 100644 --- a/CNAQ.m +++ b/CNAQ.m @@ -124,7 +124,7 @@ root_dir = pwd; % The directory where CNAQ is installed cnaq_path = root_dir; config_path = [cnaq_path filesep 'config' filesep]; tools_path = [cnaq_path filesep 'tools' filesep]; -pa_path = [cnaq_path filesep 'pa_wavplay' filesep]; +pa_path = [cnaq_path filesep 'lib' filesep 'pa_wavplay' filesep]; path(path, cnaq_path); path(path, tools_path); path(path, pa_path); @@ -134,13 +134,13 @@ path(path, config_path); [device, latency] = asio(); % Get home directory -home_dir = uigetdir(root_dir, 'Choose your home directory'); +home_dir = uigetdir(root_dir, 'Choose your workspace'); % Get/Set ID id = get_id(handles); set(handles.ID,'String',id); set(handles.home_dir_box,'String',home_dir); -set(handles.info1_text,'String',['CNAQ v' cnaq_version ' - Copyright (C) 2007']); +set(handles.info1_text,'String',['CNAQ v' cnaq_version ' - Copyright (C) 2007-2008']); set(handles.info2_text,'String','Guillaume Pellerin, Manuel Melon (CNAM Paris) http://svn.parisson.org/cnaq/'); % Set default values @@ -169,7 +169,7 @@ set(handles.f_s,'String','44100|48000|88200|96000|192000'); %set(handles.out_on_off,'Value',0); set(handles.in_on_off,'Value',0); set(handles.gen_on_off,'Value',0); -set(handles.sig_type,'String','Sinus|Chirp'); +set(handles.sig_type,'String','Sinus|Chirp|White noise|Pink noise'); set(handles.voices_in,'String','1|1 2|1 2 3|1 2 3 4'); set(handles.voices_out,'String','1|1 2|1 2 3|1 2 3 4'); @@ -216,8 +216,12 @@ function set_fs(handles, f_s) fs_ind = 1; elseif f_s == 48000 fs_ind = 2; - elseif f_s == 96000 + elseif f_s == 88200 fs_ind = 3; + elseif f_s == 96000 + fs_ind = 4; + elseif f_s == 192000 + fs_ind = 5; end set(handles.f_s,'Value',fs_ind); @@ -490,6 +494,7 @@ function gen_on_off_Callback(hObject, eventdata, handles) gain_out = get(handles.gain_out,'Value'); gain_out = 10^(gain_out/20); t = [0:1/f_s:time]; + n_t = length(t); if sig_type == 1 % SINUS @@ -497,6 +502,12 @@ function gen_on_off_Callback(hObject, eventdata, handles) elseif sig_type == 2 % CHIRP sig = gain_out*chirp(t,f_min,time,f_max,'logarithmic'); + elseif sig_type == 3 + % WHITE NOISE + sig = gain_out*white_noise(n_t); + elseif sig_type == 4 + % PINK NOISE + sig = gain_out*pink_noise(n_t); end sig_out = []; @@ -707,7 +718,8 @@ function save_button_Callback(hObject, eventdata, handles) % Increment ID increment_id(handles); - + + % --- Executes on button press in load. function load_Callback(hObject, eventdata, handless) % hObject handle to load (see GCBO) diff --git a/lib/pa_wavplay/pa_wavplay usage instructions.txt b/lib/pa_wavplay/pa_wavplay usage instructions.txt new file mode 100644 index 0000000..8f3b630 --- /dev/null +++ b/lib/pa_wavplay/pa_wavplay usage instructions.txt @@ -0,0 +1,11 @@ + +To play audio: +pa_wavplay(buffer, [samplerate], [deviceid], [devicetype]); + +To record audio: +inputbuffer = pa_wavrecord(channels, nsamples, [samplerate], [deviceid], [devicetype]); + +To play and record audio simultaneously: +inputbuffer = pa_wavplayrecord(playbuffer,[playdevice],[samplerate], [recnsamples], [recchannels], [recdevice],[devicetype]) + +see help for each of these commands for much more information. \ No newline at end of file diff --git a/lib/pa_wavplay/pa_wavplay.m b/lib/pa_wavplay/pa_wavplay.m new file mode 100644 index 0000000..9bcb4c9 --- /dev/null +++ b/lib/pa_wavplay/pa_wavplay.m @@ -0,0 +1,97 @@ +function pa_wavplay(varargin) +% pa_wavplay: playback a matrix to multichannel sound hardware +% +% Usage: pa_wavplay([devicetype]) +% pa_wavplay(buffer, [samplerate], [deviceid], [devicetype]) +% +% pa_wavplay is a tool for playing multi-channel audio through your ASIO +% device. Arguments in [] are optional +% +% pa_wavplay([devicetype]) will list all your audio devices for that +% device type then exit. +% +% - buffer is the matrix to play +% - samplerate is the sampling frequency. Default: 44100 +% - deviceid is the device id to use for output. Default: 0 +% - devicetype determines which sound driver to use +% 'win' Windows Multimedia Device +% 'dx' DirectX DirectSound driver +% 'asio' ASIO Driver (default) +% +% For stereo playback, buffer should be an N-by-2 matrix. The number of +% audio channels supported is hardware dependent. +% +% samplerate should be a valid integer sample rate, eg. 22050 44100 etc. +% +% As of pa_wavplay 0.2, buffer should be either of type double or +% single. pa_wavplay uses 32-bit floats (single) internally. +% +% SEE ALSO: pa_wavrecord, pa_wavplayrecord + +% check right num of args +error(nargchk(0,4,nargin)); + +% defaults +device_opt = 1; +device = 0; +fs = 44100; + +% no args, print devices for asio +if (nargin==0) + pawavplaya; + return; +end + +% if devtype specified +if ischar(varargin{end}), + s=varargin{end}; + varargin(end)=[]; + + device_opt = strmatch(s,{'asio','win', 'dx'}); + if isempty(device_opt), + error(['Unrecognized DEVICETYPE: ' s]); + end + + if (nargin==1) + if device_opt==1, % asio + pawavplaya; + end + if device_opt==2, % win + pawavplayw; + end + if device_opt==3, % dx + pawavplayx; + end + return; + end +end + +% data buffer +y = varargin{1}; + +% sample rate +if length(varargin)>=2, + fs=varargin{2}; +end + +% device id +if length(varargin) >= 3, + if (~(ischar(varargin{3}))) + device = varargin{3}; + end +end + +if device_opt==1, % asio + %fprintf('Using ASIO driver\n'); + pawavplaya(y, device, fs, 0, 0, 0, -1); + +elseif device_opt==2, % win + fprintf('Using WMME driver\n'); + pawavplayw(y, device, fs, 0, 0, 0, -1); + +elseif device_opt==3, % dx + fprintf('Using DirectX driver\n'); + pawavplayx(y, device, fs, 0, 0, 0, -1); +end + +% [EOF] pa_wavplay.m \ No newline at end of file diff --git a/lib/pa_wavplay/pa_wavplayrecord.m b/lib/pa_wavplay/pa_wavplayrecord.m new file mode 100644 index 0000000..cfb1e11 --- /dev/null +++ b/lib/pa_wavplay/pa_wavplayrecord.m @@ -0,0 +1,116 @@ +function y = pa_wavplayrecord(varargin) +% pa_wavplayrecord: simultaneous playback & record of multichannel sound +% +% Usage: +% inputbuffer = pa_wavplayrecord(playbuffer,[playdevice],[samplerate], +% [recnsamples], [recfirstchannel], [reclastchannel], +% [recdevice], [devicetype]) +% +% pa_wavplayrecord is a tool for playing and recording multi-channel +% audio through your ASIO device. Arguments in [] are optional +% +% pa_wavplayrecord([devicetype]) will list all your audio devices for +% that device type then exit. +% +% - playbuffer the matrix to play +% - playdevice the device to play it on. Default: 0 +% - samplerate the sampling frequency. Default: 44100 +% - recnsamples the number of samples to record. Default: 0 +% if 0 then we'll record for the duration of playbuffer +% - recfirstchannel the first channel to record from Default: 1 +% - reclastchannel the last channel to record from Default: 1 +% - recdevice the device to record from. Default: 0 +% - devicetype determines which sound driver to use +% 'win' Windows Multimedia Device +% 'dx' DirectX DirectSound driver +% 'asio' ASIO Driver (default) +% +% See the help for pa_wavplay for a list of some of these arguments, +% and the formatting of them. +% +% SEE ALSO: pa_wavrecord, pa_wavplayrecord + +% check right num of args +error(nargchk(1,8,nargin)); + +% defaults +device_opt = 1; +playdevice = 0; +fs = 44100; +recnsamples = 0; +recfirstchannel = 1; +reclastchannel = 1; +recdevice = 0; + +% if devtype specified +if ischar(varargin{end}), + s=varargin{end}; + varargin(end)=[]; + + device_opt = strmatch(s,{'asio','win', 'dx'}); + if isempty(device_opt), + error(['Unrecognized DEVICETYPE: ' s]); + end + + if (nargin==1) + if device_opt==1, % asio + pawavplaya; + end + if device_opt==2, % win + pawavplayw; + end + if device_opt==3, % dx + pawavplayx; + end + return; + end +end + +% data buffer +playbuffer = varargin{1}; + +% play device +if length(varargin)>=2, + playdevice=varargin{2}; +end + +% sample rate +if length(varargin)>=3, + fs=varargin{3}; +end + +% recnsamples +if length(varargin)>=4, + recnsamples=varargin{4}; +end + +% recfirstchannel +if length(varargin)>=5, + recfirstchannel=varargin{5}; +end + +% reclastchannel +if length(varargin)>=6, + reclastchannel=varargin{6}; +end + +% recdevice +if length(varargin)>=7, + recdevice=varargin{7}; +end + +if device_opt==1, % asio + %fprintf('Using ASIO driver\n'); + y = pawavplaya(playbuffer, playdevice, fs, recfirstchannel, reclastchannel, recnsamples, recdevice); +elseif device_opt==2, % win + fprintf('Using WMME driver\n'); + y = pawavplayw(playbuffer, playdevice, fs, recfirstchannel, reclastchannel, recnsamples, recdevice); +elseif device_opt==3, % dx + fprintf('Using DirectX driver\n'); + y = pawavplayx(playbuffer, playdevice, fs, recfirstchannel, reclastchannel, recnsamples, recdevice); +end + +%fprintf('Converting result to doubles\n'); +y = double(y); + +% [EOF] pa_wavplayrecord.m \ No newline at end of file diff --git a/lib/pa_wavplay/pa_wavrecord.m b/lib/pa_wavplay/pa_wavrecord.m new file mode 100644 index 0000000..3d1dcb1 --- /dev/null +++ b/lib/pa_wavplay/pa_wavrecord.m @@ -0,0 +1,113 @@ +function y = pa_wavrecord(varargin) +% pa_wavrecord: record from multichannel sound hardware +% +% Usage: pa_wavrecord([devicetype]) +% inputbuffer = pa_wavrecord(firstchannel, lastchannel, nsamples, [samplerate], +% [deviceid], [devicetype]) +% +% pa_wavrecord is a tool for recording multi-channel audio through your +% ASIO device. Arguments in [] are optional +% +% - firstchannel the first input channel to record from +% - lastchannel the last input channel to record from +% - nsamples the number of samples to record from each channel +% - samplerate the sampling frequency. Default: 44100 +% - deviceid the device id to use for INPUT. Default: 0 +% - informat the desired data type of inputbuffer. Valid types +% and the number of bits per sample are as follows: +% - devicetype determines which sound driver to use +% 'win' Windows Multimedia Device +% 'dx' DirectX DirectSound driver +% 'asio' ASIO Driver (default) +% - inputbuffer is a variable that will hold the recorded audio, +% running along rows, with a seperate column for +% each channel +% +% SEE ALSO: pa_wavplay, pa_wavplayrecord + +% check right num of args +error(nargchk(0,6,nargin)); + +% defaults +device_opt = 1; +device = 0; +fs = 44100; +%in_opt = 2; + +% no args, print devices for asio +if (nargin==0) + pawavplaya; + return; +end + +% if devtype specified +if ischar(varargin{end}) + s=varargin{end}; + varargin(end)=[]; + + device_opt = strmatch(s,{'asio','win', 'dx'}); + if isempty(device_opt), + error(['Unrecognized DEVICETYPE: ' s]); + end + + if (nargin==1) + if device_opt==1, % asio + pawavplaya; + end + if device_opt==2, % win + pawavplayw; + end + if device_opt==3, % dx + pawavplayx; + end + return; + end +end + +%{ +% if informat specified +if ischar(varargin{end}) + s=varargin{end}; + varargin(end)=[]; + + in_opt = strmatch(s,{'int16','double'}); + if isempty(in_opt), + error(['Unrecognized informat: ' s]); + end +end +%} + +% channels +firstchannel = varargin{1}; +lastchannel = varargin{2}; + +% samples +nsamples = varargin{3}; + +% sample rate +if length(varargin)>=4, + fs=varargin{4}; +end + +% device id +if length(varargin) >= 5, + device = varargin{5}; +end + +if device_opt==1, % asio + %fprintf('Using ASIO driver\n'); + y = pawavplaya(0, -1, fs, firstchannel, lastchannel, nsamples, device); + +elseif device_opt==2, % win + fprintf('Using WMME driver\n'); + y = pawavplayw(0, -1, fs, firstchannel, lastchannel, nsamples, device); + +elseif device_opt==3, % dx + fprintf('Using DirectX driver\n'); + y = pawavplayx(0, -1, fs, firstchannel, lastchannel, nsamples, device); +end + +%fprintf('Converting result to doubles\n'); +y = double(y); + +% [EOF] pa_wavrecord.m \ No newline at end of file diff --git a/lib/pa_wavplay/pawavplaya.dll b/lib/pa_wavplay/pawavplaya.dll new file mode 100644 index 0000000..dfbb755 Binary files /dev/null and b/lib/pa_wavplay/pawavplaya.dll differ diff --git a/lib/pa_wavplay/pawavplayw.dll b/lib/pa_wavplay/pawavplayw.dll new file mode 100644 index 0000000..bb9d2bd Binary files /dev/null and b/lib/pa_wavplay/pawavplayw.dll differ diff --git a/lib/pa_wavplay/pawavplayx.dll b/lib/pa_wavplay/pawavplayx.dll new file mode 100644 index 0000000..6714be5 Binary files /dev/null and b/lib/pa_wavplay/pawavplayx.dll differ diff --git a/pa_wavplay/pa_wavplay usage instructions.txt b/pa_wavplay/pa_wavplay usage instructions.txt deleted file mode 100644 index 8f3b630..0000000 --- a/pa_wavplay/pa_wavplay usage instructions.txt +++ /dev/null @@ -1,11 +0,0 @@ - -To play audio: -pa_wavplay(buffer, [samplerate], [deviceid], [devicetype]); - -To record audio: -inputbuffer = pa_wavrecord(channels, nsamples, [samplerate], [deviceid], [devicetype]); - -To play and record audio simultaneously: -inputbuffer = pa_wavplayrecord(playbuffer,[playdevice],[samplerate], [recnsamples], [recchannels], [recdevice],[devicetype]) - -see help for each of these commands for much more information. \ No newline at end of file diff --git a/pa_wavplay/pa_wavplay.m b/pa_wavplay/pa_wavplay.m deleted file mode 100644 index 9bcb4c9..0000000 --- a/pa_wavplay/pa_wavplay.m +++ /dev/null @@ -1,97 +0,0 @@ -function pa_wavplay(varargin) -% pa_wavplay: playback a matrix to multichannel sound hardware -% -% Usage: pa_wavplay([devicetype]) -% pa_wavplay(buffer, [samplerate], [deviceid], [devicetype]) -% -% pa_wavplay is a tool for playing multi-channel audio through your ASIO -% device. Arguments in [] are optional -% -% pa_wavplay([devicetype]) will list all your audio devices for that -% device type then exit. -% -% - buffer is the matrix to play -% - samplerate is the sampling frequency. Default: 44100 -% - deviceid is the device id to use for output. Default: 0 -% - devicetype determines which sound driver to use -% 'win' Windows Multimedia Device -% 'dx' DirectX DirectSound driver -% 'asio' ASIO Driver (default) -% -% For stereo playback, buffer should be an N-by-2 matrix. The number of -% audio channels supported is hardware dependent. -% -% samplerate should be a valid integer sample rate, eg. 22050 44100 etc. -% -% As of pa_wavplay 0.2, buffer should be either of type double or -% single. pa_wavplay uses 32-bit floats (single) internally. -% -% SEE ALSO: pa_wavrecord, pa_wavplayrecord - -% check right num of args -error(nargchk(0,4,nargin)); - -% defaults -device_opt = 1; -device = 0; -fs = 44100; - -% no args, print devices for asio -if (nargin==0) - pawavplaya; - return; -end - -% if devtype specified -if ischar(varargin{end}), - s=varargin{end}; - varargin(end)=[]; - - device_opt = strmatch(s,{'asio','win', 'dx'}); - if isempty(device_opt), - error(['Unrecognized DEVICETYPE: ' s]); - end - - if (nargin==1) - if device_opt==1, % asio - pawavplaya; - end - if device_opt==2, % win - pawavplayw; - end - if device_opt==3, % dx - pawavplayx; - end - return; - end -end - -% data buffer -y = varargin{1}; - -% sample rate -if length(varargin)>=2, - fs=varargin{2}; -end - -% device id -if length(varargin) >= 3, - if (~(ischar(varargin{3}))) - device = varargin{3}; - end -end - -if device_opt==1, % asio - %fprintf('Using ASIO driver\n'); - pawavplaya(y, device, fs, 0, 0, 0, -1); - -elseif device_opt==2, % win - fprintf('Using WMME driver\n'); - pawavplayw(y, device, fs, 0, 0, 0, -1); - -elseif device_opt==3, % dx - fprintf('Using DirectX driver\n'); - pawavplayx(y, device, fs, 0, 0, 0, -1); -end - -% [EOF] pa_wavplay.m \ No newline at end of file diff --git a/pa_wavplay/pa_wavplayrecord.m b/pa_wavplay/pa_wavplayrecord.m deleted file mode 100644 index cfb1e11..0000000 --- a/pa_wavplay/pa_wavplayrecord.m +++ /dev/null @@ -1,116 +0,0 @@ -function y = pa_wavplayrecord(varargin) -% pa_wavplayrecord: simultaneous playback & record of multichannel sound -% -% Usage: -% inputbuffer = pa_wavplayrecord(playbuffer,[playdevice],[samplerate], -% [recnsamples], [recfirstchannel], [reclastchannel], -% [recdevice], [devicetype]) -% -% pa_wavplayrecord is a tool for playing and recording multi-channel -% audio through your ASIO device. Arguments in [] are optional -% -% pa_wavplayrecord([devicetype]) will list all your audio devices for -% that device type then exit. -% -% - playbuffer the matrix to play -% - playdevice the device to play it on. Default: 0 -% - samplerate the sampling frequency. Default: 44100 -% - recnsamples the number of samples to record. Default: 0 -% if 0 then we'll record for the duration of playbuffer -% - recfirstchannel the first channel to record from Default: 1 -% - reclastchannel the last channel to record from Default: 1 -% - recdevice the device to record from. Default: 0 -% - devicetype determines which sound driver to use -% 'win' Windows Multimedia Device -% 'dx' DirectX DirectSound driver -% 'asio' ASIO Driver (default) -% -% See the help for pa_wavplay for a list of some of these arguments, -% and the formatting of them. -% -% SEE ALSO: pa_wavrecord, pa_wavplayrecord - -% check right num of args -error(nargchk(1,8,nargin)); - -% defaults -device_opt = 1; -playdevice = 0; -fs = 44100; -recnsamples = 0; -recfirstchannel = 1; -reclastchannel = 1; -recdevice = 0; - -% if devtype specified -if ischar(varargin{end}), - s=varargin{end}; - varargin(end)=[]; - - device_opt = strmatch(s,{'asio','win', 'dx'}); - if isempty(device_opt), - error(['Unrecognized DEVICETYPE: ' s]); - end - - if (nargin==1) - if device_opt==1, % asio - pawavplaya; - end - if device_opt==2, % win - pawavplayw; - end - if device_opt==3, % dx - pawavplayx; - end - return; - end -end - -% data buffer -playbuffer = varargin{1}; - -% play device -if length(varargin)>=2, - playdevice=varargin{2}; -end - -% sample rate -if length(varargin)>=3, - fs=varargin{3}; -end - -% recnsamples -if length(varargin)>=4, - recnsamples=varargin{4}; -end - -% recfirstchannel -if length(varargin)>=5, - recfirstchannel=varargin{5}; -end - -% reclastchannel -if length(varargin)>=6, - reclastchannel=varargin{6}; -end - -% recdevice -if length(varargin)>=7, - recdevice=varargin{7}; -end - -if device_opt==1, % asio - %fprintf('Using ASIO driver\n'); - y = pawavplaya(playbuffer, playdevice, fs, recfirstchannel, reclastchannel, recnsamples, recdevice); -elseif device_opt==2, % win - fprintf('Using WMME driver\n'); - y = pawavplayw(playbuffer, playdevice, fs, recfirstchannel, reclastchannel, recnsamples, recdevice); -elseif device_opt==3, % dx - fprintf('Using DirectX driver\n'); - y = pawavplayx(playbuffer, playdevice, fs, recfirstchannel, reclastchannel, recnsamples, recdevice); -end - -%fprintf('Converting result to doubles\n'); -y = double(y); - -% [EOF] pa_wavplayrecord.m \ No newline at end of file diff --git a/pa_wavplay/pa_wavrecord.m b/pa_wavplay/pa_wavrecord.m deleted file mode 100644 index 3d1dcb1..0000000 --- a/pa_wavplay/pa_wavrecord.m +++ /dev/null @@ -1,113 +0,0 @@ -function y = pa_wavrecord(varargin) -% pa_wavrecord: record from multichannel sound hardware -% -% Usage: pa_wavrecord([devicetype]) -% inputbuffer = pa_wavrecord(firstchannel, lastchannel, nsamples, [samplerate], -% [deviceid], [devicetype]) -% -% pa_wavrecord is a tool for recording multi-channel audio through your -% ASIO device. Arguments in [] are optional -% -% - firstchannel the first input channel to record from -% - lastchannel the last input channel to record from -% - nsamples the number of samples to record from each channel -% - samplerate the sampling frequency. Default: 44100 -% - deviceid the device id to use for INPUT. Default: 0 -% - informat the desired data type of inputbuffer. Valid types -% and the number of bits per sample are as follows: -% - devicetype determines which sound driver to use -% 'win' Windows Multimedia Device -% 'dx' DirectX DirectSound driver -% 'asio' ASIO Driver (default) -% - inputbuffer is a variable that will hold the recorded audio, -% running along rows, with a seperate column for -% each channel -% -% SEE ALSO: pa_wavplay, pa_wavplayrecord - -% check right num of args -error(nargchk(0,6,nargin)); - -% defaults -device_opt = 1; -device = 0; -fs = 44100; -%in_opt = 2; - -% no args, print devices for asio -if (nargin==0) - pawavplaya; - return; -end - -% if devtype specified -if ischar(varargin{end}) - s=varargin{end}; - varargin(end)=[]; - - device_opt = strmatch(s,{'asio','win', 'dx'}); - if isempty(device_opt), - error(['Unrecognized DEVICETYPE: ' s]); - end - - if (nargin==1) - if device_opt==1, % asio - pawavplaya; - end - if device_opt==2, % win - pawavplayw; - end - if device_opt==3, % dx - pawavplayx; - end - return; - end -end - -%{ -% if informat specified -if ischar(varargin{end}) - s=varargin{end}; - varargin(end)=[]; - - in_opt = strmatch(s,{'int16','double'}); - if isempty(in_opt), - error(['Unrecognized informat: ' s]); - end -end -%} - -% channels -firstchannel = varargin{1}; -lastchannel = varargin{2}; - -% samples -nsamples = varargin{3}; - -% sample rate -if length(varargin)>=4, - fs=varargin{4}; -end - -% device id -if length(varargin) >= 5, - device = varargin{5}; -end - -if device_opt==1, % asio - %fprintf('Using ASIO driver\n'); - y = pawavplaya(0, -1, fs, firstchannel, lastchannel, nsamples, device); - -elseif device_opt==2, % win - fprintf('Using WMME driver\n'); - y = pawavplayw(0, -1, fs, firstchannel, lastchannel, nsamples, device); - -elseif device_opt==3, % dx - fprintf('Using DirectX driver\n'); - y = pawavplayx(0, -1, fs, firstchannel, lastchannel, nsamples, device); -end - -%fprintf('Converting result to doubles\n'); -y = double(y); - -% [EOF] pa_wavrecord.m \ No newline at end of file diff --git a/pa_wavplay/pawavplaya.dll b/pa_wavplay/pawavplaya.dll deleted file mode 100644 index dfbb755..0000000 Binary files a/pa_wavplay/pawavplaya.dll and /dev/null differ diff --git a/pa_wavplay/pawavplayw.dll b/pa_wavplay/pawavplayw.dll deleted file mode 100644 index bb9d2bd..0000000 Binary files a/pa_wavplay/pawavplayw.dll and /dev/null differ diff --git a/pa_wavplay/pawavplayx.dll b/pa_wavplay/pawavplayx.dll deleted file mode 100644 index 6714be5..0000000 Binary files a/pa_wavplay/pawavplayx.dll and /dev/null differ diff --git a/tools/vu-meters/meterH.exe b/tools/vu-meters/meterH.exe new file mode 100644 index 0000000..51594d9 Binary files /dev/null and b/tools/vu-meters/meterH.exe differ diff --git a/tools/vu-meters/meterV.exe b/tools/vu-meters/meterV.exe new file mode 100644 index 0000000..063eaa7 Binary files /dev/null and b/tools/vu-meters/meterV.exe differ diff --git a/vu-meters/meterH.exe b/vu-meters/meterH.exe deleted file mode 100644 index 51594d9..0000000 Binary files a/vu-meters/meterH.exe and /dev/null differ diff --git a/vu-meters/meterV.exe b/vu-meters/meterV.exe deleted file mode 100644 index 063eaa7..0000000 Binary files a/vu-meters/meterV.exe and /dev/null differ