Replaced Arm/Disarm with Start/Stop

Start and stop are more commonly used than arm and disarm.

Change-Id: If6adf9cc06d6b07f5fdbf913c0286de1d22481c7
Signed-off-by: Sung-jae Park <nicesj@nicesj.com>

2 files changed, 19 insertions, 17 deletions

diff --git a/VideoPlayerLite/VideoPlayerLite.Android/Renderers/MediaRenderingViewRenderer.cs b/VideoPlayerLite/VideoPlayerLite.Android/Renderers/MediaRenderingViewRenderer.cs
index 3521e3e..199bbbb 100755
--- a/VideoPlayerLite/VideoPlayerLite.Android/Renderers/MediaRenderingViewRenderer.cs
+++ b/VideoPlayerLite/VideoPlayerLite.Android/Renderers/MediaRenderingViewRenderer.cs
@@ -42,11 +42,13 @@ namespace VideoPlayerLite.Android
             if (e.OldElement != null)
             {
                 Control.Completion -= VideoViewCompletion;
+                StopTimer();
             }
 
             if (e.NewElement != null)
             {
                 Control.Completion += VideoViewCompletion;
+                StopTimer();
             }
         }
 
@@ -58,7 +60,7 @@ namespace VideoPlayerLite.Android
             {
                 ((IElementController)Element).SetValueFromRenderer(MediaRenderingView.PlayerStatusProperty, PlayerStatus.Preparing);
 
-                DisarmPlayTimer();
+                StopTimer();
                 if (Control.IsPlaying)
                 {
                     Control.StopPlayback();
@@ -73,16 +75,16 @@ namespace VideoPlayerLite.Android
                 {
                     case PlayerStatus.Playing:
                         Control.Start();
-                        ArmPlayTimer();
+                        StartTimer();
                         break;
                     case PlayerStatus.Paused:
                         Control.Pause();
                         /// Should pause the timer
-                        DisarmPlayTimer();
+                        StopTimer();
                         break;
                     case PlayerStatus.Stopped:
                         Control.StopPlayback();
-                        DisarmPlayTimer();
+                        StopTimer();
                         break;
                     default:
                         break;
@@ -95,7 +97,7 @@ namespace VideoPlayerLite.Android
             ((IElementController)Element).SetValueFromRenderer(MediaRenderingView.PlayerStatusProperty, PlayerStatus.Stopped);
         }
 
-        private void ArmPlayTimer()
+        private void StartTimer()
         {
             if (playPositionTimer != null)
             {
@@ -121,7 +123,7 @@ namespace VideoPlayerLite.Android
 
                         if (Element == null)
                         {
-                            DisarmPlayTimer();
+                            StopTimer();
                         }
                         else
                         {
@@ -132,7 +134,7 @@ namespace VideoPlayerLite.Android
             }, null, 0, 250);
         }
 
-        private void DisarmPlayTimer()
+        private void StopTimer()
         {
             playPositionTimer?.Dispose();
             playPositionTimer = null;
diff --git a/VideoPlayerLite/VideoPlayerLite.Tizen/VideoPlayerLite.Tizen.TV/Renderers/MediaRenderingViewRenderer.cs b/VideoPlayerLite/VideoPlayerLite.Tizen/VideoPlayerLite.Tizen.TV/Renderers/MediaRenderingViewRenderer.cs
index 14d6991..6f6fa75 100755
--- a/VideoPlayerLite/VideoPlayerLite.Tizen/VideoPlayerLite.Tizen.TV/Renderers/MediaRenderingViewRenderer.cs
+++ b/VideoPlayerLite/VideoPlayerLite.Tizen/VideoPlayerLite.Tizen.TV/Renderers/MediaRenderingViewRenderer.cs
@@ -50,7 +50,7 @@ namespace VideoPlayerLite.Tizen
                 player.PlaybackCompleted -= PlaybackCompleted;
                 player.PlaybackInterrupted -= PlaybackInterrupted;
 
-                DisarmPlayTimer();
+                StopTimer();
             }
 
             if (e.NewElement != null)
@@ -60,7 +60,7 @@ namespace VideoPlayerLite.Tizen
                 player.PlaybackCompleted += PlaybackCompleted;
                 player.PlaybackInterrupted += PlaybackInterrupted;
 
-                DisarmPlayTimer();
+                StopTimer();
             }
         }
 
@@ -111,7 +111,7 @@ namespace VideoPlayerLite.Tizen
 
             if (e.PropertyName == MediaRenderingView.PlayingItemProperty.PropertyName)
             {
-                DisarmPlayTimer();
+                StopTimer();
                 PlayVideo();
             }
             else if (e.PropertyName == MediaRenderingView.PlayerStatusProperty.PropertyName)
@@ -122,7 +122,7 @@ namespace VideoPlayerLite.Tizen
                         if (player.State == PlayerState.Ready || player.State == PlayerState.Paused)
                         {
                             player.Start();
-                            ArmPlayTimer();
+                            StartTimer();
                         }
                         else if (player.State != PlayerState.Playing)
                         {
@@ -137,7 +137,7 @@ namespace VideoPlayerLite.Tizen
                             player.Pause();
                         }
                         /// TODO: Should pause the timer
-                        DisarmPlayTimer();
+                        StopTimer();
                         break;
                     case PlayerStatus.Stopped:
                         if (player.State == PlayerState.Playing || player.State == PlayerState.Paused)
@@ -150,7 +150,7 @@ namespace VideoPlayerLite.Tizen
                             player.Unprepare();
                         }
 
-                        DisarmPlayTimer();
+                        StopTimer();
                         break;
                     default:
                         break;
@@ -168,7 +168,7 @@ namespace VideoPlayerLite.Tizen
             ((IElementController)Element).SetValueFromRenderer(MediaRenderingView.PlayerStatusProperty, PlayerStatus.Stopped);
         }
 
-        private void ArmPlayTimer()
+        private void StartTimer()
         {
             if (playPositionTimer != null)
             {
@@ -190,7 +190,7 @@ namespace VideoPlayerLite.Tizen
 
                         if (Element == null)
                         {
-                            DisarmPlayTimer();
+                            StopTimer();
                         }
                         else
                         {
@@ -201,10 +201,10 @@ namespace VideoPlayerLite.Tizen
             }, null, 0, 250);
         }
 
-        private void DisarmPlayTimer()
+        private void StopTimer()
         {
             playPositionTimer?.Dispose();
             playPositionTimer = null;
         }
     }
-}
+}
\ No newline at end of file