Skip to content

Commit ff882c2

Browse files
refactor: don't use nitro dispose (#4802)
1 parent 1eb317a commit ff882c2

File tree

24 files changed

+164
-27
lines changed

24 files changed

+164
-27
lines changed

bun.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example/ios/Podfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1565,7 +1565,7 @@ PODS:
15651565
- React-logger (= 0.77.3)
15661566
- React-perflogger (= 0.77.3)
15671567
- React-utils (= 0.77.3)
1568-
- ReactNativeVideo (7.0.0-beta.0):
1568+
- ReactNativeVideo (7.0.0-beta.1):
15691569
- DoubleConversion
15701570
- glog
15711571
- hermes-engine
@@ -1587,7 +1587,7 @@ PODS:
15871587
- ReactCommon/turbomodule/bridging
15881588
- ReactCommon/turbomodule/core
15891589
- Yoga
1590-
- ReactNativeVideoDrm (7.0.0-beta.0):
1590+
- ReactNativeVideoDrm (7.0.0-beta.1):
15911591
- DoubleConversion
15921592
- glog
15931593
- hermes-engine
@@ -1904,8 +1904,8 @@ SPEC CHECKSUMS:
19041904
ReactAppDependencyProvider: 31015410a4a53b9fd0a908ad4d6e3e2b9a25086a
19051905
ReactCodegen: 53316394e985ded1babc7f143c90c77d2bb1b43c
19061906
ReactCommon: bf4612cba0fa356b529385029f470d5529dddde4
1907-
ReactNativeVideo: 5a5e609057e980e9ea2736914377804358c53ae9
1908-
ReactNativeVideoDrm: 4f266c3b018170319ed16bc511218c0d411358d5
1907+
ReactNativeVideo: 10dd0a47f8228b41565a3efb13df5b323633b590
1908+
ReactNativeVideoDrm: 07b826ab66fd0a00ab3dd3bef2dd2c026e919a9a
19091909
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
19101910
Yoga: 92f3bb322c40a86b7233b815854730442e01b8c4
19111911

packages/drm-plugin/nitrogen/generated/android/c++/JHybridPluginManagerSpec.cpp

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/drm-plugin/nitrogen/generated/android/c++/JHybridPluginManagerSpec.hpp

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/drm-plugin/nitrogen/generated/android/kotlin/com/margelo/nitro/videodrm/HybridPluginManagerSpec.kt

Lines changed: 6 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/drm-plugin/nitrogen/generated/ios/ReactNativeVideoDrm-Swift-Cxx-Bridge.cpp

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/drm-plugin/nitrogen/generated/ios/c++/HybridPluginManagerSpecSwift.hpp

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/drm-plugin/nitrogen/generated/ios/swift/HybridPluginManagerSpec.swift

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/drm-plugin/nitrogen/generated/ios/swift/HybridPluginManagerSpec_cxx.swift

Lines changed: 9 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/react-native-video/android/src/main/java/com/twg/video/core/VideoManager.kt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,17 @@ object VideoManager : LifecycleEventListener {
170170
}
171171

172172
fun unregisterPlayer(player: HybridVideoPlayer) {
173-
players.remove(player)
174173
audioFocusManager.unregisterPlayer(player)
175174
PluginsRegistry.shared.notifyPlayerDestroyed(WeakReference(player))
175+
176+
// Remove player from any views that were using it
177+
players[player]?.forEach { nitroId ->
178+
views[nitroId]?.get()?.let { view ->
179+
view.hybridPlayer = null
180+
}
181+
}
182+
183+
players.remove(player)
176184
}
177185

178186
fun getPlayerByNitroId(nitroId: Int): HybridVideoPlayer? {

0 commit comments

Comments
 (0)