* Add other sampling frequencies

* Translate comments from french to english

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

diff --git a/CNAQ.m b/CNAQ.m
index cf6c309b64079c39c2cb4c0fba06ab7551d9448f..9eac2f46c28588ae093219d35e5564c8384fc3eb 100644 (file)
--- a/CNAQ.m
+++ b/CNAQ.m
@@ -111,7 +111,7 @@ varargout{1} = handles.output;
 % uiwait(handles.figure1);\r
 % ==============================================================\r
 \r
-cnaq_version = '0.1';\r
+cnaq_version = '0.2';\r
 \r
 % ==============================================================\r
 \r
@@ -130,7 +130,10 @@ path(path, tools_path);
 path(path, pa_path);\r
 path(path, config_path);\r
 \r
+% Get audio device parameters\r
 [device, latency] = asio();\r
+\r
+% Get home directory\r
 home_dir = uigetdir(root_dir, 'Choisissez votre dossier de travail');\r
 \r
 % Get/Set ID\r
@@ -140,8 +143,7 @@ set(handles.home_dir_box,'String',home_dir);
 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
-%set(handles.home_dir_box,'C:\CNAQ\');\r
-\r
+% Set default values\r
 set(handles.f_gen_min,'String','20');\r
 set(handles.f_gen_max,'String','20000');\r
 set(handles.f_gen,'Value',1000);\r
@@ -162,7 +164,7 @@ set(handles.time_gen,'Max',20);
 set(handles.time_value,'String','5')\r
 \r
 set(handles.nbits,'String','16|24'); \r
-set(handles.f_s,'String','44100|48000|96000');\r
+set(handles.f_s,'String','44100|48000|88200|96000|192000');\r
 \r
 %set(handles.out_on_off,'Value',0);\r
 set(handles.in_on_off,'Value',0);\r
@@ -260,7 +262,7 @@ function set_nbits(handles, nbits)
     set(handles.nbits,'Value', nb_ind);\r
     \r
 %============================================\r
-% DONNEES\r
+% DATA\r
 %============================================\r
 \r
 function username_Callback(hObject, eventdata, handles)\r
@@ -352,7 +354,7 @@ function in_on_off_Callback(hObject, eventdata, handles)
 \r
     \r
 %============================================\r
-% VOIES\r
+% VOICES\r
 %============================================\r
 \r
 function gain_in_Callback(hObject, eventdata, handles)\r
@@ -386,7 +388,7 @@ function voices_out_CreateFcn(hObject, eventdata, handles)
     end\r
     \r
 %============================================\r
-% GENERATEUR\r
+% GENERATOR\r
 %============================================\r
 \r
 function sig_type_Callback(hObject, eventdata, handles)\r
@@ -501,7 +503,7 @@ function gen_on_off_Callback(hObject, eventdata, handles)
     for i=1:length(voices_out)\r
         sig_out(:,i) = sig';\r
     end\r
-    \r
+\r
     % Matlab way (needs Data Acquisition Toolbox)\r
 %      ao = analogoutput('winsound', 0);\r
 %      addchannel(ao, voices_out);\r
@@ -518,14 +520,14 @@ function gen_on_off_Callback(hObject, eventdata, handles)
     % PA way but can't work with monitor !...\r
     %pa_wavplay(sig_out',f_s,0,'asio');\r
     \r
-    % Winsoud way...\r
+    % Winsoud way to get the scope running...\r
     sound(sig_out',f_s);\r
     pause(0.1);\r
     \r
 \r
 \r
 %============================================\r
-% MESURE\r
+% MEASUREMENT\r
 %============================================\r
 \r
 function mes_type_Callback(hObject, eventdata, handles)\r