Sync upstream. Improved windows and macos backends.

LXST/Codecs/libs/pydub/utils.py

@@ -167,7 +167,7 @@ def get_encoder_name():
         return "ffmpeg"
     else:
         # should raise exception
-        warn("Couldn't find ffmpeg or avconv - defaulting to ffmpeg, but may not work", RuntimeWarning)
+        # warn("Couldn't find ffmpeg or avconv - defaulting to ffmpeg, but may not work", RuntimeWarning)
         return "ffmpeg"
 
 

LXST/Sinks.py

@@ -156,7 +156,10 @@ class LineSink(LocalSink):
 
     def __digest_job(self):
         with self.digest_lock:
-            with self.backend.get_player(samples_per_frame=self.samples_per_frame) as player:
+            if not RNS.vendor.platformutils.is_darwin(): backend_samples_per_frame = self.samples_per_frame
+            else: backend_samples_per_frame = None
+
+            with self.backend.get_player(samples_per_frame=backend_samples_per_frame) as player:
                 while self.should_run:
                     frames_ready = len(self.frame_deque)
                     if frames_ready:

LXST/Sources.py

@@ -214,7 +214,10 @@ class LineSource(LocalSource):
     def __ingest_job(self):
         with self.recording_lock:
             frame_samples = None
-            with self.backend.get_recorder(samples_per_frame=self.samples_per_frame) as recorder:
+            if not RNS.vendor.platformutils.is_darwin(): backend_samples_per_frame = self.samples_per_frame
+            else: backend_samples_per_frame = None
+
+            with self.backend.get_recorder(samples_per_frame=backend_samples_per_frame) as recorder:
                 while self.should_run:
                     frame_samples = recorder.record(numframes=self.samples_per_frame)
                     if self.codec:

LXST/Utilities/rnphone.py

@@ -789,9 +789,14 @@ WantedBy=graphical.target
 """
 
 class Terminal():
-    UNDERLINE = "\033[4m"
-    BOLD = "\033[1m"
-    END = "\033[0m"
+    if not RNS.vendor.platformutils.is_windows():
+        UNDERLINE = "\033[4m"
+        BOLD = "\033[1m"
+        END = "\033[0m"
+    else:
+        UNDERLINE = ""
+        BOLD = ""
+        END = ""
 
 if __name__ == "__main__":
     main()

setup.py

@@ -40,7 +40,7 @@ setuptools.setup(
             'rnphone=LXST.Utilities.rnphone:main',
         ]
     },
-    install_requires=["rns>=0.9.2",
+    install_requires=["rns>=0.9.3",
                       "soundcard",
                       "numpy",
                       "pycodec2",