delay to latency

git-svn-id: http://svn.parisson.org/svn/CNAQ/trunk@132 5fc3e0e6-29bc-4d03-b52b-c088cb822bde

diff --git a/CNAQ.m b/CNAQ.m
index 0a68b2463823e48d5385b96e6ba088f5f4393d4e..25c714bfa6f8610a75dafc57ec8f9bc9a1ccc395 100644 (file)
--- a/CNAQ.m
+++ b/CNAQ.m
@@ -114,7 +114,7 @@ varargout{1} = handles.output;
 cnaq_version = '0.1';\r
         \r
 % ==============================================================\r
-% PARAMETERS\r
+% PARAMETERS (IMPORTANT !)\r
 % ==============================================================\r
         \r
 % The ASIO device number in the audio sytem\r
@@ -123,12 +123,14 @@ device = 0;
 % The number of samples in the buffer of the sound card\r
 % (delay * f_s = latency time)\r
 % It IS necessary that you compute this value BEFORE any measurement\r
-% executing ./tests/get_latency.m in MATLAB like this :\r
+% executing ./tools/get_latency.m in MATLAB like this :\r
 % >> get_latency(DEVICE, N)\r
 % where DEVICE is the device number (see above) and N the number of \r
 % successive measurements\r
 % If this value is wrong, the phasis results might be also wrong...\r
-delay = 587;\r
+% BE CAREFUL : your ASIO card MUST be ALONE on its IRQ (see Windows system\r
+% settings)\r
+latency = 1424;\r
 \r
 \r
 % ==============================================================\r
@@ -184,7 +186,7 @@ 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');\r
 \r
 set(handles.in_on_off,'UserData',device);\r
-set(handles.save_button,'UserData',delay);\r
+set(handles.save_button,'UserData',latency);\r
 \r
 % ==============================================================\r
 % TOOLS\r
@@ -529,7 +531,7 @@ function mes_type_CreateFcn(hObject, eventdata, handles)
 \r
 function mes_on_Callback(hObject, eventdata, handles, device)\r
     device = get(handles.in_on_off,'UserData');\r
-    delay = get(handles.save_button,'UserData');\r
+    latency = get(handles.save_button,'UserData');\r
     nfft = 16384;\r
     f_min = str2double(get(handles.f_gen_min,'String'));\r
     f_max = str2double(get(handles.f_gen_max,'String'));\r
@@ -569,7 +571,7 @@ function mes_on_Callback(hObject, eventdata, handles, device)
     sig_exc = sig_exc.*mask;\r
     \r
     % Synchronizing\r
-    zero = zeros(1,delay);\r
+    zero = zeros(1,latency);\r
     % Zeros are added before and removed after\r
     sig_exc_z = [sig_exc zero];\r
     len_sig_exc = length(sig_exc);\r
@@ -591,7 +593,7 @@ function mes_on_Callback(hObject, eventdata, handles, device)
     len_sig_mes = length(sig_mes);\r
     size_sig_mes = size(sig_mes);\r
     n_col_sig_mes = size_sig_mes(2);\r
-    sig_mes = sig_mes(delay+1:len_sig_mes,:);\r
+    sig_mes = sig_mes(latency+1:len_sig_mes,:);\r
     len_sig_mes = length(sig_mes);\r
     sig_exc = sig_exc';\r
     f = logspace(log10(f0), log10(f3), len_sig_mes)';\r