From 5045d6615e8e776f64c512700705b49bfa5b6d7a Mon Sep 17 00:00:00 2001
From: David Madl <git@abanbytes.eu>
Date: Sat, 7 Mar 2026 23:02:15 +0100
Subject: [PATCH] build: reorg jni files

---
 app/src/main/cpp/CMakeLists.txt                |  6 +++---
 .../cpp/{lockstep.cpp => jni_lockstep.cpp}     | 18 ------------------
 .../cpp/{logging_jni.cpp => jni_logging.cpp}   |  0
 .../cpp/{jni_bridge.cpp => jni_mpg123.cpp}     |  0
 4 files changed, 3 insertions(+), 21 deletions(-)
 rename app/src/main/cpp/{lockstep.cpp => jni_lockstep.cpp} (79%)
 rename app/src/main/cpp/{logging_jni.cpp => jni_logging.cpp} (100%)
 rename app/src/main/cpp/{jni_bridge.cpp => jni_mpg123.cpp} (100%)

diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
index 543f494..67924ef 100644
--- a/app/src/main/cpp/CMakeLists.txt
+++ b/app/src/main/cpp/CMakeLists.txt
@@ -30,17 +30,17 @@ add_subdirectory(librubberband)
 # used in the AndroidManifest.xml file.
 add_library(${CMAKE_PROJECT_NAME} SHARED
     # List C/C++ source files with relative paths to this CMakeLists.txt.
-    lockstep.cpp
     PlaybackEngine.cpp
     mp3file.cpp
-    jni_bridge.cpp
+    jni_mpg123.cpp
+    jni_lockstep.cpp
     jni_stepdetector.cpp
     StepDetector.cpp
 )
 
 find_package (oboe REQUIRED CONFIG)
 
-add_library(ndk-logger SHARED logging.cpp logging_jni.cpp)
+add_library(ndk-logger SHARED logging.cpp jni_logging.cpp)
 target_link_libraries(ndk-logger log)
 
 # Add pre-built libmpg123 library
diff --git a/app/src/main/cpp/lockstep.cpp b/app/src/main/cpp/jni_lockstep.cpp
similarity index 79%
rename from app/src/main/cpp/lockstep.cpp
rename to app/src/main/cpp/jni_lockstep.cpp
index e72bffc..818e57f 100644
--- a/app/src/main/cpp/lockstep.cpp
+++ b/app/src/main/cpp/jni_lockstep.cpp
@@ -1,21 +1,3 @@
-// Write C++ code here.
-//
-// Do not forget to dynamically load the C++ library into your application.
-//
-// For instance,
-//
-// In at.lockstep.app.MainActivity.java:
-//    static {
-//       System.loadLibrary("lockstep");
-//    }
-//
-// Or, in at.lockstep.app.MainActivity.kt:
-//    companion object {
-//      init {
-//         System.loadLibrary("lockstep")
-//      }
-//    }
-
 #include "PlaybackEngine.h"
 #include <jni.h>
 #include <oboe/Oboe.h>
diff --git a/app/src/main/cpp/logging_jni.cpp b/app/src/main/cpp/jni_logging.cpp
similarity index 100%
rename from app/src/main/cpp/logging_jni.cpp
rename to app/src/main/cpp/jni_logging.cpp
diff --git a/app/src/main/cpp/jni_bridge.cpp b/app/src/main/cpp/jni_mpg123.cpp
similarity index 100%
rename from app/src/main/cpp/jni_bridge.cpp
rename to app/src/main/cpp/jni_mpg123.cpp