From e3a573ea977d31ab3fb4cfc73e2579ee85e75ae7 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 23 Mar 2015 13:19:21 -0400
Subject: update stream closing

---
 MediaBrowser.Model/Dto/MediaSourceInfo.cs | 42 ++++++++++++++++---------------
 1 file changed, 22 insertions(+), 20 deletions(-)

(limited to 'MediaBrowser.Model/Dto')

diff --git a/MediaBrowser.Model/Dto/MediaSourceInfo.cs b/MediaBrowser.Model/Dto/MediaSourceInfo.cs
index 3a9c1e7d4f..5495a1f692 100644
--- a/MediaBrowser.Model/Dto/MediaSourceInfo.cs
+++ b/MediaBrowser.Model/Dto/MediaSourceInfo.cs
@@ -57,39 +57,41 @@ namespace MediaBrowser.Model.Dto
         [IgnoreDataMember]
         public MediaStream DefaultAudioStream
         {
-            get
-            {
-                if (DefaultAudioStreamIndex.HasValue)
-                {
-                    var val = DefaultAudioStreamIndex.Value;
+            get { return GetDefaultAudioStream(DefaultAudioStreamIndex); }
+        }
 
-                    foreach (MediaStream i in MediaStreams)
-                    {
-                        if (i.Type == MediaStreamType.Audio && i.Index == val)
-                        {
-                            return i;
-                        }
-                    }
-                }
+        public MediaStream GetDefaultAudioStream(int? defaultIndex)
+        {
+            if (defaultIndex.HasValue)
+            {
+                var val = defaultIndex.Value;
 
                 foreach (MediaStream i in MediaStreams)
                 {
-                    if (i.Type == MediaStreamType.Audio && i.IsDefault)
+                    if (i.Type == MediaStreamType.Audio && i.Index == val)
                     {
                         return i;
                     }
                 }
+            }
 
-                foreach (MediaStream i in MediaStreams)
+            foreach (MediaStream i in MediaStreams)
+            {
+                if (i.Type == MediaStreamType.Audio && i.IsDefault)
                 {
-                    if (i.Type == MediaStreamType.Audio)
-                    {
-                        return i;
-                    }
+                    return i;
                 }
+            }
 
-                return null;
+            foreach (MediaStream i in MediaStreams)
+            {
+                if (i.Type == MediaStreamType.Audio)
+                {
+                    return i;
+                }
             }
+
+            return null;
         }
 
         [IgnoreDataMember]
-- 
cgit v1.2.3