expo-libvlc-player 2.2.4 → 2.2.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/android/build.gradle +2 -2
  2. package/android/src/main/java/expo/modules/libvlcplayer/LibVlcPlayerView.kt +5 -3
  3. package/android/src/main/java/expo/modules/libvlcplayer/MediaPlayerListener.kt +11 -10
  4. package/ios/LibVlcPlayerView.swift +5 -3
  5. package/ios/MediaPlayerDelegate.swift +9 -8
  6. package/package.json +1 -1
package/android/build.gradle CHANGED
@@ -1,7 +1,7 @@
1
1
  apply plugin: "com.android.library"
2
2
 
3
3
  group = "expo.modules.libvlcplayer"
4
- version = "2.2.4"
4
+ version = "2.2.6"
5
5
 
6
6
  def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
7
7
  apply from: expoModulesCorePlugin
@@ -27,7 +27,7 @@ android {
27
27
  namespace "expo.modules.libvlcplayer"
28
28
  defaultConfig {
29
29
  versionCode 1
30
- versionName "2.2.4"
30
+ versionName "2.2.6"
31
31
  consumerProguardFiles("proguard-rules.pro")
32
32
  }
33
33
  lintOptions {
package/android/src/main/java/expo/modules/libvlcplayer/LibVlcPlayerView.kt CHANGED
@@ -52,7 +52,7 @@ class LibVlcPlayerView(
52
52
 
53
53
  private var shouldCreate: Boolean = false
54
54
  internal var firstPlay: Boolean = false
55
- internal var firstPosition: Boolean = false
55
+ internal var firstTime: Boolean = false
56
56
 
57
57
  internal val onBuffering by EventDispatcher<Unit>()
58
58
  internal val onPlaying by EventDispatcher<Unit>()
@@ -119,7 +119,7 @@ class LibVlcPlayerView(
119
119
 
120
120
  shouldCreate = false
121
121
  firstPlay = true
122
- firstPosition = true
122
+ firstTime = true
123
123
  }
124
124
 
125
125
  fun attachPlayer() {
@@ -355,7 +355,9 @@ class LibVlcPlayerView(
355
355
  val newVolume = value.coerceIn(MIN_PLAYER_VOLUME, MAX_PLAYER_VOLUME)
356
356
  oldVolume = newVolume
357
357
 
358
- mediaPlayer?.setVolume(newVolume)
358
+ if (!mute) {
359
+ mediaPlayer?.setVolume(newVolume)
360
+ }
359
361
  }
360
362
 
361
363
  var mute: Boolean = false
package/android/src/main/java/expo/modules/libvlcplayer/MediaPlayerListener.kt CHANGED
@@ -42,7 +42,7 @@ fun LibVlcPlayerView.setMediaPlayerListener() {
42
42
  detachPlayer()
43
43
 
44
44
  firstPlay = true
45
- firstPosition = true
45
+ firstTime = true
46
46
  }
47
47
 
48
48
  Event.EndReached -> {
@@ -63,31 +63,32 @@ fun LibVlcPlayerView.setMediaPlayerListener() {
63
63
  onEncounteredError(error)
64
64
 
65
65
  firstPlay = true
66
- firstPosition = true
66
+ firstTime = true
67
67
  }
68
68
 
69
69
  Event.TimeChanged -> {
70
70
  val time = mapOf("time" to player.getTime().toInt())
71
71
 
72
72
  onTimeChanged(time)
73
- }
74
-
75
- Event.PositionChanged -> {
76
- val position = mapOf("position" to player.getPosition())
77
-
78
- onPositionChanged(position)
79
73
 
80
- if (firstPosition) {
74
+ if (firstTime) {
81
75
  if (mediaLength == 0L) {
82
76
  val mediaInfo = getMediaInfo()
83
77
 
78
+ // MediaInfo fallback
84
79
  onFirstPlay(mediaInfo)
85
80
  }
86
81
 
87
- firstPosition = false
82
+ firstTime = false
88
83
  }
89
84
  }
90
85
 
86
+ Event.PositionChanged -> {
87
+ val position = mapOf("position" to player.getPosition())
88
+
89
+ onPositionChanged(position)
90
+ }
91
+
91
92
  Event.ESAdded -> {
92
93
  val mediaTracks = getMediaTracks()
93
94
 
package/ios/LibVlcPlayerView.swift CHANGED
@@ -24,7 +24,7 @@ class LibVlcPlayerView: ExpoView {
24
24
 
25
25
  private var shouldCreate: Bool = false
26
26
  var firstPlay: Bool = false
27
- var firstPosition: Bool = false
27
+ var firstTime: Bool = false
28
28
 
29
29
  let onBuffering = EventDispatcher()
30
30
  let onPlaying = EventDispatcher()
@@ -93,7 +93,7 @@ class LibVlcPlayerView: ExpoView {
93
93
 
94
94
  shouldCreate = false
95
95
  firstPlay = true
96
- firstPosition = true
96
+ firstTime = true
97
97
  }
98
98
 
99
99
  func destroyPlayer() {
@@ -312,7 +312,9 @@ class LibVlcPlayerView: ExpoView {
312
312
  let newVolume = max(minPlayerVolume, min(maxPlayerVolume, volume))
313
313
  oldVolume = newVolume
314
314
 
315
- mediaPlayer?.audio?.volume = Int32(newVolume)
315
+ if !mute {
316
+ mediaPlayer?.audio?.volume = Int32(newVolume)
317
+ }
316
318
  }
317
319
  }
318
320
 
package/ios/MediaPlayerDelegate.swift CHANGED
@@ -28,7 +28,7 @@ extension LibVlcPlayerView: VLCMediaPlayerDelegate {
28
28
  onStopped()
29
29
 
30
30
  firstPlay = true
31
- firstPosition = true
31
+ firstTime = true
32
32
  case .ended:
33
33
  onEndReached()
34
34
 
@@ -45,7 +45,7 @@ extension LibVlcPlayerView: VLCMediaPlayerDelegate {
45
45
  onEncounteredError(error)
46
46
 
47
47
  firstPlay = true
48
- firstPosition = true
48
+ firstTime = true
49
49
  case .esAdded:
50
50
  let mediaTracks = getMediaTracks()
51
51
 
@@ -62,19 +62,20 @@ extension LibVlcPlayerView: VLCMediaPlayerDelegate {
62
62
 
63
63
  onTimeChanged(time)
64
64
 
65
- let position = ["position": player.position]
66
-
67
- onPositionChanged(position)
68
-
69
- if firstPosition {
65
+ if firstTime {
70
66
  if mediaLength == 0 {
71
67
  let mediaInfo = getMediaInfo()
72
68
 
69
+ // MediaInfo fallback
73
70
  onFirstPlay(mediaInfo)
74
71
  }
75
72
 
76
- firstPosition = false
73
+ firstTime = false
77
74
  }
75
+
76
+ let position = ["position": player.position]
77
+
78
+ onPositionChanged(position)
78
79
  }
79
80
  }
80
81
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "expo-libvlc-player",
3
- "version": "2.2.4",
3
+ "version": "2.2.6",
4
4
  "description": "LibVLC Player for Expo",
5
5
  "main": "build/index.js",
6
6
  "types": "build/index.d.ts",