Merge pull request #4 from martijn00/master

Bring for up to date with master
Baseflow · Oct 12, 2016 · 27befb0 · 27befb0
2 parents 65b0bd3 + ba50fa0
commit 27befb0
Show file tree

Hide file tree

Showing 5 changed files with 15,277 additions and 9,166 deletions.
diff --git a/.gitignore b/.gitignore
@@ -194,3 +194,4 @@ FakesAssemblies/
 
 # Visual Studio 6 workspace options file
 *.opt
+Resource.designer.cs
diff --git a/MediaManager/Plugin.MediaManager.UWP/MediaManagerImplementation.cs b/MediaManager/Plugin.MediaManager.UWP/MediaManagerImplementation.cs
@@ -50,7 +50,7 @@ public MediaManagerImplementation()
                         _playProgressTimer.Change(0, int.MaxValue);
                         break;
                     case MediaPlaybackState.Playing:
-                        Status = sender.Position == TimeSpan.Zero ? PlayerStatus.STOPPED : PlayerStatus.PLAYING;
+                        Status = PlayerStatus.PLAYING;
                         _playProgressTimer.Change(0, 50);
                         break;
                     case MediaPlaybackState.Paused:

diff --git a/MediaManager/Plugin.MediaManager.UWP/project.json b/MediaManager/Plugin.MediaManager.UWP/project.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.1.0"
+    "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2"
   },
   "frameworks": {
     "uap10.0": {}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -194,3 +194,4 @@ FakesAssemblies/

		# Visual Studio 6 workspace options file
		*.opt
		Resource.designer.cs