update stream sorting

2 files changed, 41 insertions, 23 deletions

diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index 7338f604c0..62ac321fe3 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -89,29 +89,7 @@ namespace MediaBrowser.Model.Dlna
 
         private StreamInfo GetOptimalStream(List<StreamInfo> streams)
         {
-            // Grab the first one that can be direct streamed
-            // If that doesn't produce anything, just take the first
-            foreach (StreamInfo i in streams)
-            {
-                if (i.PlayMethod == PlayMethod.DirectPlay && i.MediaSource.Protocol == MediaProtocol.File)
-                {
-                    return i;
-                }
-            }
-            foreach (StreamInfo i in streams)
-            {
-                if (i.PlayMethod == PlayMethod.DirectPlay)
-                {
-                    return i;
-                }
-            }
-            foreach (StreamInfo i in streams)
-            {
-                if (i.PlayMethod == PlayMethod.DirectStream)
-                {
-                    return i;
-                }
-            }
+            streams = StreamInfoSorter.SortMediaSources(streams);
 
             foreach (StreamInfo stream in streams)
             {
diff --git a/MediaBrowser.Model/Dlna/StreamInfoSorter.cs b/MediaBrowser.Model/Dlna/StreamInfoSorter.cs
new file mode 100644
index 0000000000..80eca193f5
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/StreamInfoSorter.cs
@@ -0,0 +1,40 @@
+using MediaBrowser.Model.MediaInfo;
+using MediaBrowser.Model.Session;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace MediaBrowser.Model.Dlna
+{
+    public class StreamInfoSorter
+    {
+        public static List<StreamInfo> SortMediaSources(List<StreamInfo> streams)
+        {
+            return streams.OrderBy(i =>
+            {
+                switch (i.PlayMethod)
+                {
+                    case PlayMethod.DirectPlay:
+                        return 0;
+                    case PlayMethod.DirectStream:
+                        return 1;
+                    case PlayMethod.Transcode:
+                        return 2;
+                    default:
+                        throw new ArgumentException("Unrecognized PlayMethod");
+                }
+
+            }).ThenBy(i =>
+            {
+                switch (i.MediaSource.Protocol)
+                {
+                    case MediaProtocol.File:
+                        return 0;
+                    default:
+                        return 1;
+                }
+
+            }).ToList();
+        }
+    }
+}