ANDROID: sound command now supports non-background play

Author: chrisws

src/platform/android/app/src/main/java/net/sourceforge/smallbasic/MainActivity.java

@@ -417,17 +417,21 @@ public void run() {
     }).start();
   }
 
-  public void playTone(int frq, int dur, int vol) {
+  public void playTone(int frq, int dur, int vol, boolean bgplay) {
     float volume = (vol / 100f);
     final Sound sound = new Sound(frq, dur, volume);
-    _sounds.add(sound);
-    _audioExecutor.execute(new Runnable() {
-      @Override
-      public void run() {
-        sound.play();
-        _sounds.remove(sound);
-      }
-    });
+    if (bgplay) {
+      _sounds.add(sound);
+      _audioExecutor.execute(new Runnable() {
+        @Override
+        public void run() {
+          sound.play();
+          _sounds.remove(sound);
+        }
+      });
+    } else {
+      sound.play();
+    }
   }
 
   public boolean removeLocationUpdates() {

src/platform/android/app/src/main/java/net/sourceforge/smallbasic/Sound.java

@@ -19,18 +19,14 @@ class Sound {
   private final int _dur;
   private boolean _silent;
 
-  public Sound(int frq, int dur, float vol) {
+  Sound(int frq, int dur, float vol) {
     this._sound = generateTone(frq, dur);
     this._volume = vol;
     this._dur = dur;
     this._silent = false;
   }
 
-  public boolean isSilent() {
-    return _silent;
-  }
-
-  public void play() {
+  void play() {
     if (!_silent) {
       try {
         AudioTrack audioTrack = new AudioTrack(AudioManager.STREAM_MUSIC,
@@ -48,7 +44,7 @@ public void play() {
     }
   }
 
-  public void setSilent(boolean silent) {
+  void setSilent(boolean silent) {
     this._silent = silent;
   }
 

src/platform/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.0'
+    classpath 'com.android.tools.build:gradle:3.3.1'
     classpath "com.github.ben-manes:gradle-versions-plugin:0.20.0"
   }
 }

src/platform/android/jni/Android.mk

@@ -15,7 +15,7 @@ LOCAL_PATH := $(JNI_PATH)
 include $(CLEAR_VARS)
 LOCAL_MODULE     := smallbasic
 LOCAL_CFLAGS     := -DHAVE_CONFIG_H=1 -DLODEPNG_NO_COMPILE_CPP \
-	                  -DPIXELFORMAT_RGBA8888
+	                  -DPIXELFORMAT_RGBA8888 -Wno-unknown-pragmas
 LOCAL_C_INCLUDES := $(SB_HOME) $(SB_HOME)/src  \
                     $(FREETYPE_HOME)/freetype/include/freetype2   \
                     $(FREETYPE_HOME)/freetype/include/freetype2/freetype

src/platform/android/jni/runtime.cpp

@@ -738,8 +738,8 @@ void Runtime::playTone(int frq, int dur, int vol, bool bgplay) {
   JNIEnv *env;
   _app->activity->vm->AttachCurrentThread(&env, NULL);
   jclass clazz = env->GetObjectClass(_app->activity->clazz);
-  jmethodID methodId = env->GetMethodID(clazz, "playTone", "(III)V");
-  env->CallVoidMethod(_app->activity->clazz, methodId, frq, dur, vol);
+  jmethodID methodId = env->GetMethodID(clazz, "playTone", "(IIIZ)V");
+  env->CallVoidMethod(_app->activity->clazz, methodId, frq, dur, vol, bgplay);
   env->DeleteLocalRef(clazz);
   _app->activity->vm->DetachCurrentThread();
 }

src/ui/textedit.cpp

@@ -1227,15 +1227,16 @@ void TextEditInput::editEnter() {
 
     // check whether the previous line was a comment
     char *buf = lineText(prevLineStart);
+    int length = strlen(buf);
     int pos = 0;
     while (buf && (buf[pos] == ' ' || buf[pos] == '\t')) {
       pos++;
     }
-    if ((buf[pos] == '#' || buf[pos] == '\'') && indent + 2 < LINE_BUFFER_SIZE) {
+    if (length > 2 && (buf[pos] == '#' || buf[pos] == '\'') && indent + 2 < LINE_BUFFER_SIZE) {
       spaces[indent] = buf[pos];
       spaces[++indent] = ' ';
       spaces[++indent] = '\0';
-    } else if (strncasecmp(buf + pos, "rem", 3) == 0) {
+    } else if (length > 4 && strncasecmp(buf + pos, "rem", 3) == 0) {
       indent = strlcat(spaces, "rem ", LINE_BUFFER_SIZE);
     }
     free(buf);