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

Back to archive index

sumom****@users***** sumom****@users*****
2008年 9月 25日 (木) 13:22:58 JST


Index: julius4/libjulius/src/default.c
diff -u julius4/libjulius/src/default.c:1.6 julius4/libjulius/src/default.c:1.7
--- julius4/libjulius/src/default.c:1.6	Thu Sep 25 01:17:17 2008
+++ julius4/libjulius/src/default.c	Thu Sep 25 13:22:58 2008
@@ -17,7 +17,7 @@
  * @author Akinobu Lee
  * @date   Fri Feb 16 15:05:43 2007
  *
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
  * 
  */
 /*
@@ -96,7 +96,7 @@
   j->decodeopt.force_realtime_flag	= FALSE;
   j->decodeopt.segment			= FALSE;
 
-  j->optsection				= JCONF_OPT_GLOBAL;
+  j->optsection				= JCONF_OPT_DEFAULT;
   j->optsectioning			= TRUE;
 }
 
Index: julius4/libjulius/src/m_options.c
diff -u julius4/libjulius/src/m_options.c:1.13 julius4/libjulius/src/m_options.c:1.14
--- julius4/libjulius/src/m_options.c:1.13	Thu Sep 25 01:17:17 2008
+++ julius4/libjulius/src/m_options.c	Thu Sep 25 13:22:58 2008
@@ -18,7 +18,7 @@
  * @author Akinobu Lee
  * @date   Thu May 12 18:52:07 2005
  *
- * $Revision: 1.13 $
+ * $Revision: 1.14 $
  * 
  */
 /*
@@ -105,7 +105,7 @@
 
   if (jconf->optsection == sec) return TRUE;
 
-  if (jconf->optsection == JCONF_OPT_GLOBAL) return TRUE;
+  if (jconf->optsection == JCONF_OPT_DEFAULT) return TRUE;
 
   switch(sec) {
   case JCONF_OPT_GLOBAL:
@@ -118,6 +118,8 @@
     jlog("ERROR: \"%s\" is SR (search) option", optname); break;
   }
   switch(jconf->optsection) {
+  case JCONF_OPT_GLOBAL:
+    jlog(", but exists at global section (-GLOBAL)\n"); break;
   case JCONF_OPT_AM:
     jlog(", but exists at AM section (-AM \"%s\")\n", jconf->amnow->name); break;
   case JCONF_OPT_LM:
@@ -290,6 +292,9 @@
       jconf->searchnow = sconf;
       jconf->optsection = JCONF_OPT_SR;
       continue;
+    } else if (strmatch(argv[i],"-GLOBAL")) {
+      jconf->optsection = JCONF_OPT_GLOBAL;
+      continue;
     } else if (strmatch(argv[i],"-sectioncheck")) { /* enable section check */
       jconf->optsectioning = TRUE;
       continue;
Index: julius4/libjulius/src/m_usage.c
diff -u julius4/libjulius/src/m_usage.c:1.9 julius4/libjulius/src/m_usage.c:1.10
--- julius4/libjulius/src/m_usage.c:1.9	Thu Sep 25 01:17:17 2008
+++ julius4/libjulius/src/m_usage.c	Thu Sep 25 13:22:58 2008
@@ -12,7 +12,7 @@
  * @author Akinobu Lee
  * @date   Fri May 13 15:04:34 2005
  *
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
  * 
  */
 /*
@@ -134,6 +134,7 @@
   fprintf(fp, "    [-LM]               start a new language model instance\n");
   fprintf(fp, "    [-SR]               start a new recognizer (search) instance\n");
   fprintf(fp, "    [-AM_GMM]           start an AM feature instance for GMM\n");
+  fprintf(fp, "    [-GLOBAL]           start a global section\n");
   fprintf(fp, "    [-nosectioncheck]   disable option location check\n");
   fprintf(fp, "\n--- Acoustic Model Options (-AM) ---------------------------------\n");
 


Julius-cvs メーリングリストの案内
Back to archive index