Make delay global, change parameter presentation

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

diff --git a/CNAQ.m b/CNAQ.m
index e0775718810b0c1fdefc30caa05c2042924b8b71..bf9bfe84e9af2809f5295f4b0e054d277dd53444 100644 (file)
--- a/CNAQ.m
+++ b/CNAQ.m
@@ -111,22 +111,21 @@ varargout{1} = handles.output;
 % uiwait(handles.figure1);\r
 % ==============================================================\r
 \r
+cnaq_version = '0.1';\r
+        \r
+% ==============================================================\r
+% PARAMETERS\r
+% ==============================================================\r
+        \r
+root_dir = 'E:\CNAQ'; % The directory where CNAQ is installed\r
+device = 1;  % The ASIO device number in the audio sytem\r
+delay = 588; % The number of samples in the buffer (latency of the sound card in\r
+             % samples. See tests/testacqui.m to know your delay)\r
 \r
 % ==============================================================\r
 % INIT\r
 % ==============================================================\r
 \r
-cnaq_version = '0.1';\r
-\r
-% Get/Set home_dir & paths\r
-root_dir = 'E:\CNAQ';\r
-home_dir = uigetdir(root_dir, 'Choisissez votre dossier de travail');\r
-set(handles.home_dir_box,'String',home_dir);\r
-\r
-% Audio device number\r
-device = 0;\r
-\r
-% Get tools\r
 %cnaq_path = pwd;\r
 cnaq_path = root_dir;\r
 tools_path = [cnaq_path '\tools\'];\r
@@ -138,7 +137,7 @@ path(path, pa_path);
 % Get/Set ID\r
 id = get_id(handles);\r
 set(handles.ID,'String',id);\r
-\r
+set(handles.home_dir_box,'String',home_dir);\r
 set(handles.info1_text,'String',['CNAQ v' cnaq_version ' - Copyright (C) 2007']);\r
 set(handles.info2_text,'String','Guillaume Pellerin, Manuel Melon (CNAM Paris)  http://svn.parisson.org/cnaq/');\r
 \r
@@ -172,10 +171,12 @@ set(handles.gen_on_off,'Value',0);
 set(handles.sig_type,'String','Sinus|Chirp');\r
 set(handles.voices_in,'String','1|1 2|1 2 3|1 2 3 4');\r
 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
+\r
+home_dir = uigetdir(root_dir, 'Choisissez votre dossier de travail');\r
 \r
-buffer = 4096;\r
-os_sep = '\';\r
 \r
 % ==============================================================\r
 % TOOLS\r
@@ -520,6 +521,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
     nfft = 16384;\r
     f_min = str2double(get(handles.f_gen_min,'String'));\r
     f_max = str2double(get(handles.f_gen_max,'String'));\r
@@ -559,9 +561,6 @@ function mes_on_Callback(hObject, eventdata, handles, device)
     sig_exc = sig_exc.*mask;\r
     \r
     % Synchronizing\r
-    % The number of samples in the buffer (latency of the sound card in\r
-    % samples. See tests/testacqui.m)\r
-    delay = 588; \r
     zero = zeros(1,delay);\r
     % Zeros are added before and removed after\r
     sig_exc_z = [sig_exc zero];\r