diff options
Diffstat (limited to 'samples')
-rw-r--r-- | samples/drumthumper/src/main/AndroidManifest.xml | 4 | ||||
-rw-r--r-- | samples/drumthumper/src/main/cpp/DrumPlayerJNI.cpp | 24 | ||||
-rw-r--r-- | samples/drumthumper/src/main/java/com/plausibleaudio/drumthumper/DrumPlayer.kt (renamed from samples/drumthumper/src/main/java/com/google/oboe/samples/drumthumper/DrumPlayer.kt) | 2 | ||||
-rw-r--r-- | samples/drumthumper/src/main/java/com/plausibleaudio/drumthumper/DrumThumperActivity.kt (renamed from samples/drumthumper/src/main/java/com/google/oboe/samples/drumthumper/DrumThumperActivity.kt) | 5 | ||||
-rw-r--r-- | samples/drumthumper/src/main/java/com/plausibleaudio/drumthumper/TriggerPad.kt (renamed from samples/drumthumper/src/main/java/com/google/oboe/samples/drumthumper/TriggerPad.kt) | 2 | ||||
-rw-r--r-- | samples/drumthumper/src/main/res/layout-land/drumthumper_activity.xml | 18 | ||||
-rw-r--r-- | samples/drumthumper/src/main/res/layout/drumthumper_activity.xml | 18 |
7 files changed, 36 insertions, 37 deletions
diff --git a/samples/drumthumper/src/main/AndroidManifest.xml b/samples/drumthumper/src/main/AndroidManifest.xml index 0de8d781..bd28d073 100644 --- a/samples/drumthumper/src/main/AndroidManifest.xml +++ b/samples/drumthumper/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.google.oboe.samples.drumthumper"> + package="com.plausiblesoftware.drumthumper"> <application android:allowBackup="true" @@ -9,7 +9,7 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> - <activity android:name=".DrumThumperActivity"> + <activity android:name="com.plausiblesoftware.drumthumper.DrumThumperActivity"> <intent-filter> <action android:name="android.intent.action.MAIN" /> diff --git a/samples/drumthumper/src/main/cpp/DrumPlayerJNI.cpp b/samples/drumthumper/src/main/cpp/DrumPlayerJNI.cpp index 3705afe3..1a2fbbf0 100644 --- a/samples/drumthumper/src/main/cpp/DrumPlayerJNI.cpp +++ b/samples/drumthumper/src/main/cpp/DrumPlayerJNI.cpp @@ -44,7 +44,7 @@ static SimpleMultiPlayer sDTPlayer; /** * Native (JNI) implementation of DrumPlayer.setupAudioStreamNative() */ -JNIEXPORT void JNICALL Java_com_google_oboe_samples_drumthumper_DrumPlayer_setupAudioStreamNative( +JNIEXPORT void JNICALL Java_com_plausiblesoftware_drumthumper_DrumPlayer_setupAudioStreamNative( JNIEnv* env, jobject, jint numChannels, jint sampleRate) { __android_log_print(ANDROID_LOG_INFO, TAG, "%s", "init()"); @@ -55,7 +55,7 @@ JNIEXPORT void JNICALL Java_com_google_oboe_samples_drumthumper_DrumPlayer_setup /** * Native (JNI) implementation of DrumPlayer.teardownAudioStreamNative() */ -JNIEXPORT void JNICALL Java_com_google_oboe_samples_drumthumper_DrumPlayer_teardownAudioStreamNative(JNIEnv* , jobject) { +JNIEXPORT void JNICALL Java_com_plausiblesoftware_drumthumper_DrumPlayer_teardownAudioStreamNative(JNIEnv* , jobject) { __android_log_print(ANDROID_LOG_INFO, TAG, "%s", "deinit()"); // we know in this case that the sample buffers are all 1-channel, 44.1K @@ -68,7 +68,7 @@ JNIEXPORT void JNICALL Java_com_google_oboe_samples_drumthumper_DrumPlayer_teard /** * Native (JNI) implementation of DrumPlayer.loadWavAssetNative() */ -JNIEXPORT void JNICALL Java_com_google_oboe_samples_drumthumper_DrumPlayer_loadWavAssetNative(JNIEnv* env, jobject, jbyteArray bytearray, jint index, jfloat pan) { +JNIEXPORT void JNICALL Java_com_plausiblesoftware_drumthumper_DrumPlayer_loadWavAssetNative(JNIEnv* env, jobject, jbyteArray bytearray, jint index, jfloat pan) { int len = env->GetArrayLength (bytearray); unsigned char* buf = new unsigned char[len]; @@ -91,35 +91,35 @@ JNIEXPORT void JNICALL Java_com_google_oboe_samples_drumthumper_DrumPlayer_loadW /** * Native (JNI) implementation of DrumPlayer.unloadWavAssetsNative() */ -JNIEXPORT void JNICALL Java_com_google_oboe_samples_drumthumper_DrumPlayer_unloadWavAssetsNative(JNIEnv* env, jobject) { +JNIEXPORT void JNICALL Java_com_plausiblesoftware_drumthumper_DrumPlayer_unloadWavAssetsNative(JNIEnv* env, jobject) { sDTPlayer.unloadSampleData(); } /** * Native (JNI) implementation of DrumPlayer.trigger() */ -JNIEXPORT void JNICALL Java_com_google_oboe_samples_drumthumper_DrumPlayer_trigger(JNIEnv* env, jobject, jint index) { +JNIEXPORT void JNICALL Java_com_plausiblesoftware_drumthumper_DrumPlayer_trigger(JNIEnv* env, jobject, jint index) { sDTPlayer.triggerDown(index); } /** * Native (JNI) implementation of DrumPlayer.getOutputReset() */ -JNIEXPORT jboolean JNICALL Java_com_google_oboe_samples_drumthumper_DrumPlayer_getOutputReset(JNIEnv*, jobject) { +JNIEXPORT jboolean JNICALL Java_com_plausiblesoftware_drumthumper_DrumPlayer_getOutputReset(JNIEnv*, jobject) { return sDTPlayer.getOutputReset(); } /** * Native (JNI) implementation of DrumPlayer.clearOutputReset() */ -JNIEXPORT void JNICALL Java_com_google_oboe_samples_drumthumper_DrumPlayer_clearOutputReset(JNIEnv*, jobject) { +JNIEXPORT void JNICALL Java_com_plausiblesoftware_drumthumper_DrumPlayer_clearOutputReset(JNIEnv*, jobject) { sDTPlayer.clearOutputReset(); } /** * Native (JNI) implementation of DrumPlayer.restartStream() */ -JNIEXPORT void JNICALL Java_com_google_oboe_samples_drumthumper_DrumPlayer_restartStream(JNIEnv*, jobject) { +JNIEXPORT void JNICALL Java_com_plausiblesoftware_drumthumper_DrumPlayer_restartStream(JNIEnv*, jobject) { sDTPlayer.resetAll(); if (sDTPlayer.openStream()){ __android_log_print(ANDROID_LOG_INFO, TAG, "openStream successful"); @@ -128,22 +128,22 @@ JNIEXPORT void JNICALL Java_com_google_oboe_samples_drumthumper_DrumPlayer_resta } } -JNIEXPORT void JNICALL Java_com_google_oboe_samples_drumthumper_DrumPlayer_setPan( +JNIEXPORT void JNICALL Java_com_plausiblesoftware_drumthumper_DrumPlayer_setPan( JNIEnv *env, jobject thiz, jint index, jfloat pan) { sDTPlayer.setPan(index, pan); } -JNIEXPORT jfloat JNICALL Java_com_google_oboe_samples_drumthumper_DrumPlayer_getPan( +JNIEXPORT jfloat JNICALL Java_com_plausiblesoftware_drumthumper_DrumPlayer_getPan( JNIEnv *env, jobject thiz, jint index) { return sDTPlayer.getPan(index); } -JNIEXPORT void JNICALL Java_com_google_oboe_samples_drumthumper_DrumPlayer_setGain( +JNIEXPORT void JNICALL Java_com_plausiblesoftware_drumthumper_DrumPlayer_setGain( JNIEnv *env, jobject thiz, jint index, jfloat gain) { sDTPlayer.setGain(index, gain); } -JNIEXPORT jfloat JNICALL Java_com_google_oboe_samples_drumthumper_DrumPlayer_getGain( +JNIEXPORT jfloat JNICALL Java_com_plausiblesoftware_drumthumper_DrumPlayer_getGain( JNIEnv *env, jobject thiz, jint index) { return sDTPlayer.getGain(index); } diff --git a/samples/drumthumper/src/main/java/com/google/oboe/samples/drumthumper/DrumPlayer.kt b/samples/drumthumper/src/main/java/com/plausibleaudio/drumthumper/DrumPlayer.kt index 133d4968..cbcf3233 100644 --- a/samples/drumthumper/src/main/java/com/google/oboe/samples/drumthumper/DrumPlayer.kt +++ b/samples/drumthumper/src/main/java/com/plausibleaudio/drumthumper/DrumPlayer.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.oboe.samples.drumthumper +package com.plausiblesoftware.drumthumper import android.content.res.AssetManager import android.util.Log diff --git a/samples/drumthumper/src/main/java/com/google/oboe/samples/drumthumper/DrumThumperActivity.kt b/samples/drumthumper/src/main/java/com/plausibleaudio/drumthumper/DrumThumperActivity.kt index d9730979..98a899d2 100644 --- a/samples/drumthumper/src/main/java/com/google/oboe/samples/drumthumper/DrumThumperActivity.kt +++ b/samples/drumthumper/src/main/java/com/plausibleaudio/drumthumper/DrumThumperActivity.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.oboe.samples.drumthumper +package com.plausiblesoftware.drumthumper import android.content.Context import android.media.AudioDeviceCallback @@ -31,9 +31,8 @@ import java.time.LocalDateTime import java.util.Timer import kotlin.concurrent.schedule - class DrumThumperActivity : AppCompatActivity(), - TriggerPad.DrumPadTriggerListener, + TriggerPad.DrumPadTriggerListener, SeekBar.OnSeekBarChangeListener, View.OnClickListener { private val TAG = "DrumThumperActivity" diff --git a/samples/drumthumper/src/main/java/com/google/oboe/samples/drumthumper/TriggerPad.kt b/samples/drumthumper/src/main/java/com/plausibleaudio/drumthumper/TriggerPad.kt index a5064881..cb1bdbdd 100644 --- a/samples/drumthumper/src/main/java/com/google/oboe/samples/drumthumper/TriggerPad.kt +++ b/samples/drumthumper/src/main/java/com/plausibleaudio/drumthumper/TriggerPad.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.oboe.samples.drumthumper +package com.plausiblesoftware.drumthumper import android.content.Context import android.graphics.Canvas diff --git a/samples/drumthumper/src/main/res/layout-land/drumthumper_activity.xml b/samples/drumthumper/src/main/res/layout-land/drumthumper_activity.xml index c1b91144..f27c0e57 100644 --- a/samples/drumthumper/src/main/res/layout-land/drumthumper_activity.xml +++ b/samples/drumthumper/src/main/res/layout-land/drumthumper_activity.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - tools:context=".DrumThumperActivity"> + tools:context="com.plausiblesoftware.drumthumper.DrumThumperActivity"> <TextView android:id="@+id/textView" @@ -26,7 +26,7 @@ android:layout_weight=".5" android:orientation="vertical"> - <com.google.oboe.samples.drumthumper.TriggerPad + <com.plausiblesoftware.drumthumper.TriggerPad android:id="@+id/kickPad" android:layout_width="match_parent" android:layout_height="match_parent" @@ -85,7 +85,7 @@ android:layout_weight=".5" android:orientation="vertical"> - <com.google.oboe.samples.drumthumper.TriggerPad + <com.plausiblesoftware.drumthumper.TriggerPad android:id="@+id/snarePad" android:layout_width="wrap_content" android:layout_height="match_parent" @@ -145,7 +145,7 @@ android:layout_weight=".5" android:orientation="vertical"> - <com.google.oboe.samples.drumthumper.TriggerPad + <com.plausiblesoftware.drumthumper.TriggerPad android:id="@+id/hihatOpenPad" android:layout_width="match_parent" android:layout_height="match_parent" @@ -204,7 +204,7 @@ android:layout_weight=".5" android:orientation="vertical"> - <com.google.oboe.samples.drumthumper.TriggerPad + <com.plausiblesoftware.drumthumper.TriggerPad android:id="@+id/hihatClosedPad" android:layout_width="match_parent" android:layout_height="match_parent" @@ -269,7 +269,7 @@ android:layout_weight=".5" android:orientation="vertical"> - <com.google.oboe.samples.drumthumper.TriggerPad + <com.plausiblesoftware.drumthumper.TriggerPad android:id="@+id/midTomPad" android:layout_width="match_parent" android:layout_height="match_parent" @@ -328,7 +328,7 @@ android:layout_weight=".5" android:orientation="vertical"> - <com.google.oboe.samples.drumthumper.TriggerPad + <com.plausiblesoftware.drumthumper.TriggerPad android:id="@+id/lowTomPad" android:layout_width="match_parent" android:layout_height="match_parent" @@ -387,7 +387,7 @@ android:layout_weight=".5" android:orientation="vertical"> - <com.google.oboe.samples.drumthumper.TriggerPad + <com.plausiblesoftware.drumthumper.TriggerPad android:id="@+id/ridePad" android:layout_width="match_parent" android:layout_height="match_parent" @@ -446,7 +446,7 @@ android:layout_weight=".5" android:orientation="vertical"> - <com.google.oboe.samples.drumthumper.TriggerPad + <com.plausiblesoftware.drumthumper.TriggerPad android:id="@+id/crashPad" android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/samples/drumthumper/src/main/res/layout/drumthumper_activity.xml b/samples/drumthumper/src/main/res/layout/drumthumper_activity.xml index 95690c41..7b799f94 100644 --- a/samples/drumthumper/src/main/res/layout/drumthumper_activity.xml +++ b/samples/drumthumper/src/main/res/layout/drumthumper_activity.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - tools:context=".DrumThumperActivity"> + tools:context="com.plausiblesoftware.drumthumper.DrumThumperActivity"> <TextView android:id="@+id/textView" @@ -26,7 +26,7 @@ android:layout_weight=".5" android:orientation="vertical"> - <com.google.oboe.samples.drumthumper.TriggerPad + <com.plausiblesoftware.drumthumper.TriggerPad android:id="@+id/kickPad" android:layout_width="match_parent" android:layout_height="match_parent" @@ -85,7 +85,7 @@ android:layout_weight=".5" android:orientation="vertical"> - <com.google.oboe.samples.drumthumper.TriggerPad + <com.plausiblesoftware.drumthumper.TriggerPad android:id="@+id/snarePad" android:layout_width="wrap_content" android:layout_height="match_parent" @@ -151,7 +151,7 @@ android:layout_weight=".5" android:orientation="vertical"> - <com.google.oboe.samples.drumthumper.TriggerPad + <com.plausiblesoftware.drumthumper.TriggerPad android:id="@+id/hihatOpenPad" android:layout_width="match_parent" android:layout_height="match_parent" @@ -210,7 +210,7 @@ android:layout_weight=".5" android:orientation="vertical"> - <com.google.oboe.samples.drumthumper.TriggerPad + <com.plausiblesoftware.drumthumper.TriggerPad android:id="@+id/hihatClosedPad" android:layout_width="match_parent" android:layout_height="match_parent" @@ -275,7 +275,7 @@ android:layout_weight=".5" android:orientation="vertical"> - <com.google.oboe.samples.drumthumper.TriggerPad + <com.plausiblesoftware.drumthumper.TriggerPad android:id="@+id/midTomPad" android:layout_width="match_parent" android:layout_height="match_parent" @@ -334,7 +334,7 @@ android:layout_weight=".5" android:orientation="vertical"> - <com.google.oboe.samples.drumthumper.TriggerPad + <com.plausiblesoftware.drumthumper.TriggerPad android:id="@+id/lowTomPad" android:layout_width="match_parent" android:layout_height="match_parent" @@ -399,7 +399,7 @@ android:layout_weight=".5" android:orientation="vertical"> - <com.google.oboe.samples.drumthumper.TriggerPad + <com.plausiblesoftware.drumthumper.TriggerPad android:id="@+id/ridePad" android:layout_width="match_parent" android:layout_height="match_parent" @@ -458,7 +458,7 @@ android:layout_weight=".5" android:orientation="vertical"> - <com.google.oboe.samples.drumthumper.TriggerPad + <com.plausiblesoftware.drumthumper.TriggerPad android:id="@+id/crashPad" android:layout_width="match_parent" android:layout_height="match_parent" |