Skip to content

Commit bcd6e84

Browse files
maksmaks
committed
target API29, rename packageid & java pkg names
1 parent dfec91d commit bcd6e84

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+160
-163
lines changed

‎.idea/caches/build_file_checksums.ser‎

245 Bytes
Binary file not shown.

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ android {
55
buildToolsVersion "28.0.2"
66

77
defaultConfig {
8-
applicationId "com.levien.synthesizer"
8+
applicationId "com.manichord.synthesizer"
99
minSdkVersion 16
10-
targetSdkVersion 23
10+
targetSdkVersion 29
1111
versionCode 1
1212
versionName "1.0"
1313
}

app/src/androidTest/java/com/levien/synthesizer/ApplicationTest.java renamed to app/src/androidTest/java/com/manichord/synthesizer/ApplicationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.levien.synthesizer;
1+
package com.manichord.synthesizer;
22

33
import android.app.Application;
44
import android.test.ApplicationTestCase;

‎app/src/main/AndroidManifest.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.levien.synthesizer">
2+
package="com.manichord.synthesizer">
33

44
<application
55
android:allowBackup="true"
66
android:label="@string/app_name"
77
android:supportsRtl="true">
88
<activity
9-
android:name="com.levien.synthesizer.android.ui.PianoActivity2"
9+
android:name="com.manichord.synthesizer.android.ui.PianoActivity2"
1010
android:label="@string/app_name"
1111
android:screenOrientation="landscape"
1212
android:theme="@style/LightThemeSelector"
@@ -18,57 +18,57 @@
1818
</intent-filter>
1919
</activity>
2020
<activity
21-
android:name="com.levien.synthesizer.android.ui.MainActivity"
21+
android:name="com.manichord.synthesizer.android.ui.MainActivity"
2222
android:label="@string/app_name"
2323
android:screenOrientation="landscape" />
2424
<activity
25-
android:name="com.levien.synthesizer.android.ui.ScoreActivity"
25+
android:name="com.manichord.synthesizer.android.ui.ScoreActivity"
2626
android:label="@string/app_name"
2727
android:screenOrientation="landscape" />
2828
<activity
29-
android:name="com.levien.synthesizer.android.ui.ChordGridActivity"
29+
android:name="com.manichord.synthesizer.android.ui.ChordGridActivity"
3030
android:label="@string/chord_grid"
3131
android:screenOrientation="portrait" />
3232
<activity
33-
android:name="com.levien.synthesizer.android.ui.InstrumentListActivity"
33+
android:name="com.manichord.synthesizer.android.ui.InstrumentListActivity"
3434
android:label="@string/instrument_list"
3535
android:screenOrientation="landscape" />
3636
<activity
37-
android:name="com.levien.synthesizer.android.ui.EditInstrumentActivity"
37+
android:name="com.manichord.synthesizer.android.ui.EditInstrumentActivity"
3838
android:label="@string/edit_instrument"
3939
android:screenOrientation="landscape" />
4040
<activity
41-
android:name="com.levien.synthesizer.android.ui.VibratoActivity"
41+
android:name="com.manichord.synthesizer.android.ui.VibratoActivity"
4242
android:label="@string/vibrato"
4343
android:screenOrientation="landscape" />
4444
<activity
45-
android:name="com.levien.synthesizer.android.ui.OscillatorActivity"
45+
android:name="com.manichord.synthesizer.android.ui.OscillatorActivity"
4646
android:label="@string/oscillator"
4747
android:screenOrientation="landscape" />
4848
<activity
49-
android:name="com.levien.synthesizer.android.ui.TremoloActivity"
49+
android:name="com.manichord.synthesizer.android.ui.TremoloActivity"
5050
android:label="@string/tremolo"
5151
android:screenOrientation="landscape" />
5252
<activity
53-
android:name="com.levien.synthesizer.android.ui.LowPassFilterActivity"
53+
android:name="com.manichord.synthesizer.android.ui.LowPassFilterActivity"
5454
android:label="@string/low_pass_filter"
5555
android:screenOrientation="landscape" />
5656
<activity
57-
android:name="com.levien.synthesizer.android.ui.AmplificationActivity"
57+
android:name="com.manichord.synthesizer.android.ui.AmplificationActivity"
5858
android:label="@string/amplification"
5959
android:screenOrientation="landscape" />
6060
<activity
61-
android:name="com.levien.synthesizer.android.ui.EffectsActivity"
61+
android:name="com.manichord.synthesizer.android.ui.EffectsActivity"
6262
android:label="@string/effects"
6363
android:screenOrientation="landscape" />
6464
<activity
65-
android:name="com.levien.synthesizer.android.ui.KarplusStrongActivity"
65+
android:name="com.manichord.synthesizer.android.ui.KarplusStrongActivity"
6666
android:label="@string/karplus_strong"
6767
android:screenOrientation="landscape" />
6868
<activity
69-
android:name="com.levien.synthesizer.android.ui.SettingsActivity"
69+
android:name="com.manichord.synthesizer.android.ui.SettingsActivity"
7070
android:label="@string/settings" />
71-
<service android:name=".android.service.SynthesizerService">
71+
<service android:name="com.manichord.synthesizer.android.service.SynthesizerService">
7272
</service>
7373

7474
</application>

‎app/src/main/cpp/android_glue.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ SLresult result;
133133
}
134134

135135
extern "C" JNIEXPORT void JNICALL
136-
Java_com_levien_synthesizer_android_AndroidGlue_start(JNIEnv *env,
136+
Java_com_manichord_synthesizer_android_AndroidGlue_start(JNIEnv *env,
137137
jobject thiz, jint sample_rate, jint buf_size) {
138138
CreateEngine();
139139
SLDataLocator_AndroidSimpleBufferQueue loc_bufq =
@@ -182,7 +182,7 @@ Java_com_levien_synthesizer_android_AndroidGlue_start(JNIEnv *env,
182182
}
183183

184184
extern "C" JNIEXPORT void JNICALL
185-
Java_com_levien_synthesizer_android_AndroidGlue_shutdown(JNIEnv *env,
185+
Java_com_manichord_synthesizer_android_AndroidGlue_shutdown(JNIEnv *env,
186186
jobject thiz) {
187187
LOGI("shutting down engine");
188188
if (bqPlayerObject != NULL) {
@@ -209,7 +209,7 @@ Java_com_levien_synthesizer_android_AndroidGlue_shutdown(JNIEnv *env,
209209
}
210210

211211
extern "C" JNIEXPORT void JNICALL
212-
Java_com_levien_synthesizer_android_AndroidGlue_sendMidi(JNIEnv *env,
212+
Java_com_manichord_synthesizer_android_AndroidGlue_sendMidi(JNIEnv *env,
213213
jobject thiz, jbyteArray jb) {
214214
uint8_t *data = (uint8_t *)env->GetByteArrayElements(jb, NULL);
215215
if (data != NULL) {
@@ -219,7 +219,7 @@ Java_com_levien_synthesizer_android_AndroidGlue_sendMidi(JNIEnv *env,
219219
}
220220

221221
extern "C" JNIEXPORT void JNICALL
222-
Java_com_levien_synthesizer_android_AndroidGlue_setPlayState(JNIEnv *env,
222+
Java_com_manichord_synthesizer_android_AndroidGlue_setPlayState(JNIEnv *env,
223223
jobject thiz, jboolean isPlaying) {
224224
SLresult result = (*bq_player_play)->SetPlayState(bq_player_play,
225225
isPlaying ? SL_PLAYSTATE_PLAYING : SL_PLAYSTATE_PAUSED);

app/src/main/java/com/levien/synthesizer/android/AndroidGlue.java renamed to app/src/main/java/com/manichord/synthesizer/android/AndroidGlue.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.levien.synthesizer.android;
1+
package com.manichord.synthesizer.android;
22

3-
import com.levien.synthesizer.core.midi.MessageOutputProcessor;
3+
import com.manichord.synthesizer.core.midi.MessageOutputProcessor;
44

55
/**
66
* JNI container for connecting to C++ synth engine. The actual implementation is in the cpp/src

app/src/main/java/com/levien/synthesizer/android/service/SynthesizerService.java renamed to app/src/main/java/com/manichord/synthesizer/android/service/SynthesizerService.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.levien.synthesizer.android.service;
17+
package com.manichord.synthesizer.android.service;
1818

1919
import java.io.IOException;
2020
import java.io.InputStream;
@@ -38,11 +38,11 @@
3838
import android.os.IBinder;
3939
import android.util.Log;
4040

41-
import com.levien.synthesizer.R;
42-
import com.levien.synthesizer.android.AndroidGlue;
43-
import com.levien.synthesizer.android.usb.UsbMidiDevice;
44-
import com.levien.synthesizer.core.midi.MessageTee;
45-
import com.levien.synthesizer.core.midi.MidiListener;
41+
import com.manichord.synthesizer.R;
42+
import com.manichord.synthesizer.android.AndroidGlue;
43+
import com.manichord.synthesizer.android.usb.UsbMidiDevice;
44+
import com.manichord.synthesizer.core.midi.MessageTee;
45+
import com.manichord.synthesizer.core.midi.MidiListener;
4646

4747
/**
4848
* An Android Service that plays audio from a synthesizer.

app/src/main/java/com/levien/synthesizer/android/service/SynthesizerThread.java renamed to app/src/main/java/com/manichord/synthesizer/android/service/SynthesizerThread.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
// This class is probably obsolete and should be deleted
1818

19-
package com.levien.synthesizer.android.service;
19+
package com.manichord.synthesizer.android.service;
2020

2121
import android.media.AudioFormat;
2222
import android.media.AudioManager;

app/src/main/java/com/levien/synthesizer/android/stats/JitterStats.java renamed to app/src/main/java/com/manichord/synthesizer/android/stats/JitterStats.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
package com.levien.synthesizer.android.stats;
2-
3-
import android.util.Log;
1+
package com.manichord.synthesizer.android.stats;
42

53
public class JitterStats {
64
public JitterStats() {

app/src/main/java/com/levien/synthesizer/android/ui/PianoActivity2.java renamed to app/src/main/java/com/manichord/synthesizer/android/ui/PianoActivity2.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.levien.synthesizer.android.ui;
17+
package com.manichord.synthesizer.android.ui;
1818

1919
import java.util.List;
2020

@@ -41,14 +41,14 @@
4141
import android.widget.ArrayAdapter;
4242
import android.widget.Spinner;
4343

44-
import com.levien.synthesizer.R;
45-
import com.levien.synthesizer.android.widgets.keyboard.KeyboardSpec;
46-
import com.levien.synthesizer.android.widgets.keyboard.KeyboardView;
47-
import com.levien.synthesizer.android.widgets.keyboard.ScrollStripView;
48-
import com.levien.synthesizer.android.widgets.knob.KnobListener;
49-
import com.levien.synthesizer.android.widgets.knob.KnobView;
50-
import com.levien.synthesizer.core.midi.MidiAdapter;
51-
import com.levien.synthesizer.core.midi.MidiListener;
44+
import com.manichord.synthesizer.R;
45+
import com.manichord.synthesizer.android.widgets.keyboard.KeyboardSpec;
46+
import com.manichord.synthesizer.android.widgets.keyboard.KeyboardView;
47+
import com.manichord.synthesizer.android.widgets.keyboard.ScrollStripView;
48+
import com.manichord.synthesizer.android.widgets.knob.KnobListener;
49+
import com.manichord.synthesizer.android.widgets.knob.KnobView;
50+
import com.manichord.synthesizer.core.midi.MidiAdapter;
51+
import com.manichord.synthesizer.core.midi.MidiListener;
5252

5353
/**
5454
* Activity for simply playing the piano.

0 commit comments

Comments
 (0)