Upgrade to 0.4.5

Fixed the ADX API usage in the USM file, however it is not tested, it should work as long as the input is valid. Which is now limited to wav and not pure ADX as it used to be, this will be fixed in a planned overhaul.

Author: Youjose

PyCriCodecs/usm.py

@@ -454,14 +454,12 @@ def load_audio(self, audio):
         if self.audio_codec == "adx":
             if type(audio) == list:
                 for track in audio:
-                    adxObj = ADX(track)
-                    if adxObj.filetype == "wav":
-                        adxObj.encode(AdxVersion=4, Encoding=3, force_not_looping=True)
+                    wav_bytes = open(track, "rb").read()
+                    adxObj = ADX.encode(wav_bytes, AdxVersion=4, Encoding=3, force_not_looping=True)
                     self.streams.append(adxObj)
             else:
-                adxObj = ADX(audio)
-                if adxObj.filetype == "wav":
-                    adxObj.encode(AdxVersion=4, Encoding=3, force_not_looping=True)
+                wav_bytes = open(audio, "rb").read()
+                adxObj = ADX.encode(wav_bytes, AdxVersion=4, Encoding=3, force_not_looping=True)
                 self.streams.append(adxObj)
         elif self.audio_codec == "hca":
             if type(audio) == list:
@@ -481,9 +479,8 @@ def load_audio(self, audio):
     def append_stream(self, audio):
         assert type(audio) != list
         if self.audio_codec == "adx":
-            adxObj = ADX(audio)
-            if adxObj.filetype == "wav":
-                adxObj.encode(AdxVersion=4, Encoding=3, force_not_looping=True)
+            wav_bytes = open(audio, "rb").read()
+            adxObj = ADX.encode(wav_bytes, AdxVersion=4, Encoding=3, force_not_looping=True)
             self.streams.append(adxObj)
         elif self.audio_codec == "hca":
             hcaObj = HCA(audio, self.key)

setup.py

@@ -3,7 +3,7 @@
 
 setup(
     name="PyCriCodecs",
-    version="0.4.4",
+    version="0.4.5",
     description="Python frontend with a C++ backend of managing Criware files of all kinds.",
     packages=["PyCriCodecs"],
     ext_modules=[Extension('CriCodecs', ["CriCodecs\\CriCodecs.cpp"], include_dirs=[os.path.realpath("CriCodecs")])]