Merge branch 'ms-audio-path' into ms-2020-experiment

ms-2020-experiment
Mooneer Salem 2022-04-25 00:48:05 -07:00
commit 75190e1a80
5 changed files with 17 additions and 6 deletions

View File

@ -33,9 +33,15 @@ jobs:
- name: Build freedv-gui using PortAudio
shell: bash
working-directory: ${{github.workspace}}
run: ./build_linux.sh portaudio
run: UT_ENABLE=1 ./build_linux.sh portaudio
- name: Build freedv-gui using PulseAudio
shell: bash
working-directory: ${{github.workspace}}
run: ./build_linux.sh pulseaudio
run: UT_ENABLE=1 ./build_linux.sh pulseaudio
- name: Execute unit tests
shell: bash
working-directory: ${{github.workspace}}/build_linux
run: make test

View File

@ -7,6 +7,8 @@
# Echo what you are doing, and fail if any of the steps fail:
set -x -e
UT_ENABLE=${UT_ENABLE:-0}
# Allow building of either PulseAudio or PortAudio variants
FREEDV_VARIANT=${1:-portaudio}
if [[ "$FREEDV_VARIANT" != "portaudio" && "$FREEDV_VARIANT" != "pulseaudio" ]]; then
@ -57,5 +59,5 @@ mkdir -p build_linux && cd build_linux && rm -Rf *
if [[ "$FREEDV_VARIANT" == "pulseaudio" ]]; then
PULSEAUDIO_PARAM="-DUSE_PULSEAUDIO=1"
fi
cmake $PULSEAUDIO_PARAM -DCMAKE_BUILD_TYPE=Debug -DCODEC2_BUILD_DIR=$CODEC2DIR/build_linux -DLPCNET_BUILD_DIR=$LPCNETDIR/build_linux ..
cmake $PULSEAUDIO_PARAM -DUNITTEST=$UT_ENABLE -DCMAKE_BUILD_TYPE=Debug -DCODEC2_BUILD_DIR=$CODEC2DIR/build_linux -DLPCNET_BUILD_DIR=$LPCNETDIR/build_linux ..
make VERBOSE=1

View File

@ -10,7 +10,7 @@ export LPCNETDIR=$FREEDVGUIDIR/LPCNet
export HAMLIBDIR=$FREEDVGUIDIR/hamlib
export CODEC2_BRANCH=master
export LPCNET_BRANCH=master
export UT_ENABLE=1
export UT_ENABLE=${UT_ENABLE:-0}
# Prerequisite: build dylibbundler
if [ ! -d macdylibbundler ]; then

View File

@ -9,6 +9,8 @@
# $ CMAKE=mingw32-cmake ./build_windows.sh
: ${CMAKE=mingw64-cmake}
UT_ENABLE=${UT_ENABLE:-0}
if [ $CMAKE = "mingw64-cmake" ]; then
BUILD_DIR=build_win64
else
@ -51,10 +53,10 @@ if [ $BOOTSTRAP_WX -eq 1 ]; then
make VERBOSE=1
# build freedv-gui
$CMAKE -DBOOTSTRAP_WXWIDGETS=1 -DCMAKE_BUILD_TYPE=Debug -DCODEC2_BUILD_DIR=$CODEC2DIR/$BUILD_DIR -DLPCNET_BUILD_DIR=$LPCNETDIR/$BUILD_DIR ..
$CMAKE -DBOOTSTRAP_WXWIDGETS=1 -DUNITTEST=$UT_ENABLE -DCMAKE_BUILD_TYPE=Debug -DCODEC2_BUILD_DIR=$CODEC2DIR/$BUILD_DIR -DLPCNET_BUILD_DIR=$LPCNETDIR/$BUILD_DIR ..
make VERBOSE=1
else
# build freedv-gui
$CMAKE -DCMAKE_BUILD_TYPE=Debug -DCODEC2_BUILD_DIR=$CODEC2DIR/$BUILD_DIR -DLPCNET_BUILD_DIR=$LPCNETDIR/$BUILD_DIR ..
$CMAKE -DCMAKE_BUILD_TYPE=Debug -DUNITTEST=$UT_ENABLE -DCODEC2_BUILD_DIR=$CODEC2DIR/$BUILD_DIR -DLPCNET_BUILD_DIR=$LPCNETDIR/$BUILD_DIR ..
make VERBOSE=1
fi

View File

@ -24,6 +24,7 @@
#include <algorithm>
#include <assert.h>
#include <cstdio>
// returns number of output samples generated by resampling
// TBD -- remove identical version from util.cpp.