"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "ling_class/standard_feature_functions.cc" between
speech_tools-2.4-release.tar.gz and speech_tools-2.5.0-release.tar.gz

About: The speech_tools - Edinburgh Speech Tools Library (used by the Festival Speech Synthesis System).

standard_feature_functions.cc  (speech_tools-2.4-release):standard_feature_functions.cc  (speech_tools-2.5.0-release)
skipping to change at line 50 skipping to change at line 50
/* */ /* */
/*************************************************************************/ /*************************************************************************/
#include "ling_class/EST_Item.h" #include "ling_class/EST_Item.h"
#include "ling_class/EST_Relation.h" #include "ling_class/EST_Relation.h"
#include "ling_class/EST_Item_Content.h" #include "ling_class/EST_Item_Content.h"
#include "ling_class/EST_item_aux.h" #include "ling_class/EST_item_aux.h"
EST_Val ff_duration(EST_Item *s) EST_Val ff_duration(EST_Item *s)
{ {
if (s->prev()) if (iprev(s))
return s->F("end")-s->prev()->F("end"); return s->F("end")-iprev(s)->F("end");
else else
return s->F("end"); return s->F("end");
} }
EST_Val ff_start(EST_Item *s) EST_Val ff_start(EST_Item *s)
{ {
/* Changed by awb 12/07/05, to make this actually a generic function */ /* Changed by awb 12/07/05, to make this actually a generic function */
/* no longer changes relation view to Segment -- may affect tilt and */ /* no longer changes relation view to Segment -- may affect tilt and */
/* other pault things */ /* other pault things */
return (s->prev() == 0) ? 0.0 : s->prev()->F("end"); return (iprev(s) == 0) ? 0.0 : iprev(s)->F("end");
} }
EST_Val ff_tilt_phrase_position(EST_Item *s) EST_Val ff_tilt_phrase_position(EST_Item *s)
{ {
EST_String rel_name = s->S("time_path"); EST_String rel_name = s->S("time_path");
EST_Item *t, *a; EST_Item *t, *a;
if ((t = s->as_relation(rel_name)) == 0) if ((t = s->as_relation(rel_name)) == 0)
{ {
cerr << "item: " << *s << endl; cerr << "item: " << *s << endl;
 End of changes. 2 change blocks. 
3 lines changed or deleted 3 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)