Explorar el Código

cmProc4.h/c: Fixed bug in _cmScValidateMarkers() that incorrectly tagged good fade markers and invalid.

master
kevin hace 11 años
padre
commit
2cba573163
Se han modificado 1 ficheros con 5 adiciones y 5 borrados
  1. 5
    5
      app/cmScore.c

+ 5
- 5
app/cmScore.c Ver fichero

@@ -1121,14 +1121,14 @@ cmScRC_t _cmScValidateMarkers( cmSc_t* p )
1121 1121
           break;
1122 1122
           
1123 1123
         case kFadeScMId:
1124
-          if((sl0p = _cmScFindMarkLoc(p,kRecdBegScMId, sm0p->labelSymId, NULL )) == NULL )
1125
-            rc = cmErrMsg(&p->err,kSyntaxErrScRC,"The 'fade' marker at CSV row index %i does not have an associated 'record begin' marker.",sm0p->csvRowIdx);
1124
+          if((sl0p = _cmScFindMarkLoc(p,kPlayBegScMId, sm0p->labelSymId, NULL )) == NULL )
1125
+            rc = cmErrMsg(&p->err,kSyntaxErrScRC,"The 'fade' marker at CSV row index %i does not have an associated 'play begin' marker.",sm0p->csvRowIdx);
1126 1126
           else
1127
-            if((sl1p = _cmScFindMarkLoc(p,kRecdEndScMId, sm0p->labelSymId, NULL )) == NULL )
1128
-              rc = cmErrMsg(&p->err,kSyntaxErrScRC,"The 'fade' marker at CSV row index %i does not have an associated 'record end' marker.",sm0p->csvRowIdx);
1127
+            if((sl1p = _cmScFindMarkLoc(p,kPlayEndScMId, sm0p->labelSymId, NULL )) == NULL )
1128
+              rc = cmErrMsg(&p->err,kSyntaxErrScRC,"The 'fade' marker at CSV row index %i does not have an associated 'play end' marker.",sm0p->csvRowIdx);
1129 1129
             else
1130 1130
               if( sl0p->index > p->loc[i].index || sl1p->index < p->loc[i].index )
1131
-                rc = cmErrMsg(&p->err,kSyntaxErrScRC,"The 'fade' marker at CSV row index %i is not between it's associated 'record begin' and 'record end' markers.",sm0p->csvRowIdx);
1131
+                rc = cmErrMsg(&p->err,kSyntaxErrScRC,"The 'fade' marker at CSV row index %i is not between it's associated 'play begin' and 'play end' markers.",sm0p->csvRowIdx);
1132 1132
           break;
1133 1133
           
1134 1134
         case kPlayBegScMId:

Loading…
Cancelar
Guardar