Skip to content

Fix #46 #55

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Mar 10, 2025
Merged

Fix #46 #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9535bbd
Fix controller destroying
Mar 10, 2025
70ba29a
Merge remote-tracking branch 'origin/version/0.3.0' into fix/issue46
Mar 10, 2025
992e7ed
Resolve conflict
Mar 10, 2025
98e3056
Change line length
Mar 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions android/src/main/kotlin/wtf/flutter/vr_player/VideoPlayerController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ class VideoPlayerController(
result.success(player?.isPlaying == true)
}
"dispose" -> {
dispose()
dispose(false)
result.success(true)
}
"onSizeChanged" -> {
Expand All @@ -135,13 +135,13 @@ class VideoPlayerController(
}
"fullScreen" -> {
if (mediaEntry?.isVRMediaType == true) {
dispose()
dispose(true)
}
result.success(true)
}
"onPause" -> {
if (mediaEntry?.isVRMediaType == true) {
dispose()
dispose(false)
} else {
player?.onApplicationPaused()
}
Expand All @@ -157,7 +157,7 @@ class VideoPlayerController(
}
"onOrientationChanged" -> {
if (mediaEntry?.isVRMediaType == true) {
dispose()
dispose(true)
}
result.success(true)
}
Expand Down Expand Up @@ -330,12 +330,15 @@ class VideoPlayerController(
return vrSettings
}

fun dispose() {
fun dispose(isRebuilding: Boolean = false) {
player?.let {
this.videoPlayerState = VideoPlayerState(it.currentPosition, it.isPlaying)
it.destroy()

if (!isRebuilding) {
it.destroy()
player = null
}
}
player = null

playerEventStateChanged = null
playerEventDurationChanged = null
Expand Down
6 changes: 4 additions & 2 deletions lib/src/vr_player.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ class _VideoPlayerState extends State<VrPlayer> with WidgetsBindingObserver {
void didUpdateWidget(VrPlayer oldWidget) {
super.didUpdateWidget(oldWidget);
if (oldWidget.width != widget.width) {
final pixelRatio = Platform.isAndroid ? MediaQuery.of(context).devicePixelRatio : 1;
final pixelRatio =
Platform.isAndroid ? MediaQuery.of(context).devicePixelRatio : 1;

final width = widget.width * pixelRatio;
final height = widget.height * pixelRatio;
Expand Down Expand Up @@ -100,7 +101,8 @@ class _VideoPlayerState extends State<VrPlayer> with WidgetsBindingObserver {
return AndroidViewSurface(
controller: controller as AndroidViewController,
hitTestBehavior: PlatformViewHitTestBehavior.opaque,
gestureRecognizers: const <Factory<OneSequenceGestureRecognizer>>{
gestureRecognizers: const <Factory<
OneSequenceGestureRecognizer>>{
Factory(TapGestureRecognizer.new),
},
);
Expand Down