Returning 'formant-bandwidth' tuples in alignments annotations.

src/corpora/timit.jl

@@ -351,7 +351,7 @@ function timit_annotations(dir, formantsdir=nothing)
 
     for (root, subdirs, files) in walkdir(dir)
         for file in files
-            name, ext = splitext(file)
+            name, _ = splitext(file)
             _, dialect, spk = rsplit(root, "/", limit=3)
 
             # Annotation files already processed (".wrd" and ".phn")
@@ -373,15 +373,17 @@ function timit_annotations(dir, formantsdir=nothing)
             
             if isfile(forpath)
                 # Read availabled formants values  
-                palign = Tuple{Int,Int,String,NTuple{8, Float32}}[]
+                palign = Tuple{Int,Int,String,NTuple{2, Float32}, NTuple{2, Float32}, NTuple{2, Float32}, NTuple{2, Float32}}[]
                 for line in eachline(forpath)
                     t0, t1, p, f1, f2, f3, f4, b1, b2, b3, b4 = split(line)
                     push!(palign, 
                     (
                         parse(Int, t0), parse(Int, t1), String(p),
-                        (parse(Float32, f1), parse(Float32, f2), parse(Float32, f3), parse(Float32, f4),
-                        parse(Float32, b1), parse(Float32, b2), parse(Float32, b3), parse(Float32, b4)))
-                    )
+                        (parse(Float32, f1), parse(Float32, b1)), 
+                        (parse(Float32, f2), parse(Float32, b2)),
+                        (parse(Float32, f3), parse(Float32, b3)), 
+                        (parse(Float32, f4), parse(Float32, b4))
+                    ))
                 end
             else 
                 palign = Tuple{Int,Int,String}[]