diff --git a/README.md b/README.md index 30349a33..2badc4d1 100644 --- a/README.md +++ b/README.md @@ -147,7 +147,7 @@ class _MyHomePageState extends State { _videoPlayerController = VlcPlayerController.network( 'https://media.w3.org/2010/05/sintel/trailer.mp4', - hwAcc: HwAcc.FULL, + hwAcc: HwAcc.full, autoPlay: false, options: VlcPlayerOptions(), ); diff --git a/flutter_vlc_player/CHANGELOG.md b/flutter_vlc_player/CHANGELOG.md index bf4099d6..1fa57caf 100644 --- a/flutter_vlc_player/CHANGELOG.md +++ b/flutter_vlc_player/CHANGELOG.md @@ -1,3 +1,9 @@ +## 7.0.0 +* **Breaking Change**: Refactored enum parameters to follow dart naming convention +* Fixed control overlay issue after upgrading to Flutter 2.8 +* Fixed Dart analysis warnings +Credits to Alireza Setayesh (https://github.com/alr2413). + ## 6.0.5 * Fix issue with options applying (Android) * Update VLCKit for iOS and Android diff --git a/flutter_vlc_player/android/src/main/java/software/solid/fluttervlcplayer/FlutterVlcPlayer.java b/flutter_vlc_player/android/src/main/java/software/solid/fluttervlcplayer/FlutterVlcPlayer.java index 0ff9469c..b872dc47 100644 --- a/flutter_vlc_player/android/src/main/java/software/solid/fluttervlcplayer/FlutterVlcPlayer.java +++ b/flutter_vlc_player/android/src/main/java/software/solid/fluttervlcplayer/FlutterVlcPlayer.java @@ -83,10 +83,10 @@ public void dispose() { } // VLC Player - FlutterVlcPlayer(int viewId, Context context, BinaryMessenger binaryMessenger, TextureRegistry textureRegistry) { + FlutterVlcPlayer(int playerId, Context context, BinaryMessenger binaryMessenger, TextureRegistry textureRegistry) { this.context = context; // event for media - mediaEventChannel = new EventChannel(binaryMessenger, "flutter_video_plugin/getVideoEvents_" + viewId); + mediaEventChannel = new EventChannel(binaryMessenger, "flutter_video_plugin/getVideoEvents_" + playerId); mediaEventChannel.setStreamHandler( new EventChannel.StreamHandler() { @Override @@ -100,7 +100,7 @@ public void onCancel(Object o) { } }); // event for renderer - rendererEventChannel = new EventChannel(binaryMessenger, "flutter_video_plugin/getRendererEvents_" + viewId); + rendererEventChannel = new EventChannel(binaryMessenger, "flutter_video_plugin/getRendererEvents_" + playerId); rendererEventChannel.setStreamHandler( new EventChannel.StreamHandler() { @Override diff --git a/flutter_vlc_player/android/src/main/java/software/solid/fluttervlcplayer/FlutterVlcPlayerBuilder.java b/flutter_vlc_player/android/src/main/java/software/solid/fluttervlcplayer/FlutterVlcPlayerBuilder.java index aeba33a8..351fd4a8 100644 --- a/flutter_vlc_player/android/src/main/java/software/solid/fluttervlcplayer/FlutterVlcPlayerBuilder.java +++ b/flutter_vlc_player/android/src/main/java/software/solid/fluttervlcplayer/FlutterVlcPlayerBuilder.java @@ -31,12 +31,12 @@ void stopListening(BinaryMessenger messenger) { Messages.VlcPlayerApi.setup(messenger, null); } - FlutterVlcPlayer build(int viewId, Context context, BinaryMessenger binaryMessenger, TextureRegistry textureRegistry, FlutterVlcPlayerFactory.KeyForAssetFn keyForAsset, FlutterVlcPlayerFactory.KeyForAssetAndPackageName keyForAssetAndPackageName) { + FlutterVlcPlayer build(int playerId, Context context, BinaryMessenger binaryMessenger, TextureRegistry textureRegistry, FlutterVlcPlayerFactory.KeyForAssetFn keyForAsset, FlutterVlcPlayerFactory.KeyForAssetAndPackageName keyForAssetAndPackageName) { this.keyForAsset = keyForAsset; this.keyForAssetAndPackageName = keyForAssetAndPackageName; // only create view for player and attach channel events - FlutterVlcPlayer vlcPlayer = new FlutterVlcPlayer(viewId, context, binaryMessenger, textureRegistry); - vlcPlayers.append(viewId, vlcPlayer); + FlutterVlcPlayer vlcPlayer = new FlutterVlcPlayer(playerId, context, binaryMessenger, textureRegistry); + vlcPlayers.append(playerId, vlcPlayer); return vlcPlayer; } @@ -55,7 +55,7 @@ public void initialize() { @Override public void create(Messages.CreateMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); // ArrayList options = new ArrayList(); if (arg.getOptions().size() > 0) @@ -81,14 +81,14 @@ public void create(Messages.CreateMessage arg) { } @Override - public void dispose(Messages.TextureMessage arg) { + public void dispose(Messages.PlayerMessage arg) { // the player has been already disposed by platform we just remove it from players list - vlcPlayers.remove(arg.getTextureId()); + vlcPlayers.remove(arg.getPlayerId()); } @Override public void setStreamUrl(Messages.SetMediaMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); // boolean isAssetUrl; String mediaUrl; @@ -108,34 +108,34 @@ public void setStreamUrl(Messages.SetMediaMessage arg) { } @Override - public void play(Messages.TextureMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + public void play(Messages.PlayerMessage arg) { + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); player.play(); } @Override - public void pause(Messages.TextureMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + public void pause(Messages.PlayerMessage arg) { + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); player.pause(); } @Override - public void stop(Messages.TextureMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + public void stop(Messages.PlayerMessage arg) { + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); player.stop(); } @Override - public Messages.BooleanMessage isPlaying(Messages.TextureMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + public Messages.BooleanMessage isPlaying(Messages.PlayerMessage arg) { + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); Messages.BooleanMessage message = new Messages.BooleanMessage(); message.setResult(player.isPlaying()); return message; } @Override - public Messages.BooleanMessage isSeekable(Messages.TextureMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + public Messages.BooleanMessage isSeekable(Messages.PlayerMessage arg) { + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); Messages.BooleanMessage message = new Messages.BooleanMessage(); message.setResult(player.isSeekable()); return message; @@ -143,27 +143,27 @@ public Messages.BooleanMessage isSeekable(Messages.TextureMessage arg) { @Override public void setLooping(Messages.LoopingMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); player.setLooping(arg.getIsLooping()); } @Override public void seekTo(Messages.PositionMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); player.seekTo(arg.getPosition().intValue()); } @Override - public Messages.PositionMessage position(Messages.TextureMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + public Messages.PositionMessage position(Messages.PlayerMessage arg) { + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); Messages.PositionMessage message = new Messages.PositionMessage(); message.setPosition(player.getPosition()); return message; } @Override - public Messages.DurationMessage duration(Messages.TextureMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + public Messages.DurationMessage duration(Messages.PlayerMessage arg) { + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); Messages.DurationMessage message = new Messages.DurationMessage(); message.setDuration(player.getDuration()); return message; @@ -171,13 +171,13 @@ public Messages.DurationMessage duration(Messages.TextureMessage arg) { @Override public void setVolume(Messages.VolumeMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); player.setVolume(arg.getVolume()); } @Override - public Messages.VolumeMessage getVolume(Messages.TextureMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + public Messages.VolumeMessage getVolume(Messages.PlayerMessage arg) { + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); Messages.VolumeMessage message = new Messages.VolumeMessage(); message.setVolume((long) player.getVolume()); return message; @@ -185,37 +185,37 @@ public Messages.VolumeMessage getVolume(Messages.TextureMessage arg) { @Override public void setPlaybackSpeed(Messages.PlaybackSpeedMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); player.setPlaybackSpeed(arg.getSpeed()); } @Override - public Messages.PlaybackSpeedMessage getPlaybackSpeed(Messages.TextureMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + public Messages.PlaybackSpeedMessage getPlaybackSpeed(Messages.PlayerMessage arg) { + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); Messages.PlaybackSpeedMessage message = new Messages.PlaybackSpeedMessage(); message.setSpeed((double) player.getPlaybackSpeed()); return message; } @Override - public Messages.SnapshotMessage takeSnapshot(Messages.TextureMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + public Messages.SnapshotMessage takeSnapshot(Messages.PlayerMessage arg) { + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); Messages.SnapshotMessage message = new Messages.SnapshotMessage(); message.setSnapshot(player.getSnapshot()); return message; } @Override - public Messages.TrackCountMessage getSpuTracksCount(Messages.TextureMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + public Messages.TrackCountMessage getSpuTracksCount(Messages.PlayerMessage arg) { + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); Messages.TrackCountMessage message = new Messages.TrackCountMessage(); message.setCount((long) player.getSpuTracksCount()); return message; } @Override - public Messages.SpuTracksMessage getSpuTracks(Messages.TextureMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + public Messages.SpuTracksMessage getSpuTracks(Messages.PlayerMessage arg) { + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); Messages.SpuTracksMessage message = new Messages.SpuTracksMessage(); message.setSubtitles(player.getSpuTracks()); return message; @@ -223,13 +223,13 @@ public Messages.SpuTracksMessage getSpuTracks(Messages.TextureMessage arg) { @Override public void setSpuTrack(Messages.SpuTrackMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); player.setSpuTrack(arg.getSpuTrackNumber().intValue()); } @Override - public Messages.SpuTrackMessage getSpuTrack(Messages.TextureMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + public Messages.SpuTrackMessage getSpuTrack(Messages.PlayerMessage arg) { + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); Messages.SpuTrackMessage message = new Messages.SpuTrackMessage(); message.setSpuTrackNumber((long) player.getSpuTrack()); return message; @@ -237,13 +237,13 @@ public Messages.SpuTrackMessage getSpuTrack(Messages.TextureMessage arg) { @Override public void setSpuDelay(Messages.DelayMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); player.setSpuDelay(arg.getDelay()); } @Override - public Messages.DelayMessage getSpuDelay(Messages.TextureMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + public Messages.DelayMessage getSpuDelay(Messages.PlayerMessage arg) { + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); Messages.DelayMessage message = new Messages.DelayMessage(); message.setDelay(player.getSpuDelay()); return message; @@ -251,21 +251,21 @@ public Messages.DelayMessage getSpuDelay(Messages.TextureMessage arg) { @Override public void addSubtitleTrack(Messages.AddSubtitleMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); player.addSubtitleTrack(arg.getUri(), arg.getIsSelected()); } @Override - public Messages.TrackCountMessage getAudioTracksCount(Messages.TextureMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + public Messages.TrackCountMessage getAudioTracksCount(Messages.PlayerMessage arg) { + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); Messages.TrackCountMessage message = new Messages.TrackCountMessage(); message.setCount((long) player.getAudioTracksCount()); return message; } @Override - public Messages.AudioTracksMessage getAudioTracks(Messages.TextureMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + public Messages.AudioTracksMessage getAudioTracks(Messages.PlayerMessage arg) { + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); Messages.AudioTracksMessage message = new Messages.AudioTracksMessage(); message.setAudios(player.getAudioTracks()); return message; @@ -273,13 +273,13 @@ public Messages.AudioTracksMessage getAudioTracks(Messages.TextureMessage arg) { @Override public void setAudioTrack(Messages.AudioTrackMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); player.setAudioTrack(arg.getAudioTrackNumber().intValue()); } @Override - public Messages.AudioTrackMessage getAudioTrack(Messages.TextureMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + public Messages.AudioTrackMessage getAudioTrack(Messages.PlayerMessage arg) { + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); Messages.AudioTrackMessage message = new Messages.AudioTrackMessage(); message.setAudioTrackNumber((long) player.getAudioTrack()); return message; @@ -287,13 +287,13 @@ public Messages.AudioTrackMessage getAudioTrack(Messages.TextureMessage arg) { @Override public void setAudioDelay(Messages.DelayMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); player.setAudioDelay(arg.getDelay()); } @Override - public Messages.DelayMessage getAudioDelay(Messages.TextureMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + public Messages.DelayMessage getAudioDelay(Messages.PlayerMessage arg) { + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); Messages.DelayMessage message = new Messages.DelayMessage(); message.setDelay(player.getAudioDelay()); return message; @@ -301,21 +301,21 @@ public Messages.DelayMessage getAudioDelay(Messages.TextureMessage arg) { @Override public void addAudioTrack(Messages.AddAudioMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); player.addAudioTrack(arg.getUri(), arg.getIsSelected()); } @Override - public Messages.TrackCountMessage getVideoTracksCount(Messages.TextureMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + public Messages.TrackCountMessage getVideoTracksCount(Messages.PlayerMessage arg) { + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); Messages.TrackCountMessage message = new Messages.TrackCountMessage(); message.setCount((long) player.getVideoTracksCount()); return message; } @Override - public Messages.VideoTracksMessage getVideoTracks(Messages.TextureMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + public Messages.VideoTracksMessage getVideoTracks(Messages.PlayerMessage arg) { + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); Messages.VideoTracksMessage message = new Messages.VideoTracksMessage(); message.setVideos(player.getVideoTracks()); return message; @@ -323,13 +323,13 @@ public Messages.VideoTracksMessage getVideoTracks(Messages.TextureMessage arg) { @Override public void setVideoTrack(Messages.VideoTrackMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); player.setVideoTrack(arg.getVideoTrackNumber().intValue()); } @Override - public Messages.VideoTrackMessage getVideoTrack(Messages.TextureMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + public Messages.VideoTrackMessage getVideoTrack(Messages.PlayerMessage arg) { + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); Messages.VideoTrackMessage message = new Messages.VideoTrackMessage(); message.setVideoTrackNumber((long) player.getVideoTrack()); return null; @@ -337,13 +337,13 @@ public Messages.VideoTrackMessage getVideoTrack(Messages.TextureMessage arg) { @Override public void setVideoScale(Messages.VideoScaleMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); player.setVideoScale(arg.getScale().floatValue()); } @Override - public Messages.VideoScaleMessage getVideoScale(Messages.TextureMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + public Messages.VideoScaleMessage getVideoScale(Messages.PlayerMessage arg) { + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); Messages.VideoScaleMessage message = new Messages.VideoScaleMessage(); message.setScale((double) player.getVideoScale()); return message; @@ -351,21 +351,21 @@ public Messages.VideoScaleMessage getVideoScale(Messages.TextureMessage arg) { @Override public void setVideoAspectRatio(Messages.VideoAspectRatioMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); player.setVideoAspectRatio(arg.getAspectRatio()); } @Override - public Messages.VideoAspectRatioMessage getVideoAspectRatio(Messages.TextureMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + public Messages.VideoAspectRatioMessage getVideoAspectRatio(Messages.PlayerMessage arg) { + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); Messages.VideoAspectRatioMessage message = new Messages.VideoAspectRatioMessage(); message.setAspectRatio(player.getVideoAspectRatio()); return message; } @Override - public Messages.RendererServicesMessage getAvailableRendererServices(Messages.TextureMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + public Messages.RendererServicesMessage getAvailableRendererServices(Messages.PlayerMessage arg) { + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); Messages.RendererServicesMessage message = new Messages.RendererServicesMessage(); message.setServices(player.getAvailableRendererServices()); return message; @@ -373,19 +373,19 @@ public Messages.RendererServicesMessage getAvailableRendererServices(Messages.Te @Override public void startRendererScanning(Messages.RendererScanningMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); player.startRendererScanning(arg.getRendererService()); } @Override - public void stopRendererScanning(Messages.TextureMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + public void stopRendererScanning(Messages.PlayerMessage arg) { + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); player.stopRendererScanning(); } @Override - public Messages.RendererDevicesMessage getRendererDevices(Messages.TextureMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + public Messages.RendererDevicesMessage getRendererDevices(Messages.PlayerMessage arg) { + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); Messages.RendererDevicesMessage message = new Messages.RendererDevicesMessage(); message.setRendererDevices(player.getRendererDevices()); return message; @@ -393,13 +393,13 @@ public Messages.RendererDevicesMessage getRendererDevices(Messages.TextureMessag @Override public void castToRenderer(Messages.RenderDeviceMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); player.castToRenderer(arg.getRendererDevice()); } @Override public Messages.BooleanMessage startRecording(Messages.RecordMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); Boolean result = player.startRecording(arg.getSaveDirectory()); Messages.BooleanMessage message = new Messages.BooleanMessage(); message.setResult(result); @@ -407,8 +407,8 @@ public Messages.BooleanMessage startRecording(Messages.RecordMessage arg) { } @Override - public Messages.BooleanMessage stopRecording(Messages.TextureMessage arg) { - FlutterVlcPlayer player = vlcPlayers.get(arg.getTextureId()); + public Messages.BooleanMessage stopRecording(Messages.PlayerMessage arg) { + FlutterVlcPlayer player = vlcPlayers.get(arg.getPlayerId()); Boolean result = player.stopRecording(); Messages.BooleanMessage message = new Messages.BooleanMessage(); message.setResult(result); diff --git a/flutter_vlc_player/android/src/main/java/software/solid/fluttervlcplayer/FlutterVlcPlayerFactory.java b/flutter_vlc_player/android/src/main/java/software/solid/fluttervlcplayer/FlutterVlcPlayerFactory.java index 4c7b3904..c28e7c53 100644 --- a/flutter_vlc_player/android/src/main/java/software/solid/fluttervlcplayer/FlutterVlcPlayerFactory.java +++ b/flutter_vlc_player/android/src/main/java/software/solid/fluttervlcplayer/FlutterVlcPlayerFactory.java @@ -39,9 +39,9 @@ public FlutterVlcPlayerFactory(BinaryMessenger messenger, TextureRegistry textur } @Override - public PlatformView create(Context context, int viewId, Object args) { + public PlatformView create(Context context, int playerId, Object args) { // Map params = (Map) args; - return flutterVlcPlayerBuilder.build(viewId, context, messenger, textureRegistry, keyForAsset, keyForAssetAndPackageName); + return flutterVlcPlayerBuilder.build(playerId, context, messenger, textureRegistry, keyForAsset, keyForAssetAndPackageName); } public void startListening() { diff --git a/flutter_vlc_player/android/src/main/java/software/solid/fluttervlcplayer/Messages.java b/flutter_vlc_player/android/src/main/java/software/solid/fluttervlcplayer/Messages.java index 74fb6c99..e8886855 100644 --- a/flutter_vlc_player/android/src/main/java/software/solid/fluttervlcplayer/Messages.java +++ b/flutter_vlc_player/android/src/main/java/software/solid/fluttervlcplayer/Messages.java @@ -16,9 +16,9 @@ public class Messages { /** Generated class from Pigeon that represents data sent in messages. */ public static class CreateMessage { - private Long textureId; - public Long getTextureId() { return textureId; } - public void setTextureId(Long setterArg) { this.textureId = setterArg; } + private Long playerId; + public Long getPlayerId() { return playerId; } + public void setPlayerId(Long setterArg) { this.playerId = setterArg; } private String uri; public String getUri() { return uri; } @@ -46,7 +46,7 @@ public static class CreateMessage { Map toMap() { Map toMapResult = new HashMap<>(); - toMapResult.put("textureId", textureId); + toMapResult.put("playerId", playerId); toMapResult.put("uri", uri); toMapResult.put("type", type); toMapResult.put("packageName", packageName); @@ -57,8 +57,8 @@ Map toMap() { } static CreateMessage fromMap(Map map) { CreateMessage fromMapResult = new CreateMessage(); - Object textureId = map.get("textureId"); - fromMapResult.textureId = (textureId == null) ? null : ((textureId instanceof Integer) ? (Integer)textureId : (Long)textureId); + Object playerId = map.get("playerId"); + fromMapResult.playerId = (playerId == null) ? null : ((playerId instanceof Integer) ? (Integer)playerId : (Long)playerId); Object uri = map.get("uri"); fromMapResult.uri = (String)uri; Object type = map.get("type"); @@ -76,29 +76,29 @@ static CreateMessage fromMap(Map map) { } /** Generated class from Pigeon that represents data sent in messages. */ - public static class TextureMessage { - private Long textureId; - public Long getTextureId() { return textureId; } - public void setTextureId(Long setterArg) { this.textureId = setterArg; } + public static class PlayerMessage { + private Long playerId; + public Long getPlayerId() { return playerId; } + public void setPlayerId(Long setterArg) { this.playerId = setterArg; } Map toMap() { Map toMapResult = new HashMap<>(); - toMapResult.put("textureId", textureId); + toMapResult.put("playerId", playerId); return toMapResult; } - static TextureMessage fromMap(Map map) { - TextureMessage fromMapResult = new TextureMessage(); - Object textureId = map.get("textureId"); - fromMapResult.textureId = (textureId == null) ? null : ((textureId instanceof Integer) ? (Integer)textureId : (Long)textureId); + static PlayerMessage fromMap(Map map) { + PlayerMessage fromMapResult = new PlayerMessage(); + Object playerId = map.get("playerId"); + fromMapResult.playerId = (playerId == null) ? null : ((playerId instanceof Integer) ? (Integer)playerId : (Long)playerId); return fromMapResult; } } /** Generated class from Pigeon that represents data sent in messages. */ public static class SetMediaMessage { - private Long textureId; - public Long getTextureId() { return textureId; } - public void setTextureId(Long setterArg) { this.textureId = setterArg; } + private Long playerId; + public Long getPlayerId() { return playerId; } + public void setPlayerId(Long setterArg) { this.playerId = setterArg; } private String uri; public String getUri() { return uri; } @@ -122,7 +122,7 @@ public static class SetMediaMessage { Map toMap() { Map toMapResult = new HashMap<>(); - toMapResult.put("textureId", textureId); + toMapResult.put("playerId", playerId); toMapResult.put("uri", uri); toMapResult.put("type", type); toMapResult.put("packageName", packageName); @@ -132,8 +132,8 @@ Map toMap() { } static SetMediaMessage fromMap(Map map) { SetMediaMessage fromMapResult = new SetMediaMessage(); - Object textureId = map.get("textureId"); - fromMapResult.textureId = (textureId == null) ? null : ((textureId instanceof Integer) ? (Integer)textureId : (Long)textureId); + Object playerId = map.get("playerId"); + fromMapResult.playerId = (playerId == null) ? null : ((playerId instanceof Integer) ? (Integer)playerId : (Long)playerId); Object uri = map.get("uri"); fromMapResult.uri = (String)uri; Object type = map.get("type"); @@ -150,9 +150,9 @@ static SetMediaMessage fromMap(Map map) { /** Generated class from Pigeon that represents data sent in messages. */ public static class BooleanMessage { - private Long textureId; - public Long getTextureId() { return textureId; } - public void setTextureId(Long setterArg) { this.textureId = setterArg; } + private Long playerId; + public Long getPlayerId() { return playerId; } + public void setPlayerId(Long setterArg) { this.playerId = setterArg; } private Boolean result; public Boolean getResult() { return result; } @@ -160,14 +160,14 @@ public static class BooleanMessage { Map toMap() { Map toMapResult = new HashMap<>(); - toMapResult.put("textureId", textureId); + toMapResult.put("playerId", playerId); toMapResult.put("result", result); return toMapResult; } static BooleanMessage fromMap(Map map) { BooleanMessage fromMapResult = new BooleanMessage(); - Object textureId = map.get("textureId"); - fromMapResult.textureId = (textureId == null) ? null : ((textureId instanceof Integer) ? (Integer)textureId : (Long)textureId); + Object playerId = map.get("playerId"); + fromMapResult.playerId = (playerId == null) ? null : ((playerId instanceof Integer) ? (Integer)playerId : (Long)playerId); Object result = map.get("result"); fromMapResult.result = (Boolean)result; return fromMapResult; @@ -176,9 +176,9 @@ static BooleanMessage fromMap(Map map) { /** Generated class from Pigeon that represents data sent in messages. */ public static class LoopingMessage { - private Long textureId; - public Long getTextureId() { return textureId; } - public void setTextureId(Long setterArg) { this.textureId = setterArg; } + private Long playerId; + public Long getPlayerId() { return playerId; } + public void setPlayerId(Long setterArg) { this.playerId = setterArg; } private Boolean isLooping; public Boolean getIsLooping() { return isLooping; } @@ -186,14 +186,14 @@ public static class LoopingMessage { Map toMap() { Map toMapResult = new HashMap<>(); - toMapResult.put("textureId", textureId); + toMapResult.put("playerId", playerId); toMapResult.put("isLooping", isLooping); return toMapResult; } static LoopingMessage fromMap(Map map) { LoopingMessage fromMapResult = new LoopingMessage(); - Object textureId = map.get("textureId"); - fromMapResult.textureId = (textureId == null) ? null : ((textureId instanceof Integer) ? (Integer)textureId : (Long)textureId); + Object playerId = map.get("playerId"); + fromMapResult.playerId = (playerId == null) ? null : ((playerId instanceof Integer) ? (Integer)playerId : (Long)playerId); Object isLooping = map.get("isLooping"); fromMapResult.isLooping = (Boolean)isLooping; return fromMapResult; @@ -202,9 +202,9 @@ static LoopingMessage fromMap(Map map) { /** Generated class from Pigeon that represents data sent in messages. */ public static class PositionMessage { - private Long textureId; - public Long getTextureId() { return textureId; } - public void setTextureId(Long setterArg) { this.textureId = setterArg; } + private Long playerId; + public Long getPlayerId() { return playerId; } + public void setPlayerId(Long setterArg) { this.playerId = setterArg; } private Long position; public Long getPosition() { return position; } @@ -212,14 +212,14 @@ public static class PositionMessage { Map toMap() { Map toMapResult = new HashMap<>(); - toMapResult.put("textureId", textureId); + toMapResult.put("playerId", playerId); toMapResult.put("position", position); return toMapResult; } static PositionMessage fromMap(Map map) { PositionMessage fromMapResult = new PositionMessage(); - Object textureId = map.get("textureId"); - fromMapResult.textureId = (textureId == null) ? null : ((textureId instanceof Integer) ? (Integer)textureId : (Long)textureId); + Object playerId = map.get("playerId"); + fromMapResult.playerId = (playerId == null) ? null : ((playerId instanceof Integer) ? (Integer)playerId : (Long)playerId); Object position = map.get("position"); fromMapResult.position = (position == null) ? null : ((position instanceof Integer) ? (Integer)position : (Long)position); return fromMapResult; @@ -228,9 +228,9 @@ static PositionMessage fromMap(Map map) { /** Generated class from Pigeon that represents data sent in messages. */ public static class DurationMessage { - private Long textureId; - public Long getTextureId() { return textureId; } - public void setTextureId(Long setterArg) { this.textureId = setterArg; } + private Long playerId; + public Long getPlayerId() { return playerId; } + public void setPlayerId(Long setterArg) { this.playerId = setterArg; } private Long duration; public Long getDuration() { return duration; } @@ -238,14 +238,14 @@ public static class DurationMessage { Map toMap() { Map toMapResult = new HashMap<>(); - toMapResult.put("textureId", textureId); + toMapResult.put("playerId", playerId); toMapResult.put("duration", duration); return toMapResult; } static DurationMessage fromMap(Map map) { DurationMessage fromMapResult = new DurationMessage(); - Object textureId = map.get("textureId"); - fromMapResult.textureId = (textureId == null) ? null : ((textureId instanceof Integer) ? (Integer)textureId : (Long)textureId); + Object playerId = map.get("playerId"); + fromMapResult.playerId = (playerId == null) ? null : ((playerId instanceof Integer) ? (Integer)playerId : (Long)playerId); Object duration = map.get("duration"); fromMapResult.duration = (duration == null) ? null : ((duration instanceof Integer) ? (Integer)duration : (Long)duration); return fromMapResult; @@ -254,9 +254,9 @@ static DurationMessage fromMap(Map map) { /** Generated class from Pigeon that represents data sent in messages. */ public static class VolumeMessage { - private Long textureId; - public Long getTextureId() { return textureId; } - public void setTextureId(Long setterArg) { this.textureId = setterArg; } + private Long playerId; + public Long getPlayerId() { return playerId; } + public void setPlayerId(Long setterArg) { this.playerId = setterArg; } private Long volume; public Long getVolume() { return volume; } @@ -264,14 +264,14 @@ public static class VolumeMessage { Map toMap() { Map toMapResult = new HashMap<>(); - toMapResult.put("textureId", textureId); + toMapResult.put("playerId", playerId); toMapResult.put("volume", volume); return toMapResult; } static VolumeMessage fromMap(Map map) { VolumeMessage fromMapResult = new VolumeMessage(); - Object textureId = map.get("textureId"); - fromMapResult.textureId = (textureId == null) ? null : ((textureId instanceof Integer) ? (Integer)textureId : (Long)textureId); + Object playerId = map.get("playerId"); + fromMapResult.playerId = (playerId == null) ? null : ((playerId instanceof Integer) ? (Integer)playerId : (Long)playerId); Object volume = map.get("volume"); fromMapResult.volume = (volume == null) ? null : ((volume instanceof Integer) ? (Integer)volume : (Long)volume); return fromMapResult; @@ -280,9 +280,9 @@ static VolumeMessage fromMap(Map map) { /** Generated class from Pigeon that represents data sent in messages. */ public static class PlaybackSpeedMessage { - private Long textureId; - public Long getTextureId() { return textureId; } - public void setTextureId(Long setterArg) { this.textureId = setterArg; } + private Long playerId; + public Long getPlayerId() { return playerId; } + public void setPlayerId(Long setterArg) { this.playerId = setterArg; } private Double speed; public Double getSpeed() { return speed; } @@ -290,14 +290,14 @@ public static class PlaybackSpeedMessage { Map toMap() { Map toMapResult = new HashMap<>(); - toMapResult.put("textureId", textureId); + toMapResult.put("playerId", playerId); toMapResult.put("speed", speed); return toMapResult; } static PlaybackSpeedMessage fromMap(Map map) { PlaybackSpeedMessage fromMapResult = new PlaybackSpeedMessage(); - Object textureId = map.get("textureId"); - fromMapResult.textureId = (textureId == null) ? null : ((textureId instanceof Integer) ? (Integer)textureId : (Long)textureId); + Object playerId = map.get("playerId"); + fromMapResult.playerId = (playerId == null) ? null : ((playerId instanceof Integer) ? (Integer)playerId : (Long)playerId); Object speed = map.get("speed"); fromMapResult.speed = (Double)speed; return fromMapResult; @@ -306,9 +306,9 @@ static PlaybackSpeedMessage fromMap(Map map) { /** Generated class from Pigeon that represents data sent in messages. */ public static class SnapshotMessage { - private Long textureId; - public Long getTextureId() { return textureId; } - public void setTextureId(Long setterArg) { this.textureId = setterArg; } + private Long playerId; + public Long getPlayerId() { return playerId; } + public void setPlayerId(Long setterArg) { this.playerId = setterArg; } private String snapshot; public String getSnapshot() { return snapshot; } @@ -316,14 +316,14 @@ public static class SnapshotMessage { Map toMap() { Map toMapResult = new HashMap<>(); - toMapResult.put("textureId", textureId); + toMapResult.put("playerId", playerId); toMapResult.put("snapshot", snapshot); return toMapResult; } static SnapshotMessage fromMap(Map map) { SnapshotMessage fromMapResult = new SnapshotMessage(); - Object textureId = map.get("textureId"); - fromMapResult.textureId = (textureId == null) ? null : ((textureId instanceof Integer) ? (Integer)textureId : (Long)textureId); + Object playerId = map.get("playerId"); + fromMapResult.playerId = (playerId == null) ? null : ((playerId instanceof Integer) ? (Integer)playerId : (Long)playerId); Object snapshot = map.get("snapshot"); fromMapResult.snapshot = (String)snapshot; return fromMapResult; @@ -332,9 +332,9 @@ static SnapshotMessage fromMap(Map map) { /** Generated class from Pigeon that represents data sent in messages. */ public static class TrackCountMessage { - private Long textureId; - public Long getTextureId() { return textureId; } - public void setTextureId(Long setterArg) { this.textureId = setterArg; } + private Long playerId; + public Long getPlayerId() { return playerId; } + public void setPlayerId(Long setterArg) { this.playerId = setterArg; } private Long count; public Long getCount() { return count; } @@ -342,14 +342,14 @@ public static class TrackCountMessage { Map toMap() { Map toMapResult = new HashMap<>(); - toMapResult.put("textureId", textureId); + toMapResult.put("playerId", playerId); toMapResult.put("count", count); return toMapResult; } static TrackCountMessage fromMap(Map map) { TrackCountMessage fromMapResult = new TrackCountMessage(); - Object textureId = map.get("textureId"); - fromMapResult.textureId = (textureId == null) ? null : ((textureId instanceof Integer) ? (Integer)textureId : (Long)textureId); + Object playerId = map.get("playerId"); + fromMapResult.playerId = (playerId == null) ? null : ((playerId instanceof Integer) ? (Integer)playerId : (Long)playerId); Object count = map.get("count"); fromMapResult.count = (count == null) ? null : ((count instanceof Integer) ? (Integer)count : (Long)count); return fromMapResult; @@ -358,9 +358,9 @@ static TrackCountMessage fromMap(Map map) { /** Generated class from Pigeon that represents data sent in messages. */ public static class SpuTracksMessage { - private Long textureId; - public Long getTextureId() { return textureId; } - public void setTextureId(Long setterArg) { this.textureId = setterArg; } + private Long playerId; + public Long getPlayerId() { return playerId; } + public void setPlayerId(Long setterArg) { this.playerId = setterArg; } private Map subtitles; public Map getSubtitles() { return subtitles; } @@ -368,14 +368,14 @@ public static class SpuTracksMessage { Map toMap() { Map toMapResult = new HashMap<>(); - toMapResult.put("textureId", textureId); + toMapResult.put("playerId", playerId); toMapResult.put("subtitles", subtitles); return toMapResult; } static SpuTracksMessage fromMap(Map map) { SpuTracksMessage fromMapResult = new SpuTracksMessage(); - Object textureId = map.get("textureId"); - fromMapResult.textureId = (textureId == null) ? null : ((textureId instanceof Integer) ? (Integer)textureId : (Long)textureId); + Object playerId = map.get("playerId"); + fromMapResult.playerId = (playerId == null) ? null : ((playerId instanceof Integer) ? (Integer)playerId : (Long)playerId); Object subtitles = map.get("subtitles"); fromMapResult.subtitles = (Map)subtitles; return fromMapResult; @@ -384,9 +384,9 @@ static SpuTracksMessage fromMap(Map map) { /** Generated class from Pigeon that represents data sent in messages. */ public static class SpuTrackMessage { - private Long textureId; - public Long getTextureId() { return textureId; } - public void setTextureId(Long setterArg) { this.textureId = setterArg; } + private Long playerId; + public Long getPlayerId() { return playerId; } + public void setPlayerId(Long setterArg) { this.playerId = setterArg; } private Long spuTrackNumber; public Long getSpuTrackNumber() { return spuTrackNumber; } @@ -394,14 +394,14 @@ public static class SpuTrackMessage { Map toMap() { Map toMapResult = new HashMap<>(); - toMapResult.put("textureId", textureId); + toMapResult.put("playerId", playerId); toMapResult.put("spuTrackNumber", spuTrackNumber); return toMapResult; } static SpuTrackMessage fromMap(Map map) { SpuTrackMessage fromMapResult = new SpuTrackMessage(); - Object textureId = map.get("textureId"); - fromMapResult.textureId = (textureId == null) ? null : ((textureId instanceof Integer) ? (Integer)textureId : (Long)textureId); + Object playerId = map.get("playerId"); + fromMapResult.playerId = (playerId == null) ? null : ((playerId instanceof Integer) ? (Integer)playerId : (Long)playerId); Object spuTrackNumber = map.get("spuTrackNumber"); fromMapResult.spuTrackNumber = (spuTrackNumber == null) ? null : ((spuTrackNumber instanceof Integer) ? (Integer)spuTrackNumber : (Long)spuTrackNumber); return fromMapResult; @@ -410,9 +410,9 @@ static SpuTrackMessage fromMap(Map map) { /** Generated class from Pigeon that represents data sent in messages. */ public static class DelayMessage { - private Long textureId; - public Long getTextureId() { return textureId; } - public void setTextureId(Long setterArg) { this.textureId = setterArg; } + private Long playerId; + public Long getPlayerId() { return playerId; } + public void setPlayerId(Long setterArg) { this.playerId = setterArg; } private Long delay; public Long getDelay() { return delay; } @@ -420,14 +420,14 @@ public static class DelayMessage { Map toMap() { Map toMapResult = new HashMap<>(); - toMapResult.put("textureId", textureId); + toMapResult.put("playerId", playerId); toMapResult.put("delay", delay); return toMapResult; } static DelayMessage fromMap(Map map) { DelayMessage fromMapResult = new DelayMessage(); - Object textureId = map.get("textureId"); - fromMapResult.textureId = (textureId == null) ? null : ((textureId instanceof Integer) ? (Integer)textureId : (Long)textureId); + Object playerId = map.get("playerId"); + fromMapResult.playerId = (playerId == null) ? null : ((playerId instanceof Integer) ? (Integer)playerId : (Long)playerId); Object delay = map.get("delay"); fromMapResult.delay = (delay == null) ? null : ((delay instanceof Integer) ? (Integer)delay : (Long)delay); return fromMapResult; @@ -436,9 +436,9 @@ static DelayMessage fromMap(Map map) { /** Generated class from Pigeon that represents data sent in messages. */ public static class AddSubtitleMessage { - private Long textureId; - public Long getTextureId() { return textureId; } - public void setTextureId(Long setterArg) { this.textureId = setterArg; } + private Long playerId; + public Long getPlayerId() { return playerId; } + public void setPlayerId(Long setterArg) { this.playerId = setterArg; } private String uri; public String getUri() { return uri; } @@ -454,7 +454,7 @@ public static class AddSubtitleMessage { Map toMap() { Map toMapResult = new HashMap<>(); - toMapResult.put("textureId", textureId); + toMapResult.put("playerId", playerId); toMapResult.put("uri", uri); toMapResult.put("type", type); toMapResult.put("isSelected", isSelected); @@ -462,8 +462,8 @@ Map toMap() { } static AddSubtitleMessage fromMap(Map map) { AddSubtitleMessage fromMapResult = new AddSubtitleMessage(); - Object textureId = map.get("textureId"); - fromMapResult.textureId = (textureId == null) ? null : ((textureId instanceof Integer) ? (Integer)textureId : (Long)textureId); + Object playerId = map.get("playerId"); + fromMapResult.playerId = (playerId == null) ? null : ((playerId instanceof Integer) ? (Integer)playerId : (Long)playerId); Object uri = map.get("uri"); fromMapResult.uri = (String)uri; Object type = map.get("type"); @@ -476,9 +476,9 @@ static AddSubtitleMessage fromMap(Map map) { /** Generated class from Pigeon that represents data sent in messages. */ public static class AudioTracksMessage { - private Long textureId; - public Long getTextureId() { return textureId; } - public void setTextureId(Long setterArg) { this.textureId = setterArg; } + private Long playerId; + public Long getPlayerId() { return playerId; } + public void setPlayerId(Long setterArg) { this.playerId = setterArg; } private Map audios; public Map getAudios() { return audios; } @@ -486,14 +486,14 @@ public static class AudioTracksMessage { Map toMap() { Map toMapResult = new HashMap<>(); - toMapResult.put("textureId", textureId); + toMapResult.put("playerId", playerId); toMapResult.put("audios", audios); return toMapResult; } static AudioTracksMessage fromMap(Map map) { AudioTracksMessage fromMapResult = new AudioTracksMessage(); - Object textureId = map.get("textureId"); - fromMapResult.textureId = (textureId == null) ? null : ((textureId instanceof Integer) ? (Integer)textureId : (Long)textureId); + Object playerId = map.get("playerId"); + fromMapResult.playerId = (playerId == null) ? null : ((playerId instanceof Integer) ? (Integer)playerId : (Long)playerId); Object audios = map.get("audios"); fromMapResult.audios = (Map)audios; return fromMapResult; @@ -502,9 +502,9 @@ static AudioTracksMessage fromMap(Map map) { /** Generated class from Pigeon that represents data sent in messages. */ public static class AudioTrackMessage { - private Long textureId; - public Long getTextureId() { return textureId; } - public void setTextureId(Long setterArg) { this.textureId = setterArg; } + private Long playerId; + public Long getPlayerId() { return playerId; } + public void setPlayerId(Long setterArg) { this.playerId = setterArg; } private Long audioTrackNumber; public Long getAudioTrackNumber() { return audioTrackNumber; } @@ -512,14 +512,14 @@ public static class AudioTrackMessage { Map toMap() { Map toMapResult = new HashMap<>(); - toMapResult.put("textureId", textureId); + toMapResult.put("playerId", playerId); toMapResult.put("audioTrackNumber", audioTrackNumber); return toMapResult; } static AudioTrackMessage fromMap(Map map) { AudioTrackMessage fromMapResult = new AudioTrackMessage(); - Object textureId = map.get("textureId"); - fromMapResult.textureId = (textureId == null) ? null : ((textureId instanceof Integer) ? (Integer)textureId : (Long)textureId); + Object playerId = map.get("playerId"); + fromMapResult.playerId = (playerId == null) ? null : ((playerId instanceof Integer) ? (Integer)playerId : (Long)playerId); Object audioTrackNumber = map.get("audioTrackNumber"); fromMapResult.audioTrackNumber = (audioTrackNumber == null) ? null : ((audioTrackNumber instanceof Integer) ? (Integer)audioTrackNumber : (Long)audioTrackNumber); return fromMapResult; @@ -528,9 +528,9 @@ static AudioTrackMessage fromMap(Map map) { /** Generated class from Pigeon that represents data sent in messages. */ public static class AddAudioMessage { - private Long textureId; - public Long getTextureId() { return textureId; } - public void setTextureId(Long setterArg) { this.textureId = setterArg; } + private Long playerId; + public Long getPlayerId() { return playerId; } + public void setPlayerId(Long setterArg) { this.playerId = setterArg; } private String uri; public String getUri() { return uri; } @@ -546,7 +546,7 @@ public static class AddAudioMessage { Map toMap() { Map toMapResult = new HashMap<>(); - toMapResult.put("textureId", textureId); + toMapResult.put("playerId", playerId); toMapResult.put("uri", uri); toMapResult.put("type", type); toMapResult.put("isSelected", isSelected); @@ -554,8 +554,8 @@ Map toMap() { } static AddAudioMessage fromMap(Map map) { AddAudioMessage fromMapResult = new AddAudioMessage(); - Object textureId = map.get("textureId"); - fromMapResult.textureId = (textureId == null) ? null : ((textureId instanceof Integer) ? (Integer)textureId : (Long)textureId); + Object playerId = map.get("playerId"); + fromMapResult.playerId = (playerId == null) ? null : ((playerId instanceof Integer) ? (Integer)playerId : (Long)playerId); Object uri = map.get("uri"); fromMapResult.uri = (String)uri; Object type = map.get("type"); @@ -568,9 +568,9 @@ static AddAudioMessage fromMap(Map map) { /** Generated class from Pigeon that represents data sent in messages. */ public static class VideoTracksMessage { - private Long textureId; - public Long getTextureId() { return textureId; } - public void setTextureId(Long setterArg) { this.textureId = setterArg; } + private Long playerId; + public Long getPlayerId() { return playerId; } + public void setPlayerId(Long setterArg) { this.playerId = setterArg; } private Map videos; public Map getVideos() { return videos; } @@ -578,14 +578,14 @@ public static class VideoTracksMessage { Map toMap() { Map toMapResult = new HashMap<>(); - toMapResult.put("textureId", textureId); + toMapResult.put("playerId", playerId); toMapResult.put("videos", videos); return toMapResult; } static VideoTracksMessage fromMap(Map map) { VideoTracksMessage fromMapResult = new VideoTracksMessage(); - Object textureId = map.get("textureId"); - fromMapResult.textureId = (textureId == null) ? null : ((textureId instanceof Integer) ? (Integer)textureId : (Long)textureId); + Object playerId = map.get("playerId"); + fromMapResult.playerId = (playerId == null) ? null : ((playerId instanceof Integer) ? (Integer)playerId : (Long)playerId); Object videos = map.get("videos"); fromMapResult.videos = (Map)videos; return fromMapResult; @@ -594,9 +594,9 @@ static VideoTracksMessage fromMap(Map map) { /** Generated class from Pigeon that represents data sent in messages. */ public static class VideoTrackMessage { - private Long textureId; - public Long getTextureId() { return textureId; } - public void setTextureId(Long setterArg) { this.textureId = setterArg; } + private Long playerId; + public Long getPlayerId() { return playerId; } + public void setPlayerId(Long setterArg) { this.playerId = setterArg; } private Long videoTrackNumber; public Long getVideoTrackNumber() { return videoTrackNumber; } @@ -604,14 +604,14 @@ public static class VideoTrackMessage { Map toMap() { Map toMapResult = new HashMap<>(); - toMapResult.put("textureId", textureId); + toMapResult.put("playerId", playerId); toMapResult.put("videoTrackNumber", videoTrackNumber); return toMapResult; } static VideoTrackMessage fromMap(Map map) { VideoTrackMessage fromMapResult = new VideoTrackMessage(); - Object textureId = map.get("textureId"); - fromMapResult.textureId = (textureId == null) ? null : ((textureId instanceof Integer) ? (Integer)textureId : (Long)textureId); + Object playerId = map.get("playerId"); + fromMapResult.playerId = (playerId == null) ? null : ((playerId instanceof Integer) ? (Integer)playerId : (Long)playerId); Object videoTrackNumber = map.get("videoTrackNumber"); fromMapResult.videoTrackNumber = (videoTrackNumber == null) ? null : ((videoTrackNumber instanceof Integer) ? (Integer)videoTrackNumber : (Long)videoTrackNumber); return fromMapResult; @@ -620,9 +620,9 @@ static VideoTrackMessage fromMap(Map map) { /** Generated class from Pigeon that represents data sent in messages. */ public static class VideoScaleMessage { - private Long textureId; - public Long getTextureId() { return textureId; } - public void setTextureId(Long setterArg) { this.textureId = setterArg; } + private Long playerId; + public Long getPlayerId() { return playerId; } + public void setPlayerId(Long setterArg) { this.playerId = setterArg; } private Double scale; public Double getScale() { return scale; } @@ -630,14 +630,14 @@ public static class VideoScaleMessage { Map toMap() { Map toMapResult = new HashMap<>(); - toMapResult.put("textureId", textureId); + toMapResult.put("playerId", playerId); toMapResult.put("scale", scale); return toMapResult; } static VideoScaleMessage fromMap(Map map) { VideoScaleMessage fromMapResult = new VideoScaleMessage(); - Object textureId = map.get("textureId"); - fromMapResult.textureId = (textureId == null) ? null : ((textureId instanceof Integer) ? (Integer)textureId : (Long)textureId); + Object playerId = map.get("playerId"); + fromMapResult.playerId = (playerId == null) ? null : ((playerId instanceof Integer) ? (Integer)playerId : (Long)playerId); Object scale = map.get("scale"); fromMapResult.scale = (Double)scale; return fromMapResult; @@ -646,9 +646,9 @@ static VideoScaleMessage fromMap(Map map) { /** Generated class from Pigeon that represents data sent in messages. */ public static class VideoAspectRatioMessage { - private Long textureId; - public Long getTextureId() { return textureId; } - public void setTextureId(Long setterArg) { this.textureId = setterArg; } + private Long playerId; + public Long getPlayerId() { return playerId; } + public void setPlayerId(Long setterArg) { this.playerId = setterArg; } private String aspectRatio; public String getAspectRatio() { return aspectRatio; } @@ -656,14 +656,14 @@ public static class VideoAspectRatioMessage { Map toMap() { Map toMapResult = new HashMap<>(); - toMapResult.put("textureId", textureId); + toMapResult.put("playerId", playerId); toMapResult.put("aspectRatio", aspectRatio); return toMapResult; } static VideoAspectRatioMessage fromMap(Map map) { VideoAspectRatioMessage fromMapResult = new VideoAspectRatioMessage(); - Object textureId = map.get("textureId"); - fromMapResult.textureId = (textureId == null) ? null : ((textureId instanceof Integer) ? (Integer)textureId : (Long)textureId); + Object playerId = map.get("playerId"); + fromMapResult.playerId = (playerId == null) ? null : ((playerId instanceof Integer) ? (Integer)playerId : (Long)playerId); Object aspectRatio = map.get("aspectRatio"); fromMapResult.aspectRatio = (String)aspectRatio; return fromMapResult; @@ -672,9 +672,9 @@ static VideoAspectRatioMessage fromMap(Map map) { /** Generated class from Pigeon that represents data sent in messages. */ public static class RendererServicesMessage { - private Long textureId; - public Long getTextureId() { return textureId; } - public void setTextureId(Long setterArg) { this.textureId = setterArg; } + private Long playerId; + public Long getPlayerId() { return playerId; } + public void setPlayerId(Long setterArg) { this.playerId = setterArg; } private List services; public List getServices() { return services; } @@ -682,14 +682,14 @@ public static class RendererServicesMessage { Map toMap() { Map toMapResult = new HashMap<>(); - toMapResult.put("textureId", textureId); + toMapResult.put("playerId", playerId); toMapResult.put("services", services); return toMapResult; } static RendererServicesMessage fromMap(Map map) { RendererServicesMessage fromMapResult = new RendererServicesMessage(); - Object textureId = map.get("textureId"); - fromMapResult.textureId = (textureId == null) ? null : ((textureId instanceof Integer) ? (Integer)textureId : (Long)textureId); + Object playerId = map.get("playerId"); + fromMapResult.playerId = (playerId == null) ? null : ((playerId instanceof Integer) ? (Integer)playerId : (Long)playerId); Object services = map.get("services"); fromMapResult.services = (List)services; return fromMapResult; @@ -698,9 +698,9 @@ static RendererServicesMessage fromMap(Map map) { /** Generated class from Pigeon that represents data sent in messages. */ public static class RendererScanningMessage { - private Long textureId; - public Long getTextureId() { return textureId; } - public void setTextureId(Long setterArg) { this.textureId = setterArg; } + private Long playerId; + public Long getPlayerId() { return playerId; } + public void setPlayerId(Long setterArg) { this.playerId = setterArg; } private String rendererService; public String getRendererService() { return rendererService; } @@ -708,14 +708,14 @@ public static class RendererScanningMessage { Map toMap() { Map toMapResult = new HashMap<>(); - toMapResult.put("textureId", textureId); + toMapResult.put("playerId", playerId); toMapResult.put("rendererService", rendererService); return toMapResult; } static RendererScanningMessage fromMap(Map map) { RendererScanningMessage fromMapResult = new RendererScanningMessage(); - Object textureId = map.get("textureId"); - fromMapResult.textureId = (textureId == null) ? null : ((textureId instanceof Integer) ? (Integer)textureId : (Long)textureId); + Object playerId = map.get("playerId"); + fromMapResult.playerId = (playerId == null) ? null : ((playerId instanceof Integer) ? (Integer)playerId : (Long)playerId); Object rendererService = map.get("rendererService"); fromMapResult.rendererService = (String)rendererService; return fromMapResult; @@ -724,9 +724,9 @@ static RendererScanningMessage fromMap(Map map) { /** Generated class from Pigeon that represents data sent in messages. */ public static class RendererDevicesMessage { - private Long textureId; - public Long getTextureId() { return textureId; } - public void setTextureId(Long setterArg) { this.textureId = setterArg; } + private Long playerId; + public Long getPlayerId() { return playerId; } + public void setPlayerId(Long setterArg) { this.playerId = setterArg; } private Map rendererDevices; public Map getRendererDevices() { return rendererDevices; } @@ -734,14 +734,14 @@ public static class RendererDevicesMessage { Map toMap() { Map toMapResult = new HashMap<>(); - toMapResult.put("textureId", textureId); + toMapResult.put("playerId", playerId); toMapResult.put("rendererDevices", rendererDevices); return toMapResult; } static RendererDevicesMessage fromMap(Map map) { RendererDevicesMessage fromMapResult = new RendererDevicesMessage(); - Object textureId = map.get("textureId"); - fromMapResult.textureId = (textureId == null) ? null : ((textureId instanceof Integer) ? (Integer)textureId : (Long)textureId); + Object playerId = map.get("playerId"); + fromMapResult.playerId = (playerId == null) ? null : ((playerId instanceof Integer) ? (Integer)playerId : (Long)playerId); Object rendererDevices = map.get("rendererDevices"); fromMapResult.rendererDevices = (Map)rendererDevices; return fromMapResult; @@ -750,9 +750,9 @@ static RendererDevicesMessage fromMap(Map map) { /** Generated class from Pigeon that represents data sent in messages. */ public static class RenderDeviceMessage { - private Long textureId; - public Long getTextureId() { return textureId; } - public void setTextureId(Long setterArg) { this.textureId = setterArg; } + private Long playerId; + public Long getPlayerId() { return playerId; } + public void setPlayerId(Long setterArg) { this.playerId = setterArg; } private String rendererDevice; public String getRendererDevice() { return rendererDevice; } @@ -760,14 +760,14 @@ public static class RenderDeviceMessage { Map toMap() { Map toMapResult = new HashMap<>(); - toMapResult.put("textureId", textureId); + toMapResult.put("playerId", playerId); toMapResult.put("rendererDevice", rendererDevice); return toMapResult; } static RenderDeviceMessage fromMap(Map map) { RenderDeviceMessage fromMapResult = new RenderDeviceMessage(); - Object textureId = map.get("textureId"); - fromMapResult.textureId = (textureId == null) ? null : ((textureId instanceof Integer) ? (Integer)textureId : (Long)textureId); + Object playerId = map.get("playerId"); + fromMapResult.playerId = (playerId == null) ? null : ((playerId instanceof Integer) ? (Integer)playerId : (Long)playerId); Object rendererDevice = map.get("rendererDevice"); fromMapResult.rendererDevice = (String)rendererDevice; return fromMapResult; @@ -776,9 +776,9 @@ static RenderDeviceMessage fromMap(Map map) { /** Generated class from Pigeon that represents data sent in messages. */ public static class RecordMessage { - private Long textureId; - public Long getTextureId() { return textureId; } - public void setTextureId(Long setterArg) { this.textureId = setterArg; } + private Long playerId; + public Long getPlayerId() { return playerId; } + public void setPlayerId(Long setterArg) { this.playerId = setterArg; } private String saveDirectory; public String getSaveDirectory() { return saveDirectory; } @@ -786,14 +786,14 @@ public static class RecordMessage { Map toMap() { Map toMapResult = new HashMap<>(); - toMapResult.put("textureId", textureId); + toMapResult.put("playerId", playerId); toMapResult.put("saveDirectory", saveDirectory); return toMapResult; } static RecordMessage fromMap(Map map) { RecordMessage fromMapResult = new RecordMessage(); - Object textureId = map.get("textureId"); - fromMapResult.textureId = (textureId == null) ? null : ((textureId instanceof Integer) ? (Integer)textureId : (Long)textureId); + Object playerId = map.get("playerId"); + fromMapResult.playerId = (playerId == null) ? null : ((playerId instanceof Integer) ? (Integer)playerId : (Long)playerId); Object saveDirectory = map.get("saveDirectory"); fromMapResult.saveDirectory = (String)saveDirectory; return fromMapResult; @@ -804,51 +804,51 @@ static RecordMessage fromMap(Map map) { public interface VlcPlayerApi { void initialize(); void create(CreateMessage arg); - void dispose(TextureMessage arg); + void dispose(PlayerMessage arg); void setStreamUrl(SetMediaMessage arg); - void play(TextureMessage arg); - void pause(TextureMessage arg); - void stop(TextureMessage arg); - BooleanMessage isPlaying(TextureMessage arg); - BooleanMessage isSeekable(TextureMessage arg); + void play(PlayerMessage arg); + void pause(PlayerMessage arg); + void stop(PlayerMessage arg); + BooleanMessage isPlaying(PlayerMessage arg); + BooleanMessage isSeekable(PlayerMessage arg); void setLooping(LoopingMessage arg); void seekTo(PositionMessage arg); - PositionMessage position(TextureMessage arg); - DurationMessage duration(TextureMessage arg); + PositionMessage position(PlayerMessage arg); + DurationMessage duration(PlayerMessage arg); void setVolume(VolumeMessage arg); - VolumeMessage getVolume(TextureMessage arg); + VolumeMessage getVolume(PlayerMessage arg); void setPlaybackSpeed(PlaybackSpeedMessage arg); - PlaybackSpeedMessage getPlaybackSpeed(TextureMessage arg); - SnapshotMessage takeSnapshot(TextureMessage arg); - TrackCountMessage getSpuTracksCount(TextureMessage arg); - SpuTracksMessage getSpuTracks(TextureMessage arg); + PlaybackSpeedMessage getPlaybackSpeed(PlayerMessage arg); + SnapshotMessage takeSnapshot(PlayerMessage arg); + TrackCountMessage getSpuTracksCount(PlayerMessage arg); + SpuTracksMessage getSpuTracks(PlayerMessage arg); void setSpuTrack(SpuTrackMessage arg); - SpuTrackMessage getSpuTrack(TextureMessage arg); + SpuTrackMessage getSpuTrack(PlayerMessage arg); void setSpuDelay(DelayMessage arg); - DelayMessage getSpuDelay(TextureMessage arg); + DelayMessage getSpuDelay(PlayerMessage arg); void addSubtitleTrack(AddSubtitleMessage arg); - TrackCountMessage getAudioTracksCount(TextureMessage arg); - AudioTracksMessage getAudioTracks(TextureMessage arg); + TrackCountMessage getAudioTracksCount(PlayerMessage arg); + AudioTracksMessage getAudioTracks(PlayerMessage arg); void setAudioTrack(AudioTrackMessage arg); - AudioTrackMessage getAudioTrack(TextureMessage arg); + AudioTrackMessage getAudioTrack(PlayerMessage arg); void setAudioDelay(DelayMessage arg); - DelayMessage getAudioDelay(TextureMessage arg); + DelayMessage getAudioDelay(PlayerMessage arg); void addAudioTrack(AddAudioMessage arg); - TrackCountMessage getVideoTracksCount(TextureMessage arg); - VideoTracksMessage getVideoTracks(TextureMessage arg); + TrackCountMessage getVideoTracksCount(PlayerMessage arg); + VideoTracksMessage getVideoTracks(PlayerMessage arg); void setVideoTrack(VideoTrackMessage arg); - VideoTrackMessage getVideoTrack(TextureMessage arg); + VideoTrackMessage getVideoTrack(PlayerMessage arg); void setVideoScale(VideoScaleMessage arg); - VideoScaleMessage getVideoScale(TextureMessage arg); + VideoScaleMessage getVideoScale(PlayerMessage arg); void setVideoAspectRatio(VideoAspectRatioMessage arg); - VideoAspectRatioMessage getVideoAspectRatio(TextureMessage arg); - RendererServicesMessage getAvailableRendererServices(TextureMessage arg); + VideoAspectRatioMessage getVideoAspectRatio(PlayerMessage arg); + RendererServicesMessage getAvailableRendererServices(PlayerMessage arg); void startRendererScanning(RendererScanningMessage arg); - void stopRendererScanning(TextureMessage arg); - RendererDevicesMessage getRendererDevices(TextureMessage arg); + void stopRendererScanning(PlayerMessage arg); + RendererDevicesMessage getRendererDevices(PlayerMessage arg); void castToRenderer(RenderDeviceMessage arg); BooleanMessage startRecording(RecordMessage arg); - BooleanMessage stopRecording(TextureMessage arg); + BooleanMessage stopRecording(PlayerMessage arg); /** Sets up an instance of `VlcPlayerApi` to handle messages through the `binaryMessenger`. */ static void setup(BinaryMessenger binaryMessenger, VlcPlayerApi api) { @@ -900,7 +900,7 @@ static void setup(BinaryMessenger binaryMessenger, VlcPlayerApi api) { Map wrapped = new HashMap<>(); try { @SuppressWarnings("ConstantConditions") - TextureMessage input = TextureMessage.fromMap((Map)message); + PlayerMessage input = PlayerMessage.fromMap((Map)message); api.dispose(input); wrapped.put("result", null); } @@ -942,7 +942,7 @@ static void setup(BinaryMessenger binaryMessenger, VlcPlayerApi api) { Map wrapped = new HashMap<>(); try { @SuppressWarnings("ConstantConditions") - TextureMessage input = TextureMessage.fromMap((Map)message); + PlayerMessage input = PlayerMessage.fromMap((Map)message); api.play(input); wrapped.put("result", null); } @@ -963,7 +963,7 @@ static void setup(BinaryMessenger binaryMessenger, VlcPlayerApi api) { Map wrapped = new HashMap<>(); try { @SuppressWarnings("ConstantConditions") - TextureMessage input = TextureMessage.fromMap((Map)message); + PlayerMessage input = PlayerMessage.fromMap((Map)message); api.pause(input); wrapped.put("result", null); } @@ -984,7 +984,7 @@ static void setup(BinaryMessenger binaryMessenger, VlcPlayerApi api) { Map wrapped = new HashMap<>(); try { @SuppressWarnings("ConstantConditions") - TextureMessage input = TextureMessage.fromMap((Map)message); + PlayerMessage input = PlayerMessage.fromMap((Map)message); api.stop(input); wrapped.put("result", null); } @@ -1005,7 +1005,7 @@ static void setup(BinaryMessenger binaryMessenger, VlcPlayerApi api) { Map wrapped = new HashMap<>(); try { @SuppressWarnings("ConstantConditions") - TextureMessage input = TextureMessage.fromMap((Map)message); + PlayerMessage input = PlayerMessage.fromMap((Map)message); BooleanMessage output = api.isPlaying(input); wrapped.put("result", output.toMap()); } @@ -1026,7 +1026,7 @@ static void setup(BinaryMessenger binaryMessenger, VlcPlayerApi api) { Map wrapped = new HashMap<>(); try { @SuppressWarnings("ConstantConditions") - TextureMessage input = TextureMessage.fromMap((Map)message); + PlayerMessage input = PlayerMessage.fromMap((Map)message); BooleanMessage output = api.isSeekable(input); wrapped.put("result", output.toMap()); } @@ -1089,7 +1089,7 @@ static void setup(BinaryMessenger binaryMessenger, VlcPlayerApi api) { Map wrapped = new HashMap<>(); try { @SuppressWarnings("ConstantConditions") - TextureMessage input = TextureMessage.fromMap((Map)message); + PlayerMessage input = PlayerMessage.fromMap((Map)message); PositionMessage output = api.position(input); wrapped.put("result", output.toMap()); } @@ -1110,7 +1110,7 @@ static void setup(BinaryMessenger binaryMessenger, VlcPlayerApi api) { Map wrapped = new HashMap<>(); try { @SuppressWarnings("ConstantConditions") - TextureMessage input = TextureMessage.fromMap((Map)message); + PlayerMessage input = PlayerMessage.fromMap((Map)message); DurationMessage output = api.duration(input); wrapped.put("result", output.toMap()); } @@ -1152,7 +1152,7 @@ static void setup(BinaryMessenger binaryMessenger, VlcPlayerApi api) { Map wrapped = new HashMap<>(); try { @SuppressWarnings("ConstantConditions") - TextureMessage input = TextureMessage.fromMap((Map)message); + PlayerMessage input = PlayerMessage.fromMap((Map)message); VolumeMessage output = api.getVolume(input); wrapped.put("result", output.toMap()); } @@ -1194,7 +1194,7 @@ static void setup(BinaryMessenger binaryMessenger, VlcPlayerApi api) { Map wrapped = new HashMap<>(); try { @SuppressWarnings("ConstantConditions") - TextureMessage input = TextureMessage.fromMap((Map)message); + PlayerMessage input = PlayerMessage.fromMap((Map)message); PlaybackSpeedMessage output = api.getPlaybackSpeed(input); wrapped.put("result", output.toMap()); } @@ -1215,7 +1215,7 @@ static void setup(BinaryMessenger binaryMessenger, VlcPlayerApi api) { Map wrapped = new HashMap<>(); try { @SuppressWarnings("ConstantConditions") - TextureMessage input = TextureMessage.fromMap((Map)message); + PlayerMessage input = PlayerMessage.fromMap((Map)message); SnapshotMessage output = api.takeSnapshot(input); wrapped.put("result", output.toMap()); } @@ -1236,7 +1236,7 @@ static void setup(BinaryMessenger binaryMessenger, VlcPlayerApi api) { Map wrapped = new HashMap<>(); try { @SuppressWarnings("ConstantConditions") - TextureMessage input = TextureMessage.fromMap((Map)message); + PlayerMessage input = PlayerMessage.fromMap((Map)message); TrackCountMessage output = api.getSpuTracksCount(input); wrapped.put("result", output.toMap()); } @@ -1257,7 +1257,7 @@ static void setup(BinaryMessenger binaryMessenger, VlcPlayerApi api) { Map wrapped = new HashMap<>(); try { @SuppressWarnings("ConstantConditions") - TextureMessage input = TextureMessage.fromMap((Map)message); + PlayerMessage input = PlayerMessage.fromMap((Map)message); SpuTracksMessage output = api.getSpuTracks(input); wrapped.put("result", output.toMap()); } @@ -1299,7 +1299,7 @@ static void setup(BinaryMessenger binaryMessenger, VlcPlayerApi api) { Map wrapped = new HashMap<>(); try { @SuppressWarnings("ConstantConditions") - TextureMessage input = TextureMessage.fromMap((Map)message); + PlayerMessage input = PlayerMessage.fromMap((Map)message); SpuTrackMessage output = api.getSpuTrack(input); wrapped.put("result", output.toMap()); } @@ -1341,7 +1341,7 @@ static void setup(BinaryMessenger binaryMessenger, VlcPlayerApi api) { Map wrapped = new HashMap<>(); try { @SuppressWarnings("ConstantConditions") - TextureMessage input = TextureMessage.fromMap((Map)message); + PlayerMessage input = PlayerMessage.fromMap((Map)message); DelayMessage output = api.getSpuDelay(input); wrapped.put("result", output.toMap()); } @@ -1383,7 +1383,7 @@ static void setup(BinaryMessenger binaryMessenger, VlcPlayerApi api) { Map wrapped = new HashMap<>(); try { @SuppressWarnings("ConstantConditions") - TextureMessage input = TextureMessage.fromMap((Map)message); + PlayerMessage input = PlayerMessage.fromMap((Map)message); TrackCountMessage output = api.getAudioTracksCount(input); wrapped.put("result", output.toMap()); } @@ -1404,7 +1404,7 @@ static void setup(BinaryMessenger binaryMessenger, VlcPlayerApi api) { Map wrapped = new HashMap<>(); try { @SuppressWarnings("ConstantConditions") - TextureMessage input = TextureMessage.fromMap((Map)message); + PlayerMessage input = PlayerMessage.fromMap((Map)message); AudioTracksMessage output = api.getAudioTracks(input); wrapped.put("result", output.toMap()); } @@ -1446,7 +1446,7 @@ static void setup(BinaryMessenger binaryMessenger, VlcPlayerApi api) { Map wrapped = new HashMap<>(); try { @SuppressWarnings("ConstantConditions") - TextureMessage input = TextureMessage.fromMap((Map)message); + PlayerMessage input = PlayerMessage.fromMap((Map)message); AudioTrackMessage output = api.getAudioTrack(input); wrapped.put("result", output.toMap()); } @@ -1488,7 +1488,7 @@ static void setup(BinaryMessenger binaryMessenger, VlcPlayerApi api) { Map wrapped = new HashMap<>(); try { @SuppressWarnings("ConstantConditions") - TextureMessage input = TextureMessage.fromMap((Map)message); + PlayerMessage input = PlayerMessage.fromMap((Map)message); DelayMessage output = api.getAudioDelay(input); wrapped.put("result", output.toMap()); } @@ -1530,7 +1530,7 @@ static void setup(BinaryMessenger binaryMessenger, VlcPlayerApi api) { Map wrapped = new HashMap<>(); try { @SuppressWarnings("ConstantConditions") - TextureMessage input = TextureMessage.fromMap((Map)message); + PlayerMessage input = PlayerMessage.fromMap((Map)message); TrackCountMessage output = api.getVideoTracksCount(input); wrapped.put("result", output.toMap()); } @@ -1551,7 +1551,7 @@ static void setup(BinaryMessenger binaryMessenger, VlcPlayerApi api) { Map wrapped = new HashMap<>(); try { @SuppressWarnings("ConstantConditions") - TextureMessage input = TextureMessage.fromMap((Map)message); + PlayerMessage input = PlayerMessage.fromMap((Map)message); VideoTracksMessage output = api.getVideoTracks(input); wrapped.put("result", output.toMap()); } @@ -1593,7 +1593,7 @@ static void setup(BinaryMessenger binaryMessenger, VlcPlayerApi api) { Map wrapped = new HashMap<>(); try { @SuppressWarnings("ConstantConditions") - TextureMessage input = TextureMessage.fromMap((Map)message); + PlayerMessage input = PlayerMessage.fromMap((Map)message); VideoTrackMessage output = api.getVideoTrack(input); wrapped.put("result", output.toMap()); } @@ -1635,7 +1635,7 @@ static void setup(BinaryMessenger binaryMessenger, VlcPlayerApi api) { Map wrapped = new HashMap<>(); try { @SuppressWarnings("ConstantConditions") - TextureMessage input = TextureMessage.fromMap((Map)message); + PlayerMessage input = PlayerMessage.fromMap((Map)message); VideoScaleMessage output = api.getVideoScale(input); wrapped.put("result", output.toMap()); } @@ -1677,7 +1677,7 @@ static void setup(BinaryMessenger binaryMessenger, VlcPlayerApi api) { Map wrapped = new HashMap<>(); try { @SuppressWarnings("ConstantConditions") - TextureMessage input = TextureMessage.fromMap((Map)message); + PlayerMessage input = PlayerMessage.fromMap((Map)message); VideoAspectRatioMessage output = api.getVideoAspectRatio(input); wrapped.put("result", output.toMap()); } @@ -1698,7 +1698,7 @@ static void setup(BinaryMessenger binaryMessenger, VlcPlayerApi api) { Map wrapped = new HashMap<>(); try { @SuppressWarnings("ConstantConditions") - TextureMessage input = TextureMessage.fromMap((Map)message); + PlayerMessage input = PlayerMessage.fromMap((Map)message); RendererServicesMessage output = api.getAvailableRendererServices(input); wrapped.put("result", output.toMap()); } @@ -1740,7 +1740,7 @@ static void setup(BinaryMessenger binaryMessenger, VlcPlayerApi api) { Map wrapped = new HashMap<>(); try { @SuppressWarnings("ConstantConditions") - TextureMessage input = TextureMessage.fromMap((Map)message); + PlayerMessage input = PlayerMessage.fromMap((Map)message); api.stopRendererScanning(input); wrapped.put("result", null); } @@ -1761,7 +1761,7 @@ static void setup(BinaryMessenger binaryMessenger, VlcPlayerApi api) { Map wrapped = new HashMap<>(); try { @SuppressWarnings("ConstantConditions") - TextureMessage input = TextureMessage.fromMap((Map)message); + PlayerMessage input = PlayerMessage.fromMap((Map)message); RendererDevicesMessage output = api.getRendererDevices(input); wrapped.put("result", output.toMap()); } @@ -1824,7 +1824,7 @@ static void setup(BinaryMessenger binaryMessenger, VlcPlayerApi api) { Map wrapped = new HashMap<>(); try { @SuppressWarnings("ConstantConditions") - TextureMessage input = TextureMessage.fromMap((Map)message); + PlayerMessage input = PlayerMessage.fromMap((Map)message); BooleanMessage output = api.stopRecording(input); wrapped.put("result", output.toMap()); } diff --git a/flutter_vlc_player/example/ios/Runner.xcodeproj/project.pbxproj b/flutter_vlc_player/example/ios/Runner.xcodeproj/project.pbxproj index ab2eb024..d075799c 100644 --- a/flutter_vlc_player/example/ios/Runner.xcodeproj/project.pbxproj +++ b/flutter_vlc_player/example/ios/Runner.xcodeproj/project.pbxproj @@ -155,7 +155,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1300; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { diff --git a/flutter_vlc_player/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/flutter_vlc_player/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 1d526a16..919434a6 100644 --- a/flutter_vlc_player/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/flutter_vlc_player/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/flutter_vlc_player/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/flutter_vlc_player/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 87c278db..c87d15a3 100644 --- a/flutter_vlc_player/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/flutter_vlc_player/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ { for (var i = 0; i < urls.length; i++) { var controller = VlcPlayerController.network( urls[i], - hwAcc: HwAcc.FULL, + hwAcc: HwAcc.full, autoPlay: false, options: VlcPlayerOptions( advanced: VlcAdvancedOptions([ diff --git a/flutter_vlc_player/example/lib/single_tab.dart b/flutter_vlc_player/example/lib/single_tab.dart index 6ecfad77..8b08dc3f 100644 --- a/flutter_vlc_player/example/lib/single_tab.dart +++ b/flutter_vlc_player/example/lib/single_tab.dart @@ -1,7 +1,6 @@ import 'dart:io'; import 'dart:typed_data'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_vlc_player/flutter_vlc_player.dart'; @@ -81,7 +80,7 @@ class _SingleTabState extends State { case VideoType.network: _controller = VlcPlayerController.network( initVideo.path, - hwAcc: HwAcc.FULL, + hwAcc: HwAcc.full, options: VlcPlayerOptions( advanced: VlcAdvancedOptions([ VlcAdvancedOptions.networkCaching(2000), @@ -204,7 +203,7 @@ class _SingleTabState extends State { case VideoType.network: await _controller.setMediaFromNetwork( video.path, - hwAcc: HwAcc.FULL, + hwAcc: HwAcc.full, ); break; case VideoType.file: diff --git a/flutter_vlc_player/example/lib/vlc_player_with_controls.dart b/flutter_vlc_player/example/lib/vlc_player_with_controls.dart index b05b6d9f..93249b9c 100644 --- a/flutter_vlc_player/example/lib/vlc_player_with_controls.dart +++ b/flutter_vlc_player/example/lib/vlc_player_with_controls.dart @@ -1,8 +1,6 @@ -import 'dart:io'; import 'dart:typed_data'; import 'package:flutter/material.dart'; -import 'package:flutter/rendering.dart'; import 'package:flutter_vlc_player/flutter_vlc_player.dart'; import 'package:path_provider/path_provider.dart'; diff --git a/flutter_vlc_player/ios/Classes/VlcViewBuilder.swift b/flutter_vlc_player/ios/Classes/VlcViewBuilder.swift index 800bf6d2..5aaa85d0 100644 --- a/flutter_vlc_player/ios/Classes/VlcViewBuilder.swift +++ b/flutter_vlc_player/ios/Classes/VlcViewBuilder.swift @@ -14,11 +14,11 @@ public class VLCViewBuilder: NSObject, VlcPlayerApi{ VlcPlayerApiSetup(messenger, self) } - public func build(frame: CGRect, viewId: Int64) -> VLCViewController{ + public func build(frame: CGRect, playerId: Int64) -> VLCViewController{ // var vlcViewController: VLCViewController - vlcViewController = VLCViewController(frame: frame, viewId: viewId, messenger: messenger) - players[Int(viewId)] = vlcViewController + vlcViewController = VLCViewController(frame: frame, playerId: playerId, messenger: messenger) + players[Int(playerId)] = vlcViewController return vlcViewController; } @@ -26,17 +26,17 @@ public class VLCViewBuilder: NSObject, VlcPlayerApi{ return } - func getPlayer(textureId: NSNumber?) -> VLCViewController? { - guard textureId != nil else { + func getPlayer(playerId: NSNumber?) -> VLCViewController? { + guard playerId != nil else { return nil } - return players[Int(truncating: textureId! as NSNumber)] + return players[Int(truncating: playerId! as NSNumber)] } public func create(_ input: CreateMessage, error: AutoreleasingUnsafeMutablePointer) { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) var isAssetUrl: Bool = false var mediaUrl: String = "" @@ -64,17 +64,17 @@ public class VLCViewBuilder: NSObject, VlcPlayerApi{ ) } - public func dispose(_ input: TextureMessage, error: AutoreleasingUnsafeMutablePointer) { + public func dispose(_ input: PlayerMessage, error: AutoreleasingUnsafeMutablePointer) { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) player?.dispose() - players.removeValue(forKey: input.textureId as! Int) + players.removeValue(forKey: input.playerId as! Int) } public func setStreamUrl(_ input: SetMediaMessage, error: AutoreleasingUnsafeMutablePointer) { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) var isAssetUrl: Bool = false var mediaUrl: String = "" @@ -101,39 +101,39 @@ public class VLCViewBuilder: NSObject, VlcPlayerApi{ ) } - public func play(_ input: TextureMessage, error: AutoreleasingUnsafeMutablePointer) { + public func play(_ input: PlayerMessage, error: AutoreleasingUnsafeMutablePointer) { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) player?.play() } - public func pause(_ input: TextureMessage, error: AutoreleasingUnsafeMutablePointer) { + public func pause(_ input: PlayerMessage, error: AutoreleasingUnsafeMutablePointer) { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) player?.pause() } - public func stop(_ input: TextureMessage, error: AutoreleasingUnsafeMutablePointer) { + public func stop(_ input: PlayerMessage, error: AutoreleasingUnsafeMutablePointer) { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) player?.stop() } - public func isPlaying(_ input: TextureMessage, error: AutoreleasingUnsafeMutablePointer) -> BooleanMessage? { + public func isPlaying(_ input: PlayerMessage, error: AutoreleasingUnsafeMutablePointer) -> BooleanMessage? { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) let message: BooleanMessage = BooleanMessage() message.result = player?.isPlaying() return message } - public func isSeekable(_ input: TextureMessage, error: AutoreleasingUnsafeMutablePointer) -> BooleanMessage? { + public func isSeekable(_ input: PlayerMessage, error: AutoreleasingUnsafeMutablePointer) -> BooleanMessage? { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) let message: BooleanMessage = BooleanMessage() message.result = player?.isSeekable() @@ -142,30 +142,30 @@ public class VLCViewBuilder: NSObject, VlcPlayerApi{ public func setLooping(_ input: LoopingMessage, error: AutoreleasingUnsafeMutablePointer) { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) player?.setLooping(isLooping: input.isLooping) } public func seek(to input: PositionMessage, error: AutoreleasingUnsafeMutablePointer) { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) player?.seek(position: input.position) } - public func position(_ input: TextureMessage, error: AutoreleasingUnsafeMutablePointer) -> PositionMessage? { + public func position(_ input: PlayerMessage, error: AutoreleasingUnsafeMutablePointer) -> PositionMessage? { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) let message: PositionMessage = PositionMessage() message.position = player?.position() return message } - public func duration(_ input: TextureMessage, error: AutoreleasingUnsafeMutablePointer) -> DurationMessage? { + public func duration(_ input: PlayerMessage, error: AutoreleasingUnsafeMutablePointer) -> DurationMessage? { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) let message: DurationMessage = DurationMessage() message.duration = player?.duration() @@ -174,14 +174,14 @@ public class VLCViewBuilder: NSObject, VlcPlayerApi{ public func setVolume(_ input: VolumeMessage, error: AutoreleasingUnsafeMutablePointer) { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) player?.setVolume(volume: input.volume) } - public func getVolume(_ input: TextureMessage, error: AutoreleasingUnsafeMutablePointer) -> VolumeMessage? { + public func getVolume(_ input: PlayerMessage, error: AutoreleasingUnsafeMutablePointer) -> VolumeMessage? { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) let message: VolumeMessage = VolumeMessage() message.volume = player?.getVolume() @@ -190,41 +190,41 @@ public class VLCViewBuilder: NSObject, VlcPlayerApi{ public func setPlaybackSpeed(_ input: PlaybackSpeedMessage, error: AutoreleasingUnsafeMutablePointer) { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) player?.setPlaybackSpeed(speed: input.speed) } - public func getPlaybackSpeed(_ input: TextureMessage, error: AutoreleasingUnsafeMutablePointer) -> PlaybackSpeedMessage? { + public func getPlaybackSpeed(_ input: PlayerMessage, error: AutoreleasingUnsafeMutablePointer) -> PlaybackSpeedMessage? { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) let message: PlaybackSpeedMessage = PlaybackSpeedMessage() message.speed = player?.getPlaybackSpeed() return message } - public func takeSnapshot(_ input: TextureMessage, error: AutoreleasingUnsafeMutablePointer) -> SnapshotMessage? { + public func takeSnapshot(_ input: PlayerMessage, error: AutoreleasingUnsafeMutablePointer) -> SnapshotMessage? { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) let message: SnapshotMessage = SnapshotMessage() message.snapshot = player?.takeSnapshot() return message } - public func getSpuTracksCount(_ input: TextureMessage, error: AutoreleasingUnsafeMutablePointer) -> TrackCountMessage? { + public func getSpuTracksCount(_ input: PlayerMessage, error: AutoreleasingUnsafeMutablePointer) -> TrackCountMessage? { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) let message: TrackCountMessage = TrackCountMessage() message.count = player?.getSpuTracksCount() return message } - public func getSpuTracks(_ input: TextureMessage, error: AutoreleasingUnsafeMutablePointer) -> SpuTracksMessage? { + public func getSpuTracks(_ input: PlayerMessage, error: AutoreleasingUnsafeMutablePointer) -> SpuTracksMessage? { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) let message: SpuTracksMessage = SpuTracksMessage() message.subtitles = player?.getSpuTracks() @@ -233,14 +233,14 @@ public class VLCViewBuilder: NSObject, VlcPlayerApi{ public func setSpuTrack(_ input: SpuTrackMessage, error: AutoreleasingUnsafeMutablePointer) { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) player?.setSpuTrack(spuTrackNumber: input.spuTrackNumber) } - public func getSpuTrack(_ input: TextureMessage, error: AutoreleasingUnsafeMutablePointer) -> SpuTrackMessage? { + public func getSpuTrack(_ input: PlayerMessage, error: AutoreleasingUnsafeMutablePointer) -> SpuTrackMessage? { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) let message: SpuTrackMessage = SpuTrackMessage() message.spuTrackNumber = player?.getSpuTrack() @@ -249,14 +249,14 @@ public class VLCViewBuilder: NSObject, VlcPlayerApi{ public func setSpuDelay(_ input: DelayMessage, error: AutoreleasingUnsafeMutablePointer) { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) player?.setSpuDelay(delay: input.delay) } - public func getSpuDelay(_ input: TextureMessage, error: AutoreleasingUnsafeMutablePointer) -> DelayMessage? { + public func getSpuDelay(_ input: PlayerMessage, error: AutoreleasingUnsafeMutablePointer) -> DelayMessage? { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) let message: DelayMessage = DelayMessage() message.delay = player?.getSpuDelay() @@ -265,23 +265,23 @@ public class VLCViewBuilder: NSObject, VlcPlayerApi{ public func addSubtitleTrack(_ input: AddSubtitleMessage, error: AutoreleasingUnsafeMutablePointer) { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) player?.addSubtitleTrack(uri: input.uri, isSelected: input.isSelected) } - public func getAudioTracksCount(_ input: TextureMessage, error: AutoreleasingUnsafeMutablePointer) -> TrackCountMessage? { + public func getAudioTracksCount(_ input: PlayerMessage, error: AutoreleasingUnsafeMutablePointer) -> TrackCountMessage? { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) let message: TrackCountMessage = TrackCountMessage() message.count = player?.getAudioTracksCount() return message } - public func getAudioTracks(_ input: TextureMessage, error: AutoreleasingUnsafeMutablePointer) -> AudioTracksMessage? { + public func getAudioTracks(_ input: PlayerMessage, error: AutoreleasingUnsafeMutablePointer) -> AudioTracksMessage? { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) let message: AudioTracksMessage = AudioTracksMessage() message.audios = player?.getAudioTracks() @@ -290,14 +290,14 @@ public class VLCViewBuilder: NSObject, VlcPlayerApi{ public func setAudioTrack(_ input: AudioTrackMessage, error: AutoreleasingUnsafeMutablePointer) { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) player?.setAudioTrack(audioTrackNumber: input.audioTrackNumber) } - public func getAudioTrack(_ input: TextureMessage, error: AutoreleasingUnsafeMutablePointer) -> AudioTrackMessage? { + public func getAudioTrack(_ input: PlayerMessage, error: AutoreleasingUnsafeMutablePointer) -> AudioTrackMessage? { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) let message: AudioTrackMessage = AudioTrackMessage() message.audioTrackNumber = player?.getAudioTrack() @@ -306,14 +306,14 @@ public class VLCViewBuilder: NSObject, VlcPlayerApi{ public func setAudioDelay(_ input: DelayMessage, error: AutoreleasingUnsafeMutablePointer) { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) player?.setAudioDelay(delay: input.delay) } - public func getAudioDelay(_ input: TextureMessage, error: AutoreleasingUnsafeMutablePointer) -> DelayMessage? { + public func getAudioDelay(_ input: PlayerMessage, error: AutoreleasingUnsafeMutablePointer) -> DelayMessage? { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) let message: DelayMessage = DelayMessage() message.delay = player?.getAudioDelay() @@ -322,23 +322,23 @@ public class VLCViewBuilder: NSObject, VlcPlayerApi{ public func addAudioTrack(_ input: AddAudioMessage, error: AutoreleasingUnsafeMutablePointer) { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) player?.addAudioTrack(uri: input.uri, isSelected: input.isSelected) } - public func getVideoTracksCount(_ input: TextureMessage, error: AutoreleasingUnsafeMutablePointer) -> TrackCountMessage? { + public func getVideoTracksCount(_ input: PlayerMessage, error: AutoreleasingUnsafeMutablePointer) -> TrackCountMessage? { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) let message: TrackCountMessage = TrackCountMessage() message.count = player?.getVideoTracksCount() return message } - public func getVideoTracks(_ input: TextureMessage, error: AutoreleasingUnsafeMutablePointer) -> VideoTracksMessage? { + public func getVideoTracks(_ input: PlayerMessage, error: AutoreleasingUnsafeMutablePointer) -> VideoTracksMessage? { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) let message: VideoTracksMessage = VideoTracksMessage() message.videos = player?.getVideoTracks() @@ -347,14 +347,14 @@ public class VLCViewBuilder: NSObject, VlcPlayerApi{ public func setVideoTrack(_ input: VideoTrackMessage, error: AutoreleasingUnsafeMutablePointer) { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) player?.setVideoTrack(videoTrackNumber: input.videoTrackNumber) } - public func getVideoTrack(_ input: TextureMessage, error: AutoreleasingUnsafeMutablePointer) -> VideoTrackMessage? { + public func getVideoTrack(_ input: PlayerMessage, error: AutoreleasingUnsafeMutablePointer) -> VideoTrackMessage? { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) let message: VideoTrackMessage = VideoTrackMessage() message.videoTrackNumber = player?.getVideoTrack() @@ -363,14 +363,14 @@ public class VLCViewBuilder: NSObject, VlcPlayerApi{ public func setVideoScale(_ input: VideoScaleMessage, error: AutoreleasingUnsafeMutablePointer) { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) player?.setVideoScale(scale: input.scale) } - public func getVideoScale(_ input: TextureMessage, error: AutoreleasingUnsafeMutablePointer) -> VideoScaleMessage? { + public func getVideoScale(_ input: PlayerMessage, error: AutoreleasingUnsafeMutablePointer) -> VideoScaleMessage? { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) let message: VideoScaleMessage = VideoScaleMessage() message.scale = player?.getVideoScale() @@ -379,23 +379,23 @@ public class VLCViewBuilder: NSObject, VlcPlayerApi{ public func setVideoAspectRatio(_ input: VideoAspectRatioMessage, error: AutoreleasingUnsafeMutablePointer) { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) player?.setVideoAspectRatio(aspectRatio: input.aspectRatio) } - public func getVideoAspectRatio(_ input: TextureMessage, error: AutoreleasingUnsafeMutablePointer) -> VideoAspectRatioMessage? { + public func getVideoAspectRatio(_ input: PlayerMessage, error: AutoreleasingUnsafeMutablePointer) -> VideoAspectRatioMessage? { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) let message: VideoAspectRatioMessage = VideoAspectRatioMessage() message.aspectRatio = player?.getVideoAspectRatio() return message } - public func getAvailableRendererServices(_ input: TextureMessage, error: AutoreleasingUnsafeMutablePointer) -> RendererServicesMessage? { + public func getAvailableRendererServices(_ input: PlayerMessage, error: AutoreleasingUnsafeMutablePointer) -> RendererServicesMessage? { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) let message: RendererServicesMessage = RendererServicesMessage() message.services = player?.getAvailableRendererServices() @@ -404,21 +404,21 @@ public class VLCViewBuilder: NSObject, VlcPlayerApi{ public func startRendererScanning(_ input: RendererScanningMessage, error: AutoreleasingUnsafeMutablePointer) { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) player?.startRendererScanning() } - public func stopRendererScanning(_ input: TextureMessage, error: AutoreleasingUnsafeMutablePointer) { + public func stopRendererScanning(_ input: PlayerMessage, error: AutoreleasingUnsafeMutablePointer) { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) player?.stopRendererScanning() } - public func getRendererDevices(_ input: TextureMessage, error: AutoreleasingUnsafeMutablePointer) -> RendererDevicesMessage? { + public func getRendererDevices(_ input: PlayerMessage, error: AutoreleasingUnsafeMutablePointer) -> RendererDevicesMessage? { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) let message: RendererDevicesMessage = RendererDevicesMessage() message.rendererDevices = player?.getRendererDevices() @@ -427,23 +427,23 @@ public class VLCViewBuilder: NSObject, VlcPlayerApi{ public func cast(toRenderer input: RenderDeviceMessage, error: AutoreleasingUnsafeMutablePointer) { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) player?.cast(rendererDevice: input.rendererDevice) } public func startRecording(_ input: RecordMessage, error: AutoreleasingUnsafeMutablePointer) -> BooleanMessage? { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) let message: BooleanMessage = BooleanMessage() message.result = player?.startRecording(saveDirectory: input.saveDirectory!) return message } - public func stopRecording(_ input: TextureMessage, error: AutoreleasingUnsafeMutablePointer) -> BooleanMessage? { + public func stopRecording(_ input: PlayerMessage, error: AutoreleasingUnsafeMutablePointer) -> BooleanMessage? { - let player = getPlayer(textureId: input.textureId) + let player = getPlayer(playerId: input.playerId) let message: BooleanMessage = BooleanMessage() message.result = player?.stopRecording() diff --git a/flutter_vlc_player/ios/Classes/VlcViewController.swift b/flutter_vlc_player/ios/Classes/VlcViewController.swift index 191cb9d5..9bb6c8f9 100644 --- a/flutter_vlc_player/ios/Classes/VlcViewController.swift +++ b/flutter_vlc_player/ios/Classes/VlcViewController.swift @@ -18,14 +18,14 @@ public class VLCViewController: NSObject, FlutterPlatformView { return hostedView } - init(frame: CGRect, viewId: Int64, messenger:FlutterBinaryMessenger) { + init(frame: CGRect, playerId: Int64, messenger:FlutterBinaryMessenger) { let mediaEventChannel = FlutterEventChannel( - name: "flutter_video_plugin/getVideoEvents_\(viewId)", + name: "flutter_video_plugin/getVideoEvents_\(playerId)", binaryMessenger: messenger ) let rendererEventChannel = FlutterEventChannel( - name: "flutter_video_plugin/getRendererEvents_\(viewId)", + name: "flutter_video_plugin/getRendererEvents_\(playerId)", binaryMessenger: messenger ) diff --git a/flutter_vlc_player/ios/Classes/VlcViewFactory.swift b/flutter_vlc_player/ios/Classes/VlcViewFactory.swift index d72c384c..83b55d38 100644 --- a/flutter_vlc_player/ios/Classes/VlcViewFactory.swift +++ b/flutter_vlc_player/ios/Classes/VlcViewFactory.swift @@ -13,10 +13,10 @@ public class VLCViewFactory: NSObject, FlutterPlatformViewFactory { super.init() } - public func create(withFrame frame: CGRect, viewIdentifier viewId: Int64, arguments args: Any?) -> FlutterPlatformView { + public func create(withFrame frame: CGRect, viewIdentifier playerId: Int64, arguments args: Any?) -> FlutterPlatformView { // let arguments = args as? NSDictionary ?? [:] - return builder.build(frame: frame, viewId: viewId) + return builder.build(frame: frame, playerId: playerId) } public func createArgsCodec() -> FlutterMessageCodec & NSObjectProtocol { diff --git a/flutter_vlc_player/ios/Classes/messages.h b/flutter_vlc_player/ios/Classes/messages.h index 0d6ccdd0..e41c997f 100644 --- a/flutter_vlc_player/ios/Classes/messages.h +++ b/flutter_vlc_player/ios/Classes/messages.h @@ -8,7 +8,7 @@ NS_ASSUME_NONNULL_BEGIN @class CreateMessage; -@class TextureMessage; +@class PlayerMessage; @class SetMediaMessage; @class BooleanMessage; @class LoopingMessage; @@ -36,7 +36,7 @@ NS_ASSUME_NONNULL_BEGIN @class RecordMessage; @interface CreateMessage : NSObject -@property(nonatomic, strong, nullable) NSNumber * textureId; +@property(nonatomic, strong, nullable) NSNumber * playerId; @property(nonatomic, copy, nullable) NSString * uri; @property(nonatomic, strong, nullable) NSNumber * type; @property(nonatomic, copy, nullable) NSString * packageName; @@ -45,12 +45,12 @@ NS_ASSUME_NONNULL_BEGIN @property(nonatomic, strong, nullable) NSArray * options; @end -@interface TextureMessage : NSObject -@property(nonatomic, strong, nullable) NSNumber * textureId; +@interface PlayerMessage : NSObject +@property(nonatomic, strong, nullable) NSNumber * playerId; @end @interface SetMediaMessage : NSObject -@property(nonatomic, strong, nullable) NSNumber * textureId; +@property(nonatomic, strong, nullable) NSNumber * playerId; @property(nonatomic, copy, nullable) NSString * uri; @property(nonatomic, strong, nullable) NSNumber * type; @property(nonatomic, copy, nullable) NSString * packageName; @@ -59,177 +59,177 @@ NS_ASSUME_NONNULL_BEGIN @end @interface BooleanMessage : NSObject -@property(nonatomic, strong, nullable) NSNumber * textureId; +@property(nonatomic, strong, nullable) NSNumber * playerId; @property(nonatomic, strong, nullable) NSNumber * result; @end @interface LoopingMessage : NSObject -@property(nonatomic, strong, nullable) NSNumber * textureId; +@property(nonatomic, strong, nullable) NSNumber * playerId; @property(nonatomic, strong, nullable) NSNumber * isLooping; @end @interface PositionMessage : NSObject -@property(nonatomic, strong, nullable) NSNumber * textureId; +@property(nonatomic, strong, nullable) NSNumber * playerId; @property(nonatomic, strong, nullable) NSNumber * position; @end @interface DurationMessage : NSObject -@property(nonatomic, strong, nullable) NSNumber * textureId; +@property(nonatomic, strong, nullable) NSNumber * playerId; @property(nonatomic, strong, nullable) NSNumber * duration; @end @interface VolumeMessage : NSObject -@property(nonatomic, strong, nullable) NSNumber * textureId; +@property(nonatomic, strong, nullable) NSNumber * playerId; @property(nonatomic, strong, nullable) NSNumber * volume; @end @interface PlaybackSpeedMessage : NSObject -@property(nonatomic, strong, nullable) NSNumber * textureId; +@property(nonatomic, strong, nullable) NSNumber * playerId; @property(nonatomic, strong, nullable) NSNumber * speed; @end @interface SnapshotMessage : NSObject -@property(nonatomic, strong, nullable) NSNumber * textureId; +@property(nonatomic, strong, nullable) NSNumber * playerId; @property(nonatomic, copy, nullable) NSString * snapshot; @end @interface TrackCountMessage : NSObject -@property(nonatomic, strong, nullable) NSNumber * textureId; +@property(nonatomic, strong, nullable) NSNumber * playerId; @property(nonatomic, strong, nullable) NSNumber * count; @end @interface SpuTracksMessage : NSObject -@property(nonatomic, strong, nullable) NSNumber * textureId; +@property(nonatomic, strong, nullable) NSNumber * playerId; @property(nonatomic, strong, nullable) NSDictionary * subtitles; @end @interface SpuTrackMessage : NSObject -@property(nonatomic, strong, nullable) NSNumber * textureId; +@property(nonatomic, strong, nullable) NSNumber * playerId; @property(nonatomic, strong, nullable) NSNumber * spuTrackNumber; @end @interface DelayMessage : NSObject -@property(nonatomic, strong, nullable) NSNumber * textureId; +@property(nonatomic, strong, nullable) NSNumber * playerId; @property(nonatomic, strong, nullable) NSNumber * delay; @end @interface AddSubtitleMessage : NSObject -@property(nonatomic, strong, nullable) NSNumber * textureId; +@property(nonatomic, strong, nullable) NSNumber * playerId; @property(nonatomic, copy, nullable) NSString * uri; @property(nonatomic, strong, nullable) NSNumber * type; @property(nonatomic, strong, nullable) NSNumber * isSelected; @end @interface AudioTracksMessage : NSObject -@property(nonatomic, strong, nullable) NSNumber * textureId; +@property(nonatomic, strong, nullable) NSNumber * playerId; @property(nonatomic, strong, nullable) NSDictionary * audios; @end @interface AudioTrackMessage : NSObject -@property(nonatomic, strong, nullable) NSNumber * textureId; +@property(nonatomic, strong, nullable) NSNumber * playerId; @property(nonatomic, strong, nullable) NSNumber * audioTrackNumber; @end @interface AddAudioMessage : NSObject -@property(nonatomic, strong, nullable) NSNumber * textureId; +@property(nonatomic, strong, nullable) NSNumber * playerId; @property(nonatomic, copy, nullable) NSString * uri; @property(nonatomic, strong, nullable) NSNumber * type; @property(nonatomic, strong, nullable) NSNumber * isSelected; @end @interface VideoTracksMessage : NSObject -@property(nonatomic, strong, nullable) NSNumber * textureId; +@property(nonatomic, strong, nullable) NSNumber * playerId; @property(nonatomic, strong, nullable) NSDictionary * videos; @end @interface VideoTrackMessage : NSObject -@property(nonatomic, strong, nullable) NSNumber * textureId; +@property(nonatomic, strong, nullable) NSNumber * playerId; @property(nonatomic, strong, nullable) NSNumber * videoTrackNumber; @end @interface VideoScaleMessage : NSObject -@property(nonatomic, strong, nullable) NSNumber * textureId; +@property(nonatomic, strong, nullable) NSNumber * playerId; @property(nonatomic, strong, nullable) NSNumber * scale; @end @interface VideoAspectRatioMessage : NSObject -@property(nonatomic, strong, nullable) NSNumber * textureId; +@property(nonatomic, strong, nullable) NSNumber * playerId; @property(nonatomic, copy, nullable) NSString * aspectRatio; @end @interface RendererServicesMessage : NSObject -@property(nonatomic, strong, nullable) NSNumber * textureId; +@property(nonatomic, strong, nullable) NSNumber * playerId; @property(nonatomic, strong, nullable) NSArray * services; @end @interface RendererScanningMessage : NSObject -@property(nonatomic, strong, nullable) NSNumber * textureId; +@property(nonatomic, strong, nullable) NSNumber * playerId; @property(nonatomic, copy, nullable) NSString * rendererService; @end @interface RendererDevicesMessage : NSObject -@property(nonatomic, strong, nullable) NSNumber * textureId; +@property(nonatomic, strong, nullable) NSNumber * playerId; @property(nonatomic, strong, nullable) NSDictionary * rendererDevices; @end @interface RenderDeviceMessage : NSObject -@property(nonatomic, strong, nullable) NSNumber * textureId; +@property(nonatomic, strong, nullable) NSNumber * playerId; @property(nonatomic, copy, nullable) NSString * rendererDevice; @end @interface RecordMessage : NSObject -@property(nonatomic, strong, nullable) NSNumber * textureId; +@property(nonatomic, strong, nullable) NSNumber * playerId; @property(nonatomic, copy, nullable) NSString * saveDirectory; @end @protocol VlcPlayerApi -(void)initialize:(FlutterError *_Nullable *_Nonnull)error; -(void)create:(CreateMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; --(void)dispose:(TextureMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; +-(void)dispose:(PlayerMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; -(void)setStreamUrl:(SetMediaMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; --(void)play:(TextureMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; --(void)pause:(TextureMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; --(void)stop:(TextureMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; --(nullable BooleanMessage *)isPlaying:(TextureMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; --(nullable BooleanMessage *)isSeekable:(TextureMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; +-(void)play:(PlayerMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; +-(void)pause:(PlayerMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; +-(void)stop:(PlayerMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; +-(nullable BooleanMessage *)isPlaying:(PlayerMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; +-(nullable BooleanMessage *)isSeekable:(PlayerMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; -(void)setLooping:(LoopingMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; -(void)seekTo:(PositionMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; --(nullable PositionMessage *)position:(TextureMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; --(nullable DurationMessage *)duration:(TextureMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; +-(nullable PositionMessage *)position:(PlayerMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; +-(nullable DurationMessage *)duration:(PlayerMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; -(void)setVolume:(VolumeMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; --(nullable VolumeMessage *)getVolume:(TextureMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; +-(nullable VolumeMessage *)getVolume:(PlayerMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; -(void)setPlaybackSpeed:(PlaybackSpeedMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; --(nullable PlaybackSpeedMessage *)getPlaybackSpeed:(TextureMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; --(nullable SnapshotMessage *)takeSnapshot:(TextureMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; --(nullable TrackCountMessage *)getSpuTracksCount:(TextureMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; --(nullable SpuTracksMessage *)getSpuTracks:(TextureMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; +-(nullable PlaybackSpeedMessage *)getPlaybackSpeed:(PlayerMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; +-(nullable SnapshotMessage *)takeSnapshot:(PlayerMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; +-(nullable TrackCountMessage *)getSpuTracksCount:(PlayerMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; +-(nullable SpuTracksMessage *)getSpuTracks:(PlayerMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; -(void)setSpuTrack:(SpuTrackMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; --(nullable SpuTrackMessage *)getSpuTrack:(TextureMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; +-(nullable SpuTrackMessage *)getSpuTrack:(PlayerMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; -(void)setSpuDelay:(DelayMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; --(nullable DelayMessage *)getSpuDelay:(TextureMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; +-(nullable DelayMessage *)getSpuDelay:(PlayerMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; -(void)addSubtitleTrack:(AddSubtitleMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; --(nullable TrackCountMessage *)getAudioTracksCount:(TextureMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; --(nullable AudioTracksMessage *)getAudioTracks:(TextureMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; +-(nullable TrackCountMessage *)getAudioTracksCount:(PlayerMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; +-(nullable AudioTracksMessage *)getAudioTracks:(PlayerMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; -(void)setAudioTrack:(AudioTrackMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; --(nullable AudioTrackMessage *)getAudioTrack:(TextureMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; +-(nullable AudioTrackMessage *)getAudioTrack:(PlayerMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; -(void)setAudioDelay:(DelayMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; --(nullable DelayMessage *)getAudioDelay:(TextureMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; +-(nullable DelayMessage *)getAudioDelay:(PlayerMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; -(void)addAudioTrack:(AddAudioMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; --(nullable TrackCountMessage *)getVideoTracksCount:(TextureMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; --(nullable VideoTracksMessage *)getVideoTracks:(TextureMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; +-(nullable TrackCountMessage *)getVideoTracksCount:(PlayerMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; +-(nullable VideoTracksMessage *)getVideoTracks:(PlayerMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; -(void)setVideoTrack:(VideoTrackMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; --(nullable VideoTrackMessage *)getVideoTrack:(TextureMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; +-(nullable VideoTrackMessage *)getVideoTrack:(PlayerMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; -(void)setVideoScale:(VideoScaleMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; --(nullable VideoScaleMessage *)getVideoScale:(TextureMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; +-(nullable VideoScaleMessage *)getVideoScale:(PlayerMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; -(void)setVideoAspectRatio:(VideoAspectRatioMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; --(nullable VideoAspectRatioMessage *)getVideoAspectRatio:(TextureMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; --(nullable RendererServicesMessage *)getAvailableRendererServices:(TextureMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; +-(nullable VideoAspectRatioMessage *)getVideoAspectRatio:(PlayerMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; +-(nullable RendererServicesMessage *)getAvailableRendererServices:(PlayerMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; -(void)startRendererScanning:(RendererScanningMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; --(void)stopRendererScanning:(TextureMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; --(nullable RendererDevicesMessage *)getRendererDevices:(TextureMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; +-(void)stopRendererScanning:(PlayerMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; +-(nullable RendererDevicesMessage *)getRendererDevices:(PlayerMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; -(void)castToRenderer:(RenderDeviceMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; -(nullable BooleanMessage *)startRecording:(RecordMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; --(nullable BooleanMessage *)stopRecording:(TextureMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; +-(nullable BooleanMessage *)stopRecording:(PlayerMessage*)input error:(FlutterError *_Nullable *_Nonnull)error; @end extern void VlcPlayerApiSetup(id binaryMessenger, id _Nullable api); diff --git a/flutter_vlc_player/ios/Classes/messages.m b/flutter_vlc_player/ios/Classes/messages.m index f2211014..28657a7f 100644 --- a/flutter_vlc_player/ios/Classes/messages.m +++ b/flutter_vlc_player/ios/Classes/messages.m @@ -26,8 +26,8 @@ @interface CreateMessage () +(CreateMessage*)fromMap:(NSDictionary*)dict; -(NSDictionary*)toMap; @end -@interface TextureMessage () -+(TextureMessage*)fromMap:(NSDictionary*)dict; +@interface PlayerMessage () ++(PlayerMessage*)fromMap:(NSDictionary*)dict; -(NSDictionary*)toMap; @end @interface SetMediaMessage () @@ -134,9 +134,9 @@ -(NSDictionary*)toMap; @implementation CreateMessage +(CreateMessage*)fromMap:(NSDictionary*)dict { CreateMessage* result = [[CreateMessage alloc] init]; - result.textureId = dict[@"textureId"]; - if ((NSNull *)result.textureId == [NSNull null]) { - result.textureId = nil; + result.playerId = dict[@"playerId"]; + if ((NSNull *)result.playerId == [NSNull null]) { + result.playerId = nil; } result.uri = dict[@"uri"]; if ((NSNull *)result.uri == [NSNull null]) { @@ -165,30 +165,30 @@ +(CreateMessage*)fromMap:(NSDictionary*)dict { return result; } -(NSDictionary*)toMap { - return [NSDictionary dictionaryWithObjectsAndKeys:(self.textureId ? self.textureId : [NSNull null]), @"textureId", (self.uri ? self.uri : [NSNull null]), @"uri", (self.type ? self.type : [NSNull null]), @"type", (self.packageName ? self.packageName : [NSNull null]), @"packageName", (self.autoPlay ? self.autoPlay : [NSNull null]), @"autoPlay", (self.hwAcc ? self.hwAcc : [NSNull null]), @"hwAcc", (self.options ? self.options : [NSNull null]), @"options", nil]; + return [NSDictionary dictionaryWithObjectsAndKeys:(self.playerId ? self.playerId : [NSNull null]), @"playerId", (self.uri ? self.uri : [NSNull null]), @"uri", (self.type ? self.type : [NSNull null]), @"type", (self.packageName ? self.packageName : [NSNull null]), @"packageName", (self.autoPlay ? self.autoPlay : [NSNull null]), @"autoPlay", (self.hwAcc ? self.hwAcc : [NSNull null]), @"hwAcc", (self.options ? self.options : [NSNull null]), @"options", nil]; } @end -@implementation TextureMessage -+(TextureMessage*)fromMap:(NSDictionary*)dict { - TextureMessage* result = [[TextureMessage alloc] init]; - result.textureId = dict[@"textureId"]; - if ((NSNull *)result.textureId == [NSNull null]) { - result.textureId = nil; +@implementation PlayerMessage ++(PlayerMessage*)fromMap:(NSDictionary*)dict { + PlayerMessage* result = [[PlayerMessage alloc] init]; + result.playerId = dict[@"playerId"]; + if ((NSNull *)result.playerId == [NSNull null]) { + result.playerId = nil; } return result; } -(NSDictionary*)toMap { - return [NSDictionary dictionaryWithObjectsAndKeys:(self.textureId ? self.textureId : [NSNull null]), @"textureId", nil]; + return [NSDictionary dictionaryWithObjectsAndKeys:(self.playerId ? self.playerId : [NSNull null]), @"playerId", nil]; } @end @implementation SetMediaMessage +(SetMediaMessage*)fromMap:(NSDictionary*)dict { SetMediaMessage* result = [[SetMediaMessage alloc] init]; - result.textureId = dict[@"textureId"]; - if ((NSNull *)result.textureId == [NSNull null]) { - result.textureId = nil; + result.playerId = dict[@"playerId"]; + if ((NSNull *)result.playerId == [NSNull null]) { + result.playerId = nil; } result.uri = dict[@"uri"]; if ((NSNull *)result.uri == [NSNull null]) { @@ -213,16 +213,16 @@ +(SetMediaMessage*)fromMap:(NSDictionary*)dict { return result; } -(NSDictionary*)toMap { - return [NSDictionary dictionaryWithObjectsAndKeys:(self.textureId ? self.textureId : [NSNull null]), @"textureId", (self.uri ? self.uri : [NSNull null]), @"uri", (self.type ? self.type : [NSNull null]), @"type", (self.packageName ? self.packageName : [NSNull null]), @"packageName", (self.autoPlay ? self.autoPlay : [NSNull null]), @"autoPlay", (self.hwAcc ? self.hwAcc : [NSNull null]), @"hwAcc", nil]; + return [NSDictionary dictionaryWithObjectsAndKeys:(self.playerId ? self.playerId : [NSNull null]), @"playerId", (self.uri ? self.uri : [NSNull null]), @"uri", (self.type ? self.type : [NSNull null]), @"type", (self.packageName ? self.packageName : [NSNull null]), @"packageName", (self.autoPlay ? self.autoPlay : [NSNull null]), @"autoPlay", (self.hwAcc ? self.hwAcc : [NSNull null]), @"hwAcc", nil]; } @end @implementation BooleanMessage +(BooleanMessage*)fromMap:(NSDictionary*)dict { BooleanMessage* result = [[BooleanMessage alloc] init]; - result.textureId = dict[@"textureId"]; - if ((NSNull *)result.textureId == [NSNull null]) { - result.textureId = nil; + result.playerId = dict[@"playerId"]; + if ((NSNull *)result.playerId == [NSNull null]) { + result.playerId = nil; } result.result = dict[@"result"]; if ((NSNull *)result.result == [NSNull null]) { @@ -231,16 +231,16 @@ +(BooleanMessage*)fromMap:(NSDictionary*)dict { return result; } -(NSDictionary*)toMap { - return [NSDictionary dictionaryWithObjectsAndKeys:(self.textureId ? self.textureId : [NSNull null]), @"textureId", (self.result ? self.result : [NSNull null]), @"result", nil]; + return [NSDictionary dictionaryWithObjectsAndKeys:(self.playerId ? self.playerId : [NSNull null]), @"playerId", (self.result ? self.result : [NSNull null]), @"result", nil]; } @end @implementation LoopingMessage +(LoopingMessage*)fromMap:(NSDictionary*)dict { LoopingMessage* result = [[LoopingMessage alloc] init]; - result.textureId = dict[@"textureId"]; - if ((NSNull *)result.textureId == [NSNull null]) { - result.textureId = nil; + result.playerId = dict[@"playerId"]; + if ((NSNull *)result.playerId == [NSNull null]) { + result.playerId = nil; } result.isLooping = dict[@"isLooping"]; if ((NSNull *)result.isLooping == [NSNull null]) { @@ -249,16 +249,16 @@ +(LoopingMessage*)fromMap:(NSDictionary*)dict { return result; } -(NSDictionary*)toMap { - return [NSDictionary dictionaryWithObjectsAndKeys:(self.textureId ? self.textureId : [NSNull null]), @"textureId", (self.isLooping ? self.isLooping : [NSNull null]), @"isLooping", nil]; + return [NSDictionary dictionaryWithObjectsAndKeys:(self.playerId ? self.playerId : [NSNull null]), @"playerId", (self.isLooping ? self.isLooping : [NSNull null]), @"isLooping", nil]; } @end @implementation PositionMessage +(PositionMessage*)fromMap:(NSDictionary*)dict { PositionMessage* result = [[PositionMessage alloc] init]; - result.textureId = dict[@"textureId"]; - if ((NSNull *)result.textureId == [NSNull null]) { - result.textureId = nil; + result.playerId = dict[@"playerId"]; + if ((NSNull *)result.playerId == [NSNull null]) { + result.playerId = nil; } result.position = dict[@"position"]; if ((NSNull *)result.position == [NSNull null]) { @@ -267,16 +267,16 @@ +(PositionMessage*)fromMap:(NSDictionary*)dict { return result; } -(NSDictionary*)toMap { - return [NSDictionary dictionaryWithObjectsAndKeys:(self.textureId ? self.textureId : [NSNull null]), @"textureId", (self.position ? self.position : [NSNull null]), @"position", nil]; + return [NSDictionary dictionaryWithObjectsAndKeys:(self.playerId ? self.playerId : [NSNull null]), @"playerId", (self.position ? self.position : [NSNull null]), @"position", nil]; } @end @implementation DurationMessage +(DurationMessage*)fromMap:(NSDictionary*)dict { DurationMessage* result = [[DurationMessage alloc] init]; - result.textureId = dict[@"textureId"]; - if ((NSNull *)result.textureId == [NSNull null]) { - result.textureId = nil; + result.playerId = dict[@"playerId"]; + if ((NSNull *)result.playerId == [NSNull null]) { + result.playerId = nil; } result.duration = dict[@"duration"]; if ((NSNull *)result.duration == [NSNull null]) { @@ -285,16 +285,16 @@ +(DurationMessage*)fromMap:(NSDictionary*)dict { return result; } -(NSDictionary*)toMap { - return [NSDictionary dictionaryWithObjectsAndKeys:(self.textureId ? self.textureId : [NSNull null]), @"textureId", (self.duration ? self.duration : [NSNull null]), @"duration", nil]; + return [NSDictionary dictionaryWithObjectsAndKeys:(self.playerId ? self.playerId : [NSNull null]), @"playerId", (self.duration ? self.duration : [NSNull null]), @"duration", nil]; } @end @implementation VolumeMessage +(VolumeMessage*)fromMap:(NSDictionary*)dict { VolumeMessage* result = [[VolumeMessage alloc] init]; - result.textureId = dict[@"textureId"]; - if ((NSNull *)result.textureId == [NSNull null]) { - result.textureId = nil; + result.playerId = dict[@"playerId"]; + if ((NSNull *)result.playerId == [NSNull null]) { + result.playerId = nil; } result.volume = dict[@"volume"]; if ((NSNull *)result.volume == [NSNull null]) { @@ -303,16 +303,16 @@ +(VolumeMessage*)fromMap:(NSDictionary*)dict { return result; } -(NSDictionary*)toMap { - return [NSDictionary dictionaryWithObjectsAndKeys:(self.textureId ? self.textureId : [NSNull null]), @"textureId", (self.volume ? self.volume : [NSNull null]), @"volume", nil]; + return [NSDictionary dictionaryWithObjectsAndKeys:(self.playerId ? self.playerId : [NSNull null]), @"playerId", (self.volume ? self.volume : [NSNull null]), @"volume", nil]; } @end @implementation PlaybackSpeedMessage +(PlaybackSpeedMessage*)fromMap:(NSDictionary*)dict { PlaybackSpeedMessage* result = [[PlaybackSpeedMessage alloc] init]; - result.textureId = dict[@"textureId"]; - if ((NSNull *)result.textureId == [NSNull null]) { - result.textureId = nil; + result.playerId = dict[@"playerId"]; + if ((NSNull *)result.playerId == [NSNull null]) { + result.playerId = nil; } result.speed = dict[@"speed"]; if ((NSNull *)result.speed == [NSNull null]) { @@ -321,16 +321,16 @@ +(PlaybackSpeedMessage*)fromMap:(NSDictionary*)dict { return result; } -(NSDictionary*)toMap { - return [NSDictionary dictionaryWithObjectsAndKeys:(self.textureId ? self.textureId : [NSNull null]), @"textureId", (self.speed ? self.speed : [NSNull null]), @"speed", nil]; + return [NSDictionary dictionaryWithObjectsAndKeys:(self.playerId ? self.playerId : [NSNull null]), @"playerId", (self.speed ? self.speed : [NSNull null]), @"speed", nil]; } @end @implementation SnapshotMessage +(SnapshotMessage*)fromMap:(NSDictionary*)dict { SnapshotMessage* result = [[SnapshotMessage alloc] init]; - result.textureId = dict[@"textureId"]; - if ((NSNull *)result.textureId == [NSNull null]) { - result.textureId = nil; + result.playerId = dict[@"playerId"]; + if ((NSNull *)result.playerId == [NSNull null]) { + result.playerId = nil; } result.snapshot = dict[@"snapshot"]; if ((NSNull *)result.snapshot == [NSNull null]) { @@ -339,16 +339,16 @@ +(SnapshotMessage*)fromMap:(NSDictionary*)dict { return result; } -(NSDictionary*)toMap { - return [NSDictionary dictionaryWithObjectsAndKeys:(self.textureId ? self.textureId : [NSNull null]), @"textureId", (self.snapshot ? self.snapshot : [NSNull null]), @"snapshot", nil]; + return [NSDictionary dictionaryWithObjectsAndKeys:(self.playerId ? self.playerId : [NSNull null]), @"playerId", (self.snapshot ? self.snapshot : [NSNull null]), @"snapshot", nil]; } @end @implementation TrackCountMessage +(TrackCountMessage*)fromMap:(NSDictionary*)dict { TrackCountMessage* result = [[TrackCountMessage alloc] init]; - result.textureId = dict[@"textureId"]; - if ((NSNull *)result.textureId == [NSNull null]) { - result.textureId = nil; + result.playerId = dict[@"playerId"]; + if ((NSNull *)result.playerId == [NSNull null]) { + result.playerId = nil; } result.count = dict[@"count"]; if ((NSNull *)result.count == [NSNull null]) { @@ -357,16 +357,16 @@ +(TrackCountMessage*)fromMap:(NSDictionary*)dict { return result; } -(NSDictionary*)toMap { - return [NSDictionary dictionaryWithObjectsAndKeys:(self.textureId ? self.textureId : [NSNull null]), @"textureId", (self.count ? self.count : [NSNull null]), @"count", nil]; + return [NSDictionary dictionaryWithObjectsAndKeys:(self.playerId ? self.playerId : [NSNull null]), @"playerId", (self.count ? self.count : [NSNull null]), @"count", nil]; } @end @implementation SpuTracksMessage +(SpuTracksMessage*)fromMap:(NSDictionary*)dict { SpuTracksMessage* result = [[SpuTracksMessage alloc] init]; - result.textureId = dict[@"textureId"]; - if ((NSNull *)result.textureId == [NSNull null]) { - result.textureId = nil; + result.playerId = dict[@"playerId"]; + if ((NSNull *)result.playerId == [NSNull null]) { + result.playerId = nil; } result.subtitles = dict[@"subtitles"]; if ((NSNull *)result.subtitles == [NSNull null]) { @@ -375,16 +375,16 @@ +(SpuTracksMessage*)fromMap:(NSDictionary*)dict { return result; } -(NSDictionary*)toMap { - return [NSDictionary dictionaryWithObjectsAndKeys:(self.textureId ? self.textureId : [NSNull null]), @"textureId", (self.subtitles ? self.subtitles : [NSNull null]), @"subtitles", nil]; + return [NSDictionary dictionaryWithObjectsAndKeys:(self.playerId ? self.playerId : [NSNull null]), @"playerId", (self.subtitles ? self.subtitles : [NSNull null]), @"subtitles", nil]; } @end @implementation SpuTrackMessage +(SpuTrackMessage*)fromMap:(NSDictionary*)dict { SpuTrackMessage* result = [[SpuTrackMessage alloc] init]; - result.textureId = dict[@"textureId"]; - if ((NSNull *)result.textureId == [NSNull null]) { - result.textureId = nil; + result.playerId = dict[@"playerId"]; + if ((NSNull *)result.playerId == [NSNull null]) { + result.playerId = nil; } result.spuTrackNumber = dict[@"spuTrackNumber"]; if ((NSNull *)result.spuTrackNumber == [NSNull null]) { @@ -393,16 +393,16 @@ +(SpuTrackMessage*)fromMap:(NSDictionary*)dict { return result; } -(NSDictionary*)toMap { - return [NSDictionary dictionaryWithObjectsAndKeys:(self.textureId ? self.textureId : [NSNull null]), @"textureId", (self.spuTrackNumber ? self.spuTrackNumber : [NSNull null]), @"spuTrackNumber", nil]; + return [NSDictionary dictionaryWithObjectsAndKeys:(self.playerId ? self.playerId : [NSNull null]), @"playerId", (self.spuTrackNumber ? self.spuTrackNumber : [NSNull null]), @"spuTrackNumber", nil]; } @end @implementation DelayMessage +(DelayMessage*)fromMap:(NSDictionary*)dict { DelayMessage* result = [[DelayMessage alloc] init]; - result.textureId = dict[@"textureId"]; - if ((NSNull *)result.textureId == [NSNull null]) { - result.textureId = nil; + result.playerId = dict[@"playerId"]; + if ((NSNull *)result.playerId == [NSNull null]) { + result.playerId = nil; } result.delay = dict[@"delay"]; if ((NSNull *)result.delay == [NSNull null]) { @@ -411,16 +411,16 @@ +(DelayMessage*)fromMap:(NSDictionary*)dict { return result; } -(NSDictionary*)toMap { - return [NSDictionary dictionaryWithObjectsAndKeys:(self.textureId ? self.textureId : [NSNull null]), @"textureId", (self.delay ? self.delay : [NSNull null]), @"delay", nil]; + return [NSDictionary dictionaryWithObjectsAndKeys:(self.playerId ? self.playerId : [NSNull null]), @"playerId", (self.delay ? self.delay : [NSNull null]), @"delay", nil]; } @end @implementation AddSubtitleMessage +(AddSubtitleMessage*)fromMap:(NSDictionary*)dict { AddSubtitleMessage* result = [[AddSubtitleMessage alloc] init]; - result.textureId = dict[@"textureId"]; - if ((NSNull *)result.textureId == [NSNull null]) { - result.textureId = nil; + result.playerId = dict[@"playerId"]; + if ((NSNull *)result.playerId == [NSNull null]) { + result.playerId = nil; } result.uri = dict[@"uri"]; if ((NSNull *)result.uri == [NSNull null]) { @@ -437,16 +437,16 @@ +(AddSubtitleMessage*)fromMap:(NSDictionary*)dict { return result; } -(NSDictionary*)toMap { - return [NSDictionary dictionaryWithObjectsAndKeys:(self.textureId ? self.textureId : [NSNull null]), @"textureId", (self.uri ? self.uri : [NSNull null]), @"uri", (self.type ? self.type : [NSNull null]), @"type", (self.isSelected ? self.isSelected : [NSNull null]), @"isSelected", nil]; + return [NSDictionary dictionaryWithObjectsAndKeys:(self.playerId ? self.playerId : [NSNull null]), @"playerId", (self.uri ? self.uri : [NSNull null]), @"uri", (self.type ? self.type : [NSNull null]), @"type", (self.isSelected ? self.isSelected : [NSNull null]), @"isSelected", nil]; } @end @implementation AudioTracksMessage +(AudioTracksMessage*)fromMap:(NSDictionary*)dict { AudioTracksMessage* result = [[AudioTracksMessage alloc] init]; - result.textureId = dict[@"textureId"]; - if ((NSNull *)result.textureId == [NSNull null]) { - result.textureId = nil; + result.playerId = dict[@"playerId"]; + if ((NSNull *)result.playerId == [NSNull null]) { + result.playerId = nil; } result.audios = dict[@"audios"]; if ((NSNull *)result.audios == [NSNull null]) { @@ -455,16 +455,16 @@ +(AudioTracksMessage*)fromMap:(NSDictionary*)dict { return result; } -(NSDictionary*)toMap { - return [NSDictionary dictionaryWithObjectsAndKeys:(self.textureId ? self.textureId : [NSNull null]), @"textureId", (self.audios ? self.audios : [NSNull null]), @"audios", nil]; + return [NSDictionary dictionaryWithObjectsAndKeys:(self.playerId ? self.playerId : [NSNull null]), @"playerId", (self.audios ? self.audios : [NSNull null]), @"audios", nil]; } @end @implementation AudioTrackMessage +(AudioTrackMessage*)fromMap:(NSDictionary*)dict { AudioTrackMessage* result = [[AudioTrackMessage alloc] init]; - result.textureId = dict[@"textureId"]; - if ((NSNull *)result.textureId == [NSNull null]) { - result.textureId = nil; + result.playerId = dict[@"playerId"]; + if ((NSNull *)result.playerId == [NSNull null]) { + result.playerId = nil; } result.audioTrackNumber = dict[@"audioTrackNumber"]; if ((NSNull *)result.audioTrackNumber == [NSNull null]) { @@ -473,16 +473,16 @@ +(AudioTrackMessage*)fromMap:(NSDictionary*)dict { return result; } -(NSDictionary*)toMap { - return [NSDictionary dictionaryWithObjectsAndKeys:(self.textureId ? self.textureId : [NSNull null]), @"textureId", (self.audioTrackNumber ? self.audioTrackNumber : [NSNull null]), @"audioTrackNumber", nil]; + return [NSDictionary dictionaryWithObjectsAndKeys:(self.playerId ? self.playerId : [NSNull null]), @"playerId", (self.audioTrackNumber ? self.audioTrackNumber : [NSNull null]), @"audioTrackNumber", nil]; } @end @implementation AddAudioMessage +(AddAudioMessage*)fromMap:(NSDictionary*)dict { AddAudioMessage* result = [[AddAudioMessage alloc] init]; - result.textureId = dict[@"textureId"]; - if ((NSNull *)result.textureId == [NSNull null]) { - result.textureId = nil; + result.playerId = dict[@"playerId"]; + if ((NSNull *)result.playerId == [NSNull null]) { + result.playerId = nil; } result.uri = dict[@"uri"]; if ((NSNull *)result.uri == [NSNull null]) { @@ -499,16 +499,16 @@ +(AddAudioMessage*)fromMap:(NSDictionary*)dict { return result; } -(NSDictionary*)toMap { - return [NSDictionary dictionaryWithObjectsAndKeys:(self.textureId ? self.textureId : [NSNull null]), @"textureId", (self.uri ? self.uri : [NSNull null]), @"uri", (self.type ? self.type : [NSNull null]), @"type", (self.isSelected ? self.isSelected : [NSNull null]), @"isSelected", nil]; + return [NSDictionary dictionaryWithObjectsAndKeys:(self.playerId ? self.playerId : [NSNull null]), @"playerId", (self.uri ? self.uri : [NSNull null]), @"uri", (self.type ? self.type : [NSNull null]), @"type", (self.isSelected ? self.isSelected : [NSNull null]), @"isSelected", nil]; } @end @implementation VideoTracksMessage +(VideoTracksMessage*)fromMap:(NSDictionary*)dict { VideoTracksMessage* result = [[VideoTracksMessage alloc] init]; - result.textureId = dict[@"textureId"]; - if ((NSNull *)result.textureId == [NSNull null]) { - result.textureId = nil; + result.playerId = dict[@"playerId"]; + if ((NSNull *)result.playerId == [NSNull null]) { + result.playerId = nil; } result.videos = dict[@"videos"]; if ((NSNull *)result.videos == [NSNull null]) { @@ -517,16 +517,16 @@ +(VideoTracksMessage*)fromMap:(NSDictionary*)dict { return result; } -(NSDictionary*)toMap { - return [NSDictionary dictionaryWithObjectsAndKeys:(self.textureId ? self.textureId : [NSNull null]), @"textureId", (self.videos ? self.videos : [NSNull null]), @"videos", nil]; + return [NSDictionary dictionaryWithObjectsAndKeys:(self.playerId ? self.playerId : [NSNull null]), @"playerId", (self.videos ? self.videos : [NSNull null]), @"videos", nil]; } @end @implementation VideoTrackMessage +(VideoTrackMessage*)fromMap:(NSDictionary*)dict { VideoTrackMessage* result = [[VideoTrackMessage alloc] init]; - result.textureId = dict[@"textureId"]; - if ((NSNull *)result.textureId == [NSNull null]) { - result.textureId = nil; + result.playerId = dict[@"playerId"]; + if ((NSNull *)result.playerId == [NSNull null]) { + result.playerId = nil; } result.videoTrackNumber = dict[@"videoTrackNumber"]; if ((NSNull *)result.videoTrackNumber == [NSNull null]) { @@ -535,16 +535,16 @@ +(VideoTrackMessage*)fromMap:(NSDictionary*)dict { return result; } -(NSDictionary*)toMap { - return [NSDictionary dictionaryWithObjectsAndKeys:(self.textureId ? self.textureId : [NSNull null]), @"textureId", (self.videoTrackNumber ? self.videoTrackNumber : [NSNull null]), @"videoTrackNumber", nil]; + return [NSDictionary dictionaryWithObjectsAndKeys:(self.playerId ? self.playerId : [NSNull null]), @"playerId", (self.videoTrackNumber ? self.videoTrackNumber : [NSNull null]), @"videoTrackNumber", nil]; } @end @implementation VideoScaleMessage +(VideoScaleMessage*)fromMap:(NSDictionary*)dict { VideoScaleMessage* result = [[VideoScaleMessage alloc] init]; - result.textureId = dict[@"textureId"]; - if ((NSNull *)result.textureId == [NSNull null]) { - result.textureId = nil; + result.playerId = dict[@"playerId"]; + if ((NSNull *)result.playerId == [NSNull null]) { + result.playerId = nil; } result.scale = dict[@"scale"]; if ((NSNull *)result.scale == [NSNull null]) { @@ -553,16 +553,16 @@ +(VideoScaleMessage*)fromMap:(NSDictionary*)dict { return result; } -(NSDictionary*)toMap { - return [NSDictionary dictionaryWithObjectsAndKeys:(self.textureId ? self.textureId : [NSNull null]), @"textureId", (self.scale ? self.scale : [NSNull null]), @"scale", nil]; + return [NSDictionary dictionaryWithObjectsAndKeys:(self.playerId ? self.playerId : [NSNull null]), @"playerId", (self.scale ? self.scale : [NSNull null]), @"scale", nil]; } @end @implementation VideoAspectRatioMessage +(VideoAspectRatioMessage*)fromMap:(NSDictionary*)dict { VideoAspectRatioMessage* result = [[VideoAspectRatioMessage alloc] init]; - result.textureId = dict[@"textureId"]; - if ((NSNull *)result.textureId == [NSNull null]) { - result.textureId = nil; + result.playerId = dict[@"playerId"]; + if ((NSNull *)result.playerId == [NSNull null]) { + result.playerId = nil; } result.aspectRatio = dict[@"aspectRatio"]; if ((NSNull *)result.aspectRatio == [NSNull null]) { @@ -571,16 +571,16 @@ +(VideoAspectRatioMessage*)fromMap:(NSDictionary*)dict { return result; } -(NSDictionary*)toMap { - return [NSDictionary dictionaryWithObjectsAndKeys:(self.textureId ? self.textureId : [NSNull null]), @"textureId", (self.aspectRatio ? self.aspectRatio : [NSNull null]), @"aspectRatio", nil]; + return [NSDictionary dictionaryWithObjectsAndKeys:(self.playerId ? self.playerId : [NSNull null]), @"playerId", (self.aspectRatio ? self.aspectRatio : [NSNull null]), @"aspectRatio", nil]; } @end @implementation RendererServicesMessage +(RendererServicesMessage*)fromMap:(NSDictionary*)dict { RendererServicesMessage* result = [[RendererServicesMessage alloc] init]; - result.textureId = dict[@"textureId"]; - if ((NSNull *)result.textureId == [NSNull null]) { - result.textureId = nil; + result.playerId = dict[@"playerId"]; + if ((NSNull *)result.playerId == [NSNull null]) { + result.playerId = nil; } result.services = dict[@"services"]; if ((NSNull *)result.services == [NSNull null]) { @@ -589,16 +589,16 @@ +(RendererServicesMessage*)fromMap:(NSDictionary*)dict { return result; } -(NSDictionary*)toMap { - return [NSDictionary dictionaryWithObjectsAndKeys:(self.textureId ? self.textureId : [NSNull null]), @"textureId", (self.services ? self.services : [NSNull null]), @"services", nil]; + return [NSDictionary dictionaryWithObjectsAndKeys:(self.playerId ? self.playerId : [NSNull null]), @"playerId", (self.services ? self.services : [NSNull null]), @"services", nil]; } @end @implementation RendererScanningMessage +(RendererScanningMessage*)fromMap:(NSDictionary*)dict { RendererScanningMessage* result = [[RendererScanningMessage alloc] init]; - result.textureId = dict[@"textureId"]; - if ((NSNull *)result.textureId == [NSNull null]) { - result.textureId = nil; + result.playerId = dict[@"playerId"]; + if ((NSNull *)result.playerId == [NSNull null]) { + result.playerId = nil; } result.rendererService = dict[@"rendererService"]; if ((NSNull *)result.rendererService == [NSNull null]) { @@ -607,16 +607,16 @@ +(RendererScanningMessage*)fromMap:(NSDictionary*)dict { return result; } -(NSDictionary*)toMap { - return [NSDictionary dictionaryWithObjectsAndKeys:(self.textureId ? self.textureId : [NSNull null]), @"textureId", (self.rendererService ? self.rendererService : [NSNull null]), @"rendererService", nil]; + return [NSDictionary dictionaryWithObjectsAndKeys:(self.playerId ? self.playerId : [NSNull null]), @"playerId", (self.rendererService ? self.rendererService : [NSNull null]), @"rendererService", nil]; } @end @implementation RendererDevicesMessage +(RendererDevicesMessage*)fromMap:(NSDictionary*)dict { RendererDevicesMessage* result = [[RendererDevicesMessage alloc] init]; - result.textureId = dict[@"textureId"]; - if ((NSNull *)result.textureId == [NSNull null]) { - result.textureId = nil; + result.playerId = dict[@"playerId"]; + if ((NSNull *)result.playerId == [NSNull null]) { + result.playerId = nil; } result.rendererDevices = dict[@"rendererDevices"]; if ((NSNull *)result.rendererDevices == [NSNull null]) { @@ -625,16 +625,16 @@ +(RendererDevicesMessage*)fromMap:(NSDictionary*)dict { return result; } -(NSDictionary*)toMap { - return [NSDictionary dictionaryWithObjectsAndKeys:(self.textureId ? self.textureId : [NSNull null]), @"textureId", (self.rendererDevices ? self.rendererDevices : [NSNull null]), @"rendererDevices", nil]; + return [NSDictionary dictionaryWithObjectsAndKeys:(self.playerId ? self.playerId : [NSNull null]), @"playerId", (self.rendererDevices ? self.rendererDevices : [NSNull null]), @"rendererDevices", nil]; } @end @implementation RenderDeviceMessage +(RenderDeviceMessage*)fromMap:(NSDictionary*)dict { RenderDeviceMessage* result = [[RenderDeviceMessage alloc] init]; - result.textureId = dict[@"textureId"]; - if ((NSNull *)result.textureId == [NSNull null]) { - result.textureId = nil; + result.playerId = dict[@"playerId"]; + if ((NSNull *)result.playerId == [NSNull null]) { + result.playerId = nil; } result.rendererDevice = dict[@"rendererDevice"]; if ((NSNull *)result.rendererDevice == [NSNull null]) { @@ -643,16 +643,16 @@ +(RenderDeviceMessage*)fromMap:(NSDictionary*)dict { return result; } -(NSDictionary*)toMap { - return [NSDictionary dictionaryWithObjectsAndKeys:(self.textureId ? self.textureId : [NSNull null]), @"textureId", (self.rendererDevice ? self.rendererDevice : [NSNull null]), @"rendererDevice", nil]; + return [NSDictionary dictionaryWithObjectsAndKeys:(self.playerId ? self.playerId : [NSNull null]), @"playerId", (self.rendererDevice ? self.rendererDevice : [NSNull null]), @"rendererDevice", nil]; } @end @implementation RecordMessage +(RecordMessage*)fromMap:(NSDictionary*)dict { RecordMessage* result = [[RecordMessage alloc] init]; - result.textureId = dict[@"textureId"]; - if ((NSNull *)result.textureId == [NSNull null]) { - result.textureId = nil; + result.playerId = dict[@"playerId"]; + if ((NSNull *)result.playerId == [NSNull null]) { + result.playerId = nil; } result.saveDirectory = dict[@"saveDirectory"]; if ((NSNull *)result.saveDirectory == [NSNull null]) { @@ -661,7 +661,7 @@ +(RecordMessage*)fromMap:(NSDictionary*)dict { return result; } -(NSDictionary*)toMap { - return [NSDictionary dictionaryWithObjectsAndKeys:(self.textureId ? self.textureId : [NSNull null]), @"textureId", (self.saveDirectory ? self.saveDirectory : [NSNull null]), @"saveDirectory", nil]; + return [NSDictionary dictionaryWithObjectsAndKeys:(self.playerId ? self.playerId : [NSNull null]), @"playerId", (self.saveDirectory ? self.saveDirectory : [NSNull null]), @"saveDirectory", nil]; } @end @@ -706,7 +706,7 @@ void VlcPlayerApiSetup(id binaryMessenger, id binaryMessenger, id binaryMessenger, id binaryMessenger, id binaryMessenger, id binaryMessenger, id binaryMessenger, id binaryMessenger, id binaryMessenger, id binaryMessenger, id binaryMessenger, id binaryMessenger, id binaryMessenger, id binaryMessenger, id binaryMessenger, id binaryMessenger, id binaryMessenger, id binaryMessenger, id binaryMessenger, id binaryMessenger, id binaryMessenger, id binaryMessenger, id binaryMessenger, id binaryMessenger, id binaryMessenger, id binaryMessenger, id binaryMessenger, id binaryMessenger, id { this.dataSource, { this.autoInitialize = true, this.package, - this.hwAcc = HwAcc.AUTO, + this.hwAcc = HwAcc.auto, this.autoPlay = true, this.options, @Deprecated('Please, use the addOnInitListener method instead.') @@ -52,7 +52,7 @@ class VlcPlayerController extends ValueNotifier { VlcPlayerController.network( this.dataSource, { this.autoInitialize = true, - this.hwAcc = HwAcc.AUTO, + this.hwAcc = HwAcc.auto, this.autoPlay = true, this.options, @Deprecated('Please, use the addOnInitListener method instead.') @@ -72,7 +72,7 @@ class VlcPlayerController extends ValueNotifier { VlcPlayerController.file( File file, { this.autoInitialize = true, - this.hwAcc = HwAcc.AUTO, + this.hwAcc = HwAcc.auto, this.autoPlay = true, this.options, @Deprecated('Please, use the addOnInitListener method instead.') @@ -131,10 +131,10 @@ class VlcPlayerController extends ValueNotifier { /// This is just exposed for testing. It shouldn't be used by anyone depending /// on the plugin. @visibleForTesting - int? get viewId => _viewId; + int? get playerId => _playerId; - /// The viewId for this controller - late int _viewId; + /// The playerId for this controller + late int _playerId; /// List of onInit listeners final List _onInitListeners = []; @@ -180,7 +180,7 @@ class VlcPlayerController extends ValueNotifier { _lifeCycleObserver!.initialize(); await vlcPlayerPlatform.create( - viewId: _viewId, + playerId: _playerId, uri: dataSource, type: dataSourceType, package: package, @@ -311,7 +311,7 @@ class VlcPlayerController extends ValueNotifier { } vlcPlayerPlatform - .mediaEventsFor(_viewId) + .mediaEventsFor(_playerId) .listen(mediaEventListener, onError: errorListener); // listen for renderer devices events @@ -333,7 +333,9 @@ class VlcPlayerController extends ValueNotifier { } } - vlcPlayerPlatform.rendererEventsFor(_viewId).listen(rendererEventListener); + vlcPlayerPlatform + .rendererEventsFor(_playerId) + .listen(rendererEventListener); if (!initializingCompleter.isCompleted) { initializingCompleter.complete(null); @@ -361,7 +363,7 @@ class VlcPlayerController extends ValueNotifier { _isDisposed = true; super.dispose(); // - await vlcPlayerPlatform.dispose(_viewId); + await vlcPlayerPlatform.dispose(_playerId); } /// Notify onInit callback & all registered listeners @@ -369,7 +371,9 @@ class VlcPlayerController extends ValueNotifier { if (_onInit != null) { _onInit!(); } - _onInitListeners.forEach((listener) => listener()); + for (var listener in _onInitListeners) { + listener(); + } } /// Notify onRendererHandler callback & all registered listeners @@ -381,7 +385,9 @@ class VlcPlayerController extends ValueNotifier { if (_onRendererHandler != null) { _onRendererHandler!(type, id!, name!); } - _onRendererEventListeners.forEach((listener) => listener(type, id!, name!)); + for (var listener in _onRendererEventListeners) { + listener(type, id!, name!); + } } /// This stops playback and changes the data source. Once the new data source has been loaded, the playback state will revert to @@ -459,13 +465,13 @@ class VlcPlayerController extends ValueNotifier { HwAcc? hwAcc, }) async { _throwIfNotInitialized('setStreamUrl'); - await vlcPlayerPlatform.stop(_viewId); + await vlcPlayerPlatform.stop(_playerId); await vlcPlayerPlatform.setStreamUrl( - _viewId, + _playerId, uri: dataSource, type: dataSourceType, package: package, - hwAcc: hwAcc ?? HwAcc.AUTO, + hwAcc: hwAcc ?? HwAcc.auto, autoPlay: autoPlay ?? true, ); return; @@ -478,7 +484,7 @@ class VlcPlayerController extends ValueNotifier { /// finished. Future play() async { _throwIfNotInitialized('play'); - await vlcPlayerPlatform.play(_viewId); + await vlcPlayerPlatform.play(_playerId); // This ensures that the correct playback speed is always applied when // playing back. This is necessary because we do not set playback speed // when paused. @@ -488,32 +494,32 @@ class VlcPlayerController extends ValueNotifier { /// Pauses the video. Future pause() async { _throwIfNotInitialized('pause'); - await vlcPlayerPlatform.pause(_viewId); + await vlcPlayerPlatform.pause(_playerId); } /// stops the video. Future stop() async { _throwIfNotInitialized('stop'); - await vlcPlayerPlatform.stop(_viewId); + await vlcPlayerPlatform.stop(_playerId); } /// Sets whether or not the video should loop after playing once. Future setLooping(bool looping) async { _throwIfNotInitialized('setLooping'); value = value.copyWith(isLooping: looping); - await vlcPlayerPlatform.setLooping(_viewId, looping); + await vlcPlayerPlatform.setLooping(_playerId, looping); } /// Returns true if media is playing. Future isPlaying() async { _throwIfNotInitialized('isPlaying'); - return await vlcPlayerPlatform.isPlaying(_viewId); + return await vlcPlayerPlatform.isPlaying(_playerId); } /// Returns true if media is seekable. Future isSeekable() async { _throwIfNotInitialized('isSeekable'); - return await vlcPlayerPlatform.isSeekable(_viewId); + return await vlcPlayerPlatform.isSeekable(_playerId); } /// Set video timestamp in millisecond @@ -533,7 +539,7 @@ class VlcPlayerController extends ValueNotifier { } else if (position < Duration.zero) { position = Duration.zero; } - await vlcPlayerPlatform.seekTo(_viewId, position); + await vlcPlayerPlatform.seekTo(_playerId, position); } /// Get the video timestamp in millisecond @@ -545,7 +551,7 @@ class VlcPlayerController extends ValueNotifier { /// Returns the position in the current video. Future getPosition() async { _throwIfNotInitialized('getPosition'); - var position = await vlcPlayerPlatform.getPosition(_viewId); + var position = await vlcPlayerPlatform.getPosition(_playerId); value = value.copyWith(position: position); return position; } @@ -557,13 +563,14 @@ class VlcPlayerController extends ValueNotifier { Future setVolume(int volume) async { _throwIfNotInitialized('setVolume'); value = value.copyWith(volume: volume.clamp(0, 100)); - await vlcPlayerPlatform.setVolume(_viewId, value.volume); + await vlcPlayerPlatform.setVolume(_playerId, value.volume); } /// Returns current vlc volume level. Future getVolume() async { _throwIfNotInitialized('getVolume'); - var volume = await (vlcPlayerPlatform.getVolume(_viewId) as FutureOr); + var volume = + await (vlcPlayerPlatform.getVolume(_playerId) as FutureOr); value = value.copyWith(volume: volume.clamp(0, 100)); return volume; } @@ -571,7 +578,7 @@ class VlcPlayerController extends ValueNotifier { /// Returns duration/length of loaded video Future getDuration() async { _throwIfNotInitialized('getDuration'); - var duration = await vlcPlayerPlatform.getDuration(_viewId); + var duration = await vlcPlayerPlatform.getDuration(_playerId); value = value.copyWith(duration: duration); return duration; } @@ -602,7 +609,7 @@ class VlcPlayerController extends ValueNotifier { if (!value.isPlaying) return; value = value.copyWith(playbackSpeed: speed); await vlcPlayerPlatform.setPlaybackSpeed( - _viewId, + _playerId, value.playbackSpeed, ); } @@ -610,7 +617,7 @@ class VlcPlayerController extends ValueNotifier { /// Returns the vlc playback speed. Future getPlaybackSpeed() async { _throwIfNotInitialized('getPlaybackSpeed'); - var speed = await vlcPlayerPlatform.getPlaybackSpeed(_viewId); + var speed = await vlcPlayerPlatform.getPlaybackSpeed(_playerId); value = value.copyWith(playbackSpeed: speed); return speed; } @@ -618,7 +625,7 @@ class VlcPlayerController extends ValueNotifier { /// Return the number of subtitle tracks (both embedded and inserted) Future getSpuTracksCount() async { _throwIfNotInitialized('getSpuTracksCount'); - var spuTracksCount = await vlcPlayerPlatform.getSpuTracksCount(_viewId); + var spuTracksCount = await vlcPlayerPlatform.getSpuTracksCount(_playerId); value = value.copyWith(spuTracksCount: spuTracksCount); return spuTracksCount; } @@ -628,20 +635,20 @@ class VlcPlayerController extends ValueNotifier { /// and the value is the display name of subtitle Future> getSpuTracks() async { _throwIfNotInitialized('getSpuTracks'); - return await vlcPlayerPlatform.getSpuTracks(_viewId); + return await vlcPlayerPlatform.getSpuTracks(_playerId); } /// Change active subtitle index (set -1 to disable subtitle). /// [spuTrackNumber] - the subtitle index obtained from getSpuTracks() Future setSpuTrack(int spuTrackNumber) async { _throwIfNotInitialized('setSpuTrack'); - return await vlcPlayerPlatform.setSpuTrack(_viewId, spuTrackNumber); + return await vlcPlayerPlatform.setSpuTrack(_playerId, spuTrackNumber); } /// Returns active spu track index Future getSpuTrack() async { _throwIfNotInitialized('getSpuTrack'); - var activeSpuTrack = await vlcPlayerPlatform.getSpuTrack(_viewId); + var activeSpuTrack = await vlcPlayerPlatform.getSpuTrack(_playerId); value = value.copyWith(activeSpuTrack: activeSpuTrack); return activeSpuTrack; } @@ -651,13 +658,13 @@ class VlcPlayerController extends ValueNotifier { Future setSpuDelay(int spuDelay) async { _throwIfNotInitialized('setSpuDelay'); value = value.copyWith(spuDelay: spuDelay); - return await vlcPlayerPlatform.setSpuDelay(_viewId, spuDelay); + return await vlcPlayerPlatform.setSpuDelay(_playerId, spuDelay); } /// Returns the amount of subtitle time delay. Future getSpuDelay() async { _throwIfNotInitialized('getSpuDelay'); - var spuDelay = await vlcPlayerPlatform.getSpuDelay(_viewId); + var spuDelay = await vlcPlayerPlatform.getSpuDelay(_playerId); value = value.copyWith(spuDelay: spuDelay); return spuDelay; } @@ -700,7 +707,7 @@ class VlcPlayerController extends ValueNotifier { }) async { _throwIfNotInitialized('addSubtitleTrack'); return await vlcPlayerPlatform.addSubtitleTrack( - _viewId, + _playerId, uri: uri, type: dataSourceType, isSelected: isSelected ?? true, @@ -710,7 +717,8 @@ class VlcPlayerController extends ValueNotifier { /// Returns the number of audio tracks Future getAudioTracksCount() async { _throwIfNotInitialized('getAudioTracksCount'); - var audioTracksCount = await vlcPlayerPlatform.getAudioTracksCount(_viewId); + var audioTracksCount = + await vlcPlayerPlatform.getAudioTracksCount(_playerId); value = value.copyWith(audioTracksCount: audioTracksCount); return audioTracksCount; } @@ -720,13 +728,13 @@ class VlcPlayerController extends ValueNotifier { /// and the value is the display name of audio Future> getAudioTracks() async { _throwIfNotInitialized('getAudioTracks'); - return await vlcPlayerPlatform.getAudioTracks(_viewId); + return await vlcPlayerPlatform.getAudioTracks(_playerId); } /// Returns active audio track index Future getAudioTrack() async { _throwIfNotInitialized('getAudioTrack'); - var activeAudioTrack = await vlcPlayerPlatform.getAudioTrack(_viewId); + var activeAudioTrack = await vlcPlayerPlatform.getAudioTrack(_playerId); value = value.copyWith(activeAudioTrack: activeAudioTrack); return activeAudioTrack; } @@ -735,7 +743,7 @@ class VlcPlayerController extends ValueNotifier { /// [audioTrackNumber] - the audio track index obtained from getAudioTracks() Future setAudioTrack(int audioTrackNumber) async { _throwIfNotInitialized('setAudioTrack'); - return await vlcPlayerPlatform.setAudioTrack(_viewId, audioTrackNumber); + return await vlcPlayerPlatform.setAudioTrack(_playerId, audioTrackNumber); } /// [audioDelay] - the amount of time in milliseconds which vlc audio should be delayed. @@ -743,13 +751,13 @@ class VlcPlayerController extends ValueNotifier { Future setAudioDelay(int audioDelay) async { _throwIfNotInitialized('setAudioDelay'); value = value.copyWith(audioDelay: audioDelay); - return await vlcPlayerPlatform.setAudioDelay(_viewId, audioDelay); + return await vlcPlayerPlatform.setAudioDelay(_playerId, audioDelay); } /// Returns the amount of audio track time delay in millisecond. Future getAudioDelay() async { _throwIfNotInitialized('getAudioDelay'); - var audioDelay = await vlcPlayerPlatform.getAudioDelay(_viewId); + var audioDelay = await vlcPlayerPlatform.getAudioDelay(_playerId); value = value.copyWith(audioDelay: audioDelay); return audioDelay; } @@ -792,7 +800,7 @@ class VlcPlayerController extends ValueNotifier { }) async { _throwIfNotInitialized('addAudioTrack'); return await vlcPlayerPlatform.addAudioTrack( - _viewId, + _playerId, uri: uri, type: dataSourceType, isSelected: isSelected ?? true, @@ -802,7 +810,8 @@ class VlcPlayerController extends ValueNotifier { /// Returns the number of video tracks Future getVideoTracksCount() async { _throwIfNotInitialized('getVideoTracksCount'); - var videoTracksCount = await vlcPlayerPlatform.getVideoTracksCount(_viewId); + var videoTracksCount = + await vlcPlayerPlatform.getVideoTracksCount(_playerId); value = value.copyWith(videoTracksCount: videoTracksCount); return videoTracksCount; } @@ -811,20 +820,20 @@ class VlcPlayerController extends ValueNotifier { /// The key parameter is the index of video track and the value is the display name of video track Future> getVideoTracks() async { _throwIfNotInitialized('getVideoTracks'); - return await vlcPlayerPlatform.getVideoTracks(_viewId); + return await vlcPlayerPlatform.getVideoTracks(_playerId); } /// Change active video track index. /// [videoTrackNumber] - the video track index obtained from getVideoTracks() Future setVideoTrack(int videoTrackNumber) async { _throwIfNotInitialized('setVideoTrack'); - return await vlcPlayerPlatform.setVideoTrack(_viewId, videoTrackNumber); + return await vlcPlayerPlatform.setVideoTrack(_playerId, videoTrackNumber); } /// Returns active video track index Future getVideoTrack() async { _throwIfNotInitialized('getVideoTrack'); - var activeVideoTrack = await vlcPlayerPlatform.getVideoTrack(_viewId); + var activeVideoTrack = await vlcPlayerPlatform.getVideoTrack(_playerId); value = value.copyWith(activeVideoTrack: activeVideoTrack); return activeVideoTrack; } @@ -834,13 +843,13 @@ class VlcPlayerController extends ValueNotifier { Future setVideoScale(double videoScale) async { _throwIfNotInitialized('setVideoScale'); value = value.copyWith(videoScale: videoScale); - return await vlcPlayerPlatform.setVideoScale(_viewId, videoScale); + return await vlcPlayerPlatform.setVideoScale(_playerId, videoScale); } /// Returns video scale Future getVideoScale() async { _throwIfNotInitialized('getVideoScale'); - var videoScale = await vlcPlayerPlatform.getVideoScale(_viewId); + var videoScale = await vlcPlayerPlatform.getVideoScale(_playerId); value = value.copyWith(videoScale: videoScale); return videoScale; } @@ -850,7 +859,7 @@ class VlcPlayerController extends ValueNotifier { /// Set video aspect ratio Future setVideoAspectRatio(String aspectRatio) async { _throwIfNotInitialized('setVideoAspectRatio'); - return vlcPlayerPlatform.setVideoAspectRatio(_viewId, aspectRatio); + return vlcPlayerPlatform.setVideoAspectRatio(_playerId, aspectRatio); } /// Returns video aspect ratio in string format @@ -858,41 +867,41 @@ class VlcPlayerController extends ValueNotifier { /// This is different from the aspectRatio property in video value "16:9" Future getVideoAspectRatio() async { _throwIfNotInitialized('getVideoAspectRatio'); - return vlcPlayerPlatform.getVideoAspectRatio(_viewId); + return vlcPlayerPlatform.getVideoAspectRatio(_playerId); } /// Returns binary data for a snapshot of the media at the current frame. /// Future takeSnapshot() async { _throwIfNotInitialized('takeSnapshot'); - return await vlcPlayerPlatform.takeSnapshot(_viewId); + return await vlcPlayerPlatform.takeSnapshot(_playerId); } /// Get list of available renderer services which is supported by vlc library Future> getAvailableRendererServices() async { _throwIfNotInitialized('getAvailableRendererServices'); - return await vlcPlayerPlatform.getAvailableRendererServices(_viewId); + return await vlcPlayerPlatform.getAvailableRendererServices(_playerId); } /// Start vlc cast discovery to find external display devices (chromecast) /// By setting serviceName, the vlc discovers renderer with that service Future startRendererScanning({String? rendererService}) async { _throwIfNotInitialized('startRendererScanning'); - return await vlcPlayerPlatform.startRendererScanning(_viewId, + return await vlcPlayerPlatform.startRendererScanning(_playerId, rendererService: rendererService ?? ''); } /// Stop vlc cast and scan Future stopRendererScanning() async { _throwIfNotInitialized('stopRendererScanning'); - return await vlcPlayerPlatform.stopRendererScanning(_viewId); + return await vlcPlayerPlatform.stopRendererScanning(_playerId); } /// Returns all detected renderer devices as array of /// The key parameter is the name of cast device and the value is the display name of cast device Future> getRendererDevices() async { _throwIfNotInitialized('getRendererDevices'); - return await vlcPlayerPlatform.getRendererDevices(_viewId); + return await vlcPlayerPlatform.getRendererDevices(_playerId); } /// [castDevice] - name of renderer device @@ -900,20 +909,20 @@ class VlcPlayerController extends ValueNotifier { /// Set null if you wanna stop video casting. Future castToRenderer(String castDevice) async { _throwIfNotInitialized('castToRenderer'); - return await vlcPlayerPlatform.castToRenderer(_viewId, castDevice); + return await vlcPlayerPlatform.castToRenderer(_playerId, castDevice); } /// [saveDirectory] - directory path of the recorded file /// Returns true if media is start recording. Future startRecording(String saveDirectory) async { _throwIfNotInitialized('startRecording'); - return await vlcPlayerPlatform.startRecording(_viewId, saveDirectory); + return await vlcPlayerPlatform.startRecording(_playerId, saveDirectory); } /// Returns true if media is stop recording. Future stopRecording() async { _throwIfNotInitialized('stopRecording'); - return await vlcPlayerPlatform.stopRecording(_viewId); + return await vlcPlayerPlatform.stopRecording(_playerId); } /// [functionName] - name of function @@ -931,13 +940,13 @@ class VlcPlayerController extends ValueNotifier { } } - /// [viewId] - the id of view that is generated by the platform + /// [playerId] - the id of view that is generated by the platform /// This method will be called after the platform view has been created - Future onPlatformViewCreated(int viewId) async { - _viewId = viewId; + Future onPlatformViewCreated(int playerId) async { + _playerId = playerId; // do we need to initialize controller after view becomes ready? if (autoInitialize) { - await Future.delayed(Duration(seconds: 1)); + await Future.delayed(const Duration(seconds: 1)); await initialize(); } _isReadyToInitialize = true; diff --git a/flutter_vlc_player/pigeons/messages.dart b/flutter_vlc_player/pigeons/messages.dart index d33609bc..48b82699 100644 --- a/flutter_vlc_player/pigeons/messages.dart +++ b/flutter_vlc_player/pigeons/messages.dart @@ -1,11 +1,11 @@ import 'package:pigeon/pigeon_lib.dart'; -class TextureMessage { - int? textureId; +class PlayerMessage { + int? playerId; } class CreateMessage { - int? textureId; + int? playerId; String? uri; int? type; String? packageName; @@ -15,7 +15,7 @@ class CreateMessage { } class SetMediaMessage { - int? textureId; + int? playerId; String? uri; int? type; String? packageName; @@ -24,126 +24,126 @@ class SetMediaMessage { } class BooleanMessage { - int? textureId; + int? playerId; bool? result; } class LoopingMessage { - int? textureId; + int? playerId; bool? isLooping; } class VolumeMessage { - int? textureId; + int? playerId; int? volume; } class PlaybackSpeedMessage { - int? textureId; + int? playerId; double? speed; } class PositionMessage { - int? textureId; + int? playerId; int? position; } class DurationMessage { - int? textureId; + int? playerId; int? duration; } class DelayMessage { - int? textureId; + int? playerId; int? delay; } class TrackCountMessage { - int? textureId; + int? playerId; int? count; } class SnapshotMessage { - int? textureId; + int? playerId; String? snapshot; } class SpuTracksMessage { - int? textureId; + int? playerId; Map? subtitles; } class SpuTrackMessage { - int? textureId; + int? playerId; int? spuTrackNumber; } class AddSubtitleMessage { - int? textureId; + int? playerId; String? uri; int? type; bool? isSelected; } class AudioTracksMessage { - int? textureId; + int? playerId; Map? audios; } class AudioTrackMessage { - int? textureId; + int? playerId; int? audioTrackNumber; } class AddAudioMessage { - int? textureId; + int? playerId; String? uri; int? type; bool? isSelected; } class VideoTracksMessage { - int? textureId; + int? playerId; Map? videos; } class VideoTrackMessage { - int? textureId; + int? playerId; int? videoTrackNumber; } class VideoScaleMessage { - int? textureId; + int? playerId; double? scale; } class VideoAspectRatioMessage { - int? textureId; + int? playerId; String? aspectRatio; } class RendererServicesMessage { - int? textureId; + int? playerId; List? services; } class RendererScanningMessage { - int? textureId; + int? playerId; String? rendererService; } class RendererDevicesMessage { - int? textureId; + int? playerId; Map? rendererDevices; } class RenderDeviceMessage { - int? textureId; + int? playerId; String? rendererDevice; } class RecordMessage { - int? textureId; + int? playerId; String? saveDirectory; } @@ -151,57 +151,57 @@ class RecordMessage { abstract class VlcPlayerApi { void initialize(); void create(CreateMessage msg); - void dispose(TextureMessage msg); + void dispose(PlayerMessage msg); // general methods void setStreamUrl(SetMediaMessage msg); - void play(TextureMessage msg); - void pause(TextureMessage msg); - void stop(TextureMessage msg); - BooleanMessage isPlaying(TextureMessage msg); - BooleanMessage isSeekable(TextureMessage msg); + void play(PlayerMessage msg); + void pause(PlayerMessage msg); + void stop(PlayerMessage msg); + BooleanMessage isPlaying(PlayerMessage msg); + BooleanMessage isSeekable(PlayerMessage msg); void setLooping(LoopingMessage msg); void seekTo(PositionMessage msg); - PositionMessage position(TextureMessage msg); - DurationMessage duration(TextureMessage msg); + PositionMessage position(PlayerMessage msg); + DurationMessage duration(PlayerMessage msg); void setVolume(VolumeMessage msg); - VolumeMessage getVolume(TextureMessage msg); + VolumeMessage getVolume(PlayerMessage msg); void setPlaybackSpeed(PlaybackSpeedMessage msg); - PlaybackSpeedMessage getPlaybackSpeed(TextureMessage msg); - SnapshotMessage takeSnapshot(TextureMessage msg); + PlaybackSpeedMessage getPlaybackSpeed(PlayerMessage msg); + SnapshotMessage takeSnapshot(PlayerMessage msg); // captions & subtitles methods - TrackCountMessage getSpuTracksCount(TextureMessage msg); - SpuTracksMessage getSpuTracks(TextureMessage msg); + TrackCountMessage getSpuTracksCount(PlayerMessage msg); + SpuTracksMessage getSpuTracks(PlayerMessage msg); void setSpuTrack(SpuTrackMessage msg); - SpuTrackMessage getSpuTrack(TextureMessage msg); + SpuTrackMessage getSpuTrack(PlayerMessage msg); void setSpuDelay(DelayMessage msg); - DelayMessage getSpuDelay(TextureMessage msg); + DelayMessage getSpuDelay(PlayerMessage msg); void addSubtitleTrack(AddSubtitleMessage msg); // audios methods - TrackCountMessage getAudioTracksCount(TextureMessage msg); - AudioTracksMessage getAudioTracks(TextureMessage msg); + TrackCountMessage getAudioTracksCount(PlayerMessage msg); + AudioTracksMessage getAudioTracks(PlayerMessage msg); void setAudioTrack(AudioTrackMessage msg); - AudioTrackMessage getAudioTrack(TextureMessage msg); + AudioTrackMessage getAudioTrack(PlayerMessage msg); void setAudioDelay(DelayMessage msg); - DelayMessage getAudioDelay(TextureMessage msg); + DelayMessage getAudioDelay(PlayerMessage msg); void addAudioTrack(AddAudioMessage msg); // videos methods - TrackCountMessage getVideoTracksCount(TextureMessage msg); - VideoTracksMessage getVideoTracks(TextureMessage msg); + TrackCountMessage getVideoTracksCount(PlayerMessage msg); + VideoTracksMessage getVideoTracks(PlayerMessage msg); void setVideoTrack(VideoTrackMessage msg); - VideoTrackMessage getVideoTrack(TextureMessage msg); + VideoTrackMessage getVideoTrack(PlayerMessage msg); void setVideoScale(VideoScaleMessage msg); - VideoScaleMessage getVideoScale(TextureMessage msg); + VideoScaleMessage getVideoScale(PlayerMessage msg); void setVideoAspectRatio(VideoAspectRatioMessage msg); - VideoAspectRatioMessage getVideoAspectRatio(TextureMessage msg); + VideoAspectRatioMessage getVideoAspectRatio(PlayerMessage msg); // casts & renderers methods - RendererServicesMessage getAvailableRendererServices(TextureMessage msg); + RendererServicesMessage getAvailableRendererServices(PlayerMessage msg); void startRendererScanning(RendererScanningMessage msg); - void stopRendererScanning(TextureMessage msg); - RendererDevicesMessage getRendererDevices(TextureMessage msg); + void stopRendererScanning(PlayerMessage msg); + RendererDevicesMessage getRendererDevices(PlayerMessage msg); void castToRenderer(RenderDeviceMessage msg); // recording methods BooleanMessage startRecording(RecordMessage msg); - BooleanMessage stopRecording(TextureMessage msg); + BooleanMessage stopRecording(PlayerMessage msg); } // to make changes effect, must run "flutter pub run pigeon \--input pigeons/messages.dart --dart_null_safety" diff --git a/flutter_vlc_player/pubspec.yaml b/flutter_vlc_player/pubspec.yaml index d5a26593..3ed2a103 100644 --- a/flutter_vlc_player/pubspec.yaml +++ b/flutter_vlc_player/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_vlc_player description: A VLC-powered alternative to Flutter's video_player. Supports multiple players on one screen. -version: 6.0.5 +version: 7.0.0 homepage: https://github.com/solid-software/flutter_vlc_player/ environment: @@ -21,7 +21,7 @@ dependencies: sdk: flutter meta: ^1.3.0 - flutter_vlc_player_platform_interface: ^1.0.7 + flutter_vlc_player_platform_interface: ^1.1.0 dev_dependencies: flutter_test: diff --git a/flutter_vlc_player_platform_interface/CHANGELOG.md b/flutter_vlc_player_platform_interface/CHANGELOG.md index 874f3da6..9136a2a1 100644 --- a/flutter_vlc_player_platform_interface/CHANGELOG.md +++ b/flutter_vlc_player_platform_interface/CHANGELOG.md @@ -1,3 +1,8 @@ +## 1.1.0 + +- Fix Dart analysis warnings +- Refactored enum parameters to follow dart naming convention + ## 1.0.7 - Add VLC http options diff --git a/flutter_vlc_player_platform_interface/lib/src/enums/hardware_acceleration.dart b/flutter_vlc_player_platform_interface/lib/src/enums/hardware_acceleration.dart index c58d766b..7effb5d4 100644 --- a/flutter_vlc_player_platform_interface/lib/src/enums/hardware_acceleration.dart +++ b/flutter_vlc_player_platform_interface/lib/src/enums/hardware_acceleration.dart @@ -1,6 +1,6 @@ enum HwAcc { - AUTO, - DISABLED, - DECODING, - FULL, + auto, + disabled, + decoding, + full, } diff --git a/flutter_vlc_player_platform_interface/lib/src/enums/player_state.dart b/flutter_vlc_player_platform_interface/lib/src/enums/player_state.dart deleted file mode 100644 index 91d4d60d..00000000 --- a/flutter_vlc_player_platform_interface/lib/src/enums/player_state.dart +++ /dev/null @@ -1,17 +0,0 @@ -/// Indicates the current player state. -enum VlcPlayerState { - /// The player is currently stopped. - STOPPED, - - /// The player is currently paused. - PAUSED, - - /// The player is currently buffering. - BUFFERING, - - /// The player is currently playing. - PLAYING, - - /// The player is encountered an error. - ERROR, -} diff --git a/flutter_vlc_player_platform_interface/lib/src/messages/messages.dart b/flutter_vlc_player_platform_interface/lib/src/messages/messages.dart index 99abf9a6..682bc742 100644 --- a/flutter_vlc_player_platform_interface/lib/src/messages/messages.dart +++ b/flutter_vlc_player_platform_interface/lib/src/messages/messages.dart @@ -8,7 +8,7 @@ import 'dart:typed_data' show Uint8List, Int32List, Int64List, Float64List; import 'package:flutter/services.dart'; class CreateMessage { - int? textureId; + int? playerId; String? uri; int? type; String? packageName; @@ -18,7 +18,7 @@ class CreateMessage { Object encode() { final Map pigeonMap = {}; - pigeonMap['textureId'] = textureId; + pigeonMap['playerId'] = playerId; pigeonMap['uri'] = uri; pigeonMap['type'] = type; pigeonMap['packageName'] = packageName; @@ -31,7 +31,7 @@ class CreateMessage { static CreateMessage decode(Object message) { final Map pigeonMap = message as Map; return CreateMessage() - ..textureId = pigeonMap['textureId'] as int? + ..playerId = pigeonMap['playerId'] as int? ..uri = pigeonMap['uri'] as String? ..type = pigeonMap['type'] as int? ..packageName = pigeonMap['packageName'] as String? @@ -41,23 +41,23 @@ class CreateMessage { } } -class TextureMessage { - int? textureId; +class PlayerMessage { + int? playerId; Object encode() { final Map pigeonMap = {}; - pigeonMap['textureId'] = textureId; + pigeonMap['playerId'] = playerId; return pigeonMap; } - static TextureMessage decode(Object message) { + static PlayerMessage decode(Object message) { final Map pigeonMap = message as Map; - return TextureMessage()..textureId = pigeonMap['textureId'] as int?; + return PlayerMessage()..playerId = pigeonMap['playerId'] as int?; } } class SetMediaMessage { - int? textureId; + int? playerId; String? uri; int? type; String? packageName; @@ -66,7 +66,7 @@ class SetMediaMessage { Object encode() { final Map pigeonMap = {}; - pigeonMap['textureId'] = textureId; + pigeonMap['playerId'] = playerId; pigeonMap['uri'] = uri; pigeonMap['type'] = type; pigeonMap['packageName'] = packageName; @@ -78,7 +78,7 @@ class SetMediaMessage { static SetMediaMessage decode(Object message) { final Map pigeonMap = message as Map; return SetMediaMessage() - ..textureId = pigeonMap['textureId'] as int? + ..playerId = pigeonMap['playerId'] as int? ..uri = pigeonMap['uri'] as String? ..type = pigeonMap['type'] as int? ..packageName = pigeonMap['packageName'] as String? @@ -88,12 +88,12 @@ class SetMediaMessage { } class BooleanMessage { - int? textureId; + int? playerId; bool? result; Object encode() { final Map pigeonMap = {}; - pigeonMap['textureId'] = textureId; + pigeonMap['playerId'] = playerId; pigeonMap['result'] = result; return pigeonMap; } @@ -101,18 +101,18 @@ class BooleanMessage { static BooleanMessage decode(Object message) { final Map pigeonMap = message as Map; return BooleanMessage() - ..textureId = pigeonMap['textureId'] as int? + ..playerId = pigeonMap['playerId'] as int? ..result = pigeonMap['result'] as bool?; } } class LoopingMessage { - int? textureId; + int? playerId; bool? isLooping; Object encode() { final Map pigeonMap = {}; - pigeonMap['textureId'] = textureId; + pigeonMap['playerId'] = playerId; pigeonMap['isLooping'] = isLooping; return pigeonMap; } @@ -120,18 +120,18 @@ class LoopingMessage { static LoopingMessage decode(Object message) { final Map pigeonMap = message as Map; return LoopingMessage() - ..textureId = pigeonMap['textureId'] as int? + ..playerId = pigeonMap['playerId'] as int? ..isLooping = pigeonMap['isLooping'] as bool?; } } class PositionMessage { - int? textureId; + int? playerId; int? position; Object encode() { final Map pigeonMap = {}; - pigeonMap['textureId'] = textureId; + pigeonMap['playerId'] = playerId; pigeonMap['position'] = position; return pigeonMap; } @@ -139,18 +139,18 @@ class PositionMessage { static PositionMessage decode(Object message) { final Map pigeonMap = message as Map; return PositionMessage() - ..textureId = pigeonMap['textureId'] as int? + ..playerId = pigeonMap['playerId'] as int? ..position = pigeonMap['position'] as int?; } } class DurationMessage { - int? textureId; + int? playerId; int? duration; Object encode() { final Map pigeonMap = {}; - pigeonMap['textureId'] = textureId; + pigeonMap['playerId'] = playerId; pigeonMap['duration'] = duration; return pigeonMap; } @@ -158,18 +158,18 @@ class DurationMessage { static DurationMessage decode(Object message) { final Map pigeonMap = message as Map; return DurationMessage() - ..textureId = pigeonMap['textureId'] as int? + ..playerId = pigeonMap['playerId'] as int? ..duration = pigeonMap['duration'] as int?; } } class VolumeMessage { - int? textureId; + int? playerId; int? volume; Object encode() { final Map pigeonMap = {}; - pigeonMap['textureId'] = textureId; + pigeonMap['playerId'] = playerId; pigeonMap['volume'] = volume; return pigeonMap; } @@ -177,18 +177,18 @@ class VolumeMessage { static VolumeMessage decode(Object message) { final Map pigeonMap = message as Map; return VolumeMessage() - ..textureId = pigeonMap['textureId'] as int? + ..playerId = pigeonMap['playerId'] as int? ..volume = pigeonMap['volume'] as int?; } } class PlaybackSpeedMessage { - int? textureId; + int? playerId; double? speed; Object encode() { final Map pigeonMap = {}; - pigeonMap['textureId'] = textureId; + pigeonMap['playerId'] = playerId; pigeonMap['speed'] = speed; return pigeonMap; } @@ -196,18 +196,18 @@ class PlaybackSpeedMessage { static PlaybackSpeedMessage decode(Object message) { final Map pigeonMap = message as Map; return PlaybackSpeedMessage() - ..textureId = pigeonMap['textureId'] as int? + ..playerId = pigeonMap['playerId'] as int? ..speed = pigeonMap['speed'] as double?; } } class SnapshotMessage { - int? textureId; + int? playerId; String? snapshot; Object encode() { final Map pigeonMap = {}; - pigeonMap['textureId'] = textureId; + pigeonMap['playerId'] = playerId; pigeonMap['snapshot'] = snapshot; return pigeonMap; } @@ -215,18 +215,18 @@ class SnapshotMessage { static SnapshotMessage decode(Object message) { final Map pigeonMap = message as Map; return SnapshotMessage() - ..textureId = pigeonMap['textureId'] as int? + ..playerId = pigeonMap['playerId'] as int? ..snapshot = pigeonMap['snapshot'] as String?; } } class TrackCountMessage { - int? textureId; + int? playerId; int? count; Object encode() { final Map pigeonMap = {}; - pigeonMap['textureId'] = textureId; + pigeonMap['playerId'] = playerId; pigeonMap['count'] = count; return pigeonMap; } @@ -234,18 +234,18 @@ class TrackCountMessage { static TrackCountMessage decode(Object message) { final Map pigeonMap = message as Map; return TrackCountMessage() - ..textureId = pigeonMap['textureId'] as int? + ..playerId = pigeonMap['playerId'] as int? ..count = pigeonMap['count'] as int?; } } class SpuTracksMessage { - int? textureId; + int? playerId; Map? subtitles; Object encode() { final Map pigeonMap = {}; - pigeonMap['textureId'] = textureId; + pigeonMap['playerId'] = playerId; pigeonMap['subtitles'] = subtitles; return pigeonMap; } @@ -253,18 +253,18 @@ class SpuTracksMessage { static SpuTracksMessage decode(Object message) { final Map pigeonMap = message as Map; return SpuTracksMessage() - ..textureId = pigeonMap['textureId'] as int? + ..playerId = pigeonMap['playerId'] as int? ..subtitles = pigeonMap['subtitles'] as Map?; } } class SpuTrackMessage { - int? textureId; + int? playerId; int? spuTrackNumber; Object encode() { final Map pigeonMap = {}; - pigeonMap['textureId'] = textureId; + pigeonMap['playerId'] = playerId; pigeonMap['spuTrackNumber'] = spuTrackNumber; return pigeonMap; } @@ -272,18 +272,18 @@ class SpuTrackMessage { static SpuTrackMessage decode(Object message) { final Map pigeonMap = message as Map; return SpuTrackMessage() - ..textureId = pigeonMap['textureId'] as int? + ..playerId = pigeonMap['playerId'] as int? ..spuTrackNumber = pigeonMap['spuTrackNumber'] as int?; } } class DelayMessage { - int? textureId; + int? playerId; int? delay; Object encode() { final Map pigeonMap = {}; - pigeonMap['textureId'] = textureId; + pigeonMap['playerId'] = playerId; pigeonMap['delay'] = delay; return pigeonMap; } @@ -291,20 +291,20 @@ class DelayMessage { static DelayMessage decode(Object message) { final Map pigeonMap = message as Map; return DelayMessage() - ..textureId = pigeonMap['textureId'] as int? + ..playerId = pigeonMap['playerId'] as int? ..delay = pigeonMap['delay'] as int?; } } class AddSubtitleMessage { - int? textureId; + int? playerId; String? uri; int? type; bool? isSelected; Object encode() { final Map pigeonMap = {}; - pigeonMap['textureId'] = textureId; + pigeonMap['playerId'] = playerId; pigeonMap['uri'] = uri; pigeonMap['type'] = type; pigeonMap['isSelected'] = isSelected; @@ -314,7 +314,7 @@ class AddSubtitleMessage { static AddSubtitleMessage decode(Object message) { final Map pigeonMap = message as Map; return AddSubtitleMessage() - ..textureId = pigeonMap['textureId'] as int? + ..playerId = pigeonMap['playerId'] as int? ..uri = pigeonMap['uri'] as String? ..type = pigeonMap['type'] as int? ..isSelected = pigeonMap['isSelected'] as bool?; @@ -322,12 +322,12 @@ class AddSubtitleMessage { } class AudioTracksMessage { - int? textureId; + int? playerId; Map? audios; Object encode() { final Map pigeonMap = {}; - pigeonMap['textureId'] = textureId; + pigeonMap['playerId'] = playerId; pigeonMap['audios'] = audios; return pigeonMap; } @@ -335,18 +335,18 @@ class AudioTracksMessage { static AudioTracksMessage decode(Object message) { final Map pigeonMap = message as Map; return AudioTracksMessage() - ..textureId = pigeonMap['textureId'] as int? + ..playerId = pigeonMap['playerId'] as int? ..audios = pigeonMap['audios'] as Map?; } } class AudioTrackMessage { - int? textureId; + int? playerId; int? audioTrackNumber; Object encode() { final Map pigeonMap = {}; - pigeonMap['textureId'] = textureId; + pigeonMap['playerId'] = playerId; pigeonMap['audioTrackNumber'] = audioTrackNumber; return pigeonMap; } @@ -354,20 +354,20 @@ class AudioTrackMessage { static AudioTrackMessage decode(Object message) { final Map pigeonMap = message as Map; return AudioTrackMessage() - ..textureId = pigeonMap['textureId'] as int? + ..playerId = pigeonMap['playerId'] as int? ..audioTrackNumber = pigeonMap['audioTrackNumber'] as int?; } } class AddAudioMessage { - int? textureId; + int? playerId; String? uri; int? type; bool? isSelected; Object encode() { final Map pigeonMap = {}; - pigeonMap['textureId'] = textureId; + pigeonMap['playerId'] = playerId; pigeonMap['uri'] = uri; pigeonMap['type'] = type; pigeonMap['isSelected'] = isSelected; @@ -377,7 +377,7 @@ class AddAudioMessage { static AddAudioMessage decode(Object message) { final Map pigeonMap = message as Map; return AddAudioMessage() - ..textureId = pigeonMap['textureId'] as int? + ..playerId = pigeonMap['playerId'] as int? ..uri = pigeonMap['uri'] as String? ..type = pigeonMap['type'] as int? ..isSelected = pigeonMap['isSelected'] as bool?; @@ -385,12 +385,12 @@ class AddAudioMessage { } class VideoTracksMessage { - int? textureId; + int? playerId; Map? videos; Object encode() { final Map pigeonMap = {}; - pigeonMap['textureId'] = textureId; + pigeonMap['playerId'] = playerId; pigeonMap['videos'] = videos; return pigeonMap; } @@ -398,18 +398,18 @@ class VideoTracksMessage { static VideoTracksMessage decode(Object message) { final Map pigeonMap = message as Map; return VideoTracksMessage() - ..textureId = pigeonMap['textureId'] as int? + ..playerId = pigeonMap['playerId'] as int? ..videos = pigeonMap['videos'] as Map?; } } class VideoTrackMessage { - int? textureId; + int? playerId; int? videoTrackNumber; Object encode() { final Map pigeonMap = {}; - pigeonMap['textureId'] = textureId; + pigeonMap['playerId'] = playerId; pigeonMap['videoTrackNumber'] = videoTrackNumber; return pigeonMap; } @@ -417,18 +417,18 @@ class VideoTrackMessage { static VideoTrackMessage decode(Object message) { final Map pigeonMap = message as Map; return VideoTrackMessage() - ..textureId = pigeonMap['textureId'] as int? + ..playerId = pigeonMap['playerId'] as int? ..videoTrackNumber = pigeonMap['videoTrackNumber'] as int?; } } class VideoScaleMessage { - int? textureId; + int? playerId; double? scale; Object encode() { final Map pigeonMap = {}; - pigeonMap['textureId'] = textureId; + pigeonMap['playerId'] = playerId; pigeonMap['scale'] = scale; return pigeonMap; } @@ -436,18 +436,18 @@ class VideoScaleMessage { static VideoScaleMessage decode(Object message) { final Map pigeonMap = message as Map; return VideoScaleMessage() - ..textureId = pigeonMap['textureId'] as int? + ..playerId = pigeonMap['playerId'] as int? ..scale = pigeonMap['scale'] as double?; } } class VideoAspectRatioMessage { - int? textureId; + int? playerId; String? aspectRatio; Object encode() { final Map pigeonMap = {}; - pigeonMap['textureId'] = textureId; + pigeonMap['playerId'] = playerId; pigeonMap['aspectRatio'] = aspectRatio; return pigeonMap; } @@ -455,18 +455,18 @@ class VideoAspectRatioMessage { static VideoAspectRatioMessage decode(Object message) { final Map pigeonMap = message as Map; return VideoAspectRatioMessage() - ..textureId = pigeonMap['textureId'] as int? + ..playerId = pigeonMap['playerId'] as int? ..aspectRatio = pigeonMap['aspectRatio'] as String?; } } class RendererServicesMessage { - int? textureId; + int? playerId; List? services; Object encode() { final Map pigeonMap = {}; - pigeonMap['textureId'] = textureId; + pigeonMap['playerId'] = playerId; pigeonMap['services'] = services; return pigeonMap; } @@ -474,18 +474,18 @@ class RendererServicesMessage { static RendererServicesMessage decode(Object message) { final Map pigeonMap = message as Map; return RendererServicesMessage() - ..textureId = pigeonMap['textureId'] as int? + ..playerId = pigeonMap['playerId'] as int? ..services = pigeonMap['services'] as List?; } } class RendererScanningMessage { - int? textureId; + int? playerId; String? rendererService; Object encode() { final Map pigeonMap = {}; - pigeonMap['textureId'] = textureId; + pigeonMap['playerId'] = playerId; pigeonMap['rendererService'] = rendererService; return pigeonMap; } @@ -493,18 +493,18 @@ class RendererScanningMessage { static RendererScanningMessage decode(Object message) { final Map pigeonMap = message as Map; return RendererScanningMessage() - ..textureId = pigeonMap['textureId'] as int? + ..playerId = pigeonMap['playerId'] as int? ..rendererService = pigeonMap['rendererService'] as String?; } } class RendererDevicesMessage { - int? textureId; + int? playerId; Map? rendererDevices; Object encode() { final Map pigeonMap = {}; - pigeonMap['textureId'] = textureId; + pigeonMap['playerId'] = playerId; pigeonMap['rendererDevices'] = rendererDevices; return pigeonMap; } @@ -512,19 +512,19 @@ class RendererDevicesMessage { static RendererDevicesMessage decode(Object message) { final Map pigeonMap = message as Map; return RendererDevicesMessage() - ..textureId = pigeonMap['textureId'] as int? + ..playerId = pigeonMap['playerId'] as int? ..rendererDevices = pigeonMap['rendererDevices'] as Map?; } } class RenderDeviceMessage { - int? textureId; + int? playerId; String? rendererDevice; Object encode() { final Map pigeonMap = {}; - pigeonMap['textureId'] = textureId; + pigeonMap['playerId'] = playerId; pigeonMap['rendererDevice'] = rendererDevice; return pigeonMap; } @@ -532,18 +532,18 @@ class RenderDeviceMessage { static RenderDeviceMessage decode(Object message) { final Map pigeonMap = message as Map; return RenderDeviceMessage() - ..textureId = pigeonMap['textureId'] as int? + ..playerId = pigeonMap['playerId'] as int? ..rendererDevice = pigeonMap['rendererDevice'] as String?; } } class RecordMessage { - int? textureId; + int? playerId; String? saveDirectory; Object encode() { final Map pigeonMap = {}; - pigeonMap['textureId'] = textureId; + pigeonMap['playerId'] = playerId; pigeonMap['saveDirectory'] = saveDirectory; return pigeonMap; } @@ -551,7 +551,7 @@ class RecordMessage { static RecordMessage decode(Object message) { final Map pigeonMap = message as Map; return RecordMessage() - ..textureId = pigeonMap['textureId'] as int? + ..playerId = pigeonMap['playerId'] as int? ..saveDirectory = pigeonMap['saveDirectory'] as String?; } } @@ -617,7 +617,7 @@ class VlcPlayerApi { } } - Future dispose(TextureMessage arg) async { + Future dispose(PlayerMessage arg) async { final Object encoded = arg.encode(); final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.VlcPlayerApi.dispose', const StandardMessageCodec(), @@ -670,7 +670,7 @@ class VlcPlayerApi { } } - Future play(TextureMessage arg) async { + Future play(PlayerMessage arg) async { final Object encoded = arg.encode(); final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.VlcPlayerApi.play', const StandardMessageCodec(), @@ -696,7 +696,7 @@ class VlcPlayerApi { } } - Future pause(TextureMessage arg) async { + Future pause(PlayerMessage arg) async { final Object encoded = arg.encode(); final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.VlcPlayerApi.pause', const StandardMessageCodec(), @@ -722,7 +722,7 @@ class VlcPlayerApi { } } - Future stop(TextureMessage arg) async { + Future stop(PlayerMessage arg) async { final Object encoded = arg.encode(); final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.VlcPlayerApi.stop', const StandardMessageCodec(), @@ -748,7 +748,7 @@ class VlcPlayerApi { } } - Future isPlaying(TextureMessage arg) async { + Future isPlaying(PlayerMessage arg) async { final Object encoded = arg.encode(); final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.VlcPlayerApi.isPlaying', @@ -775,7 +775,7 @@ class VlcPlayerApi { } } - Future isSeekable(TextureMessage arg) async { + Future isSeekable(PlayerMessage arg) async { final Object encoded = arg.encode(); final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.VlcPlayerApi.isSeekable', @@ -855,7 +855,7 @@ class VlcPlayerApi { } } - Future position(TextureMessage arg) async { + Future position(PlayerMessage arg) async { final Object encoded = arg.encode(); final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.VlcPlayerApi.position', @@ -882,7 +882,7 @@ class VlcPlayerApi { } } - Future duration(TextureMessage arg) async { + Future duration(PlayerMessage arg) async { final Object encoded = arg.encode(); final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.VlcPlayerApi.duration', @@ -936,7 +936,7 @@ class VlcPlayerApi { } } - Future getVolume(TextureMessage arg) async { + Future getVolume(PlayerMessage arg) async { final Object encoded = arg.encode(); final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.VlcPlayerApi.getVolume', @@ -990,7 +990,7 @@ class VlcPlayerApi { } } - Future getPlaybackSpeed(TextureMessage arg) async { + Future getPlaybackSpeed(PlayerMessage arg) async { final Object encoded = arg.encode(); final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.VlcPlayerApi.getPlaybackSpeed', @@ -1017,7 +1017,7 @@ class VlcPlayerApi { } } - Future takeSnapshot(TextureMessage arg) async { + Future takeSnapshot(PlayerMessage arg) async { final Object encoded = arg.encode(); final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.VlcPlayerApi.takeSnapshot', @@ -1044,7 +1044,7 @@ class VlcPlayerApi { } } - Future getSpuTracksCount(TextureMessage arg) async { + Future getSpuTracksCount(PlayerMessage arg) async { final Object encoded = arg.encode(); final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.VlcPlayerApi.getSpuTracksCount', @@ -1071,7 +1071,7 @@ class VlcPlayerApi { } } - Future getSpuTracks(TextureMessage arg) async { + Future getSpuTracks(PlayerMessage arg) async { final Object encoded = arg.encode(); final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.VlcPlayerApi.getSpuTracks', @@ -1125,7 +1125,7 @@ class VlcPlayerApi { } } - Future getSpuTrack(TextureMessage arg) async { + Future getSpuTrack(PlayerMessage arg) async { final Object encoded = arg.encode(); final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.VlcPlayerApi.getSpuTrack', @@ -1179,7 +1179,7 @@ class VlcPlayerApi { } } - Future getSpuDelay(TextureMessage arg) async { + Future getSpuDelay(PlayerMessage arg) async { final Object encoded = arg.encode(); final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.VlcPlayerApi.getSpuDelay', @@ -1233,7 +1233,7 @@ class VlcPlayerApi { } } - Future getAudioTracksCount(TextureMessage arg) async { + Future getAudioTracksCount(PlayerMessage arg) async { final Object encoded = arg.encode(); final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.VlcPlayerApi.getAudioTracksCount', @@ -1260,7 +1260,7 @@ class VlcPlayerApi { } } - Future getAudioTracks(TextureMessage arg) async { + Future getAudioTracks(PlayerMessage arg) async { final Object encoded = arg.encode(); final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.VlcPlayerApi.getAudioTracks', @@ -1314,7 +1314,7 @@ class VlcPlayerApi { } } - Future getAudioTrack(TextureMessage arg) async { + Future getAudioTrack(PlayerMessage arg) async { final Object encoded = arg.encode(); final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.VlcPlayerApi.getAudioTrack', @@ -1368,7 +1368,7 @@ class VlcPlayerApi { } } - Future getAudioDelay(TextureMessage arg) async { + Future getAudioDelay(PlayerMessage arg) async { final Object encoded = arg.encode(); final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.VlcPlayerApi.getAudioDelay', @@ -1422,7 +1422,7 @@ class VlcPlayerApi { } } - Future getVideoTracksCount(TextureMessage arg) async { + Future getVideoTracksCount(PlayerMessage arg) async { final Object encoded = arg.encode(); final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.VlcPlayerApi.getVideoTracksCount', @@ -1449,7 +1449,7 @@ class VlcPlayerApi { } } - Future getVideoTracks(TextureMessage arg) async { + Future getVideoTracks(PlayerMessage arg) async { final Object encoded = arg.encode(); final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.VlcPlayerApi.getVideoTracks', @@ -1503,7 +1503,7 @@ class VlcPlayerApi { } } - Future getVideoTrack(TextureMessage arg) async { + Future getVideoTrack(PlayerMessage arg) async { final Object encoded = arg.encode(); final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.VlcPlayerApi.getVideoTrack', @@ -1557,7 +1557,7 @@ class VlcPlayerApi { } } - Future getVideoScale(TextureMessage arg) async { + Future getVideoScale(PlayerMessage arg) async { final Object encoded = arg.encode(); final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.VlcPlayerApi.getVideoScale', @@ -1611,8 +1611,7 @@ class VlcPlayerApi { } } - Future getVideoAspectRatio( - TextureMessage arg) async { + Future getVideoAspectRatio(PlayerMessage arg) async { final Object encoded = arg.encode(); final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.VlcPlayerApi.getVideoAspectRatio', @@ -1640,7 +1639,7 @@ class VlcPlayerApi { } Future getAvailableRendererServices( - TextureMessage arg) async { + PlayerMessage arg) async { final Object encoded = arg.encode(); final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.VlcPlayerApi.getAvailableRendererServices', @@ -1694,7 +1693,7 @@ class VlcPlayerApi { } } - Future stopRendererScanning(TextureMessage arg) async { + Future stopRendererScanning(PlayerMessage arg) async { final Object encoded = arg.encode(); final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.VlcPlayerApi.stopRendererScanning', @@ -1721,7 +1720,7 @@ class VlcPlayerApi { } } - Future getRendererDevices(TextureMessage arg) async { + Future getRendererDevices(PlayerMessage arg) async { final Object encoded = arg.encode(); final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.VlcPlayerApi.getRendererDevices', @@ -1802,7 +1801,7 @@ class VlcPlayerApi { } } - Future stopRecording(TextureMessage arg) async { + Future stopRecording(PlayerMessage arg) async { final Object encoded = arg.encode(); final BasicMessageChannel channel = BasicMessageChannel( 'dev.flutter.pigeon.VlcPlayerApi.stopRecording', diff --git a/flutter_vlc_player_platform_interface/lib/src/method_channel/method_channel_vlc_player.dart b/flutter_vlc_player_platform_interface/lib/src/method_channel/method_channel_vlc_player.dart index 59ebdca9..249aedc2 100644 --- a/flutter_vlc_player_platform_interface/lib/src/method_channel/method_channel_vlc_player.dart +++ b/flutter_vlc_player_platform_interface/lib/src/method_channel/method_channel_vlc_player.dart @@ -8,25 +8,18 @@ import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; import '../../flutter_vlc_player_platform_interface.dart'; -import '../enums/hardware_acceleration.dart'; -import '../enums/media_event_type.dart'; -import '../enums/renderer_event_type.dart'; -import '../events/media_event.dart'; -import '../events/renderer_event.dart'; import '../messages/messages.dart'; -import '../platform_interface/vlc_player_platform_interface.dart'; -import '../utils/options/vlc_player_options.dart'; /// An implementation of [VlcPlayerPlatform] that uses method channels. class MethodChannelVlcPlayer extends VlcPlayerPlatform { final _api = VlcPlayerApi(); - EventChannel _mediaEventChannelFor(int textureId) { - return EventChannel('flutter_video_plugin/getVideoEvents_$textureId'); + EventChannel _mediaEventChannelFor(int playerId) { + return EventChannel('flutter_video_plugin/getVideoEvents_$playerId'); } - EventChannel _rendererEventChannelFor(int textureId) { - return EventChannel('flutter_video_plugin/getRendererEvents_$textureId'); + EventChannel _rendererEventChannelFor(int playerId) { + return EventChannel('flutter_video_plugin/getRendererEvents_$playerId'); } @override @@ -36,7 +29,7 @@ class MethodChannelVlcPlayer extends VlcPlayerPlatform { @override Future create({ - required int viewId, + required int playerId, required String uri, required DataSourceType type, String? package, @@ -45,7 +38,7 @@ class MethodChannelVlcPlayer extends VlcPlayerPlatform { VlcPlayerOptions? options, }) async { var message = CreateMessage(); - message.textureId = viewId; + message.playerId = playerId; message.uri = uri; message.type = type.index; message.packageName = package; @@ -56,13 +49,13 @@ class MethodChannelVlcPlayer extends VlcPlayerPlatform { } @override - Future dispose(int textureId) async { - return await _api.dispose(TextureMessage()..textureId = textureId); + Future dispose(int playerId) async { + return await _api.dispose(PlayerMessage()..playerId = playerId); } /// This method builds the appropriate platform view where the player /// can be rendered. - /// The `textureId` is passed as a parameter from the framework on the + /// The `playerId` is passed as a parameter from the framework on the /// `onPlatformViewCreated` callback. @override Widget buildView(PlatformViewCreatedCallback onPlatformViewCreated) { @@ -81,12 +74,12 @@ class MethodChannelVlcPlayer extends VlcPlayerPlatform { creationParamsCodec: const StandardMessageCodec(), ); } - return Text('Requested platform is not yet supported by this plugin'); + return const Text('Requested platform is not yet supported by this plugin'); } @override - Stream mediaEventsFor(int textureId) { - return _mediaEventChannelFor(textureId).receiveBroadcastStream().map( + Stream mediaEventsFor(int playerId) { + return _mediaEventChannelFor(playerId).receiveBroadcastStream().map( (dynamic event) { final Map map = event; // @@ -174,7 +167,7 @@ class MethodChannelVlcPlayer extends VlcPlayerPlatform { @override Future setStreamUrl( - int textureId, { + int playerId, { required String uri, required DataSourceType type, String? package, @@ -182,7 +175,7 @@ class MethodChannelVlcPlayer extends VlcPlayerPlatform { HwAcc? hwAcc, }) async { var message = SetMediaMessage(); - message.textureId = textureId; + message.playerId = playerId; message.uri = uri; message.type = type.index; message.packageName = package; @@ -192,140 +185,135 @@ class MethodChannelVlcPlayer extends VlcPlayerPlatform { } @override - Future setLooping(int textureId, bool looping) async { + Future setLooping(int playerId, bool looping) async { return await _api.setLooping(LoopingMessage() - ..textureId = textureId + ..playerId = playerId ..isLooping = looping); } @override - Future play(int textureId) async { - return await _api.play(TextureMessage()..textureId = textureId); + Future play(int playerId) async { + return await _api.play(PlayerMessage()..playerId = playerId); } @override - Future pause(int textureId) async { - return await _api.pause(TextureMessage()..textureId = textureId); + Future pause(int playerId) async { + return await _api.pause(PlayerMessage()..playerId = playerId); } @override - Future stop(int textureId) async { - return await _api.stop(TextureMessage()..textureId = textureId); + Future stop(int playerId) async { + return await _api.stop(PlayerMessage()..playerId = playerId); } @override - Future isPlaying(int textureId) async { - var response = - await _api.isPlaying(TextureMessage()..textureId = textureId); + Future isPlaying(int playerId) async { + var response = await _api.isPlaying(PlayerMessage()..playerId = playerId); return response.result; } @override - Future isSeekable(int textureId) async { - var response = - await _api.isSeekable(TextureMessage()..textureId = textureId); + Future isSeekable(int playerId) async { + var response = await _api.isSeekable(PlayerMessage()..playerId = playerId); return response.result; } @override - Future seekTo(int textureId, Duration position) async { + Future seekTo(int playerId, Duration position) async { return await _api.seekTo(PositionMessage() - ..textureId = textureId + ..playerId = playerId ..position = position.inMilliseconds); } @override - Future getPosition(int textureId) async { - var response = await _api.position(TextureMessage()..textureId = textureId); + Future getPosition(int playerId) async { + var response = await _api.position(PlayerMessage()..playerId = playerId); return Duration(milliseconds: response.position!); } @override - Future getDuration(int textureId) async { - var response = await _api.duration(TextureMessage()..textureId = textureId); + Future getDuration(int playerId) async { + var response = await _api.duration(PlayerMessage()..playerId = playerId); return Duration(milliseconds: response.duration!); } @override - Future setVolume(int textureId, int volume) async { + Future setVolume(int playerId, int volume) async { return await _api.setVolume(VolumeMessage() - ..textureId = textureId + ..playerId = playerId ..volume = volume); } @override - Future getVolume(int textureId) async { - var response = - await _api.getVolume(TextureMessage()..textureId = textureId); + Future getVolume(int playerId) async { + var response = await _api.getVolume(PlayerMessage()..playerId = playerId); return response.volume; } @override - Future setPlaybackSpeed(int textureId, double speed) async { + Future setPlaybackSpeed(int playerId, double speed) async { assert(speed > 0); return await _api.setPlaybackSpeed(PlaybackSpeedMessage() - ..textureId = textureId + ..playerId = playerId ..speed = speed); } @override - Future getPlaybackSpeed(int textureId) async { + Future getPlaybackSpeed(int playerId) async { var response = - await _api.getPlaybackSpeed(TextureMessage()..textureId = textureId); + await _api.getPlaybackSpeed(PlayerMessage()..playerId = playerId); return response.speed; } @override - Future getSpuTracksCount(int textureId) async { + Future getSpuTracksCount(int playerId) async { var response = - await _api.getSpuTracksCount(TextureMessage()..textureId = textureId); + await _api.getSpuTracksCount(PlayerMessage()..playerId = playerId); return response.count; } @override - Future> getSpuTracks(int textureId) async { + Future> getSpuTracks(int playerId) async { var response = - await _api.getSpuTracks(TextureMessage()..textureId = textureId); + await _api.getSpuTracks(PlayerMessage()..playerId = playerId); return response.subtitles!.cast(); } @override - Future getSpuTrack(int textureId) async { - var response = - await _api.getSpuTrack(TextureMessage()..textureId = textureId); + Future getSpuTrack(int playerId) async { + var response = await _api.getSpuTrack(PlayerMessage()..playerId = playerId); return response.spuTrackNumber; } @override - Future setSpuTrack(int textureId, int spuTrackNumber) async { + Future setSpuTrack(int playerId, int spuTrackNumber) async { return await _api.setSpuTrack(SpuTrackMessage() - ..textureId = textureId + ..playerId = playerId ..spuTrackNumber = spuTrackNumber); } @override - Future setSpuDelay(int textureId, int delay) async { + Future setSpuDelay(int playerId, int delay) async { return await _api.setSpuDelay(DelayMessage() - ..textureId = textureId + ..playerId = playerId ..delay = delay); } @override - Future getSpuDelay(int textureId) async { - var response = - await _api.getSpuDelay(TextureMessage()..textureId = textureId); + Future getSpuDelay(int playerId) async { + var response = await _api.getSpuDelay(PlayerMessage()..playerId = playerId); return response.delay; } @override Future addSubtitleTrack( - int textureId, { + int playerId, { required String uri, required DataSourceType type, bool? isSelected, }) async { var message = AddSubtitleMessage(); - message.textureId = textureId; + message.playerId = playerId; message.uri = uri; message.type = type.index; message.isSelected = isSelected; @@ -333,56 +321,56 @@ class MethodChannelVlcPlayer extends VlcPlayerPlatform { } @override - Future getAudioTracksCount(int textureId) async { + Future getAudioTracksCount(int playerId) async { var response = - await _api.getAudioTracksCount(TextureMessage()..textureId = textureId); + await _api.getAudioTracksCount(PlayerMessage()..playerId = playerId); return response.count; } @override - Future> getAudioTracks(int textureId) async { + Future> getAudioTracks(int playerId) async { var response = - await _api.getAudioTracks(TextureMessage()..textureId = textureId); + await _api.getAudioTracks(PlayerMessage()..playerId = playerId); return response.audios!.cast(); } @override - Future getAudioTrack(int textureId) async { + Future getAudioTrack(int playerId) async { var response = - await _api.getAudioTrack(TextureMessage()..textureId = textureId); + await _api.getAudioTrack(PlayerMessage()..playerId = playerId); return response.audioTrackNumber; } @override - Future setAudioTrack(int textureId, int audioTrackNumber) async { + Future setAudioTrack(int playerId, int audioTrackNumber) async { return await _api.setAudioTrack(AudioTrackMessage() - ..textureId = textureId + ..playerId = playerId ..audioTrackNumber = audioTrackNumber); } @override - Future setAudioDelay(int textureId, int delay) async { + Future setAudioDelay(int playerId, int delay) async { return await _api.setAudioDelay(DelayMessage() - ..textureId = textureId + ..playerId = playerId ..delay = delay); } @override - Future getAudioDelay(int textureId) async { + Future getAudioDelay(int playerId) async { var response = - await _api.getAudioDelay(TextureMessage()..textureId = textureId); + await _api.getAudioDelay(PlayerMessage()..playerId = playerId); return response.delay; } @override Future addAudioTrack( - int textureId, { + int playerId, { required String uri, required DataSourceType type, bool? isSelected, }) async { var message = AddAudioMessage(); - message.textureId = textureId; + message.playerId = playerId; message.uri = uri; message.type = type.index; message.isSelected = isSelected; @@ -390,58 +378,58 @@ class MethodChannelVlcPlayer extends VlcPlayerPlatform { } @override - Future getVideoTracksCount(int textureId) async { + Future getVideoTracksCount(int playerId) async { var response = - await _api.getVideoTracksCount(TextureMessage()..textureId = textureId); + await _api.getVideoTracksCount(PlayerMessage()..playerId = playerId); return response.count; } @override - Future> getVideoTracks(int textureId) async { + Future> getVideoTracks(int playerId) async { var response = - await _api.getVideoTracks(TextureMessage()..textureId = textureId); + await _api.getVideoTracks(PlayerMessage()..playerId = playerId); return response.videos!.cast(); } @override - Future setVideoTrack(int textureId, int videoTrackNumber) async { + Future setVideoTrack(int playerId, int videoTrackNumber) async { return await _api.setVideoTrack(VideoTrackMessage() - ..textureId = textureId + ..playerId = playerId ..videoTrackNumber = videoTrackNumber); } @override - Future getVideoTrack(int textureId) async { + Future getVideoTrack(int playerId) async { var response = - await _api.getVideoTrack(TextureMessage()..textureId = textureId); + await _api.getVideoTrack(PlayerMessage()..playerId = playerId); return response.videoTrackNumber; } @override - Future setVideoScale(int textureId, double scale) async { + Future setVideoScale(int playerId, double scale) async { return await _api.setVideoScale(VideoScaleMessage() - ..textureId = textureId + ..playerId = playerId ..scale = scale); } @override - Future getVideoScale(int textureId) async { + Future getVideoScale(int playerId) async { var response = - await _api.getVideoScale(TextureMessage()..textureId = textureId); + await _api.getVideoScale(PlayerMessage()..playerId = playerId); return response.scale; } @override - Future setVideoAspectRatio(int textureId, String aspect) async { + Future setVideoAspectRatio(int playerId, String aspect) async { return await _api.setVideoAspectRatio(VideoAspectRatioMessage() - ..textureId = textureId + ..playerId = playerId ..aspectRatio = aspect); } @override - Future getVideoAspectRatio(int textureId) async { + Future getVideoAspectRatio(int playerId) async { var response = - await _api.getVideoAspectRatio(TextureMessage()..textureId = textureId); + await _api.getVideoAspectRatio(PlayerMessage()..playerId = playerId); return response.aspectRatio; } @@ -449,52 +437,52 @@ class MethodChannelVlcPlayer extends VlcPlayerPlatform { Uint8List base64Decode(String source) => base64.decode(source); @override - Future takeSnapshot(int textureId) async { + Future takeSnapshot(int playerId) async { var response = - await _api.takeSnapshot(TextureMessage()..textureId = textureId); + await _api.takeSnapshot(PlayerMessage()..playerId = playerId); var base64String = response.snapshot!; var imageBytes = base64Decode(base64.normalize(base64String)); return imageBytes; } @override - Future> getAvailableRendererServices(int textureId) async { + Future> getAvailableRendererServices(int playerId) async { var response = await _api - .getAvailableRendererServices(TextureMessage()..textureId = textureId); + .getAvailableRendererServices(PlayerMessage()..playerId = playerId); return response.services!.cast(); } @override - Future startRendererScanning(int textureId, + Future startRendererScanning(int playerId, {String? rendererService}) async { return await _api.startRendererScanning(RendererScanningMessage() - ..textureId = textureId + ..playerId = playerId ..rendererService = rendererService ?? ''); } @override - Future stopRendererScanning(int textureId) async { + Future stopRendererScanning(int playerId) async { return await _api - .stopRendererScanning(TextureMessage()..textureId = textureId); + .stopRendererScanning(PlayerMessage()..playerId = playerId); } @override - Future> getRendererDevices(int textureId) async { + Future> getRendererDevices(int playerId) async { var response = - await _api.getRendererDevices(TextureMessage()..textureId = textureId); + await _api.getRendererDevices(PlayerMessage()..playerId = playerId); return response.rendererDevices!.cast(); } @override - Future castToRenderer(int textureId, String rendererDevice) async { + Future castToRenderer(int playerId, String rendererDevice) async { return await _api.castToRenderer(RenderDeviceMessage() - ..textureId = textureId + ..playerId = playerId ..rendererDevice = rendererDevice); } @override - Stream rendererEventsFor(int textureId) { - return _rendererEventChannelFor(textureId).receiveBroadcastStream().map( + Stream rendererEventsFor(int playerId) { + return _rendererEventChannelFor(playerId).receiveBroadcastStream().map( (dynamic event) { final Map map = event; // @@ -521,17 +509,17 @@ class MethodChannelVlcPlayer extends VlcPlayerPlatform { } @override - Future startRecording(int textureId, String saveDirectory) async { + Future startRecording(int playerId, String saveDirectory) async { var response = await _api.startRecording(RecordMessage() - ..textureId = textureId + ..playerId = playerId ..saveDirectory = saveDirectory); return response.result; } @override - Future stopRecording(int textureId) async { + Future stopRecording(int playerId) async { var response = - await _api.stopRecording(TextureMessage()..textureId = textureId); + await _api.stopRecording(PlayerMessage()..playerId = playerId); return response.result; } } diff --git a/flutter_vlc_player_platform_interface/lib/src/platform_interface/vlc_player_platform_interface.dart b/flutter_vlc_player_platform_interface/lib/src/platform_interface/vlc_player_platform_interface.dart index 208b5409..85610b1a 100644 --- a/flutter_vlc_player_platform_interface/lib/src/platform_interface/vlc_player_platform_interface.dart +++ b/flutter_vlc_player_platform_interface/lib/src/platform_interface/vlc_player_platform_interface.dart @@ -6,11 +6,7 @@ import 'package:flutter/widgets.dart'; import 'package:plugin_platform_interface/plugin_platform_interface.dart'; import '../../flutter_vlc_player_platform_interface.dart'; -import '../enums/hardware_acceleration.dart'; -import '../events/media_event.dart'; -import '../events/renderer_event.dart'; import '../method_channel/method_channel_vlc_player.dart'; -import '../utils/options/vlc_player_options.dart'; /// The interface that implementations of vlc must implement. /// @@ -50,13 +46,13 @@ abstract class VlcPlayerPlatform extends PlatformInterface { } /// Clears one video. - Future dispose(int viewId) { + Future dispose(int playerId) { throw _unimplemented('dispose'); } /// Creates an instance of a vlc player Future create({ - required int viewId, + required int playerId, required String uri, required DataSourceType type, String? package, @@ -68,13 +64,13 @@ abstract class VlcPlayerPlatform extends PlatformInterface { } /// Returns a Stream of [VlcMediaEvent]s. - Stream mediaEventsFor(int viewId) { + Stream mediaEventsFor(int playerId) { throw _unimplemented('mediaEventsFor'); } /// Set/Change video streaming url Future setStreamUrl( - int viewId, { + int playerId, { required String uri, required DataSourceType type, String? package, @@ -85,112 +81,112 @@ abstract class VlcPlayerPlatform extends PlatformInterface { } /// Sets the looping attribute of the video. - Future setLooping(int viewId, bool looping) { + Future setLooping(int playerId, bool looping) { throw _unimplemented('setLooping'); } /// Starts the video playback. - Future play(int viewId) { + Future play(int playerId) { throw _unimplemented('play'); } /// Pauses the video playback. - Future pause(int viewId) { + Future pause(int playerId) { throw _unimplemented('pause'); } /// Stops the video playback. - Future stop(int viewId) { + Future stop(int playerId) { throw _unimplemented('stop'); } /// Returns true if media is playing. - Future isPlaying(int viewId) { + Future isPlaying(int playerId) { throw _unimplemented('isPlaying'); } /// Returns true if media is seekable. - Future isSeekable(int viewId) { + Future isSeekable(int playerId) { throw _unimplemented('isSeekable'); } /// Same as seekTo /// Sets the video position to a [Duration] from the start. - Future setTime(int viewId, Duration position) { + Future setTime(int playerId, Duration position) { throw _unimplemented('setTime'); } /// Sets the video position to a [Duration] from the start. - Future seekTo(int viewId, Duration position) { + Future seekTo(int playerId, Duration position) { throw _unimplemented('seekTo'); } /// Same as getPosition /// Gets the video position as [Duration] from the start. - Future getTime(int viewId) { + Future getTime(int playerId) { throw _unimplemented('getTime'); } /// Gets the video position as [Duration] from the start. - Future getPosition(int viewId) { + Future getPosition(int playerId) { throw _unimplemented('getPosition'); } /// Returns duration/length of loaded video in milliseconds. - Future getDuration(int viewId) { + Future getDuration(int playerId) { throw _unimplemented('getDuration'); } /// Sets the volume to a range between 0 and 100. - Future setVolume(int viewId, int volume) { + Future setVolume(int playerId, int volume) { throw _unimplemented('setVolume'); } /// Returns current vlc volume level within a range between 0 and 100. - Future getVolume(int viewId) { + Future getVolume(int playerId) { throw _unimplemented('getVolume'); } /// Sets the playback speed to a [speed] value indicating the playback rate. - Future setPlaybackSpeed(int viewId, double speed) { + Future setPlaybackSpeed(int playerId, double speed) { throw _unimplemented('setPlaybackSpeed'); } /// Returns the vlc playback speed. - Future getPlaybackSpeed(int viewId) { + Future getPlaybackSpeed(int playerId) { throw _unimplemented('getPlaybackSpeed'); } /// Return the number of subtitle tracks (both embedded and inserted) - Future getSpuTracksCount(int viewId) { + Future getSpuTracksCount(int playerId) { throw _unimplemented('getSpuTracksCount'); } /// Return all subtitle tracks as array of /// The key parameter is the index of subtitle which is used for changing subtitle and the value is the display name of subtitle - Future> getSpuTracks(int viewId) { + Future> getSpuTracks(int playerId) { throw _unimplemented('getSpuTracks'); } /// Change active subtitle index (set -1 to disable subtitle). /// [spuTrackNumber] - the subtitle index obtained from getSpuTracks() - Future setSpuTrack(int viewId, int spuTrackNumber) { + Future setSpuTrack(int playerId, int spuTrackNumber) { throw _unimplemented('setSpuTrack'); } /// Returns the selected spu track index - Future getSpuTrack(int viewId) { + Future getSpuTrack(int playerId) { throw _unimplemented('getSpuTrack'); } /// [delay] - the amount of time in milliseconds which vlc subtitle should be delayed. /// (support both positive & negative delay value) - Future setSpuDelay(int viewId, int delay) { + Future setSpuDelay(int playerId, int delay) { throw _unimplemented('setSpuDelay'); } /// Returns the amount of subtitle time delay. - Future getSpuDelay(int viewId) { + Future getSpuDelay(int playerId) { throw _unimplemented('getSpuDelay'); } @@ -199,7 +195,7 @@ abstract class VlcPlayerPlatform extends PlatformInterface { /// [type] - Set type of subtitle /// [isSelected] - Set true if you wanna force the added subtitle to start display on media. Future addSubtitleTrack( - int viewId, { + int playerId, { required String uri, required DataSourceType type, bool? isSelected, @@ -208,35 +204,35 @@ abstract class VlcPlayerPlatform extends PlatformInterface { } /// Returns the number of audio tracks - Future getAudioTracksCount(int viewId) { + Future getAudioTracksCount(int playerId) { throw _unimplemented('getAudioTracksCount'); } /// Returns all audio tracks as array of /// The key parameter is the index of audio track which is used for changing audio and the value is the display name of audio - Future> getAudioTracks(int viewId) { + Future> getAudioTracks(int playerId) { throw _unimplemented('getAudioTracks'); } /// Returns selected audio track index - Future getAudioTrack(int viewId) { + Future getAudioTrack(int playerId) { throw _unimplemented('getAudioTrack'); } /// Change active audio track index (set -1 to mute). /// [audioTrackNumber] - the audio track index obtained from getAudioTracks() - Future setAudioTrack(int viewId, int audioTrackNumber) { + Future setAudioTrack(int playerId, int audioTrackNumber) { throw _unimplemented('setAudioTrack'); } /// [delay] - the amount of time in milliseconds which vlc audio should be delayed. /// (support both positive & negative value) - Future setAudioDelay(int viewId, int delay) { + Future setAudioDelay(int playerId, int delay) { throw _unimplemented('setAudioDelay'); } /// Returns the amount of audio track time delay. - Future getAudioDelay(int viewId) { + Future getAudioDelay(int playerId) { throw _unimplemented('getAudioDelay'); } @@ -245,7 +241,7 @@ abstract class VlcPlayerPlatform extends PlatformInterface { /// [type] - type of subtitle (network or file) /// [isSelected] - Set true if you wanna force the added subtitle to start display on media. Future addAudioTrack( - int viewId, { + int playerId, { required String uri, required DataSourceType type, bool? isSelected, @@ -254,94 +250,94 @@ abstract class VlcPlayerPlatform extends PlatformInterface { } /// Returns the number of video tracks - Future getVideoTracksCount(int viewId) { + Future getVideoTracksCount(int playerId) { throw _unimplemented('getVideoTracksCount'); } /// Returns all video tracks as array of /// The key parameter is the index of video track and the value is the display name of video track - Future> getVideoTracks(int viewId) { + Future> getVideoTracks(int playerId) { throw _unimplemented('getVideoTracks'); } /// Change active video track index. /// [videoTrackNumber] - the video track index obtained from getVideoTracks() - Future setVideoTrack(int viewId, int videoTrackNumber) { + Future setVideoTrack(int playerId, int videoTrackNumber) { throw _unimplemented('setVideoTrack'); } /// Returns selected video track index - Future getVideoTrack(int viewId) { + Future getVideoTrack(int playerId) { throw _unimplemented('getVideoTrack'); } /// [scale] - the video scale value /// Set video scale - Future setVideoScale(int viewId, double scale) { + Future setVideoScale(int playerId, double scale) { throw _unimplemented('setVideoScale'); } /// Returns video scale - Future getVideoScale(int viewId) { + Future getVideoScale(int playerId) { throw _unimplemented('getVideoScale'); } /// [aspect] - the video apect ratio like '16:9' /// Set video aspect ratio - Future setVideoAspectRatio(int viewId, String aspect) { + Future setVideoAspectRatio(int playerId, String aspect) { throw _unimplemented('setVideoAspectRatio'); } /// Returns video aspect ratio - Future getVideoAspectRatio(int viewId) { + Future getVideoAspectRatio(int playerId) { throw _unimplemented('getVideoAspectRatio'); } /// Returns binary data for a snapshot of the media at the current frame. - Future takeSnapshot(int viewId) { + Future takeSnapshot(int playerId) { throw _unimplemented('takeSnapshot'); } /// Returns list of all avialble vlc renderer services - Future> getAvailableRendererServices(int viewId) { + Future> getAvailableRendererServices(int playerId) { throw _unimplemented('getAvailableRendererServices'); } /// Start vlc renderer discovery to find external display devices (chromecast) - Future startRendererScanning(int viewId, {String? rendererService}) { + Future startRendererScanning(int playerId, {String? rendererService}) { throw _unimplemented('startRendererScanning'); } /// Stop vlc renderer and cast discovery - Future stopRendererScanning(int viewId) { + Future stopRendererScanning(int playerId) { throw _unimplemented('stopRendererScanning'); } /// Returns all detected renderer devices as array of /// The key parameter is the name of renderer device and the value is the display name of renderer device - Future> getRendererDevices(int viewId) { + Future> getRendererDevices(int playerId) { throw _unimplemented('getRendererDevices'); } /// [rendererDevice] - name of renderer device /// Start vlc video casting to the renderered device. /// Set null if you wanna to stop video casting. - Future castToRenderer(int viewId, String rendererDevice) { + Future castToRenderer(int playerId, String rendererDevice) { throw _unimplemented('castToRenderer'); } /// Returns a Stream of [VlcRendererEvent]s. - Stream rendererEventsFor(int viewId) { + Stream rendererEventsFor(int playerId) { throw _unimplemented('rendererEventsFor'); } /// Returns true if vlc starts recording. - Future startRecording(int viewId, String saveDirectory) { + Future startRecording(int playerId, String saveDirectory) { throw _unimplemented('startRecording'); } /// Returns true if vlc stops recording. - Future stopRecording(int viewId) { + Future stopRecording(int playerId) { throw _unimplemented('stopRecording'); } diff --git a/flutter_vlc_player_platform_interface/pubspec.yaml b/flutter_vlc_player_platform_interface/pubspec.yaml index b3bc8545..8fa67980 100644 --- a/flutter_vlc_player_platform_interface/pubspec.yaml +++ b/flutter_vlc_player_platform_interface/pubspec.yaml @@ -1,7 +1,7 @@ name: flutter_vlc_player_platform_interface description: A common platform interface for the flutter vlc player plugin. homepage: https://github.com/solid-software/flutter_vlc_player -version: 1.0.7 +version: 1.1.0 environment: sdk: '>=2.12.0 <3.0.0'