Onboard

djshaji · Mar 27, 2024 · 4042b42 · 4042b42
1 parent c88ad15
commit 4042b42
Show file tree

Hide file tree

Showing 8 changed files with 96 additions and 34 deletions.
diff --git a/app/src/main/cpp/Engine.cpp b/app/src/main/cpp/Engine.cpp
@@ -593,4 +593,14 @@ long Engine::getTimeStamp () {
 
 void Engine::setSampleRateDisplay (int sampleRate, bool lowLatency) {
 
+}
+
+double Engine::getLatency (bool input) {
+    if (input) {
+        const oboe::ResultWithValue<double> &latency = mRecordingStream->calculateLatencyMillis();
+        return latency.value();
+    } else {
+        const oboe::ResultWithValue<double> &latency = mPlayStream->calculateLatencyMillis();
+        return latency.value();
+    }
 }
diff --git a/app/src/main/cpp/Engine.h b/app/src/main/cpp/Engine.h
@@ -112,6 +112,9 @@ std::string LIBRARY_PATH ;
     static int pushToVideo(AudioBuffer *buffer);
 
     void setSampleRateDisplay(int sampleRate, bool lowLatency);
+
+public:
+    double getLatency(bool input);
 } ;
 
 #endif // __ENGINE__H
diff --git a/app/src/main/cpp/native-lib.cpp b/app/src/main/cpp/native-lib.cpp
@@ -836,4 +836,13 @@ JNIEXPORT jlong JNICALL
 Java_com_shajikhan_ladspa_amprack_AudioEngine_getTimeStamp(JNIEnv *env, jclass clazz) {
     // TODO: implement getTimeStamp()
     return (jlong) engine -> getTimeStamp() ;
+}
+extern "C"
+JNIEXPORT jdouble JNICALL
+Java_com_shajikhan_ladspa_amprack_AudioEngine_getLatency(JNIEnv *env, jclass clazz, jboolean input) {
+    // TODO: implement getLatency()
+    if (! engine)
+        return -1.0;
+
+    return engine->getLatency(input);
 }
diff --git a/app/src/main/java/com/shajikhan/ladspa/amprack/AudioEngine.java b/app/src/main/java/com/shajikhan/ladspa/amprack/AudioEngine.java
@@ -113,4 +113,5 @@ static void warnLowLatency (Context context) {
     static native int getSampleRate () ;
     static native void toggleVideoRecording (boolean toggle);
     static native long getTimeStamp () ;
+    static native double getLatency (boolean input) ;
 }
diff --git a/app/src/main/java/com/shajikhan/ladspa/amprack/MainActivity.java b/app/src/main/java/com/shajikhan/ladspa/amprack/MainActivity.java
@@ -3588,6 +3588,7 @@ public static void cameraTest () {
 
     public static void setSampleRateDisplay (int sampleRateDisplay, boolean lowLatency) {
         Log.d(TAG, String.format ("[audio]: %d (%b)", sampleRateDisplay, lowLatency));
+//        double inputLatency = AudioEngine.getLatency(true), outputLatency = AudioEngine.getLatency(false) ;
 
         mainActivity.handler.post(() -> {
             srLayout.setVisibility(View.VISIBLE);

diff --git a/app/src/main/java/com/shajikhan/ladspa/amprack/Onboard.java b/app/src/main/java/com/shajikhan/ladspa/amprack/Onboard.java
@@ -8,6 +8,7 @@
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ArrayAdapter;
+import android.widget.Button;
 import android.widget.CompoundButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -28,9 +29,9 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_onboard);
         getSupportActionBar().hide ();
 
-        ExtendedFloatingActionButton prev = findViewById(R.id.onboard_prev);
-        ExtendedFloatingActionButton next = findViewById(R.id.onboard_next);
-        ExtendedFloatingActionButton finish = findViewById(R.id.onboard_finish);
+        Button prev = findViewById(R.id.onboard_prev);
+        Button next = findViewById(R.id.onboard_next);
+        Button finish = findViewById(R.id.onboard_finish);
 
         TextView buildId = findViewById(R.id.onboard_build_number);
         String version = String.format("Build %s Version Code %d",
@@ -109,7 +110,7 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         spinner.setAdapter(adapter);
 
-        ExtendedFloatingActionButton skip = findViewById(R.id.onboard_skip);
+        Button skip = findViewById(R.id.onboard_skip);
         skip.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

diff --git a/app/src/main/res/layout/activity_onboard.xml b/app/src/main/res/layout/activity_onboard.xml
@@ -25,6 +25,9 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:gravity="center"
+            android:layout_marginBottom="5dp"
+            android:padding="5dp"
+            android:background="@drawable/semi_trans"
             android:layout_height="wrap_content"
             android:orientation="horizontal">
 
@@ -36,26 +39,40 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:fontFamily="@font/comfortaa"
+                android:fontFamily="@font/gruppo"
                 android:textSize="40dp"
                 android:layout_marginLeft="10dp"
                 android:text="Amp Rack"/>
 
         </LinearLayout>
 
-        <TextView
-            android:fontFamily="@font/start"
-            android:layout_width="wrap_content"
-            android:layout_marginTop="10dp"
-            android:textSize="11sp"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/app_version"/>
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:orientation="vertical">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/build_id"
-            android:id="@+id/onboard_build_number"/>
+            <TextView
+                android:fontFamily="@font/start"
+                android:layout_width="wrap_content"
+                android:layout_marginTop="10dp"
+                android:textSize="11sp"
+                android:layout_height="wrap_content"
+                android:text="@string/app_version"/>
+
+            <androidx.legacy.widget.Space
+                android:layout_width="10dp"
+                android:layout_height="wrap_content"/>
+            <TextView
+                android:fontFamily="@font/gruppo"
+                android:layout_marginTop="10dp"
+                android:textSize="15sp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/build_id"
+                android:id="@+id/onboard_build_number"/>
+        </LinearLayout>
 
         <TextView
             android:layout_width="wrap_content"
@@ -67,15 +84,21 @@
             android:fontFamily="@font/comfortaa"
             android:text="Advanced High Performance\nGuitar Effects Processor"/>
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left"
-            android:gravity="left"
-            android:textSize="17dp"
-            android:layout_marginTop="20dp"
-            android:fontFamily="@font/comfortaa"
-            android:text="@string/onboard_description"/>
+        <ScrollView
+            android:layout_marginBottom="70dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:gravity="left"
+                android:textSize="17dp"
+                android:layout_marginTop="20dp"
+                android:fontFamily="@font/comfortaa"
+                android:text="@string/onboard_description"/>
+        </ScrollView>
     </LinearLayout>
 
     <LinearLayout
@@ -233,8 +256,9 @@
             android:text="Detailed User Guide"/>
     </LinearLayout>
 
-    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+    <Button
         android:id="@+id/onboard_prev"
+        android:background="@drawable/semi_trans"
         android:clickable="true"
         android:layout_margin="30dp"
         android:layout_width="wrap_content"
@@ -246,7 +270,8 @@
         android:visibility="gone"
         android:drawableLeft="@drawable/ic_baseline_arrow_back_ios_new_24" />
 
-    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+    <Button
+        android:background="@drawable/semi_trans"
         android:id="@+id/onboard_skip"
         android:clickable="true"
         android:layout_margin="30dp"
@@ -257,7 +282,8 @@
         android:textColor="@color/white"
         android:text="Skip"/>
 
-    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+    <Button
+        android:background="@drawable/semi_trans"
         android:id="@+id/onboard_next"
         android:clickable="true"
         android:layout_margin="30dp"
@@ -269,7 +295,8 @@
         android:text="Next"
         android:drawableRight="@drawable/ic_baseline_arrow_forward_ios_24" />
 
-    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+    <Button
+        android:background="@drawable/semi_trans"
         android:id="@+id/onboard_finish"
         android:clickable="true"
         android:layout_margin="30dp"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,7 +1,20 @@
 <resources>
     <string name="app_name">Amp Rack</string>
-    <string name="app_version">Version 3 Nighthawk</string>
-    <string name="build_id">491</string>
+    <string name="app_version">Version 4 Razor</string>
+    <string name="build_id">570</string>
+    <string name="onboard_description">
+        [new] Video Recorder\n\n
+        Welcome to Version 4: \n\n
+        ✓ High Quality Audio / Video Recording Capability\n\n
+        ✓ Low Latency\n\n
+        ✓ More than 200 High Quality Effect Plugins\n\n
+        ✓ Floating point precision at native device sample rate\n\n
+        ✓ Tube Amp Emulation, Cabinet Emulation, Distortions, Chorus, Phasers, Delay, Reverb and more\n\n
+        ✓ Fully Skinnable User Interface\n\n
+        ✓ Save patches and share them with the world\n\n
+
+        Made with ♥
+    </string>
     <string name="onboard_theme_chooser">
         Choose a theme for the UI. Choose Material Theme for Native
         Android Material Design, or Tube Amp theme based on the new
@@ -533,9 +546,6 @@
     <string name="title_activity_delete_account">DeleteAccount</string>
     <string name="delete_warn">This action will delete the following data\n\t- Your presets\n\t-Your favorites\n\t-Associated account data</string>
     <string name="title_activity_drum_machine">DrumMachineActivity</string>
-    <string name="onboard_description">
-        Version 3.2: More than 50 new plugins\n\n✓ More than 200 High Quality Effect Plugins\n\n✓ Low Latency\n\n✓ Tube Amp Emulation, Cabinet Emulation, Distortions, Chorus, Phasers, Delay, Reverb and more\n\n✓ Fully Skinnable User Interface\n\n✓ Save patches and share them with the world\n\nMade with ♥
-    </string>
     <string name="title_activity_featured_videos">FeaturedVideos</string>
     <string name="low_latency_warning">
         The app is not running in low latency mode.