diff options
| author | Paul McLean <pmclean@google.com> | 2020-08-10 10:34:46 -0600 |
|---|---|---|
| committer | Paul McLean <pmclean@google.com> | 2020-08-10 10:34:46 -0600 |
| commit | 0f59ab1e98e3638295ede672f6c00ca8eeab5895 (patch) | |
| tree | 5c564bf1e6a5777f048989d99570f9f93504f391 /samples | |
| parent | 6d35c0fee730febf1b759e3144e4992e65acc347 (diff) | |
| download | oboe-0f59ab1e98e3638295ede672f6c00ca8eeab5895.tar.gz | |
Fixed some merge errors.
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/drumthumper/src/main/java/com/plausibleaudio/drumthumper/DrumPlayer.kt | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/samples/drumthumper/src/main/java/com/plausibleaudio/drumthumper/DrumPlayer.kt b/samples/drumthumper/src/main/java/com/plausibleaudio/drumthumper/DrumPlayer.kt index a620f3be..8d50510a 100644 --- a/samples/drumthumper/src/main/java/com/plausibleaudio/drumthumper/DrumPlayer.kt +++ b/samples/drumthumper/src/main/java/com/plausibleaudio/drumthumper/DrumPlayer.kt @@ -34,7 +34,7 @@ class DrumPlayer { val BASSDRUM: Int = 0 val SNAREDRUM: Int = 1 val CRASHCYMBAL: Int = 2 - const val RIDECYMBAL: Int = 3 + val RIDECYMBAL: Int = 3 val MIDTOM: Int = 4 val LOWTOM: Int = 5 val HIHATOPEN: Int = 6 @@ -89,11 +89,7 @@ class DrumPlayer { var dataLen = assetFD.getLength().toInt() var dataBytes: ByteArray = ByteArray(dataLen) dataStream.read(dataBytes, 0, dataLen) -<<<<<<< HEAD returnVal = loadWavAssetNative(dataBytes, index, pan, SAMPLE_RATE, NUM_SAMPLE_CHANNELS) -======= - returnVal = loadWavAssetNative(dataBytes, index, pan) ->>>>>>> 08ec9691dd328522a77fd42284b0a265b890a39c assetFD.close() } catch (ex: IOException) { Log.i(TAG, "IOException" + ex) @@ -105,11 +101,8 @@ class DrumPlayer { external fun setupAudioStreamNative(sampleRate: Int, numChannels: Int) external fun teardownAudioStreamNative() -<<<<<<< HEAD - external fun loadWavAssetNative(wavBytes: ByteArray, index: Int, pan: Float, rate: Int, channels: Int) : Boolean -======= - external fun loadWavAssetNative(wavBytes: ByteArray, index: Int, pan: Float) : Boolean ->>>>>>> 08ec9691dd328522a77fd42284b0a265b890a39c + external fun loadWavAssetNative( + wavBytes: ByteArray, index: Int, pan: Float, rate: Int, channels: Int) : Boolean external fun unloadWavAssetsNative() external fun trigger(drumIndex: Int) |