wbrawner/Simple-Music-Player
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move everything to playback package

Browse source
This commit is contained in:
Naveen 2023-08-20 21:02:37 +05:30
parent 88b0b1aba4
commit 45da77bd07
No known key found for this signature in database
GPG key ID: 0E155DAD31671DA3
22 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View file

@ -160,7 +160,7 @@
android:parentActivityName=".activities.TrackActivity" />
<service
android:name=".services.playback.PlaybackService"
android:name=".playback.PlaybackService"
android:exported="true"
android:foregroundServiceType="mediaPlayback">
<intent-filter>

2
app/src/main/kotlin/com/simplemobiletools/musicplayer/activities/EqualizerActivity.kt
View file

@ -15,7 +15,7 @@ import com.simplemobiletools.commons.views.MySeekBar
import com.simplemobiletools.musicplayer.R
import com.simplemobiletools.musicplayer.extensions.config
import com.simplemobiletools.musicplayer.helpers.EQUALIZER_PRESET_CUSTOM
import com.simplemobiletools.musicplayer.services.playback.SimpleEqualizer
import com.simplemobiletools.musicplayer.playback.SimpleEqualizer
import kotlinx.android.synthetic.main.activity_equalizer.*
import kotlinx.android.synthetic.main.equalizer_band.view.*
import java.text.DecimalFormat

2
app/src/main/kotlin/com/simplemobiletools/musicplayer/activities/MainActivity.kt
View file

@ -31,7 +31,7 @@ import com.simplemobiletools.musicplayer.fragments.MyViewPagerFragment
import com.simplemobiletools.musicplayer.helpers.*
import com.simplemobiletools.musicplayer.helpers.M3uImporter.ImportResult
import com.simplemobiletools.musicplayer.models.Events
import com.simplemobiletools.musicplayer.services.playback.CustomCommands
import com.simplemobiletools.musicplayer.playback.CustomCommands
import kotlinx.android.synthetic.main.activity_main.*
import kotlinx.android.synthetic.main.fragment_albums.albums_fragment_holder
import kotlinx.android.synthetic.main.fragment_artists.artists_fragment_holder

2
app/src/main/kotlin/com/simplemobiletools/musicplayer/activities/SettingsActivity.kt
View file

@ -15,7 +15,7 @@ import com.simplemobiletools.musicplayer.extensions.sendCommand
import com.simplemobiletools.musicplayer.helpers.SHOW_FILENAME_ALWAYS
import com.simplemobiletools.musicplayer.helpers.SHOW_FILENAME_IF_UNAVAILABLE
import com.simplemobiletools.musicplayer.helpers.SHOW_FILENAME_NEVER
import com.simplemobiletools.musicplayer.services.playback.CustomCommands
import com.simplemobiletools.musicplayer.playback.CustomCommands
import kotlinx.android.synthetic.main.activity_settings.*
import java.util.Locale
import kotlin.system.exitProcess

4
app/src/main/kotlin/com/simplemobiletools/musicplayer/activities/SimpleControllerActivity.kt
View file

@ -16,8 +16,8 @@ import com.simplemobiletools.musicplayer.helpers.SimpleMediaController
import com.simplemobiletools.musicplayer.models.Events
import com.simplemobiletools.musicplayer.models.Track
import com.simplemobiletools.musicplayer.models.toMediaItems
import com.simplemobiletools.musicplayer.services.playback.CustomCommands
import com.simplemobiletools.musicplayer.services.playback.PlaybackService.Companion.updatePlaybackInfo
import com.simplemobiletools.musicplayer.playback.CustomCommands
import com.simplemobiletools.musicplayer.playback.PlaybackService.Companion.updatePlaybackInfo
import org.greenrobot.eventbus.EventBus
import java.io.File

4
app/src/main/kotlin/com/simplemobiletools/musicplayer/activities/TrackActivity.kt
View file

@ -30,8 +30,8 @@ import com.simplemobiletools.musicplayer.fragments.PlaybackSpeedFragment
import com.simplemobiletools.musicplayer.helpers.*
import com.simplemobiletools.musicplayer.interfaces.PlaybackSpeedListener
import com.simplemobiletools.musicplayer.models.Track
import com.simplemobiletools.musicplayer.services.playback.CustomCommands
import com.simplemobiletools.musicplayer.services.playback.PlaybackService
import com.simplemobiletools.musicplayer.playback.CustomCommands
import com.simplemobiletools.musicplayer.playback.PlaybackService
import kotlinx.android.synthetic.main.activity_track.*
import java.text.DecimalFormat
import kotlin.math.min

2
app/src/main/kotlin/com/simplemobiletools/musicplayer/activities/WidgetConfigureActivity.kt
View file

@ -14,7 +14,7 @@ import com.simplemobiletools.commons.helpers.IS_CUSTOMIZING_COLORS
import com.simplemobiletools.musicplayer.R
import com.simplemobiletools.musicplayer.extensions.config
import com.simplemobiletools.musicplayer.helpers.MyWidgetProvider
import com.simplemobiletools.musicplayer.services.playback.PlaybackService
import com.simplemobiletools.musicplayer.playback.PlaybackService
import kotlinx.android.synthetic.main.widget.song_info_artist
import kotlinx.android.synthetic.main.widget.song_info_title
import kotlinx.android.synthetic.main.widget.view.widget_background

2
app/src/main/kotlin/com/simplemobiletools/musicplayer/adapters/BaseMusicAdapter.kt
View file

@ -16,7 +16,7 @@ import com.simplemobiletools.musicplayer.activities.SimpleControllerActivity
import com.simplemobiletools.musicplayer.extensions.*
import com.simplemobiletools.musicplayer.helpers.TagHelper
import com.simplemobiletools.musicplayer.models.Track
import com.simplemobiletools.musicplayer.services.playback.PlaybackService
import com.simplemobiletools.musicplayer.playback.PlaybackService
abstract class BaseMusicAdapter<Type>(
var items: ArrayList<Type>,

2
app/src/main/kotlin/com/simplemobiletools/musicplayer/adapters/QueueAdapter.kt
View file

@ -17,7 +17,7 @@ import com.simplemobiletools.musicplayer.R
import com.simplemobiletools.musicplayer.activities.SimpleActivity
import com.simplemobiletools.musicplayer.extensions.*
import com.simplemobiletools.musicplayer.models.Track
import com.simplemobiletools.musicplayer.services.playback.PlaybackService
import com.simplemobiletools.musicplayer.playback.PlaybackService
import kotlinx.android.synthetic.main.item_track_queue.view.track_queue_drag_handle
import kotlinx.android.synthetic.main.item_track_queue.view.track_queue_duration
import kotlinx.android.synthetic.main.item_track_queue.view.track_queue_frame

2
app/src/main/kotlin/com/simplemobiletools/musicplayer/extensions/Player.kt
View file

@ -3,7 +3,7 @@ package com.simplemobiletools.musicplayer.extensions
import androidx.media3.common.MediaItem
import androidx.media3.common.Player
import com.simplemobiletools.musicplayer.helpers.PlaybackSetting
import com.simplemobiletools.musicplayer.services.playback.player.PlayerListener
import com.simplemobiletools.musicplayer.playback.player.PlayerListener
val Player.isReallyPlaying: Boolean
get() = when (playbackState) {

2
app/src/main/kotlin/com/simplemobiletools/musicplayer/helpers/MyWidgetProvider.kt
View file

@ -22,7 +22,7 @@ import com.simplemobiletools.musicplayer.extensions.broadcastUpdateWidgetState
import com.simplemobiletools.musicplayer.extensions.config
import com.simplemobiletools.musicplayer.extensions.queueDAO
import com.simplemobiletools.musicplayer.extensions.togglePlayback
import com.simplemobiletools.musicplayer.services.playback.PlaybackService
import com.simplemobiletools.musicplayer.playback.PlaybackService
class MyWidgetProvider : AppWidgetProvider() {

2
app/src/main/kotlin/com/simplemobiletools/musicplayer/helpers/SimpleMediaController.kt
View file

@ -10,7 +10,7 @@ import com.google.common.util.concurrent.ListenableFuture
import com.google.common.util.concurrent.MoreExecutors
import com.simplemobiletools.musicplayer.extensions.getOrNull
import com.simplemobiletools.musicplayer.extensions.runOnPlayerThread
import com.simplemobiletools.musicplayer.services.playback.PlaybackService
import com.simplemobiletools.musicplayer.playback.PlaybackService
import java.util.concurrent.Executors
class SimpleMediaController(val context: Context, val listener: Listener? = null) {

2
app/src/main/kotlin/com/simplemobiletools/musicplayer/services/playback/CustomCommands.kt → app/src/main/kotlin/com/simplemobiletools/musicplayer/playback/CustomCommands.kt
View file

@ -1,4 +1,4 @@
package com.simplemobiletools.musicplayer.services.playback
package com.simplemobiletools.musicplayer.playback
import android.content.Context
import android.os.Bundle

2
app/src/main/kotlin/com/simplemobiletools/musicplayer/services/playback/MediaSessionCallback.kt → app/src/main/kotlin/com/simplemobiletools/musicplayer/playback/MediaSessionCallback.kt
View file

@ -1,4 +1,4 @@
package com.simplemobiletools.musicplayer.services.playback
package com.simplemobiletools.musicplayer.playback
import android.os.Bundle
import android.os.ConditionVariable

10
app/src/main/kotlin/com/simplemobiletools/musicplayer/services/playback/PlaybackService.kt → app/src/main/kotlin/com/simplemobiletools/musicplayer/playback/PlaybackService.kt
View file

@ -1,4 +1,4 @@
package com.simplemobiletools.musicplayer.services.playback
package com.simplemobiletools.musicplayer.playback
import android.os.Handler
import android.os.HandlerThread
@ -14,10 +14,10 @@ import com.simplemobiletools.musicplayer.extensions.isReallyPlaying
import com.simplemobiletools.musicplayer.extensions.nextMediaItem
import com.simplemobiletools.musicplayer.helpers.NotificationHelper
import com.simplemobiletools.musicplayer.helpers.getPermissionToRequest
import com.simplemobiletools.musicplayer.services.playback.library.MediaItemProvider
import com.simplemobiletools.musicplayer.services.playback.player.PlayerListener
import com.simplemobiletools.musicplayer.services.playback.player.SimpleMusicPlayer
import com.simplemobiletools.musicplayer.services.playback.player.initializeSessionAndPlayer
import com.simplemobiletools.musicplayer.playback.library.MediaItemProvider
import com.simplemobiletools.musicplayer.playback.player.PlayerListener
import com.simplemobiletools.musicplayer.playback.player.SimpleMusicPlayer
import com.simplemobiletools.musicplayer.playback.player.initializeSessionAndPlayer
@OptIn(UnstableApi::class)
class PlaybackService : MediaLibraryService() {

4
app/src/main/kotlin/com/simplemobiletools/musicplayer/services/playback/SimpleEqualizer.kt → app/src/main/kotlin/com/simplemobiletools/musicplayer/playback/SimpleEqualizer.kt
View file

@ -1,4 +1,4 @@
package com.simplemobiletools.musicplayer.services.playback
package com.simplemobiletools.musicplayer.playback
import android.content.Context
import android.media.audiofx.Equalizer
@ -9,7 +9,7 @@ import com.simplemobiletools.commons.extensions.toast
import com.simplemobiletools.musicplayer.R
import com.simplemobiletools.musicplayer.extensions.config
import com.simplemobiletools.musicplayer.helpers.EQUALIZER_PRESET_CUSTOM
import com.simplemobiletools.musicplayer.services.playback.player.SimpleMusicPlayer
import com.simplemobiletools.musicplayer.playback.player.SimpleMusicPlayer
@UnstableApi
object SimpleEqualizer {

2
app/src/main/kotlin/com/simplemobiletools/musicplayer/services/playback/SleepTimer.kt → app/src/main/kotlin/com/simplemobiletools/musicplayer/playback/SleepTimer.kt
View file

@ -1,4 +1,4 @@
package com.simplemobiletools.musicplayer.services.playback
package com.simplemobiletools.musicplayer.playback
import android.os.CountDownTimer
import com.simplemobiletools.musicplayer.extensions.config

2
app/src/main/kotlin/com/simplemobiletools/musicplayer/services/playback/library/MediaItemProvider.kt → app/src/main/kotlin/com/simplemobiletools/musicplayer/playback/library/MediaItemProvider.kt
View file

@ -1,4 +1,4 @@
package com.simplemobiletools.musicplayer.services.playback.library
package com.simplemobiletools.musicplayer.playback.library
import android.content.ContentResolver
import android.content.Context

2
app/src/main/kotlin/com/simplemobiletools/musicplayer/services/playback/player/AudioOnlyRenderersFactory.kt → app/src/main/kotlin/com/simplemobiletools/musicplayer/playback/player/AudioOnlyRenderersFactory.kt
View file

@ -1,4 +1,4 @@
package com.simplemobiletools.musicplayer.services.playback.player
package com.simplemobiletools.musicplayer.playback.player
import android.content.Context
import android.os.Handler

10
app/src/main/kotlin/com/simplemobiletools/musicplayer/services/playback/player/Player.kt → app/src/main/kotlin/com/simplemobiletools/musicplayer/playback/player/Player.kt
View file

@ -1,6 +1,6 @@
@file:UnstableApi
package com.simplemobiletools.musicplayer.services.playback.player
package com.simplemobiletools.musicplayer.playback.player
import android.app.PendingIntent
import android.content.Context
@ -16,10 +16,10 @@ import com.simplemobiletools.musicplayer.activities.MainActivity
import com.simplemobiletools.musicplayer.extensions.config
import com.simplemobiletools.musicplayer.extensions.setRepeatMode
import com.simplemobiletools.musicplayer.helpers.SEEK_INTERVAL_MS
import com.simplemobiletools.musicplayer.services.playback.PlaybackService
import com.simplemobiletools.musicplayer.services.playback.SimpleEqualizer
import com.simplemobiletools.musicplayer.services.playback.getCustomLayout
import com.simplemobiletools.musicplayer.services.playback.getMediaSessionCallback
import com.simplemobiletools.musicplayer.playback.PlaybackService
import com.simplemobiletools.musicplayer.playback.SimpleEqualizer
import com.simplemobiletools.musicplayer.playback.getCustomLayout
import com.simplemobiletools.musicplayer.playback.getMediaSessionCallback
private const val PLAYER_THREAD = "PlayerThread"

6
app/src/main/kotlin/com/simplemobiletools/musicplayer/services/playback/player/PlayerListener.kt → app/src/main/kotlin/com/simplemobiletools/musicplayer/playback/player/PlayerListener.kt
View file

@ -1,4 +1,4 @@
package com.simplemobiletools.musicplayer.services.playback.player
package com.simplemobiletools.musicplayer.playback.player
import android.widget.Toast
import androidx.media3.common.MediaItem
@ -11,8 +11,8 @@ import com.simplemobiletools.musicplayer.extensions.broadcastUpdateWidgetState
import com.simplemobiletools.musicplayer.extensions.config
import com.simplemobiletools.musicplayer.extensions.currentMediaItems
import com.simplemobiletools.musicplayer.helpers.PlaybackSetting
import com.simplemobiletools.musicplayer.services.playback.PlaybackService
import com.simplemobiletools.musicplayer.services.playback.PlaybackService.Companion.updatePlaybackInfo
import com.simplemobiletools.musicplayer.playback.PlaybackService
import com.simplemobiletools.musicplayer.playback.PlaybackService.Companion.updatePlaybackInfo
@UnstableApi
class PlayerListener(private val context: PlaybackService) : Player.Listener {

2
app/src/main/kotlin/com/simplemobiletools/musicplayer/services/playback/player/SimpleMusicPlayer.kt → app/src/main/kotlin/com/simplemobiletools/musicplayer/playback/player/SimpleMusicPlayer.kt
View file

@ -1,4 +1,4 @@
package com.simplemobiletools.musicplayer.services.playback.player
package com.simplemobiletools.musicplayer.playback.player
import androidx.media3.common.ForwardingPlayer
import androidx.media3.common.Player