tictacsync 0.3a1__tar.gz → 0.3a3__tar.gz

{tictacsync-0.3a1/tictacsync.egg-info → tictacsync-0.3a3}/PKG-INFO

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

{tictacsync-0.3a1 → tictacsync-0.3a3}/setup.py

@@ -31,7 +31,7 @@ setup(
         'multi2polywav = tictacsync.multi2polywav:main',
         ]
         },
-    version = '0.3a1',
+    version = '0.3a3',
     description = "command for syncing audio video recordings",
     long_description_content_type='text/markdown',
     long_description = long_descr,

{tictacsync-0.3a1 → tictacsync-0.3a3}/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-0.3a1 → tictacsync-0.3a3}/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
-                return _sox_mix(_split_channels(multichan_tmpfl))
+        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,
@@ -687,7 +690,8 @@ class AudioStitcherVideoMerger:
         mixes = [self._get_mix(device, multi_chan_audio)
                 for device, multi_chan_audio
                 in merged_audio_files_by_device]
-        logger.debug('thera are %i dev mixes'%len(mixes))
+        logger.debug('there are %i dev mixes'%len(mixes))
+        logger.debug('mixes %s'%mixes)
         dev_mixes_mix = _sox_mix(mixes)
         # dev_mixes_mix = _sox_combine([audio for _, audio
         #         in merged_audio_files_by_device]) # all devices

{tictacsync-0.3a1 → tictacsync-0.3a3/tictacsync.egg-info}/PKG-INFO

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