Reformat JustAMan review pt2 changes

Refs #575

7 files changed, 30 insertions, 33 deletions

diff --git a/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs b/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
index b71531bf1b..901d81c5ff 100644
--- a/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
+++ b/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
@@ -31,7 +31,7 @@ namespace MediaBrowser.Model.Dlna
             string dlnaflags = string.Format(";DLNA.ORG_FLAGS={0}",
              DlnaMaps.FlagsToString(flagValue));
 
-            var mediaProfile = _profile.GetImageMediaProfile(container,
+            ResponseProfile mediaProfile = _profile.GetImageMediaProfile(container,
                 width,
                 height);
 
@@ -83,7 +83,7 @@ namespace MediaBrowser.Model.Dlna
             string dlnaflags = string.Format(";DLNA.ORG_FLAGS={0}",
              DlnaMaps.FlagsToString(flagValue));
 
-            var mediaProfile = _profile.GetAudioMediaProfile(container,
+            ResponseProfile mediaProfile = _profile.GetAudioMediaProfile(container,
                 audioCodec,
                 audioChannels,
                 audioBitrate,
@@ -148,7 +148,7 @@ namespace MediaBrowser.Model.Dlna
             string dlnaflags = string.Format(";DLNA.ORG_FLAGS={0}",
              DlnaMaps.FlagsToString(flagValue));
 
-            var mediaProfile = _profile.GetVideoMediaProfile(container,
+            ResponseProfile mediaProfile = _profile.GetVideoMediaProfile(container,
                 audioCodec,
                 videoCodec,
                 width,
diff --git a/MediaBrowser.Model/Dlna/DeviceProfile.cs b/MediaBrowser.Model/Dlna/DeviceProfile.cs
index 8124cf5289..6894f45edc 100644
--- a/MediaBrowser.Model/Dlna/DeviceProfile.cs
+++ b/MediaBrowser.Model/Dlna/DeviceProfile.cs
@@ -191,7 +191,7 @@ namespace MediaBrowser.Model.Dlna
                 var conditionProcessor = new ConditionProcessor();
 
                 var anyOff = false;
-                foreach (var c in i.Conditions)
+                foreach (ProfileCondition c in i.Conditions)
                 {
                     if (!conditionProcessor.IsAudioConditionSatisfied(GetModelProfileCondition(c), audioChannels, audioBitrate, audioSampleRate, audioBitDepth))
                     {
@@ -304,7 +304,7 @@ namespace MediaBrowser.Model.Dlna
                 var conditionProcessor = new ConditionProcessor();
 
                 var anyOff = false;
-                foreach (var c in i.Conditions)
+                foreach (ProfileCondition c in i.Conditions)
                 {
                     if (!conditionProcessor.IsVideoConditionSatisfied(GetModelProfileCondition(c), width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isInterlaced, refFrames, numVideoStreams, numAudioStreams, videoCodecTag, isAvc))
                     {
diff --git a/MediaBrowser.Model/Dlna/DeviceProfileInfo.cs b/MediaBrowser.Model/Dlna/DeviceProfileInfo.cs
index 9b3515fc3d..c78f0d9b2b 100644
--- a/MediaBrowser.Model/Dlna/DeviceProfileInfo.cs
+++ b/MediaBrowser.Model/Dlna/DeviceProfileInfo.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Dlna
 {
     public class DeviceProfileInfo
diff --git a/MediaBrowser.Model/Dlna/MediaFormatProfile.cs b/MediaBrowser.Model/Dlna/MediaFormatProfile.cs
index 376849c435..7c56fc5f45 100644
--- a/MediaBrowser.Model/Dlna/MediaFormatProfile.cs
+++ b/MediaBrowser.Model/Dlna/MediaFormatProfile.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Dlna
 {
     public enum MediaFormatProfile
diff --git a/MediaBrowser.Model/Dlna/PlaybackErrorCode.cs b/MediaBrowser.Model/Dlna/PlaybackErrorCode.cs
index 9412cd1b68..5080bc2863 100644
--- a/MediaBrowser.Model/Dlna/PlaybackErrorCode.cs
+++ b/MediaBrowser.Model/Dlna/PlaybackErrorCode.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Dlna
 {
     public enum PlaybackErrorCode
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index 4f4054db4b..ec05e2eb72 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -32,7 +32,7 @@ namespace MediaBrowser.Model.Dlna
             ValidateAudioInput(options);
 
             var mediaSources = new List<MediaSourceInfo>();
-            foreach (var i in options.MediaSources)
+            foreach (MediaSourceInfo i in options.MediaSources)
             {
                 if (string.IsNullOrEmpty(options.MediaSourceId) ||
                     StringHelper.EqualsIgnoreCase(i.Id, options.MediaSourceId))
@@ -42,16 +42,16 @@ namespace MediaBrowser.Model.Dlna
             }
 
             var streams = new List<StreamInfo>();
-            foreach (var i in mediaSources)
+            foreach (MediaSourceInfo i in mediaSources)
             {
-                var streamInfo = BuildAudioItem(i, options);
+                StreamInfo streamInfo = BuildAudioItem(i, options);
                 if (streamInfo != null)
                 {
                     streams.Add(streamInfo);
                 }
             }
 
-            foreach (var stream in streams)
+            foreach (StreamInfo stream in streams)
             {
                 stream.DeviceId = options.DeviceId;
                 stream.DeviceProfileId = options.Profile.Id;
@@ -65,7 +65,7 @@ namespace MediaBrowser.Model.Dlna
             ValidateInput(options);
 
             var mediaSources = new List<MediaSourceInfo>();
-            foreach (var i in options.MediaSources)
+            foreach (MediaSourceInfo i in options.MediaSources)
             {
                 if (string.IsNullOrEmpty(options.MediaSourceId) ||
                     StringHelper.EqualsIgnoreCase(i.Id, options.MediaSourceId))
@@ -75,7 +75,7 @@ namespace MediaBrowser.Model.Dlna
             }
 
             var streams = new List<StreamInfo>();
-            foreach (var i in mediaSources)
+            foreach (MediaSourceInfo i in mediaSources)
             {
                 var streamInfo = BuildVideoItem(i, options);
                 if (streamInfo != null)
@@ -84,7 +84,7 @@ namespace MediaBrowser.Model.Dlna
                 }
             }
 
-            foreach (var stream in streams)
+            foreach (StreamInfo stream in streams)
             {
                 stream.DeviceId = options.DeviceId;
                 stream.DeviceProfileId = options.Profile.Id;
@@ -97,7 +97,7 @@ namespace MediaBrowser.Model.Dlna
         {
             var sorted = SortMediaSources(streams, maxBitrate);
 
-            foreach (var stream in sorted)
+            foreach (StreamInfo stream in sorted)
             {
                 return stream;
             }
@@ -333,7 +333,7 @@ namespace MediaBrowser.Model.Dlna
                     if (i.Type == CodecType.Audio && i.ContainsAnyCodec(audioCodec, item.Container))
                     {
                         bool applyConditions = true;
-                        foreach (var applyCondition in i.ApplyConditions)
+                        foreach (ProfileCondition applyCondition in i.ApplyConditions)
                         {
                             if (!conditionProcessor.IsAudioConditionSatisfied(applyCondition, inputAudioChannels, inputAudioBitrate, inputAudioSampleRate, inputAudioBitDepth))
                             {
@@ -345,7 +345,7 @@ namespace MediaBrowser.Model.Dlna
 
                         if (applyConditions)
                         {
-                            foreach (var c in i.Conditions)
+                            foreach (ProfileCondition c in i.Conditions)
                             {
                                 conditions.Add(c);
                             }
@@ -354,7 +354,7 @@ namespace MediaBrowser.Model.Dlna
                 }
 
                 bool all = true;
-                foreach (var c in conditions)
+                foreach (ProfileCondition c in conditions)
                 {
                     if (!conditionProcessor.IsAudioConditionSatisfied(c, inputAudioChannels, inputAudioBitrate, inputAudioSampleRate, inputAudioBitDepth))
                     {
@@ -431,7 +431,7 @@ namespace MediaBrowser.Model.Dlna
 
                     if (applyConditions)
                     {
-                        foreach (var c in i.Conditions)
+                        foreach (ProfileCondition c in i.Conditions)
                         {
                             audioTranscodingConditions.Add(c);
                         }
@@ -811,7 +811,7 @@ namespace MediaBrowser.Model.Dlna
                     if (i.Type == CodecType.Video && i.ContainsAnyCodec(transcodingProfile.VideoCodec, transcodingProfile.Container))
                     {
                         bool applyConditions = true;
-                        foreach (var applyCondition in i.ApplyConditions)
+                        foreach (ProfileCondition applyCondition in i.ApplyConditions)
                         {
                             int? width = videoStream == null ? null : videoStream.Width;
                             int? height = videoStream == null ? null : videoStream.Height;
@@ -867,7 +867,7 @@ namespace MediaBrowser.Model.Dlna
                     if (i.Type == CodecType.VideoAudio && i.ContainsAnyCodec(transcodingProfile.AudioCodec, transcodingProfile.Container))
                     {
                         bool applyConditions = true;
-                        foreach (var applyCondition in i.ApplyConditions)
+                        foreach (ProfileCondition applyCondition in i.ApplyConditions)
                         {
                             bool? isSecondaryAudio = audioStream == null ? null : item.IsSecondaryAudio(audioStream);
                             int? inputAudioBitrate = audioStream == null ? null : audioStream.BitRate;
@@ -997,7 +997,7 @@ namespace MediaBrowser.Model.Dlna
             bool isEligibleForDirectPlay,
             bool isEligibleForDirectStream)
         {
-            var profile = options.Profile;
+            DeviceProfile profile = options.Profile;
 
             if (options.ForceDirectPlay)
             {
@@ -1071,7 +1071,7 @@ namespace MediaBrowser.Model.Dlna
             int? numVideoStreams = mediaSource.GetStreamCount(MediaStreamType.Video);
 
             // Check container conditions
-            foreach (var i in conditions)
+            foreach (ProfileCondition i in conditions)
             {
                 if (!conditionProcessor.IsVideoConditionSatisfied(i, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isInterlaced, refFrames, numVideoStreams, numAudioStreams, videoCodecTag, isAvc))
                 {
@@ -1094,7 +1094,7 @@ namespace MediaBrowser.Model.Dlna
                 if (i.Type == CodecType.Video && i.ContainsAnyCodec(videoCodec, container))
                 {
                     bool applyConditions = true;
-                    foreach (var applyCondition in i.ApplyConditions)
+                    foreach (ProfileCondition applyCondition in i.ApplyConditions)
                     {
                         if (!conditionProcessor.IsVideoConditionSatisfied(applyCondition, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isInterlaced, refFrames, numVideoStreams, numAudioStreams, videoCodecTag, isAvc))
                         {
@@ -1106,7 +1106,7 @@ namespace MediaBrowser.Model.Dlna
 
                     if (applyConditions)
                     {
-                        foreach (var c in i.Conditions)
+                        foreach (ProfileCondition c in i.Conditions)
                         {
                             conditions.Add(c);
                         }
@@ -1114,7 +1114,7 @@ namespace MediaBrowser.Model.Dlna
                 }
             }
 
-            foreach (var i in conditions)
+            foreach (ProfileCondition i in conditions)
             {
                 if (!conditionProcessor.IsVideoConditionSatisfied(i, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isInterlaced, refFrames, numVideoStreams, numAudioStreams, videoCodecTag, isAvc))
                 {
@@ -1141,7 +1141,7 @@ namespace MediaBrowser.Model.Dlna
                     if (i.Type == CodecType.VideoAudio && i.ContainsAnyCodec(audioCodec, container))
                     {
                         bool applyConditions = true;
-                        foreach (var applyCondition in i.ApplyConditions)
+                        foreach (ProfileCondition applyCondition in i.ApplyConditions)
                         {
                             if (!conditionProcessor.IsVideoAudioConditionSatisfied(applyCondition, audioChannels, audioBitrate, audioSampleRate, audioBitDepth, audioProfile, isSecondaryAudio))
                             {
@@ -1153,7 +1153,7 @@ namespace MediaBrowser.Model.Dlna
 
                         if (applyConditions)
                         {
-                            foreach (var c in i.Conditions)
+                            foreach (ProfileCondition c in i.Conditions)
                             {
                                 conditions.Add(c);
                             }
@@ -1161,7 +1161,7 @@ namespace MediaBrowser.Model.Dlna
                     }
                 }
 
-                foreach (var i in conditions)
+                foreach (ProfileCondition i in conditions)
                 {
                     if (!conditionProcessor.IsVideoAudioConditionSatisfied(i, audioChannels, audioBitrate, audioSampleRate, audioBitDepth, audioProfile, isSecondaryAudio))
                     {
@@ -1466,7 +1466,7 @@ namespace MediaBrowser.Model.Dlna
 
         private void ApplyTranscodingConditions(StreamInfo item, IEnumerable<ProfileCondition> conditions, string qualifier, bool enableQualifiedConditions, bool enableNonQualifiedConditions)
         {
-            foreach (var condition in conditions)
+            foreach (ProfileCondition condition in conditions)
             {
                 string value = condition.Value;
 
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index 99c545cc02..522c109803 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -145,7 +145,7 @@ namespace MediaBrowser.Model.Dlna
             }
 
             var list = new List<string>();
-            foreach (var pair in BuildParams(this, accessToken))
+            foreach (NameValuePair pair in BuildParams(this, accessToken))
             {
                 if (string.IsNullOrEmpty(pair.Value))
                 {
@@ -349,7 +349,7 @@ namespace MediaBrowser.Model.Dlna
             var newList = new List<SubtitleStreamInfo>();
 
             // First add the selected track
-            foreach (var stream in list)
+            foreach (SubtitleStreamInfo stream in list)
             {
                 if (stream.DeliveryMethod == SubtitleDeliveryMethod.External)
                 {