EST_item_aux.cc (speech_tools-2.4-release) | : | EST_item_aux.cc (speech_tools-2.5.0-release) | ||
---|---|---|---|---|
skipping to change at line 62 | skipping to change at line 62 | |||
float start(const EST_Item &item) | float start(const EST_Item &item) | |||
{ | { | |||
float v=0; | float v=0; | |||
EST_feat_status status=efs_ok; | EST_feat_status status=efs_ok; | |||
EST_Item * pp; | EST_Item * pp; | |||
v = getFloat(item, "start", -1.0, status); | v = getFloat(item, "start", -1.0, status); | |||
if (v<0.0) | if (v<0.0) | |||
{ | { | |||
if ((pp = item.prev()) != NULL) | if ((pp = iprev(&item)) != NULL) | |||
v = getFloat(*pp, "end", -1.0, status); | v = getFloat(*pp, "end", -1.0, status); | |||
} | } | |||
return v; | return v; | |||
} | } | |||
float mid(const EST_Item &item) | float mid(const EST_Item &item) | |||
{ | { | |||
float v = 0; | float v = 0; | |||
EST_feat_status status=efs_ok; | EST_feat_status status=efs_ok; | |||
skipping to change at line 106 | skipping to change at line 106 | |||
float end(const EST_Item &item) | float end(const EST_Item &item) | |||
{ | { | |||
float v=0; | float v=0; | |||
EST_feat_status status=efs_ok; | EST_feat_status status=efs_ok; | |||
EST_Item * nn; | EST_Item * nn; | |||
v = getFloat(item, "end", -1.0, status); | v = getFloat(item, "end", -1.0, status); | |||
if (v < 0.0) | if (v < 0.0) | |||
{ | { | |||
if ((nn = item.next()) != NULL) | if ((nn = inext(&item)) != NULL) | |||
v = getFloat(*nn, "start", -1.0, status); | v = getFloat(*nn, "start", -1.0, status); | |||
} | } | |||
return v; | return v; | |||
} | } | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added |