Fix some bugs

Baseflow · Apr 13, 2019 · c20bac2 · c20bac2
1 parent dd9b74d
commit c20bac2
Show file tree

Hide file tree

Showing 10 changed files with 159 additions and 11 deletions.
diff --git a/Directory.build.props b/Directory.build.props
@@ -14,7 +14,7 @@
     <RepositoryType>git</RepositoryType>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
     <NeutralLanguage>en</NeutralLanguage>
-    <Version>0.5.0</Version>
+    <Version>0.5.1</Version>
 
     <LangVersion>latest</LangVersion>
     <NoWarn>$(NoWarn);1591;1701;1702;1705;VSX1000</NoWarn>

diff --git a/MediaManager.Forms/Platforms/Ios/VideoViewRenderer.cs b/MediaManager.Forms/Platforms/Ios/VideoViewRenderer.cs
@@ -11,9 +11,9 @@
 namespace MediaManager.Forms.Platforms.iOS
 {
     [Preserve(AllMembers = true)]
-    public class VideoViewRenderer : ViewRenderer<VideoView, MediaManager.Platforms.Ios.Video.VideoView> 
+    public class VideoViewRenderer : ViewRenderer<VideoView, MediaManager.Platforms.Ios.Video.VideoSurface> 
     {
-        private MediaManager.Platforms.Ios.Video.VideoView _videoView;
+        private MediaManager.Platforms.Ios.Video.VideoSurface _videoView;
 
         public static void Init()
         {
@@ -25,7 +25,7 @@ protected override void OnElementChanged(ElementChangedEventArgs<VideoView> e)
             base.OnElementChanged(e);
             if (Control == null)
             {
-                _videoView = new MediaManager.Platforms.Ios.Video.VideoView(Control);
+                _videoView = new MediaManager.Platforms.Ios.Video.VideoSurface(Control);
                 SetNativeControl(_videoView);
                 CrossMediaManager.Current.MediaPlayer.SetPlayerView(_videoView);
             }

diff --git a/MediaManager.Forms/Platforms/Mac/VideoViewRenderer.cs b/MediaManager.Forms/Platforms/Mac/VideoViewRenderer.cs
@@ -0,0 +1,33 @@
+using System;
+using Foundation;
+using MediaManager;
+using MediaManager.Forms;
+using MediaManager.Forms.Platforms.Mac;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.MacOS;
+
+[assembly: ExportRenderer(typeof(MediaManager.Forms.VideoView), typeof(VideoViewRenderer))]
+namespace MediaManager.Forms.Platforms.Mac
+{
+    [Preserve(AllMembers = true)]
+    public class VideoViewRenderer : ViewRenderer<VideoView, MediaManager.Platforms.Mac.Video.VideoSurface> 
+    {
+        private MediaManager.Platforms.Mac.Video.VideoSurface _videoView;
+
+        public static void Init()
+        {
+            var temp = DateTime.Now;
+        }
+
+        protected override void OnElementChanged(ElementChangedEventArgs<VideoView> e)
+        {
+            base.OnElementChanged(e);
+            if (Control == null)
+            {
+                _videoView = new MediaManager.Platforms.Mac.Video.VideoSurface(Control);
+                SetNativeControl(_videoView);
+                CrossMediaManager.Current.MediaPlayer.SetPlayerView(_videoView);
+            }
+        }
+    }
+}
diff --git a/MediaManager/Platforms/Ios/Media/MediaPlayer.cs b/MediaManager/Platforms/Ios/Media/MediaPlayer.cs
@@ -11,12 +11,12 @@
 
 namespace MediaManager.Platforms.Ios.Media
 {
-    public class MediaPlayer : AppleMediaPlayer, IVideoPlayer<AVPlayer, VideoView>
+    public class MediaPlayer : AppleMediaPlayer, IVideoPlayer<AVPlayer, VideoSurface>
     {
         //TODO: Make possible to hook into
         AVPlayerViewController aVPlayerViewController;
 
-        public VideoView PlayerView { get; set; }
+        public VideoSurface PlayerView { get; set; }
 
         public override void Initialize()
         {

diff --git a/MediaManager/Platforms/Ios/Media/MediaPlayerExtensions.cs b/MediaManager/Platforms/Ios/Media/MediaPlayerExtensions.cs
@@ -10,9 +10,9 @@ namespace MediaManager
 {
     public static partial class MediaPlayerExtensions
     {
-        public static void SetPlayerView(this IMediaPlayer mediaPlayer, VideoView videoView)
+        public static void SetPlayerView(this IMediaPlayer mediaPlayer, VideoSurface videoView)
         {
-            if (mediaPlayer is IVideoPlayer<AVPlayer, VideoView> videoPlayer)
+            if (mediaPlayer is IVideoPlayer<AVPlayer, VideoSurface> videoPlayer)
             {
                 var layer = AVPlayerLayer.FromPlayer(videoPlayer.Player);
                 layer.Frame = videoView.Frame;
@@ -21,7 +21,7 @@ public static void SetPlayerView(this IMediaPlayer mediaPlayer, VideoView videoV
                 videoPlayer.PlayerView = videoView;
             }
             else
-                throw new ArgumentException($"MediaPlayer needs to be of type {nameof(IVideoPlayer<AVPlayer, VideoView>)} to use this extension", nameof(mediaPlayer));
+                throw new ArgumentException($"MediaPlayer needs to be of type {nameof(IVideoPlayer<AVPlayer, VideoSurface>)} to use this extension", nameof(mediaPlayer));
         }
     }
 }
diff --git a/MediaManager/Platforms/Ios/Video/VideoSurface.cs b/MediaManager/Platforms/Ios/Video/VideoSurface.cs
@@ -5,11 +5,11 @@
 
 namespace MediaManager.Platforms.Ios.Video
 {
-    public class VideoView : UIView, IVideoView
+    public class VideoSurface : UIView, IVideoView
     {
         private UIView _view;
 
-        public VideoView(UIView view)
+        public VideoSurface(UIView view)
         {
             this._view = view;
             Frame = view.Frame;

diff --git a/MediaManager/Platforms/Mac/Media/MediaPlayerExtensions.cs b/MediaManager/Platforms/Mac/Media/MediaPlayerExtensions.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using AVFoundation;
+using MediaManager.Platforms.Mac.Video;
+using MediaManager.Video;
+
+namespace MediaManager
+{
+    public static partial class MediaPlayerExtensions
+    {
+        public static void SetPlayerView(this IMediaPlayer mediaPlayer, VideoSurface videoView)
+        {
+            if (mediaPlayer is IVideoPlayer<AVPlayer, VideoSurface> videoPlayer)
+            {
+                var layer = AVPlayerLayer.FromPlayer(videoPlayer.Player);
+                layer.Frame = videoView.Frame;
+                layer.VideoGravity = AVLayerVideoGravity.ResizeAspect;
+                videoView.Layer.AddSublayer(layer);
+                videoPlayer.PlayerView = videoView;
+            }
+            else
+                throw new ArgumentException($"MediaPlayer needs to be of type {nameof(IVideoPlayer<AVPlayer, VideoSurface>)} to use this extension", nameof(mediaPlayer));
+        }
+    }
+}
diff --git a/MediaManager/Platforms/Mac/Video/VideoSurface.cs b/MediaManager/Platforms/Mac/Video/VideoSurface.cs
@@ -0,0 +1,31 @@
+using AppKit;
+using AVFoundation;
+using CoreGraphics;
+using MediaManager.Video;
+
+namespace MediaManager.Platforms.Mac.Video
+{
+    public class VideoSurface : NSView, IVideoView
+    {
+        private NSView _view;
+
+        public VideoSurface(NSView view)
+        {
+            this._view = view;
+            Frame = view.Frame;
+            view.AddSubview(this);
+        }
+
+        #region IDisposable
+        public bool IsDisposed { get; private set; }
+        public VideoAspectMode VideoAspect { get => throw new System.NotImplementedException(); set => throw new System.NotImplementedException(); }
+
+        protected override void Dispose(bool disposing)
+        {
+            IsDisposed = true;
+
+            base.Dispose(disposing);
+        }
+        #endregion
+    }
+}
diff --git a/MediaManager/Platforms/Tvos/Media/MediaPlayerExtensions.cs b/MediaManager/Platforms/Tvos/Media/MediaPlayerExtensions.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using AVFoundation;
+using MediaManager.Platforms.Tvos.Video;
+using MediaManager.Video;
+using UIKit;
+
+namespace MediaManager
+{
+    public static partial class MediaPlayerExtensions
+    {
+        public static void SetPlayerView(this IMediaPlayer mediaPlayer, VideoSurface videoView)
+        {
+            if (mediaPlayer is IVideoPlayer<AVPlayer, VideoSurface> videoPlayer)
+            {
+                var layer = AVPlayerLayer.FromPlayer(videoPlayer.Player);
+                layer.Frame = videoView.Frame;
+                layer.VideoGravity = AVLayerVideoGravity.ResizeAspect;
+                videoView.Layer.AddSublayer(layer);
+                videoPlayer.PlayerView = videoView;
+            }
+            else
+                throw new ArgumentException($"MediaPlayer needs to be of type {nameof(IVideoPlayer<AVPlayer, VideoSurface>)} to use this extension", nameof(mediaPlayer));
+        }
+    }
+}
diff --git a/MediaManager/Platforms/Tvos/Video/VideoSurface.cs b/MediaManager/Platforms/Tvos/Video/VideoSurface.cs
@@ -0,0 +1,31 @@
+using AVFoundation;
+using CoreGraphics;
+using MediaManager.Video;
+using UIKit;
+
+namespace MediaManager.Platforms.Tvos.Video
+{
+    public class VideoSurface : UIView, IVideoView
+    {
+        private UIView _view;
+
+        public VideoSurface(UIView view)
+        {
+            this._view = view;
+            Frame = view.Frame;
+            view.Add(this);
+        }
+
+        #region IDisposable
+        public bool IsDisposed { get; private set; }
+        public VideoAspectMode VideoAspect { get => throw new System.NotImplementedException(); set => throw new System.NotImplementedException(); }
+
+        protected override void Dispose(bool disposing)
+        {
+            IsDisposed = true;
+
+            base.Dispose(disposing);
+        }
+        #endregion
+    }
+}