Open up some events

martijn00 · martijn00 · commit ff8b6659f94b · 2021-01-06T19:15:36.000+01:00
diff --git a/MediaManager/Platforms/Android/Player/AndroidMediaPlayer.cs b/MediaManager/Platforms/Android/Player/AndroidMediaPlayer.cs
@@ -250,7 +250,7 @@ protected virtual void Initialize()
             }
         }
 
-        private void Player_VideoSizeChanged(object sender, Com.Google.Android.Exoplayer2.Video.VideoSizeChangedEventArgs e)
+        protected virtual void Player_VideoSizeChanged(object sender, Com.Google.Android.Exoplayer2.Video.VideoSizeChangedEventArgs e)
         {
             VideoWidth = e.Width;
             VideoHeight = e.Height;
diff --git a/MediaManager/Platforms/Tizen/Player/TizenMediaPlayer.cs b/MediaManager/Platforms/Tizen/Player/TizenMediaPlayer.cs
@@ -55,7 +55,7 @@ public override void UpdateVideoPlaceholder(object value)
             //TODO: Implement placeholder
         }
 
-        protected virtual void Initialize()
+        public virtual void Initialize()
         {
             Player = new TizenPlayer();
             Player.ErrorOccurred += Player_ErrorOccurred;
@@ -64,23 +64,23 @@ protected virtual void Initialize()
             Player.BufferingProgressChanged += Player_BufferingProgressChanged;
         }
 
-        private void Player_BufferingProgressChanged(object sender, BufferingProgressChangedEventArgs e)
+        protected virtual void Player_BufferingProgressChanged(object sender, BufferingProgressChangedEventArgs e)
         {
             //TODO: Percent is not correct here
             MediaManager.Buffered = TimeSpan.FromMilliseconds(e.Percent);
         }
 
-        private void Player_PlaybackCompleted(object sender, EventArgs e)
+        protected virtual void Player_PlaybackCompleted(object sender, EventArgs e)
         {
             MediaManager.OnMediaItemFinished(this, new MediaItemEventArgs(MediaManager.Queue.Current));
         }
 
-        private void Player_PlaybackInterrupted(object sender, PlaybackInterruptedEventArgs e)
+        protected virtual void Player_PlaybackInterrupted(object sender, PlaybackInterruptedEventArgs e)
         {
 
         }
 
-        private void Player_ErrorOccurred(object sender, PlayerErrorOccurredEventArgs e)
+        protected virtual void Player_ErrorOccurred(object sender, PlayerErrorOccurredEventArgs e)
         {
             MediaManager.OnMediaItemFailed(this, new MediaItemFailedEventArgs(MediaManager.Queue.Current, new Exception(e.ToString()), e.ToString()));
         }
@@ -89,9 +89,6 @@ private void Player_ErrorOccurred(object sender, PlayerErrorOccurredEventArgs e)
 
         public VideoView PlayerView => VideoView as VideoView;
 
-        public override event BeforePlayingEventHandler BeforePlaying;
-        public override event AfterPlayingEventHandler AfterPlaying;
-
         public override Task Pause()
         {
             Player.Pause();
diff --git a/MediaManager/Platforms/Uap/Player/WindowsMediaPlayer.cs b/MediaManager/Platforms/Uap/Player/WindowsMediaPlayer.cs
@@ -103,7 +103,7 @@ public override void UpdateVideoPlaceholder(object value)
                 PlayerView.PlayerView.PosterSource = imageSource;
         }
 
-        public void Initialize()
+        public virtual void Initialize()
         {
             Player = new MediaPlayer();
             Player.AudioCategory = MediaPlayerAudioCategory.Media;
@@ -121,43 +121,43 @@ public void Initialize()
             Player.PlaybackSession.SeekCompleted += PlaybackSession_SeekCompleted;
         }
 
-        private void Player_MediaOpened(MediaPlayer sender, object args)
+        protected virtual void Player_MediaOpened(MediaPlayer sender, object args)
         {
 
         }
 
-        private void PlaybackSession_SeekCompleted(MediaPlaybackSession sender, object args)
+        protected virtual void PlaybackSession_SeekCompleted(MediaPlaybackSession sender, object args)
         {
             //TODO: Maybe use this?
         }
 
-        private void PlaybackSession_NaturalVideoSizeChanged(MediaPlaybackSession sender, object args)
+        protected virtual void PlaybackSession_NaturalVideoSizeChanged(MediaPlaybackSession sender, object args)
         {
             VideoHeight = (int)sender.NaturalVideoHeight;
             VideoWidth = (int)sender.NaturalVideoWidth;
         }
 
-        private void PlaybackSession_PositionChanged(MediaPlaybackSession sender, object args)
+        protected virtual void PlaybackSession_PositionChanged(MediaPlaybackSession sender, object args)
         {
             //TODO: Maybe use this?
         }
 
-        private void PlaybackSession_BufferingProgressChanged(MediaPlaybackSession sender, object args)
+        protected virtual void PlaybackSession_BufferingProgressChanged(MediaPlaybackSession sender, object args)
         {
             MediaManager.Buffered = TimeSpan.FromMilliseconds(sender.BufferingProgress);
         }
 
-        private void PlaybackSession_PlaybackStateChanged(MediaPlaybackSession sender, object args)
+        protected virtual void PlaybackSession_PlaybackStateChanged(MediaPlaybackSession sender, object args)
         {
             MediaManager.State = sender.PlaybackState.ToMediaPlayerState();
         }
 
-        private void Player_MediaFailed(MediaPlayer sender, MediaPlayerFailedEventArgs args)
+        protected virtual void Player_MediaFailed(MediaPlayer sender, MediaPlayerFailedEventArgs args)
         {
             MediaManager.OnMediaItemFailed(this, new MediaItemFailedEventArgs(MediaManager.Queue.Current, new Exception(args.ErrorMessage), args.ErrorMessage));
         }
 
-        private void Player_MediaEnded(MediaPlayer sender, object args)
+        protected virtual void Player_MediaEnded(MediaPlayer sender, object args)
         {
             MediaManager.OnMediaItemFinished(this, new MediaItemEventArgs(MediaManager.Queue.Current));
         }
diff --git a/MediaManager/Platforms/Wpf/Player/WpfMediaPlayer.cs b/MediaManager/Platforms/Wpf/Player/WpfMediaPlayer.cs
@@ -83,7 +83,7 @@ public override void UpdateVideoPlaceholder(object value)
             //TODO: Implement placeholder
         }
 
-        public void Initialize()
+        public virtual void Initialize()
         {
             Application.Current.Dispatcher.Invoke((Action)delegate
             {
@@ -103,29 +103,29 @@ public void Initialize()
             });
         }
 
-        private void Player_MediaFailed(object sender, System.Windows.ExceptionRoutedEventArgs e)
+        protected virtual void Player_MediaFailed(object sender, System.Windows.ExceptionRoutedEventArgs e)
         {
             MediaManager.State = MediaPlayerState.Failed;
             MediaManager.OnMediaItemFailed(this, new MediaItemFailedEventArgs(MediaManager.Queue.Current, e.ErrorException, e.ErrorException.Message));
         }
 
-        private void Player_BufferingEnded(object sender, EventArgs e)
+        protected virtual void Player_BufferingEnded(object sender, EventArgs e)
         {
             MediaManager.Buffered = TimeSpan.FromMilliseconds(Player.BufferingProgress);
         }
 
-        private void Player_BufferingStarted(object sender, EventArgs e)
+        protected virtual void Player_BufferingStarted(object sender, EventArgs e)
         {
             MediaManager.State = MediaPlayerState.Buffering;
             MediaManager.Buffered = TimeSpan.FromMilliseconds(Player.BufferingProgress);
         }
 
-        private void Player_MediaOpened(object sender, EventArgs e)
+        protected virtual void Player_MediaOpened(object sender, EventArgs e)
         {
             MediaManager.State = MediaPlayerState.Playing;
         }
 
-        private void Player_MediaEnded(object sender, EventArgs e)
+        protected virtual void Player_MediaEnded(object sender, EventArgs e)
         {
             MediaManager.OnMediaItemFinished(this, new MediaItemEventArgs(MediaManager.Queue.Current));
         }

Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ protected virtual void Initialize()`
`250`	`250`	`}`
`251`	`251`	`}`
`252`	`252`
`253`		`- private void Player_VideoSizeChanged(object sender, Com.Google.Android.Exoplayer2.Video.VideoSizeChangedEventArgs e)`
	`253`	`+ protected virtual void Player_VideoSizeChanged(object sender, Com.Google.Android.Exoplayer2.Video.VideoSizeChangedEventArgs e)`
`254`	`254`	`{`
`255`	`255`	`VideoWidth = e.Width;`
`256`	`256`	`VideoHeight = e.Height;`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public override void UpdateVideoPlaceholder(object value)`
`55`	`55`	`//TODO: Implement placeholder`
`56`	`56`	`}`
`57`	`57`
`58`		`- protected virtual void Initialize()`
	`58`	`+ public virtual void Initialize()`
`59`	`59`	`{`
`60`	`60`	`Player = new TizenPlayer();`
`61`	`61`	`Player.ErrorOccurred += Player_ErrorOccurred;`
`@@ -64,23 +64,23 @@ protected virtual void Initialize()`
`64`	`64`	`Player.BufferingProgressChanged += Player_BufferingProgressChanged;`
`65`	`65`	`}`
`66`	`66`
`67`		`- private void Player_BufferingProgressChanged(object sender, BufferingProgressChangedEventArgs e)`
	`67`	`+ protected virtual void Player_BufferingProgressChanged(object sender, BufferingProgressChangedEventArgs e)`
`68`	`68`	`{`
`69`	`69`	`//TODO: Percent is not correct here`
`70`	`70`	`MediaManager.Buffered = TimeSpan.FromMilliseconds(e.Percent);`
`71`	`71`	`}`
`72`	`72`
`73`		`- private void Player_PlaybackCompleted(object sender, EventArgs e)`
	`73`	`+ protected virtual void Player_PlaybackCompleted(object sender, EventArgs e)`
`74`	`74`	`{`
`75`	`75`	`MediaManager.OnMediaItemFinished(this, new MediaItemEventArgs(MediaManager.Queue.Current));`
`76`	`76`	`}`
`77`	`77`
`78`		`- private void Player_PlaybackInterrupted(object sender, PlaybackInterruptedEventArgs e)`
	`78`	`+ protected virtual void Player_PlaybackInterrupted(object sender, PlaybackInterruptedEventArgs e)`
`79`	`79`	`{`
`80`	`80`
`81`	`81`	`}`
`82`	`82`
`83`		`- private void Player_ErrorOccurred(object sender, PlayerErrorOccurredEventArgs e)`
	`83`	`+ protected virtual void Player_ErrorOccurred(object sender, PlayerErrorOccurredEventArgs e)`
`84`	`84`	`{`
`85`	`85`	`MediaManager.OnMediaItemFailed(this, new MediaItemFailedEventArgs(MediaManager.Queue.Current, new Exception(e.ToString()), e.ToString()));`
`86`	`86`	`}`
`@@ -89,9 +89,6 @@ private void Player_ErrorOccurred(object sender, PlayerErrorOccurredEventArgs e)`
`89`	`89`
`90`	`90`	`public VideoView PlayerView => VideoView as VideoView;`
`91`	`91`
`92`		`- public override event BeforePlayingEventHandler BeforePlaying;`
`93`		`- public override event AfterPlayingEventHandler AfterPlaying;`
`94`		`-`
`95`	`92`	`public override Task Pause()`
`96`	`93`	`{`
`97`	`94`	`Player.Pause();`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public override void UpdateVideoPlaceholder(object value)`
`103`	`103`	`PlayerView.PlayerView.PosterSource = imageSource;`
`104`	`104`	`}`
`105`	`105`
`106`		`- public void Initialize()`
	`106`	`+ public virtual void Initialize()`
`107`	`107`	`{`
`108`	`108`	`Player = new MediaPlayer();`
`109`	`109`	`Player.AudioCategory = MediaPlayerAudioCategory.Media;`
`@@ -121,43 +121,43 @@ public void Initialize()`
`121`	`121`	`Player.PlaybackSession.SeekCompleted += PlaybackSession_SeekCompleted;`
`122`	`122`	`}`
`123`	`123`
`124`		`- private void Player_MediaOpened(MediaPlayer sender, object args)`
	`124`	`+ protected virtual void Player_MediaOpened(MediaPlayer sender, object args)`
`125`	`125`	`{`
`126`	`126`
`127`	`127`	`}`
`128`	`128`
`129`		`- private void PlaybackSession_SeekCompleted(MediaPlaybackSession sender, object args)`
	`129`	`+ protected virtual void PlaybackSession_SeekCompleted(MediaPlaybackSession sender, object args)`
`130`	`130`	`{`
`131`	`131`	`//TODO: Maybe use this?`
`132`	`132`	`}`
`133`	`133`
`134`		`- private void PlaybackSession_NaturalVideoSizeChanged(MediaPlaybackSession sender, object args)`
	`134`	`+ protected virtual void PlaybackSession_NaturalVideoSizeChanged(MediaPlaybackSession sender, object args)`
`135`	`135`	`{`
`136`	`136`	`VideoHeight = (int)sender.NaturalVideoHeight;`
`137`	`137`	`VideoWidth = (int)sender.NaturalVideoWidth;`
`138`	`138`	`}`
`139`	`139`
`140`		`- private void PlaybackSession_PositionChanged(MediaPlaybackSession sender, object args)`
	`140`	`+ protected virtual void PlaybackSession_PositionChanged(MediaPlaybackSession sender, object args)`
`141`	`141`	`{`
`142`	`142`	`//TODO: Maybe use this?`
`143`	`143`	`}`
`144`	`144`
`145`		`- private void PlaybackSession_BufferingProgressChanged(MediaPlaybackSession sender, object args)`
	`145`	`+ protected virtual void PlaybackSession_BufferingProgressChanged(MediaPlaybackSession sender, object args)`
`146`	`146`	`{`
`147`	`147`	`MediaManager.Buffered = TimeSpan.FromMilliseconds(sender.BufferingProgress);`
`148`	`148`	`}`
`149`	`149`
`150`		`- private void PlaybackSession_PlaybackStateChanged(MediaPlaybackSession sender, object args)`
	`150`	`+ protected virtual void PlaybackSession_PlaybackStateChanged(MediaPlaybackSession sender, object args)`
`151`	`151`	`{`
`152`	`152`	`MediaManager.State = sender.PlaybackState.ToMediaPlayerState();`
`153`	`153`	`}`
`154`	`154`
`155`		`- private void Player_MediaFailed(MediaPlayer sender, MediaPlayerFailedEventArgs args)`
	`155`	`+ protected virtual void Player_MediaFailed(MediaPlayer sender, MediaPlayerFailedEventArgs args)`
`156`	`156`	`{`
`157`	`157`	`MediaManager.OnMediaItemFailed(this, new MediaItemFailedEventArgs(MediaManager.Queue.Current, new Exception(args.ErrorMessage), args.ErrorMessage));`
`158`	`158`	`}`
`159`	`159`
`160`		`- private void Player_MediaEnded(MediaPlayer sender, object args)`
	`160`	`+ protected virtual void Player_MediaEnded(MediaPlayer sender, object args)`
`161`	`161`	`{`
`162`	`162`	`MediaManager.OnMediaItemFinished(this, new MediaItemEventArgs(MediaManager.Queue.Current));`
`163`	`163`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public override void UpdateVideoPlaceholder(object value)`
`83`	`83`	`//TODO: Implement placeholder`
`84`	`84`	`}`
`85`	`85`
`86`		`- public void Initialize()`
	`86`	`+ public virtual void Initialize()`
`87`	`87`	`{`
`88`	`88`	`Application.Current.Dispatcher.Invoke((Action)delegate`
`89`	`89`	`{`
`@@ -103,29 +103,29 @@ public void Initialize()`
`103`	`103`	`});`
`104`	`104`	`}`
`105`	`105`
`106`		`- private void Player_MediaFailed(object sender, System.Windows.ExceptionRoutedEventArgs e)`
	`106`	`+ protected virtual void Player_MediaFailed(object sender, System.Windows.ExceptionRoutedEventArgs e)`
`107`	`107`	`{`
`108`	`108`	`MediaManager.State = MediaPlayerState.Failed;`
`109`	`109`	`MediaManager.OnMediaItemFailed(this, new MediaItemFailedEventArgs(MediaManager.Queue.Current, e.ErrorException, e.ErrorException.Message));`
`110`	`110`	`}`
`111`	`111`
`112`		`- private void Player_BufferingEnded(object sender, EventArgs e)`
	`112`	`+ protected virtual void Player_BufferingEnded(object sender, EventArgs e)`
`113`	`113`	`{`
`114`	`114`	`MediaManager.Buffered = TimeSpan.FromMilliseconds(Player.BufferingProgress);`
`115`	`115`	`}`
`116`	`116`
`117`		`- private void Player_BufferingStarted(object sender, EventArgs e)`
	`117`	`+ protected virtual void Player_BufferingStarted(object sender, EventArgs e)`
`118`	`118`	`{`
`119`	`119`	`MediaManager.State = MediaPlayerState.Buffering;`
`120`	`120`	`MediaManager.Buffered = TimeSpan.FromMilliseconds(Player.BufferingProgress);`
`121`	`121`	`}`
`122`	`122`
`123`		`- private void Player_MediaOpened(object sender, EventArgs e)`
	`123`	`+ protected virtual void Player_MediaOpened(object sender, EventArgs e)`
`124`	`124`	`{`
`125`	`125`	`MediaManager.State = MediaPlayerState.Playing;`
`126`	`126`	`}`
`127`	`127`
`128`		`- private void Player_MediaEnded(object sender, EventArgs e)`
	`128`	`+ protected virtual void Player_MediaEnded(object sender, EventArgs e)`
`129`	`129`	`{`
`130`	`130`	`MediaManager.OnMediaItemFinished(this, new MediaItemEventArgs(MediaManager.Queue.Current));`
`131`	`131`	`}`