Merge branch 'dev' into code-cleanup

8 files changed, 25 insertions, 25 deletions

diff --git a/MediaBrowser.Model/Dlna/AudioOptions.cs b/MediaBrowser.Model/Dlna/AudioOptions.cs
index 189f646350..9480311b53 100644
--- a/MediaBrowser.Model/Dlna/AudioOptions.cs
+++ b/MediaBrowser.Model/Dlna/AudioOptions.cs
@@ -55,7 +55,7 @@ namespace MediaBrowser.Model.Dlna
         /// </summary>
         /// <value>The audio transcoding bitrate.</value>
         public int? AudioTranscodingBitrate { get; set; }
-        
+
         /// <summary>
         /// Gets the maximum bitrate.
         /// </summary>
diff --git a/MediaBrowser.Model/Dlna/CodecProfile.cs b/MediaBrowser.Model/Dlna/CodecProfile.cs
index 6d143962dd..c40408e9b5 100644
--- a/MediaBrowser.Model/Dlna/CodecProfile.cs
+++ b/MediaBrowser.Model/Dlna/CodecProfile.cs
@@ -9,7 +9,7 @@ namespace MediaBrowser.Model.Dlna
     {
         [XmlAttribute("type")]
         public CodecType Type { get; set; }
-       
+
         public ProfileCondition[] Conditions { get; set; }
 
         public ProfileCondition[] ApplyConditions { get; set; }
diff --git a/MediaBrowser.Model/Dlna/ConditionProcessor.cs b/MediaBrowser.Model/Dlna/ConditionProcessor.cs
index a550ee9826..5bcee6de29 100644
--- a/MediaBrowser.Model/Dlna/ConditionProcessor.cs
+++ b/MediaBrowser.Model/Dlna/ConditionProcessor.cs
@@ -98,7 +98,7 @@ namespace MediaBrowser.Model.Dlna
         public bool IsVideoAudioConditionSatisfied(ProfileCondition condition,
             int? audioChannels,
             int? audioBitrate,
-            int? audioSampleRate, 
+            int? audioSampleRate,
             int? audioBitDepth,
             string audioProfile,
             bool? isSecondaryTrack)
diff --git a/MediaBrowser.Model/Dlna/DlnaFlags.cs b/MediaBrowser.Model/Dlna/DlnaFlags.cs
index b981e8455c..28c93464d9 100644
--- a/MediaBrowser.Model/Dlna/DlnaFlags.cs
+++ b/MediaBrowser.Model/Dlna/DlnaFlags.cs
@@ -5,14 +5,14 @@ namespace MediaBrowser.Model.Dlna
     [Flags]
     public enum DlnaFlags : ulong
     {
-        /*!	<i>Background</i> transfer mode.
-		For use with upload and download transfers to and from the server. 
-		The primary difference between \ref DH_TransferMode_Interactive and 
-		\ref DH_TransferMode_Bulk is that the latter assumes that the user 
-		is not relying on the transfer for immediately rendering the content 
-		and there are no issues with causing a buffer overflow if the 
-		receiver uses TCP flow control to reduce total throughput.
-	    */
+        /*! <i>Background</i> transfer mode.
+            For use with upload and download transfers to and from the server.
+            The primary difference between \ref DH_TransferMode_Interactive and
+            \ref DH_TransferMode_Bulk is that the latter assumes that the user
+            is not relying on the transfer for immediately rendering the content
+            and there are no issues with causing a buffer overflow if the
+            receiver uses TCP flow control to reduce total throughput.
+        */
         BackgroundTransferMode = 1 << 22,
 
         ByteBasedSeek = 1 << 29,
@@ -21,10 +21,10 @@ namespace MediaBrowser.Model.Dlna
         DlnaV15 = 1 << 20,
 
         /*! <i>Interactive</i> transfer mode.
-            For best effort transfer of images and non-real-time transfers. 
-            URIs with image content usually support \ref DH_TransferMode_Bulk too. 
-            The primary difference between \ref DH_TransferMode_Interactive and 
-            \ref DH_TransferMode_Bulk is that the former assumes that the 
+            For best effort transfer of images and non-real-time transfers.
+            URIs with image content usually support \ref DH_TransferMode_Bulk too.
+            The primary difference between \ref DH_TransferMode_Interactive and
+            \ref DH_TransferMode_Bulk is that the former assumes that the
             transfer is intended for immediate rendering.
         */
         InteractiveTransferMode = 1 << 23,
@@ -35,14 +35,14 @@ namespace MediaBrowser.Model.Dlna
         SenderPaced = 1L << 31,
         SnIncrease = 1 << 26,
 
-        /*!	<i>Streaming</i> transfer mode.
-        The server transmits at a throughput sufficient for real-time playback of 
-        audio or video. URIs with audio or video often support the 
-        \ref DH_TransferMode_Interactive and \ref DH_TransferMode_Bulk transfer modes. 
-        The most well-known exception to this general claim is for live streams.
+        /*! <i>Streaming</i> transfer mode.
+            The server transmits at a throughput sufficient for real-time playback of
+            audio or video. URIs with audio or video often support the
+            \ref DH_TransferMode_Interactive and \ref DH_TransferMode_Bulk transfer modes.
+            The most well-known exception to this general claim is for live streams.
         */
         StreamingTransferMode = 1 << 24,
 
         TimeBasedSeek = 1 << 30
     }
-}
\ No newline at end of file
+}
diff --git a/MediaBrowser.Model/Dlna/ProfileCondition.cs b/MediaBrowser.Model/Dlna/ProfileCondition.cs
index 9234a27136..39f99b92ee 100644
--- a/MediaBrowser.Model/Dlna/ProfileCondition.cs
+++ b/MediaBrowser.Model/Dlna/ProfileCondition.cs
@@ -24,7 +24,7 @@ namespace MediaBrowser.Model.Dlna
         public ProfileCondition(ProfileConditionType condition, ProfileConditionValue property, string value)
             : this(condition, property, value, false)
         {
-            
+
         }
 
         public ProfileCondition(ProfileConditionType condition, ProfileConditionValue property, string value, bool isRequired)
diff --git a/MediaBrowser.Model/Dlna/SearchCriteria.cs b/MediaBrowser.Model/Dlna/SearchCriteria.cs
index 5304903d94..50ee4a3783 100644
--- a/MediaBrowser.Model/Dlna/SearchCriteria.cs
+++ b/MediaBrowser.Model/Dlna/SearchCriteria.cs
@@ -48,7 +48,7 @@ namespace MediaBrowser.Model.Dlna
                 if (subFactors.Length == 3)
                 {
 
-                    if (StringHelper.EqualsIgnoreCase("upnp:class", subFactors[0]) && 
+                    if (StringHelper.EqualsIgnoreCase("upnp:class", subFactors[0]) &&
                         (StringHelper.EqualsIgnoreCase("=", subFactors[1]) || StringHelper.EqualsIgnoreCase("derivedfrom", subFactors[1])))
                     {
                         if (StringHelper.EqualsIgnoreCase("\"object.item.imageItem\"", subFactors[2]) || StringHelper.EqualsIgnoreCase("\"object.item.imageItem.photo\"", subFactors[2]))
diff --git a/MediaBrowser.Model/Dlna/SortCriteria.cs b/MediaBrowser.Model/Dlna/SortCriteria.cs
index 600a2f58e9..ecaf32614c 100644
--- a/MediaBrowser.Model/Dlna/SortCriteria.cs
+++ b/MediaBrowser.Model/Dlna/SortCriteria.cs
@@ -11,7 +11,7 @@ namespace MediaBrowser.Model.Dlna
 
         public SortCriteria(string value)
         {
-            
+
         }
     }
 }
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index 2242ce7a53..c571d83849 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -951,7 +951,7 @@ namespace MediaBrowser.Model.Dlna
 
             if (audioStream != null)
             {
-                // Seeing webm encoding failures when source has 1 audio channel and 22k bitrate. 
+                // Seeing webm encoding failures when source has 1 audio channel and 22k bitrate.
                 // Any attempts to transcode over 64k will fail
                 if (audioStream.Channels.HasValue &&
                     audioStream.Channels.Value == 1)