[Julius-cvs 422] CVS update: julius4/libjulius/src

アーカイブの一覧に戻る

sumom****@users***** sumom****@users*****
2009年 7月 3日 (金) 02:05:20 JST


Index: julius4/libjulius/src/adin-cut.c
diff -u julius4/libjulius/src/adin-cut.c:1.10 julius4/libjulius/src/adin-cut.c:1.11
--- julius4/libjulius/src/adin-cut.c:1.10	Sat Jan 17 16:53:47 2009
+++ julius4/libjulius/src/adin-cut.c	Fri Jul  3 02:05:20 2009
@@ -95,7 +95,7 @@
  * @author Akinobu LEE
  * @date   Sat Feb 12 13:20:53 2005
  *
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
  * 
  */
 /*
@@ -1277,6 +1277,7 @@
  * </JA>
  * 
  * @param a [in] A/D-in work area
+ * @param file_or_dev_name [in] device / file path to open or NULL for default
  * 
  * @return TRUE on success, FALSE on failure.
  * 
@@ -1285,12 +1286,12 @@
  * 
  */
 boolean
-adin_begin(ADIn *a)
+adin_begin(ADIn *a, char *file_or_dev_name)
 {
   if (debug2_flag && a->input_side_segment) jlog("Stat: adin_begin: skip\n");
   if (a->input_side_segment == FALSE) {
     if (a->need_zmean) zmean_reset();
-    if (a->ad_begin != NULL) return(a->ad_begin());
+    if (a->ad_begin != NULL) return(a->ad_begin(file_or_dev_name));
   }
   return TRUE;
 }
Index: julius4/libjulius/src/m_adin.c
diff -u julius4/libjulius/src/m_adin.c:1.9 julius4/libjulius/src/m_adin.c:1.10
--- julius4/libjulius/src/m_adin.c:1.9	Thu Mar 19 20:02:23 2009
+++ julius4/libjulius/src/m_adin.c	Fri Jul  3 02:05:20 2009
@@ -12,7 +12,7 @@
  * @author Akinobu LEE
  * @date   Fri Mar 18 16:17:23 2005
  *
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
  * 
  */
 /*
@@ -263,7 +263,7 @@
     adin->enable_thread = (*func)(2);
 
     adin->ad_standby 	   = (boolean (*)(int, void *)) plugin_get_func(sid, "adin_standby");
-    adin->ad_begin 	   = (boolean (*)()) plugin_get_func(sid, "adin_open");
+    adin->ad_begin 	   = (boolean (*)(char *)) plugin_get_func(sid, "adin_open");
     adin->ad_end 	   = (boolean (*)()) plugin_get_func(sid, "adin_close");
     adin->ad_resume 	   = (boolean (*)()) plugin_get_func(sid, "adin_resume");
     adin->ad_pause 	   = (boolean (*)()) plugin_get_func(sid, "adin_pause");
Index: julius4/libjulius/src/recogmain.c
diff -u julius4/libjulius/src/recogmain.c:1.12 julius4/libjulius/src/recogmain.c:1.13
--- julius4/libjulius/src/recogmain.c:1.12	Wed Mar 18 16:05:30 2009
+++ julius4/libjulius/src/recogmain.c	Fri Jul  3 02:05:20 2009
@@ -12,7 +12,7 @@
  * @author Akinobu Lee
  * @date   Wed Aug  8 14:53:53 2007
  *
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
  * 
  */
 
@@ -499,7 +499,7 @@
 
   if (jconf->input.type == INPUT_WAVEFORM) {
     /* begin A/D input */
-    if (adin_begin(recog->adin) == FALSE) {
+    if (adin_begin(recog->adin, file_or_dev_name) == FALSE) {
       return -2;
     }
     /* create A/D-in thread here */



Julius-cvs メーリングリストの案内
アーカイブの一覧に戻る