-
Notifications
You must be signed in to change notification settings - Fork 818
CATROID-1554: Refactor WaitForSoundAction to Kotlin #5193
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: develop
Are you sure you want to change the base?
Changes from 1 commit
4b12b35
3e79a6f
31b5db2
89e0bd3
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| /* | ||
| * Catroid: An on-device visual programming system for Android devices | ||
| * Copyright (C) 2010-2026 The Catrobat Team | ||
| * (<http://developer.catrobat.org/credits>) | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * An additional term exception under section 7 of the GNU Affero | ||
| * General Public License, version 3, is available at | ||
| * http://developer.catrobat.org/license_additional_term | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package org.catrobat.catroid.content.actions | ||
|
|
||
| import androidx.annotation.VisibleForTesting | ||
| import org.catrobat.catroid.content.SoundFilePathWithSprite | ||
| import org.catrobat.catroid.io.SoundManager | ||
| import org.catrobat.catroid.pocketmusic.mididriver.MidiSoundManager | ||
|
|
||
| class WaitForSoundAction : WaitAction() { | ||
|
|
||
| var soundFilePath: String? = null | ||
|
|
||
| @VisibleForTesting | ||
| var soundManager: SoundManager = SoundManager.getInstance() | ||
|
|
||
| @VisibleForTesting | ||
| var midiSoundManager: MidiSoundManager = MidiSoundManager.getInstance() | ||
|
|
||
| private var soundStopped = false | ||
|
|
||
| override fun update(percent: Float) { | ||
| val path = soundFilePath ?: return | ||
| val sprite = scope.sprite | ||
|
|
||
| val startedPaths = midiSoundManager.startedSoundfilePaths | ||
| if (startedPaths.isNotEmpty()) { | ||
| val spriteSoundFilePath = SoundFilePathWithSprite(path, sprite) | ||
| if (spriteSoundFilePath in startedPaths && | ||
| !midiSoundManager.isSoundInSpritePlaying(sprite, path) | ||
| ) { | ||
| startedPaths.remove(spriteSoundFilePath) | ||
| finish() | ||
| soundStopped = true | ||
| return | ||
| } | ||
| } | ||
|
|
||
| val stoppedPaths = soundManager.recentlyStoppedSoundfilePaths | ||
| if (stoppedPaths.isNotEmpty()) { | ||
| val spriteSoundFilePath = SoundFilePathWithSprite(path, sprite) | ||
| if (spriteSoundFilePath in stoppedPaths) { | ||
| stoppedPaths.remove(spriteSoundFilePath) | ||
| finish() | ||
| soundStopped = true | ||
| } | ||
| } | ||
| } | ||
|
|
||
| override fun end() { | ||
| val path = soundFilePath ?: return | ||
| val sprite = scope.sprite | ||
|
|
||
| for (mediaPlayer in soundManager.mediaPlayers) { | ||
| if (mediaPlayer.isPlaying && | ||
| mediaPlayer.startedBySprite === sprite && | ||
| mediaPlayer.pathToSoundFile == path && | ||
| !soundStopped | ||
Check warningCode scanning / detekt Complex conditions should be simplified and extracted into well-named methods if necessary. Warning
This condition is too complex (4). Defined complexity threshold for conditions is set to '4'
|
||
|
github-advanced-security[bot] marked this conversation as resolved.
Fixed
|
||
| ) { | ||
| restart() | ||
| setTime(mediaPlayer.currentPosition) | ||
| } | ||
|
harshsomankar123-tech marked this conversation as resolved.
|
||
| } | ||
|
|
||
| for (midiPlayer in midiSoundManager.midiPlayers) { | ||
| if (midiPlayer.isPlaying && | ||
| midiPlayer.startedBySprite === sprite && | ||
| midiPlayer.pathToSoundFile == path && | ||
| !soundStopped | ||
Check warningCode scanning / detekt Complex conditions should be simplified and extracted into well-named methods if necessary. Warning
This condition is too complex (4). Defined complexity threshold for conditions is set to '4'
|
||
|
github-advanced-security[bot] marked this conversation as resolved.
Fixed
|
||
| ) { | ||
| restart() | ||
| setTime(midiPlayer.currentPosition) | ||
| } | ||
|
harshsomankar123-tech marked this conversation as resolved.
|
||
| } | ||
| } | ||
|
|
||
| companion object { | ||
| @JvmField | ||
| val TAG: String = WaitForSoundAction::class.java.simpleName | ||
| } | ||
| } | ||
Uh oh!
There was an error while loading. Please reload this page.