From 05290ae5ba85093d65ad998747a65b6b61eb959b Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Fri, 21 Apr 2023 14:26:07 +0200 Subject: [PATCH] adjusted ctests to new codec2 module structure --- test/util_callback_multimode_rx.py | 6 +++--- test/util_callback_multimode_rx_outside.py | 6 +++--- test/util_callback_multimode_tx.py | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/util_callback_multimode_rx.py b/test/util_callback_multimode_rx.py index 248c056c..573c8a6d 100644 --- a/test/util_callback_multimode_rx.py +++ b/test/util_callback_multimode_rx.py @@ -113,7 +113,7 @@ class Test: # open codec2 instance self.datac0_freedv = ctypes.cast( - codec2.api.freedv_open(codec2.api.FREEDV_MODE_DATAC0), ctypes.c_void_p + codec2.api.freedv_open(codec2.FREEDV_MODE.datac0.value), ctypes.c_void_p ) self.datac0_bytes_per_frame = int( codec2.api.freedv_get_bits_per_modem_frame(self.datac0_freedv) / 8 @@ -125,7 +125,7 @@ class Test: self.datac0_buffer = codec2.audio_buffer(2 * self.AUDIO_FRAMES_PER_BUFFER) self.datac1_freedv = ctypes.cast( - codec2.api.freedv_open(codec2.api.FREEDV_MODE_DATAC1), ctypes.c_void_p + codec2.api.freedv_open(codec2.FREEDV_MODE.datac1.value), ctypes.c_void_p ) self.datac1_bytes_per_frame = int( codec2.api.freedv_get_bits_per_modem_frame(self.datac1_freedv) / 8 @@ -137,7 +137,7 @@ class Test: self.datac1_buffer = codec2.audio_buffer(2 * self.AUDIO_FRAMES_PER_BUFFER) self.datac3_freedv = ctypes.cast( - codec2.api.freedv_open(codec2.api.FREEDV_MODE_DATAC3), ctypes.c_void_p + codec2.api.freedv_open(codec2.FREEDV_MODE.datac3.value), ctypes.c_void_p ) self.datac3_bytes_per_frame = int( codec2.api.freedv_get_bits_per_modem_frame(self.datac3_freedv) / 8 diff --git a/test/util_callback_multimode_rx_outside.py b/test/util_callback_multimode_rx_outside.py index decedefe..9c9d8b3a 100644 --- a/test/util_callback_multimode_rx_outside.py +++ b/test/util_callback_multimode_rx_outside.py @@ -111,7 +111,7 @@ class Test: # open codec2 instance self.datac0_freedv = ctypes.cast( - codec2.api.freedv_open(codec2.api.FREEDV_MODE_DATAC0), ctypes.c_void_p + codec2.api.freedv_open(codec2.FREEDV_MODE.datac0.value), ctypes.c_void_p ) self.datac0_bytes_per_frame = int( codec2.api.freedv_get_bits_per_modem_frame(self.datac0_freedv) / 8 @@ -123,7 +123,7 @@ class Test: self.datac0_buffer = codec2.audio_buffer(2 * self.AUDIO_FRAMES_PER_BUFFER) self.datac1_freedv = ctypes.cast( - codec2.api.freedv_open(codec2.api.FREEDV_MODE_DATAC1), ctypes.c_void_p + codec2.api.freedv_open(codec2.FREEDV_MODE.datac1.value), ctypes.c_void_p ) self.datac1_bytes_per_frame = int( codec2.api.freedv_get_bits_per_modem_frame(self.datac1_freedv) / 8 @@ -135,7 +135,7 @@ class Test: self.datac1_buffer = codec2.audio_buffer(2 * self.AUDIO_FRAMES_PER_BUFFER) self.datac3_freedv = ctypes.cast( - codec2.api.freedv_open(codec2.api.FREEDV_MODE_DATAC3), ctypes.c_void_p + codec2.api.freedv_open(codec2.FREEDV_MODE.datac3.value), ctypes.c_void_p ) self.datac3_bytes_per_frame = int( codec2.api.freedv_get_bits_per_modem_frame(self.datac3_freedv) / 8 diff --git a/test/util_callback_multimode_tx.py b/test/util_callback_multimode_tx.py index 89eee0ae..1e33930b 100644 --- a/test/util_callback_multimode_tx.py +++ b/test/util_callback_multimode_tx.py @@ -158,9 +158,9 @@ class Test: def create_modulation(self): modes = [ - codec2.api.FREEDV_MODE_DATAC0, - codec2.api.FREEDV_MODE_DATAC1, - codec2.api.FREEDV_MODE_DATAC3, + codec2.FREEDV_MODE.datac0.value, + codec2.FREEDV_MODE.datac1.value, + codec2.FREEDV_MODE.datac3.value, ] for m in modes: