tictacsync 0.3a2__py3-none-any.whl → 0.3a3__py3-none-any.whl

tictacsync/entry.py

@@ -126,10 +126,10 @@ def main():
     # logger.add(sys.stdout, filter="__main__")
     # logger.add(sys.stdout, filter="device_scanner")
     # logger.add(sys.stdout, filter="yaltc") _extract_sound_to_merge
-    # logger.add(sys.stdout, filter=lambda r: r["function"] == "build_audio_and_write_video")
+    logger.add(sys.stdout, filter=lambda r: r["function"] == "build_audio_and_write_video")
     # logger.add(sys.stdout, filter=lambda r: r["function"] == "_get_audio_devices")
-    # logger.add(sys.stdout, filter=lambda r: r["function"] == "_get_mix")
-    # logger.add(sys.stdout, filter=lambda r: r["function"] == "_sox_mix")
+    logger.add(sys.stdout, filter=lambda r: r["function"] == "_get_mix")
+    logger.add(sys.stdout, filter=lambda r: r["function"] == "_sox_mix")
     top_dir = args.directory[0]
     if os.path.isfile(top_dir):
         file = top_dir

tictacsync/timeline.py

@@ -581,34 +581,37 @@ class AudioStitcherVideoMerger:
         tracks. If not, mix all the tracks with sox.
 
         """
-        if device.tracks != None:
-            mix_tracks = device.tracks.mix
-            if len(mix_tracks) > 0:
-                logger.debug('%s has mix %s'%(device.name, mix_tracks))
-                logger.debug('device %s'%device)
-                if 'ttc' in device.tracks.rawtrx:
-                    sox_TTC_chan = device.tracks.rawtrx.index('ttc')
-                elif 'tc' in device.tracks.rawtrx:
-                    sox_TTC_chan = device.tracks.rawtrx.index('tc')
-                else:
-                    print('Error: no tc or ttc tag in track.txt')
-                    sys.exit(1)
-                sox_TTC_chan += 1 # sox NZBIDX
-                logger.debug('TTC chan %i'%sox_TTC_chan)
-                # redo indexing since tracks.txt numbers refere to complete
-                # files and here audio file had TTC and muted channels
-                # removed.
-                shift = 0
-                if mix_tracks[0] > sox_TTC_chan:
-                    shift += 1
-                for unused_tr in device.tracks.unused:
-                    if mix_tracks[0] > unused_tr:
-                        shift += 1
-                mix_tracks = [t-shift for t in mix_tracks]
-                logger.debug('new mix_tracks: %s'%mix_tracks)
-                return _sox_keep(multichan_tmpfl, mix_tracks)
-        else: # no tracks declaration, mix programmatically
+        if device.tracks is None:
+            logger.debug('no tracks.txt, mixing all')
+            return _sox_mix(_split_channels(multichan_tmpfl))
+        mix_tracks = device.tracks.mix
+        if mix_tracks == []:
+            logger.debug('tracks.txt present but no mix trx, mixing all')
             return _sox_mix(_split_channels(multichan_tmpfl))
+        logger.debug('%s has mix %s'%(device.name, mix_tracks))
+        logger.debug('device %s'%device)
+        if 'ttc' in device.tracks.rawtrx:
+            sox_TTC_chan = device.tracks.rawtrx.index('ttc')
+        elif 'tc' in device.tracks.rawtrx:
+            sox_TTC_chan = device.tracks.rawtrx.index('tc')
+        else:
+            print('Error: no tc or ttc tag in track.txt')
+            sys.exit(1)
+        sox_TTC_chan += 1 # sox NZBIDX
+        logger.debug('TTC chan %i'%sox_TTC_chan)
+        # redo indexing since tracks.txt numbers refere to complete
+        # files and here audio file had TTC and muted channels
+        # removed.
+        shift = 0
+        if mix_tracks[0] > sox_TTC_chan:
+            shift += 1
+        for unused_tr in device.tracks.unused:
+            if mix_tracks[0] > unused_tr:
+                shift += 1
+        mix_tracks = [t-shift for t in mix_tracks]
+        logger.debug('new mix_tracks: %s'%mix_tracks)
+        return _sox_keep(multichan_tmpfl, mix_tracks)
+            
 
     def build_audio_and_write_video(self, top_dir, output_dir,
                                     write_multicam_structure,

{tictacsync-0.3a2.dist-info → tictacsync-0.3a3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tictacsync
-Version: 0.3a2
+Version: 0.3a3
 Summary: command for syncing audio video recordings
 Home-page: https://tictacsync.org/
 Author: Raymond Lutz

{tictacsync-0.3a2.dist-info → tictacsync-0.3a3.dist-info}/RECORD

@@ -1,15 +1,15 @@
 tictacsync/LTCcheck.py,sha256=IEfpB_ZajWuRTWtqji0H-B2g7GQvWmGVjfT0Icumv7o,15704
 tictacsync/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tictacsync/device_scanner.py,sha256=-m2gd0XWXyJLNWfpLc_XQbMwFfNLJ4y3AmI4abz85W4,27558
-tictacsync/entry.py,sha256=ptE6Vf1SeAg-Bc8-O3Ni8KnZhU6LtAHYHZqCHMsPt98,11391
+tictacsync/entry.py,sha256=zyF8alGtJ57fmKm-_w1eCZber-T9VmeuKFL6yRyRofM,11385
 tictacsync/multi2polywav.py,sha256=Zl5EP2Yf-PKiZ8ewRSwqWsDULvKKjeWANK_-Yd5RAg4,7279
 tictacsync/remergemix.py,sha256=BUtZ8YHw5Oz8VseTD-A4imNbtF7h391pw5yyl6v6OG4,4885
 tictacsync/synciso.py,sha256=XmUcdUF9rl4VdCm7XW4PeYWYWM0vgAY9dC2hapoul9g,4821
-tictacsync/timeline.py,sha256=XVFnvxzM6uZmsWjhsl6Yadjp7M7YwUqy0xcXitmx63s,45977
+tictacsync/timeline.py,sha256=Qy37vFmFsGDSVpEio3ts_TmGeD96868qfioIevhp92U,45925
 tictacsync/yaltc.py,sha256=eGCDzp5aTF4zqFN4wNfiESXRnaHEXtQB-u13gYBf8g8,76810
-tictacsync-0.3a2.dist-info/LICENSE,sha256=ZAOPXLh1zlQAnhHUd7oLslKM01YZ5UiAu3STYjwIxck,1068
-tictacsync-0.3a2.dist-info/METADATA,sha256=NB4_AB8eD5SLW6vNcNHsu1PCHWdwIez2lcXW5KNeO4Y,5298
-tictacsync-0.3a2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-tictacsync-0.3a2.dist-info/entry_points.txt,sha256=g3tdFFrVRcrKpuyKOCLUVBMgYfV65q9kpLZUOD_XCKg,139
-tictacsync-0.3a2.dist-info/top_level.txt,sha256=eaCWG-BsYTRR-gLTJbK4RfcaXajr0gjQ6wG97MkGRrg,11
-tictacsync-0.3a2.dist-info/RECORD,,
+tictacsync-0.3a3.dist-info/LICENSE,sha256=ZAOPXLh1zlQAnhHUd7oLslKM01YZ5UiAu3STYjwIxck,1068
+tictacsync-0.3a3.dist-info/METADATA,sha256=RLwLKCbmVfO1A1dBZL-wdF9I4nHk2km0c5j05N9mTIY,5298
+tictacsync-0.3a3.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+tictacsync-0.3a3.dist-info/entry_points.txt,sha256=g3tdFFrVRcrKpuyKOCLUVBMgYfV65q9kpLZUOD_XCKg,139
+tictacsync-0.3a3.dist-info/top_level.txt,sha256=eaCWG-BsYTRR-gLTJbK4RfcaXajr0gjQ6wG97MkGRrg,11
+tictacsync-0.3a3.dist-info/RECORD,,