android fix so name.

sannysanoff · May 14, 2024 · bdfc855 · bdfc855
1 parent 03844a6
commit bdfc855
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.4.31'
+    ext.kotlin_version = '1.8.0'
     repositories {
         google()
         mavenCentral()

diff --git a/decoder_modules/ch_extravhf_decoder/CMakeLists.txt b/decoder_modules/ch_extravhf_decoder/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.13)
-project(ch_dmr_decoder)
+project(ch_extravhf_decoder)
 
 
 message("HERE ${VCPKG_INSTALLED_DIR}")
@@ -61,19 +61,19 @@ include(${SDRPP_MODULE_CMAKE})
 
 if (NOT MSVC)
     target_compile_options(mbe-static PUBLIC "-fPIC")
-    target_include_directories(ch_dmr_decoder PUBLIC "${DLROOT}/itpp" "${DLROOT}")
+    target_include_directories(ch_extravhf_decoder PUBLIC "${DLROOT}/itpp" "${DLROOT}")
 endif()
 
 if(ANDROID)
-    target_link_libraries(ch_dmr_decoder PUBLIC ${SDR_KIT_ROOT}/${ANDROID_ABI}/lib/libfftw3f.so)
+    target_link_libraries(ch_extravhf_decoder PUBLIC ${SDR_KIT_ROOT}/${ANDROID_ABI}/lib/libfftw3f.so)
 elseif(MSVC)
-    target_link_libraries(ch_dmr_decoder PUBLIC itpp)
-    target_link_directories(ch_dmr_decoder PUBLIC "${VCPKG_INSTALLED_DIR}/x64-windows/lib")
+    target_link_libraries(ch_extravhf_decoder PUBLIC itpp)
+    target_link_directories(ch_extravhf_decoder PUBLIC "${VCPKG_INSTALLED_DIR}/x64-windows/lib")
     find_package(FFTW3f CONFIG REQUIRED)
-    target_link_libraries(ch_dmr_decoder PUBLIC FFTW3::fftw3f)
+    target_link_libraries(ch_extravhf_decoder PUBLIC FFTW3::fftw3f)
 else()
-    target_link_libraries(ch_dmr_decoder PUBLIC fftw3 )
+    target_link_libraries(ch_extravhf_decoder PUBLIC fftw3 )
 endif()
 
-target_link_libraries(ch_dmr_decoder PUBLIC ${libitpp_target} mbe-static)
-target_include_directories(ch_dmr_decoder PUBLIC "src/" ${CMAKE_CURRENT_LIST_DIR}/../../core/src/ ${DLROOT}/mbelib)
+target_link_libraries(ch_extravhf_decoder PUBLIC ${libitpp_target} mbe-static)
+target_include_directories(ch_extravhf_decoder PUBLIC "src/" ${CMAKE_CURRENT_LIST_DIR}/../../core/src/ ${DLROOT}/mbelib)
diff --git a/sink_modules/android_audio_sink/src/main.cpp b/sink_modules/android_audio_sink/src/main.cpp
@@ -537,9 +537,9 @@ class AudioSink : SinkManager::Sink {
                 nInBuffer += rd;
                 totalRead+= rd;
                 auto ctm = currentTimeMillis();
-                if (ctm > lastReport + 1000) {
+                if (ctm > lastReport + 1800000) {
                     lastReport = ctm;
-                    flog::info("Got data from microphone: {}", std::to_string(totalRead));
+                    flog::info("(each 30 min) Got data from microphone: {}", std::to_string(totalRead));
                     totalRead = 0;
                 }
             }