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

アーカイブの一覧に戻る

sumom****@users***** sumom****@users*****
2013年 12月 5日 (木) 14:41:04 JST


Index: julius4/libjulius/src/m_info.c
diff -u julius4/libjulius/src/m_info.c:1.21 julius4/libjulius/src/m_info.c:1.22
--- julius4/libjulius/src/m_info.c:1.21	Thu Dec  5 12:43:13 2013
+++ julius4/libjulius/src/m_info.c	Thu Dec  5 14:41:04 2013
@@ -12,7 +12,7 @@
  * @author Akinobu Lee
  * @date   Thu May 12 14:14:01 2005
  *
- * $Revision: 1.21 $
+ * $Revision: 1.22 $
  * 
  */
 /*
@@ -945,11 +945,12 @@
   jlog("----------------------- System Information end -----------------------\n");
   jlog("\n");
 
-  for(mfcc=recog->mfcclist; mfcc; mfcc=mfcc->next) {
+  if (jconf->input.type == INPUT_WAVEFORM) {
 
-    if (jconf->decodeopt.realtime_flag) {
+   if (jconf->decodeopt.realtime_flag) {
 
-      /* warning for real-time decoding */
+    /* warning for real-time decoding */
+    for(mfcc=recog->mfcclist; mfcc; mfcc=mfcc->next) {
       if (mfcc->para->cmn || mfcc->para->cvn) {
 	jlog("Notice for feature extraction (%02d),\n", mfcc->id);
 	jlog("\t*************************************************************\n");
@@ -997,10 +998,12 @@
 	jlog("\t*         So, the first input will not be recognized.       *\n");
 	jlog("\t*************************************************************\n");
       }
+    }
 
-    } else {
+   } else {
 
-      /* warning for batch decoding */
+    /* warning for batch decoding */
+    for(mfcc=recog->mfcclist; mfcc; mfcc=mfcc->next) {
       if (mfcc->para->cmn || mfcc->para->cvn) {
 	jlog("Notice for feature extraction (%02d),\n", mfcc->id);
 	jlog("\t*************************************************************\n");
@@ -1032,10 +1035,12 @@
 	}
 	jlog("\t*************************************************************\n");
       }
-
     }
 
+   }
+
   }
+
 }
 
 /* end of file */
Index: julius4/libjulius/src/plugin.c
diff -u julius4/libjulius/src/plugin.c:1.8 julius4/libjulius/src/plugin.c:1.9
--- julius4/libjulius/src/plugin.c:1.8	Fri Jun 21 02:14:20 2013
+++ julius4/libjulius/src/plugin.c	Thu Dec  5 14:41:04 2013
@@ -12,7 +12,7 @@
  * @author Akinobu Lee
  * @date   Sat Aug  2 09:46:09 2008
  * 
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
  * 
  */
 /*
@@ -81,6 +81,8 @@
   PLUGIN_ENTRY *p, *ptmp;
   int i, num;
 
+  if (global_plugin_list == NULL) return;
+
   num = plugin_namelist_num();
   for(i=0;i<num;i++) {
     p = global_plugin_list[i];
@@ -91,6 +93,7 @@
     }
   }
   free(global_plugin_list);
+  global_plugin_list = NULL;
 }    
 
 
@@ -98,6 +101,7 @@
 plugin_get_id(char *name)
 {
   int i, num;
+
   num = plugin_namelist_num();
   for(i=0;i<num;i++) {
     if (strmatch(plugin_function_namelist[i], name)) {
@@ -336,8 +340,9 @@
   PLUGIN_ENTRY *p;
   FUNC_VOID func;
 
-  if ((id = plugin_get_id(optfuncname)) < 0) return -1;
+  if (global_plugin_list == NULL) return -1;
 
+  if ((id = plugin_get_id(optfuncname)) < 0) return -1;
   for(p=global_plugin_list[id];p;p=p->next) {
     func = (FUNC_VOID) p->func;
     (*func)(buf, (int)64);
@@ -355,6 +360,8 @@
   PLUGIN_ENTRY *p;
   FUNC_VOID func;
 
+  if (global_plugin_list == NULL) return NULL;
+
   if ((id = plugin_get_id(name)) < 0) return NULL;
 
   for(p=global_plugin_list[id];p;p=p->next) {



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