Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updates #80

Merged
merged 15 commits into from
Dec 17, 2023
Merged
2 changes: 2 additions & 0 deletions .github/workflows/jni_libs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ jobs:
build-raspi-jni-artifact:
name: JNI Artifact Raspi Build
runs-on: ubuntu-22.04
if: |
false
permissions:
contents: write
steps:
Expand Down
4 changes: 4 additions & 0 deletions .localrun/Dockerfile_ub20
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,7 @@ RUN apt-get update && \
yasm \
openjdk-17-jdk-headless

RUN apt-get update && \
apt-get -y --force-yes install \
nasm \
sudo
4 changes: 4 additions & 0 deletions .localrun/docker_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ pkgs_Ubuntu_16_04="
gdb
nano
yasm
nasm
sudo
openjdk-8-jdk-headless
"

Expand All @@ -77,6 +79,8 @@ pkgs_Ubuntu_18_04="
gdb
nano
yasm
nasm
sudo
openjdk-17-jdk-headless
"

Expand Down
13 changes: 11 additions & 2 deletions .localrun/docker_linux_fast.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,17 @@ if [ "$1""x" == "localx" ]; then
../circle_scripts/deps_linux.sh local || exit 1
../circle_scripts/java_jni_lib_linux.sh local || exit 1
else
../circle_scripts/deps_linux.sh || exit 1
../circle_scripts/java_jni_lib_linux.sh || exit 1
WITHASAN=1
if [ "$WITHASAN""x" == "1x" ]; then
echo "*******ASAN*******"
echo "*******ASAN*******"
echo "*******ASAN*******"
../circle_scripts/deps_linux.sh "" asan || exit 1
../circle_scripts/java_jni_lib_linux.sh "" asan || exit 1
else
../circle_scripts/deps_linux.sh || exit 1
../circle_scripts/java_jni_lib_linux.sh || exit 1
fi
fi


Expand Down
12 changes: 12 additions & 0 deletions asan_run.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#! /bin/bash

p=$(pwd)
h=$(echo $HOME)

if [ "$1""x" == "buildx" ]; then
./gradlew -Dorg.gradle.java.home=/usr/lib/jvm/java-17-openjdk-amd64/ packageDistributionForCurrentOS
fi

LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libasan.so.6.0.0 \
/usr/lib/jvm/java-17-openjdk-amd64/bin/java -Dapple.awt.application.name=TRIfA \
-Dcom.apple.mrj.application.apple.menu.about.name=TRIfA -Dcompose.application.configure.swing.globals=true -Dcompose.application.resources.dir="$p"/build/compose/tmp/prepareAppResources -Dfile.encoding=UTF-8 -Duser.country=US -Duser.language=en -Duser.variant -cp "$p"/build/libs/trifa_material-1.0.5.jar:"$h"/.gradle/caches/modules-2/files-2.1/org.jetbrains.compose.desktop/desktop-jvm/1.6.0-dev1334/f640e39ac0a51a00f788a0cc8ac1107fdc9a528f/desktop-jvm-1.6.0-dev1334.jar:"$h"/.gradle/caches/modules-2/files-2.1/org.jetbrains.compose.material/material-desktop/1.6.0-dev1334/37f5fbfd7f792902ed6b5bf7f8ad0679b7770bba/material-desktop-1.6.0-dev1334.jar:"$h"/.gradle/caches/modules-2/files-2.1/org.jetbrains.compose.components/components-resources-desktop/1.6.0-dev1334/e26294014ef9b4fb8722df8a92b84fe88d70625/library-desktop-1.6.0-dev1334.jar:"$h"/.gradle/caches/modules-2/files-2.1/org.jetbrains.compose.material3/material3-desktop/1.6.0-dev1334/c4f78e20d9bea223397212b80145934dc9507f76/material3-desktop-1.6.0-dev1334.jar:"$h"/.gradle/caches/modules-2/files-2.1/org.jetbrains.compose.material/material-ripple-desktop/1.6.0-dev1334/73de6da196c34db3e71935baf37d6b6734eea6f6/material-ripple-desktop-1.6.0-dev1334.jar:"$h"/.gradle/caches/modules-2/files-2.1/org.jetbrains.compose.foundation/foundation-desktop/1.6.0-dev1334/f4098f54feb3fe99e67eab4d48cbd43241644152/foundation-desktop-1.6.0-dev1334.jar:"$h"/.gradle/caches/modules-2/files-2.1/org.jetbrains.compose.material/material-icons-extended-desktop/1.6.0-dev1334/20da10db08144f8020231ba2e48b4e1c34f913cd/material-icons-extended-desktop-1.6.0-dev1334.jar:"$h"/.gradle/caches/modules-2/files-2.1/io.github.alexzhirkevich/qrose-desktop/1.0.0-beta02/657a675d6ae17a8428eeb658312e8315d2df4364/qrose-desktop-1.0.0-beta02.jar:"$h"/.gradle/caches/modules-2/files-2.1/org.jetbrains.compose.animation/animation-desktop/1.6.0-dev1334/da5a9e417f2cc10cc9840e4b66fb3fa1f09daca2/animation-desktop-1.6.0-dev1334.jar:"$h"/.gradle/caches/modules-2/files-2.1/org.jetbrains.compose.foundation/foundation-layout-desktop/1.6.0-dev1334/312976986a73c70255570e5bfbc51847c0059baa/foundation-layout-desktop-1.6.0-dev1334.jar:"$h"/.gradle/caches/modules-2/files-2.1/org.jetbrains.compose.animation/animation-core-desktop/1.6.0-dev1334/19c476a09cc66652fe69b9064f3a77c894e188c3/animation-core-desktop-1.6.0-dev1334.jar:"$h"/.gradle/caches/modules-2/files-2.1/org.jetbrains.compose.material/material-icons-core-desktop/1.6.0-dev1334/30a5b7bdb98c19105b3bffb44f9d7591159e546c/material-icons-core-desktop-1.6.0-dev1334.jar:"$h"/.gradle/caches/modules-2/files-2.1/org.jetbrains.compose.ui/ui-desktop/1.6.0-dev1334/2a023641d0e2a58f50880b8cd78b74e95b1db14a/ui-desktop-1.6.0-dev1334.jar:"$h"/.gradle/caches/modules-2/files-2.1/org.jetbrains.compose.ui/ui-tooling-preview-desktop/1.6.0-dev1334/62232c44c61692b56d3071c29b0f9c8481b20574/ui-tooling-preview-desktop-1.6.0-dev1334.jar:"$h"/.gradle/caches/modules-2/files-2.1/org.jetbrains.compose.ui/ui-text-desktop/1.6.0-dev1334/b8a03a9467683f7aeedbcc969e2789292027a7f/ui-text-desktop-1.6.0-dev1334.jar:"$h"/.gradle/caches/modules-2/files-2.1/org.jetbrains.compose.runtime/runtime-saveable-desktop/1.6.0-dev1334/88cee67f1f9b135321745f0f470e0c3f2c456cbc/runtime-saveable-desktop-1.6.0-dev1334.jar:"$h"/.gradle/caches/modules-2/files-2.1/org.jetbrains.compose.ui/ui-graphics-desktop/1.6.0-dev1334/a775f10d95051b85eb468a5240495cfdaf483a67/ui-graphics-desktop-1.6.0-dev1334.jar:"$h"/.gradle/caches/modules-2/files-2.1/org.jetbrains.compose.ui/ui-unit-desktop/1.6.0-dev1334/73a81fa29b6859c388996d3a2865206756aedc1a/ui-unit-desktop-1.6.0-dev1334.jar:"$h"/.gradle/caches/modules-2/files-2.1/org.jetbrains.compose.ui/ui-geometry-desktop/1.6.0-dev1334/67678193a2f7e0cb1f8a899ae5de229bee3a30dc/ui-geometry-desktop-1.6.0-dev1334.jar:"$h"/.gradle/caches/modules-2/files-2.1/org.jetbrains.compose.runtime/runtime-desktop/1.6.0-dev1334/14406b2d2a9e7a32b8f0b733d0d0eb6674f36896/runtime-desktop-1.6.0-dev1334.jar:"$h"/.gradle/caches/modules-2/files-2.1/org.jetbrains.skiko/skiko-awt-runtime-linux-x64/0.7.89.1/3f65f421f9b64292a7a92c3823d65d4168f4af1e/skiko-awt-runtime-linux-x64-0.7.89.1.jar:"$h"/.gradle/caches/modules-2/files-2.1/org.jetbrains.skiko/skiko-awt/0.7.89.1/d0afd7b7c0c55b7e689d3c1ea0e0f6028d6b3d9a/skiko-awt-0.7.89.1.jar:"$h"/.gradle/caches/modules-2/files-2.1/ca.gosyer/kotlin-multiplatform-appdirs-jvm/1.1.1/a8b92433066050fc0c0840185fde18c741aab4ce/Kotlin-Multiplatform-AppDirs-jvm-1.1.0.jar:"$h"/.gradle/caches/modules-2/files-2.1/org.jetbrains.compose.ui/ui-util-desktop/1.6.0-dev1334/82fadb7456a2328ac783c2a3b93641fbfe416dde/ui-util-desktop-1.6.0-dev1334.jar:"$h"/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/atomicfu-jvm/0.23.1/a4601dc42dceb031a586058e8356ff778a57dea0/atomicfu-jvm-0.23.1.jar:"$h"/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.9.21/290a25c998941b1c904d2cef480fd56be7ae9d7/kotlin-stdlib-jdk8-1.9.21.jar:"$h"/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/1.8.0-RC/66f50b3d0f13b1fba29e99a06111626a962061fa/kotlinx-coroutines-core-jvm-1.8.0-RC.jar:"$h"/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.9.21/2d2c2b1d441e48ed37383e42f133339691436425/kotlin-stdlib-jdk7-1.9.21.jar:"$h"/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-datetime-jvm/0.5.0/8882b30187d18d2dcb5e22587447485e6f42dfb3/kotlinx-datetime-jvm-0.5.0.jar:"$h"/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.9.21/17ee3e873d439566c7d8354403b5f3d9744c4c9c/kotlin-stdlib-1.9.21.jar:"$h"/.gradle/caches/modules-2/files-2.1/org.xerial/sqlite-jdbc/3.44.1.0/12e6182deef32d366ade664aa33bec9f4dd3ffe/sqlite-jdbc-3.44.1.0.jar:"$h"/.gradle/caches/modules-2/files-2.1/com.sksamuel.scrimage/scrimage-webp/4.1.1/9452b5920cb0536b5dfc9adddf4ed0af1ce25c31/scrimage-webp-4.1.1.jar:"$h"/.gradle/caches/modules-2/files-2.1/com.sksamuel.scrimage/scrimage-core/4.1.1/33b6fa2cc5d6d872f8de4d93528d978aeb3416d7/scrimage-core-4.1.1.jar:"$h"/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.10.1/b3add478d4382b78ea20b1671390a858002feb6c/gson-2.10.1.jar:"$h"/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/23.0.0/8cc20c07506ec18e0834947b84a864bfc094484e/annotations-23.0.0.jar:"$h"/.gradle/caches/modules-2/files-2.1/com.github.zh79325/open-gif/1.0.4/a52a4183dae721cb69dd1fcd4ef34b0bb72d7698/open-gif-1.0.4.jar:"$h"/.gradle/caches/modules-2/files-2.1/ch.qos.logback/logback-classic/1.1.2/b316e9737eea25e9ddd6d88eaeee76878045c6b2/logback-classic-1.1.2.jar:"$h"/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/2.0.6/88c40d8b4f33326f19a7d3c0aaf2c7e8721d4953/slf4j-api-2.0.6.jar:"$h"/.gradle/caches/modules-2/files-2.1/com.twelvemonkeys.imageio/imageio-jpeg/3.9.4/af05e039169ab2d42efde9070f55565a169f795d/imageio-jpeg-3.9.4.jar:"$h"/.gradle/caches/modules-2/files-2.1/com.twelvemonkeys.imageio/imageio-metadata/3.9.4/423ab3a09a87ab0b1e6831269db74832ee4184ac/imageio-metadata-3.9.4.jar:"$h"/.gradle/caches/modules-2/files-2.1/com.twelvemonkeys.imageio/imageio-core/3.9.4/e33aabf2d21a2f66817a258abfcd9f5b1e898117/imageio-core-3.9.4.jar:"$h"/.gradle/caches/modules-2/files-2.1/com.drewnoakes/metadata-extractor/2.18.0/fa9fd43a28b10333108c603819810d5176d2b092/metadata-extractor-2.18.0.jar:"$h"/.gradle/caches/modules-2/files-2.1/commons-io/commons-io/2.11.0/a2503f302b11ebde7ebc3df41daebe0e4eea3689/commons-io-2.11.0.jar:"$h"/.gradle/caches/modules-2/files-2.1/ar.com.hjg/pngj/2.1.0/b9a0d5cca5108431c4068976e795d4d2766dab5b/pngj-2.1.0.jar:"$h"/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.12.0/c6842c86792ff03b9f1d1fe2aab8dc23aa6c6f0e/commons-lang3-3.12.0.jar:"$h"/.gradle/caches/modules-2/files-2.1/net.java.dev.jna/jna-platform/5.12.1/97406a297c852f4a41e688a176ec675f72e8329/jna-platform-5.12.1.jar:"$h"/.gradle/caches/modules-2/files-2.1/com.twelvemonkeys.common/common-image/3.9.4/8fc121f4f652cb8ef626ad4dade85b64948df36c/common-image-3.9.4.jar:"$h"/.gradle/caches/modules-2/files-2.1/com.twelvemonkeys.common/common-io/3.9.4/5a0bbb2f431196990780a4912f0ac46009c82f0e/common-io-3.9.4.jar:"$h"/.gradle/caches/modules-2/files-2.1/com.twelvemonkeys.common/common-lang/3.9.4/c68d7dd18962dda58615d3b5d929a68c8f8a1092/common-lang-3.9.4.jar:"$h"/.gradle/caches/modules-2/files-2.1/com.adobe.xmp/xmpcore/6.1.11/852f14101381e527e6d43339d7db1698c970436c/xmpcore-6.1.11.jar:"$h"/.gradle/caches/modules-2/files-2.1/ch.qos.logback/logback-core/1.1.2/2d23694879c2c12f125dac5076bdfd5d771cc4cb/logback-core-1.1.2.jar:"$h"/.gradle/caches/modules-2/files-2.1/net.java.dev.jna/jna/5.12.1/b1e93a735caea94f503e95e6fe79bf9cdc1e985d/jna-5.12.1.jar MainKt
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ plugins {
}

group = "com.zoffcc.applications.trifa_material"
version = "1.0.5"
version = "1.0.6"
val appName = "trifa_material"

repositories {
Expand Down
12 changes: 9 additions & 3 deletions circle_scripts/deps_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ _X264_VERSION_="baee400fa9ced6f5481a728138fed6e867b0ff7f"
# ------- deps verisions ---------



# ---------- ffmpeg ---------
if [ 1 == 1 ]; then

Expand Down Expand Up @@ -349,7 +348,6 @@ else
type -a nasm

nasm --version || exit 1

export PATH=$NEWPATH
cd "$_HOME_"
fi
Expand Down Expand Up @@ -435,9 +433,17 @@ if [ "$1""x" == "raspix" ]; then
--disable-testing \
--disable-rt || exit 1
else
if [ "$2""x" == "asanx" ]; then
echo "***** ASAN *****"
echo "***** ASAN *****"
echo "***** ASAN *****"
CFLAGS_ASAN="-fsanitize=address -fno-omit-frame-pointer -fsanitize-recover=address -static-libasan"
else
CFLAGS_ASAN=""
fi
./configure \
CXXFLAGS="$CXXFLAGS_ADDON" \
CFLAGS="-fPIC $CFLAGS_ADDON $CFLAGS_MORE -DTOX_CAPABILITIES_ACTIVE $LOGG" \
CFLAGS="-fPIC $CFLAGS_ADDON $CFLAGS_MORE -DTOX_CAPABILITIES_ACTIVE $LOGG $CFLAGS_ASAN" \
--prefix="$_INST_" \
--disable-soname-versions \
--disable-shared \
Expand Down
11 changes: 11 additions & 0 deletions circle_scripts/java_jni_lib_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,19 @@ fi
git_hash_for_jni=$(git rev-parse --verify --short=8 HEAD 2>/dev/null|tr -dc '[A-Fa-f0-9]' 2>/dev/null)
echo "XX:""$git_hash_for_jni"":YY"

if [ "$2""x" == "asanx" ]; then
echo "***** ASAN *****"
echo "***** ASAN *****"
echo "***** ASAN *****"
CFLAGS_ASAN="-fsanitize=address -fno-omit-frame-pointer -fsanitize-recover=address -static-libasan"
else
CFLAGS_ASAN=""
fi


$GCC_ $CFLAGS \
-Wall \
$CFLAGS_ASAN \
-DGIT_HASH=\"$git_hash_for_jni\" \
-DJAVA_LINUX \
-DNOGLOBALVARS \
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ org.jetbrains.compose.experimental.uikit.enabled=true
android.defaults.buildfeatures.buildconfig=true
# Enable kotlin/native experimental memory model
kotlin.native.binary.memoryModel=experimental
compose.version=1.6.0-dev1323
compose.version=1.6.0-dev1334
kotlin.version=1.9.21
multiplatform.version=1.9.21
Binary file modified resources/common/ffmpeg_av_jni.dll
Binary file not shown.
Binary file modified resources/common/libffmpeg_av_jni.jnilib
Binary file not shown.
Binary file modified resources/common/libffmpeg_av_jni.so
Binary file not shown.
4 changes: 3 additions & 1 deletion resources/trifa_material.desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[Desktop Entry]
Name=trifa_material
Name=TRIfA Material
GenericName=Tox client
StartupWMClass=normal_trifa_material
Comment=TRIfA Material Tox Client
Exec=trifa_material/bin/trifa_material
Expand All @@ -8,3 +9,4 @@ Terminal=false
Type=Application
Categories=InstantMessaging;Network;
MimeType=x-scheme-handler/tox;
X-GNOME-UsesNotifications=true
43 changes: 32 additions & 11 deletions src/main/java/com/zoffcc/applications/ffmpegav/AVActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
public class AVActivity {

private static final String TAG = "ffmpegav.AVActivity";
static final String Version = "0.99.10";
static final String Version = "0.99.11";

public static native String ffmpegav_version();
public static native String ffmpegav_libavutil_version();
Expand Down Expand Up @@ -425,16 +425,33 @@ public void onBufferTooSmall(int audio_buffer_size) {
catch(Exception e)
{
}
//
//
ffmpegav_stop_audio_in_capture();
ffmpegav_stop_video_in_capture();


final int res_aclose = ffmpegav_close_audio_in_device();
int res_aclose = ffmpegav_close_audio_in_device();
Log.i(TAG, "ffmpeg open close audio capture device: " + res_aclose);

final int res_vclose = ffmpegav_close_video_in_device();
int res_vclose = ffmpegav_close_video_in_device();
Log.i(TAG, "ffmpeg open close video capture device: " + res_vclose);

//
//
// test if calling stop and close again does something bad
//
Log.i(TAG, "ffmpeg ========= stop and close again =========");
Log.i(TAG, "ffmpeg ========= stop and close again =========");
Log.i(TAG, "ffmpeg ========= stop and close again =========");
Log.i(TAG, "ffmpeg ========= stop and close again =========");
ffmpegav_stop_audio_in_capture();
ffmpegav_stop_video_in_capture();
res_aclose = ffmpegav_close_audio_in_device();
Log.i(TAG, "ffmpeg open close audio capture device: " + res_aclose);
res_vclose = ffmpegav_close_video_in_device();
Log.i(TAG, "ffmpeg open close video capture device: " + res_vclose);
Log.i(TAG, "ffmpeg ========= stop and close again =========");
Log.i(TAG, "ffmpeg ========= stop and close again =========");
Log.i(TAG, "ffmpeg ========= stop and close again =========");
//
//
try
{
Thread.sleep(100);
Expand All @@ -445,13 +462,12 @@ public void onBufferTooSmall(int audio_buffer_size) {

// -----------------------
// -----------------------
/*
final int res_vd2 = ffmpegav_open_video_in_device(vdevice,
vsource, 640, 480, 15, 0);
vsource, 640, 480, 15, 0);
Log.i(TAG, "ffmpeg open video capture device: " + res_vd2);

final int res_ad2 = ffmpegav_open_audio_in_device(adevice,
asource);
asource);
Log.i(TAG, "ffmpeg open audio capture device: " + res_ad2);
ffmpegav_start_video_in_capture();
ffmpegav_start_audio_in_capture();
Expand All @@ -466,13 +482,15 @@ public void onBufferTooSmall(int audio_buffer_size) {
ffmpegav_stop_video_in_capture();
ffmpegav_close_audio_in_device();
ffmpegav_close_video_in_device();
*/
// -----------------------
// -----------------------


// -----------------------
// -----------------------
Log.i(TAG, "ffmpeg ========= test with empty parameters =========");
Log.i(TAG, "ffmpeg ========= test with empty parameters =========");
Log.i(TAG, "ffmpeg ========= test with empty parameters =========");
final int res_vd3 = ffmpegav_open_video_in_device("",
"", 640, 480, 30, 0);
Log.i(TAG, "ffmpeg open video capture device: " + res_vd3);
Expand All @@ -495,6 +513,9 @@ public void onBufferTooSmall(int audio_buffer_size) {
ffmpegav_close_video_in_device();
// -----------------------
// -----------------------
Log.i(TAG, "ffmpeg ========= all OK =========");
Log.i(TAG, "ffmpeg ========= all OK =========");
Log.i(TAG, "ffmpeg ========= all OK =========");

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ public class AudioSelectOutBox
public synchronized static void init()
{
if (init_ready == false) {
Log.i(TAG, "____________init");
audioformat = new AudioFormat(SAMPLE_RATE, SAMPLE_SIZE_BIT, CHANNELS, true, false);
reload_device_list();
init_ready = true;
Expand All @@ -65,6 +66,7 @@ public synchronized static void init()

public static void reload_device_list()
{
Log.i(TAG, "____________reload_device_list");
Mixer.Info[] mixerInfo = AudioSystem.getMixerInfo();
DataLine.Info sourceDLInfo = new DataLine.Info(SourceDataLine.class, audioformat);
for (int cnt = 0; cnt < mixerInfo.length; cnt++)
Expand Down Expand Up @@ -103,6 +105,7 @@ public static void reload_device_list()

public static void change_audio_format(int sample_rate, int channels)
{
Log.i(TAG, "____________change_audio_format");
try
{
Log.i(TAG, "AA::OUT::change_audio_format:001:" + sample_rate + " " + channels);
Expand All @@ -129,6 +132,7 @@ public static void change_audio_format(int sample_rate, int channels)

public synchronized static void change_device(Mixer.Info i)
{
Log.i(TAG, "____________change_device");
try
{
semaphore_audio_device_changes.acquire();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import java.io.File;

import static com.zoffcc.applications.jninotifications.NTFYActivity.jninotifications_notify;
import static com.zoffcc.applications.jninotifications.NTFYActivity.jninotifications_version;

public class HelperNotification
{
Expand Down Expand Up @@ -56,8 +55,9 @@ public static void displayNotification(String message)

last_message_timestamp = System.currentTimeMillis();

String title = "TRIfA";
String os = System.getProperty("os.name");
final String application = "TRIfA";
final String title = "TRIfA";
final String os = System.getProperty("os.name");
if (os.contains("Linux"))
{
int res_jni_notify = -1;
Expand All @@ -68,7 +68,7 @@ public static void displayNotification(String message)
{
icon_path = resources_dir + File.separator + "icon-linux.png";
}
res_jni_notify = jninotifications_notify(title,
res_jni_notify = jninotifications_notify(application,
title, message,
icon_path);
Log.i(TAG, "using native JNI for Notification");
Expand Down Expand Up @@ -102,7 +102,7 @@ else if (os.contains("Mac"))
{
icon_path = resources_dir + File.separator + "icon-linux.png";
}
res_jni_notify = jninotifications_notify(title,
res_jni_notify = jninotifications_notify(application,
title, message,
icon_path);
Log.i(TAG, "using macOS objC native JNI for Notification");
Expand Down
Loading
Loading