hfe: Use MasterTrack for generating track for writeout.

Gets rid of (buggy) Flux.from_bitarray().

scripts/greaseweazle/flux.py

@@ -27,22 +27,6 @@ class Flux:
     def flux_for_writeout(self):
         return self
 
-
-    @classmethod
-    def from_bitarray(cls, bitarray, bitrate, timing=None):
-        if not timing:
-            timing = [1000] * len(bitarray)
-        timing_i = iter(timing)
-        flux_list = []
-        count = 0
-        for bit in bitarray:
-            count += next(timing_i)
-            if bit:
-                flux_list.append(count)
-                count = 0
-        flux_list[0] += count
-        return Flux([sum(flux_list)], flux_list, bitrate * 1000)
-
  
 # Local variables:
 # python-indent: 4

scripts/greaseweazle/image/hfe.py

@@ -8,7 +8,7 @@
 import struct
 
 from greaseweazle import error
-from greaseweazle.flux import Flux
+from greaseweazle.track import MasterTrack
 from greaseweazle.bitcell import Bitcell
 from bitarray import bitarray
 
@@ -70,8 +70,10 @@ class HFE:
         bitlen, rawbytes = self.track_list[off]
         tdat = bitarray(endian='little')
         tdat.frombytes(rawbytes)
-        tdat = tdat[:bitlen]
-        return Flux.from_bitarray(tdat, self.bitrate * 2000)
+        track = MasterTrack(
+            bits = tdat[:bitlen],
+            time_per_rev = bitlen / (2000*self.bitrate))
+        return track
 
 
     def append_track(self, flux):