Skip to content

Commit 2bccf50

Browse files
committed
arm64
1 parent 5f3203d commit 2bccf50

12 files changed

+7
-13
lines changed

.idea/gradle.xml

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

aar/startrek_player-release.aar

11.8 MB
Binary file not shown.

app/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,4 @@ dependencies {
4646
implementation files('../aar/startrek_player-release.aar')
4747
implementation 'com.android.support:multidex:1.0.3'
4848
compile project(path: ':radioplayer')
49-
implementation project(path: ':startrek_player-release')
5049
}

app/src/main/AndroidManifest.xml

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
android:roundIcon="@mipmap/ic_launcher_round"
1010
android:supportsRtl="true"
1111
android:name=".App"
12+
tools:replace="android:name"
1213
android:theme="@style/AppTheme" tools:ignore="GoogleAppIndexingWarning">
1314
<activity android:name=".MainActivity">
1415
<intent-filter>
-7.44 MB
Binary file not shown.
-7.09 MB
Binary file not shown.

radioplayer/src/main/java/com/likhanov/radioplayer/playback/Player.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class Player(private var url: String = "", private val listener: RadioPlayerCall
6161

6262
fun play() {
6363
try {
64-
if (masterStream) mPlayback.playMasterStream(url)
64+
if (masterStream) mPlayback.playMasterUrl(url)
6565
else mPlayback.playUrl(url)
6666
} catch (err: Exception) {
6767
Log.e("stateTag", "play error", err)

radioplayer/src/main/java/com/likhanov/radioplayer/playback/RadioPlayback.kt

+4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ class RadioPlayback(url: String) : Playback {
1010

1111
private val playerCallback: RadioPlayerCallback = object : RadioPlayerCallback() {
1212

13+
override fun onDaastSkip() {
14+
15+
}
16+
1317
override fun onPlay() {
1418
callback?.onPlaybackStatusChanged(PlaybackStateCompat.STATE_PLAYING)
1519
}

radioplayer/src/main/java/com/likhanov/radioplayer/playback/RadioPlayerCallback.kt

-7
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ import org.radiobox.startrek_player.StartrekPlayerDelegate
44

55
abstract class RadioPlayerCallback : StartrekPlayerDelegate() {
66

7-
override fun onHlsMasterDone() {
8-
9-
}
10-
117
override fun onDaastError() {
128
}
139

@@ -23,9 +19,6 @@ abstract class RadioPlayerCallback : StartrekPlayerDelegate() {
2319
override fun onStop() {
2420
}
2521

26-
override fun onHlsMasterError() {
27-
}
28-
2922
override fun onDaastStart(p0: String?, p1: String?, p2: String?) {
3023
}
3124

settings.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
include ':app', ':radioplayer', ':startrek_player-release'
1+
include ':app', ':radioplayer'

startrek_player-release/build.gradle

-2
This file was deleted.
Binary file not shown.

0 commit comments

Comments
 (0)