fix: sound effect on sub-scenes

This commit fixes an issue that would cause the sound effect to not stop when it's started in a sub-scene parent. closes #22
PerformanC · Oct 11, 2023 · cebae49 · cebae49
1 parent 4a38972
commit cebae49
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 14 deletions.
diff --git a/android/app/src/main/java/com/perforvnm/MainActivity.kt b/android/app/src/main/java/com/perforvnm/MainActivity.kt
@@ -1734,6 +1734,16 @@ class MainActivity : Activity() {
     buttonSubScenes.layoutParams = layoutParamsSubScenes
 
     buttonSubScenes.setOnClickListener {
+      if (mediaPlayer != null) {
+        mediaPlayer!!.stop()
+        mediaPlayer!!.release()
+        mediaPlayer = null
+      }
+
+      handler.removeCallbacksAndMessages(null)
+
+      findViewById<FrameLayout>(android.R.id.content).setOnClickListener(null)
+
       scene2(true)
     }
 
@@ -1756,6 +1766,16 @@ class MainActivity : Activity() {
     buttonSubScenes2.layoutParams = layoutParamsSubScenes2
 
     buttonSubScenes2.setOnClickListener {
+      if (mediaPlayer != null) {
+        mediaPlayer!!.stop()
+        mediaPlayer!!.release()
+        mediaPlayer = null
+      }
+
+      handler.removeCallbacksAndMessages(null)
+
+      findViewById<FrameLayout>(android.R.id.content).setOnClickListener(null)
+
       scene3(true)
     }
 

diff --git a/src/coder.js b/src/coder.js
@@ -785,7 +785,7 @@ ${finishScene.join('\n')}\n\n`, 6, 0)
 
   helper.replace('__PERFORVNM_HEADER__', addHeaders ? '\n' + addHeaders : '')
 
-  const startMusicCode = helper.codePrepare(`
+  const startMusicCode = helper.codePrepare(`\n
     mediaPlayer = MediaPlayer.create(this, R.raw.${visualNovel.menu?.background.music})
 
     if (mediaPlayer != null) {

diff --git a/src/scene.js b/src/scene.js
@@ -1209,14 +1209,10 @@ function finalize(scene) {
     buttonMenu.layoutParams = layoutParamsMenu\n\n`
   )
 
-  if (finishScene.length != 0) {
-    sceneCode += helper.codePrepare(`
+  sceneCode += helper.codePrepare(`
       buttonMenu.setOnClickListener {
-${finishScene.join('\n\n')}
-  __PERFORVNM_START_MUSIC__\n\n`, 2, 0)
-  } else {
-    sceneCode += helper.codePrepare('buttonMenu.setOnClickListener {__PERFORVNM_START_MUSIC__' + '\n\n', 0, 4, false)
-  }
+${finishScene.join('\n\n')}__PERFORVNM_START_MUSIC__\n\n`, 2
+  )
 
   sceneCode += helper.codePrepare(`
       ${(visualNovel.menu ? 'menu()' : '__PERFORVNM_MENU__')}
@@ -1247,13 +1243,10 @@ ${finishScene.join('\n\n')}
       buttonBack.layoutParams = layoutParamsBack\n\n`, 2
     )
 
-    if (finishScene.length != 0) {
-      sceneCode += helper.codePrepare(`
+    sceneCode += helper.codePrepare(`
       buttonBack.setOnClickListener {
-${finishScene.join('\n\n')}\n\n`, 2, 0)
-    } else {
-      sceneCode += helper.codePrepare('buttonBack.setOnClickListener {\n', 0, 2, false)
-    }
+${finishScene.join('\n\n')}\n\n`, 2
+    )
 
     const oldScene = visualNovel.subScenes.find((subScene) => subScene.next == scene.name) || visualNovel.scenes[visualNovel.scenes.length - 1]
 
@@ -1320,6 +1313,8 @@ ${finishScene.join('\n\n')}\n\n`, 2, 0)
 
     sceneCode += helper.codePrepare(`
       buttonSubScenes.setOnClickListener {
+${finishScene.join('\n\n')}
+
         __PERFORVNM_SUBSCENE_1__
       }
 
@@ -1342,6 +1337,8 @@ ${finishScene.join('\n\n')}\n\n`, 2, 0)
       buttonSubScenes2.layoutParams = layoutParamsSubScenes2
 
       buttonSubScenes2.setOnClickListener {
+${finishScene.join('\n\n')}
+
         __PERFORVNM_SUBSCENE_2__
       }