← Back to branch summary

~ubuntu-branches/ubuntu/saucy/speech-tools/saucy-proposed

« back to all changes in this revision

Viewing changes to speech_class/EST_Track.cc

  • Committer: Bazaar Package Importer
  • Author(s): Kumar Appaiah
  • Date: 2011-02-16 20:53:04 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20110216205304-8ddwyufsq8qqxg8z
Tags: 1:2.1~release-1
* New upstream release
* Bump soname; shlibs etc. updated
* Update patches and rules file to handle symlinks with just x.y
  versioning as opposed to x.y.z by appropriately ignoring the absence
  of the minor version number. Also fix major version detection in
  debian/get_version.sh.
* Update watch file to handle "release" in version number

Show diffs side-by-side

added added

removed removed

Lines of Context:
speech_class/EST_Track.cc
244
244
    EST_String b, type, first, last;
245
245
    int n_f, n_l;
246
246
 
247
 
    for (p = channel_map.head(); p; p = next(p))
 
247
    for (p = channel_map.head(); p; p = p->next())
248
248
    {
249
249
        b = channel_map(p);
250
250
        if (b.matches("$", 0))
297
297
    p_channel_names.resize(new_num_channels);
298
298
    // this ensures the new channels have a default name
299
299
 
300
 
    for (i = 0, p = x.head(); p ; p = next(p), ++i)
 
300
    for (i = 0, p = x.head(); p ; p = p->next(), ++i)
301
301
        set_channel_name(x(p), i);
302
302
 
303
303
    p_values.resize(new_num_frames, new_num_channels, set);
319
319
    p_aux_names.resize(new_num_channels);
320
320
 
321
321
    // this ensures the new channels have a default name
322
 
    for (i = 0, p = new_aux_channels.head(); p ; p = next(p), ++i)
 
322
    for (i = 0, p = new_aux_channels.head(); p ; p = p->next(), ++i)
323
323
        set_aux_channel_name(new_aux_channels(p), i);
324
324
 
325
325
    p_aux.resize(num_frames(), new_num_channels, set);