Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
66 changes: 29 additions & 37 deletions flutter_vlc_player/lib/src/vlc_player_controller.dart
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,10 @@ class VlcPlayerController extends ValueNotifier<VlcPlayerValue> {
VoidCallback? onInit,
@Deprecated('Please, use the addOnRendererEventListener method instead.')
RendererCallback? onRendererHandler,
}) : _dataSourceType = DataSourceType.asset,
_onInit = onInit,
_onRendererHandler = onRendererHandler,
super(VlcPlayerValue(duration: Duration.zero));
}) : _dataSourceType = DataSourceType.asset,
_onInit = onInit,
_onRendererHandler = onRendererHandler,
super(VlcPlayerValue(duration: Duration.zero));

/// Constructs a [VlcPlayerController] playing a video from obtained from
/// the network.
Expand All @@ -125,11 +125,11 @@ class VlcPlayerController extends ValueNotifier<VlcPlayerValue> {
VoidCallback? onInit,
@Deprecated('Please, use the addOnRendererEventListener method instead.')
RendererCallback? onRendererHandler,
}) : package = null,
_dataSourceType = DataSourceType.network,
_onInit = onInit,
_onRendererHandler = onRendererHandler,
super(VlcPlayerValue(duration: Duration.zero));
}) : package = null,
_dataSourceType = DataSourceType.network,
_onInit = onInit,
_onRendererHandler = onRendererHandler,
super(VlcPlayerValue(duration: Duration.zero));

/// Constructs a [VlcPlayerController] playing a video from a file.
///
Expand All @@ -146,12 +146,12 @@ class VlcPlayerController extends ValueNotifier<VlcPlayerValue> {
VoidCallback? onInit,
@Deprecated('Please, use the addOnRendererEventListener method instead.')
RendererCallback? onRendererHandler,
}) : dataSource = 'file://${file.path}',
package = null,
_dataSourceType = DataSourceType.file,
_onInit = onInit,
_onRendererHandler = onRendererHandler,
super(VlcPlayerValue(duration: Duration.zero));
}) : dataSource = 'file://${file.path}',
package = null,
_dataSourceType = DataSourceType.file,
_onInit = onInit,
_onRendererHandler = onRendererHandler,
super(VlcPlayerValue(duration: Duration.zero));

/// Register a [VoidCallback] closure to be called when the controller gets initialized
void addOnInitListener(VoidCallback listener) {
Expand Down Expand Up @@ -273,9 +273,10 @@ class VlcPlayerController extends ValueNotifier<VlcPlayerValue> {
spuTracksCount: event.spuTracksCount,
activeSpuTrack: event.activeSpuTrack,
isPlaying: event.isPlaying,
playingState: (event.isPlaying ?? false)
? PlayingState.playing
: value.playingState,
playingState:
(event.isPlaying ?? false)
? PlayingState.playing
: value.playingState,
errorDescription: VlcPlayerValue.noError,
);
break;
Expand Down Expand Up @@ -571,9 +572,7 @@ class VlcPlayerController extends ValueNotifier<VlcPlayerValue> {
Future<int?> getVolume() async {
_throwIfNotInitialized('getVolume');
final volume = await vlcPlayerPlatform.getVolume(_viewId);
value = value.copyWith(
volume: volume?.clamp(0, _maxVolume),
);
value = value.copyWith(volume: volume?.clamp(0, _maxVolume));

return volume;
}
Expand Down Expand Up @@ -612,10 +611,7 @@ class VlcPlayerController extends ValueNotifier<VlcPlayerValue> {
// the video is manually played from Flutter.
if (!value.isPlaying) return;
value = value.copyWith(playbackSpeed: speed);
await vlcPlayerPlatform.setPlaybackSpeed(
_viewId,
value.playbackSpeed,
);
await vlcPlayerPlatform.setPlaybackSpeed(_viewId, value.playbackSpeed);
}

/// Returns the vlc playback speed.
Expand Down Expand Up @@ -697,10 +693,7 @@ class VlcPlayerController extends ValueNotifier<VlcPlayerValue> {
/// Add extra subtitle file to media.
/// [file] - Subtitle file
/// [isSelected] - Set true if you wanna force the added subtitle to start display on media.
Future<void> addSubtitleFromFile(
File file, {
bool? isSelected,
}) async {
Future<void> addSubtitleFromFile(File file, {bool? isSelected}) async {
return _addSubtitleTrack(
'file://${file.path}',
dataSourceType: DataSourceType.file,
Expand Down Expand Up @@ -729,8 +722,9 @@ class VlcPlayerController extends ValueNotifier<VlcPlayerValue> {
/// Returns the number of audio tracks
Future<int?> getAudioTracksCount() async {
_throwIfNotInitialized('getAudioTracksCount');
final audioTracksCount =
await vlcPlayerPlatform.getAudioTracksCount(_viewId);
final audioTracksCount = await vlcPlayerPlatform.getAudioTracksCount(
_viewId,
);
value = value.copyWith(audioTracksCount: audioTracksCount);

return audioTracksCount;
Expand Down Expand Up @@ -797,10 +791,7 @@ class VlcPlayerController extends ValueNotifier<VlcPlayerValue> {
/// Add extra audio file to media.
/// [file] - Audio file
/// [isSelected] - Set true if you wanna force the added audio to start playing on media.
Future<void> addAudioFromFile(
File file, {
bool? isSelected,
}) async {
Future<void> addAudioFromFile(File file, {bool? isSelected}) async {
return _addAudioTrack(
'file://${file.path}',
dataSourceType: DataSourceType.file,
Expand Down Expand Up @@ -829,8 +820,9 @@ class VlcPlayerController extends ValueNotifier<VlcPlayerValue> {
/// Returns the number of video tracks
Future<int?> getVideoTracksCount() async {
_throwIfNotInitialized('getVideoTracksCount');
final videoTracksCount =
await vlcPlayerPlatform.getVideoTracksCount(_viewId);
final videoTracksCount = await vlcPlayerPlatform.getVideoTracksCount(
_viewId,
);
value = value.copyWith(videoTracksCount: videoTracksCount);

return videoTracksCount;
Expand Down
9 changes: 5 additions & 4 deletions flutter_vlc_player/lib/src/vlc_player_platform.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'package:flutter_vlc_player_platform_interface/flutter_vlc_player_platform_interface.dart';

final VlcPlayerPlatform vlcPlayerPlatform = VlcPlayerPlatform.instance
// This will clear all open videos on the platform when a full restart is
// performed.
..init();
final VlcPlayerPlatform vlcPlayerPlatform =
VlcPlayerPlatform.instance
// This will clear all open videos on the platform when a full restart is
// performed.
..init();
Original file line number Diff line number Diff line change
@@ -1,7 +1,2 @@
// ignore: prefer-match-file-name
enum HwAcc {
auto,
disabled,
decoding,
full,
}
enum HwAcc { auto, disabled, decoding, full }
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
// ignore: prefer-match-file-name
enum VlcRendererEventType {
attached,
detached,
unknown,
}
enum VlcRendererEventType { attached, detached, unknown }
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
enum VlcSubtitleTextDirection {
ltr,
rtl,
auto,
}
enum VlcSubtitleTextDirection { ltr, rtl, auto }

extension VlcSubtitleTextDirectionExtensionMap on VlcSubtitleTextDirection {
static const valueMap = {
Expand Down
Loading
Loading