fix portable and 3.5 project references

22 files changed, 209 insertions, 174 deletions

diff --git a/MediaBrowser.Model/Dlna/AudioOptions.cs b/MediaBrowser.Model/Dlna/AudioOptions.cs
new file mode 100644
index 0000000000..d04133a3d9
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/AudioOptions.cs
@@ -0,0 +1,33 @@
+using System.Collections.Generic;
+using MediaBrowser.Model.Dto;
+
+namespace MediaBrowser.Model.Dlna
+{
+    /// <summary>
+    /// Class AudioOptions.
+    /// </summary>
+    public class AudioOptions
+    {
+        public string ItemId { get; set; }
+        public List<MediaSourceInfo> MediaSources { get; set; }
+        public DeviceProfile Profile { get; set; }
+
+        /// <summary>
+        /// Optional. Only needed if a specific AudioStreamIndex or SubtitleStreamIndex are requested.
+        /// </summary>
+        public string MediaSourceId { get; set; }
+
+        public string DeviceId { get; set; }
+
+        /// <summary>
+        /// Allows an override of supported number of audio channels
+        /// Example: DeviceProfile supports five channel, but user only has stereo speakers
+        /// </summary>
+        public int? MaxAudioChannels { get; set; }
+
+        /// <summary>
+        /// The application's configured quality setting
+        /// </summary>
+        public int? MaxBitrate { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/CodecProfile.cs b/MediaBrowser.Model/Dlna/CodecProfile.cs
index 2b04b7fdb7..7d7e0057eb 100644
--- a/MediaBrowser.Model/Dlna/CodecProfile.cs
+++ b/MediaBrowser.Model/Dlna/CodecProfile.cs
@@ -32,56 +32,4 @@ namespace MediaBrowser.Model.Dlna
             return codecs.Count == 0 || codecs.Contains(codec, StringComparer.OrdinalIgnoreCase);
         }
     }
-
-    public enum CodecType
-    {
-        Video = 0,
-        VideoAudio = 1,
-        Audio = 2
-    }
-
-    public class ProfileCondition
-    {
-        [XmlAttribute("condition")]
-        public ProfileConditionType Condition { get; set; }
-
-        [XmlAttribute("property")]
-        public ProfileConditionValue Property { get; set; }
-
-        [XmlAttribute("value")]
-        public string Value { get; set; }
-
-        [XmlAttribute("isRequired")]
-        public bool IsRequired { get; set; }
-
-        public ProfileCondition()
-        {
-            IsRequired = true;
-        }
-    }
-
-    public enum ProfileConditionType
-    {
-        Equals = 0,
-        NotEquals = 1,
-        LessThanEqual = 2,
-        GreaterThanEqual = 3
-    }
-
-    public enum ProfileConditionValue
-    {
-        AudioChannels,
-        AudioBitrate,
-        AudioProfile,
-        Width,
-        Height,
-        Has64BitOffsets,
-        PacketLength,
-        VideoBitDepth,
-        VideoBitrate,
-        VideoFramerate,
-        VideoLevel,
-        VideoProfile,
-        VideoTimestamp
-    }
 }
diff --git a/MediaBrowser.Model/Dlna/CodecType.cs b/MediaBrowser.Model/Dlna/CodecType.cs
new file mode 100644
index 0000000000..415cae7acf
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/CodecType.cs
@@ -0,0 +1,9 @@
+namespace MediaBrowser.Model.Dlna
+{
+    public enum CodecType
+    {
+        Video = 0,
+        VideoAudio = 1,
+        Audio = 2
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/DeviceIdentification.cs b/MediaBrowser.Model/Dlna/DeviceIdentification.cs
index 87cf000b1a..97f4409daf 100644
--- a/MediaBrowser.Model/Dlna/DeviceIdentification.cs
+++ b/MediaBrowser.Model/Dlna/DeviceIdentification.cs
@@ -1,6 +1,4 @@
-using System.Xml.Serialization;
-
-namespace MediaBrowser.Model.Dlna
+namespace MediaBrowser.Model.Dlna
 {
     public class DeviceIdentification
     {
@@ -60,23 +58,4 @@ namespace MediaBrowser.Model.Dlna
             Headers = new HttpHeaderInfo[] {};
         }
     }
-
-    public class HttpHeaderInfo
-    {
-        [XmlAttribute("name")]
-        public string Name { get; set; }
-
-        [XmlAttribute("value")]
-        public string Value { get; set; }
-
-        [XmlAttribute("match")]
-        public HeaderMatchType Match { get; set; }
-    }
-
-    public enum HeaderMatchType
-    {
-        Equals = 0,
-        Regex = 1,
-        Substring = 2
-    }
 }
diff --git a/MediaBrowser.Model/Dlna/DeviceProfileInfo.cs b/MediaBrowser.Model/Dlna/DeviceProfileInfo.cs
index ceb27386c1..b2afdf2924 100644
--- a/MediaBrowser.Model/Dlna/DeviceProfileInfo.cs
+++ b/MediaBrowser.Model/Dlna/DeviceProfileInfo.cs
@@ -21,10 +21,4 @@ namespace MediaBrowser.Model.Dlna
         /// <value>The type.</value>
         public DeviceProfileType Type { get; set; }
     }
-
-    public enum DeviceProfileType
-    {
-        System = 0,
-        User = 1
-    }
 }
diff --git a/MediaBrowser.Model/Dlna/DeviceProfileType.cs b/MediaBrowser.Model/Dlna/DeviceProfileType.cs
new file mode 100644
index 0000000000..f881a45395
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/DeviceProfileType.cs
@@ -0,0 +1,8 @@
+namespace MediaBrowser.Model.Dlna
+{
+    public enum DeviceProfileType
+    {
+        System = 0,
+        User = 1
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/DirectPlayProfile.cs b/MediaBrowser.Model/Dlna/DirectPlayProfile.cs
index e195c94507..5cfcafca42 100644
--- a/MediaBrowser.Model/Dlna/DirectPlayProfile.cs
+++ b/MediaBrowser.Model/Dlna/DirectPlayProfile.cs
@@ -33,20 +33,4 @@ namespace MediaBrowser.Model.Dlna
             return (VideoCodec ?? string.Empty).Split(',').Where(i => !string.IsNullOrEmpty(i)).ToList();
         }
     }
-
-    public class XmlAttribute
-    {
-        [XmlAttribute("name")]
-        public string Name { get; set; }
-
-        [XmlAttribute("value")]
-        public string Value { get; set; }
-    }
-
-    public enum DlnaProfileType
-    {
-        Audio = 0,
-        Video = 1,
-        Photo = 2
-    }
 }
diff --git a/MediaBrowser.Model/Dlna/DlnaFlags.cs b/MediaBrowser.Model/Dlna/DlnaFlags.cs
new file mode 100644
index 0000000000..23859312dc
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/DlnaFlags.cs
@@ -0,0 +1,21 @@
+using System;
+
+namespace MediaBrowser.Model.Dlna
+{
+    [Flags]
+    public enum DlnaFlags : ulong
+    {
+        BackgroundTransferMode = (1 << 22),
+        ByteBasedSeek = (1 << 29),
+        ConnectionStall = (1 << 21),
+        DlnaV15 = (1 << 20),
+        InteractiveTransferMode = (1 << 23),
+        PlayContainer = (1 << 28),
+        RtspPause = (1 << 25),
+        S0Increase = (1 << 27),
+        SenderPaced = (1L << 31),
+        SnIncrease = (1 << 26),
+        StreamingTransferMode = (1 << 24),
+        TimeBasedSeek = (1 << 30)
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/DlnaMaps.cs b/MediaBrowser.Model/Dlna/DlnaMaps.cs
index d2871474ad..0a4069d8f5 100644
--- a/MediaBrowser.Model/Dlna/DlnaMaps.cs
+++ b/MediaBrowser.Model/Dlna/DlnaMaps.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace MediaBrowser.Model.Dlna
+namespace MediaBrowser.Model.Dlna
 {
     public class DlnaMaps
     {
@@ -55,21 +53,4 @@ namespace MediaBrowser.Model.Dlna
             return orgOp;
         }
     }
-
-    [Flags]
-    public enum DlnaFlags : ulong
-    {
-        BackgroundTransferMode = (1 << 22),
-        ByteBasedSeek = (1 << 29),
-        ConnectionStall = (1 << 21),
-        DlnaV15 = (1 << 20),
-        InteractiveTransferMode = (1 << 23),
-        PlayContainer = (1 << 28),
-        RtspPause = (1 << 25),
-        S0Increase = (1 << 27),
-        SenderPaced = (1L << 31),
-        SnIncrease = (1 << 26),
-        StreamingTransferMode = (1 << 24),
-        TimeBasedSeek = (1 << 30)
-    }
 }
diff --git a/MediaBrowser.Model/Dlna/DlnaProfileType.cs b/MediaBrowser.Model/Dlna/DlnaProfileType.cs
new file mode 100644
index 0000000000..1bad14081a
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/DlnaProfileType.cs
@@ -0,0 +1,9 @@
+namespace MediaBrowser.Model.Dlna
+{
+    public enum DlnaProfileType
+    {
+        Audio = 0,
+        Video = 1,
+        Photo = 2
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/HeaderMatchType.cs b/MediaBrowser.Model/Dlna/HeaderMatchType.cs
new file mode 100644
index 0000000000..7a0d5c24f9
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/HeaderMatchType.cs
@@ -0,0 +1,9 @@
+namespace MediaBrowser.Model.Dlna
+{
+    public enum HeaderMatchType
+    {
+        Equals = 0,
+        Regex = 1,
+        Substring = 2
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/HttpHeaderInfo.cs b/MediaBrowser.Model/Dlna/HttpHeaderInfo.cs
new file mode 100644
index 0000000000..926963ef67
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/HttpHeaderInfo.cs
@@ -0,0 +1,16 @@
+using System.Xml.Serialization;
+
+namespace MediaBrowser.Model.Dlna
+{
+    public class HttpHeaderInfo
+    {
+        [XmlAttribute("name")]
+        public string Name { get; set; }
+
+        [XmlAttribute("value")]
+        public string Value { get; set; }
+
+        [XmlAttribute("match")]
+        public HeaderMatchType Match { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/ProfileCondition.cs b/MediaBrowser.Model/Dlna/ProfileCondition.cs
new file mode 100644
index 0000000000..24733426c8
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/ProfileCondition.cs
@@ -0,0 +1,24 @@
+using System.Xml.Serialization;
+
+namespace MediaBrowser.Model.Dlna
+{
+    public class ProfileCondition
+    {
+        [XmlAttribute("condition")]
+        public ProfileConditionType Condition { get; set; }
+
+        [XmlAttribute("property")]
+        public ProfileConditionValue Property { get; set; }
+
+        [XmlAttribute("value")]
+        public string Value { get; set; }
+
+        [XmlAttribute("isRequired")]
+        public bool IsRequired { get; set; }
+
+        public ProfileCondition()
+        {
+            IsRequired = true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/ProfileConditionType.cs b/MediaBrowser.Model/Dlna/ProfileConditionType.cs
new file mode 100644
index 0000000000..22156c47d7
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/ProfileConditionType.cs
@@ -0,0 +1,10 @@
+namespace MediaBrowser.Model.Dlna
+{
+    public enum ProfileConditionType
+    {
+        Equals = 0,
+        NotEquals = 1,
+        LessThanEqual = 2,
+        GreaterThanEqual = 3
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/ProfileConditionValue.cs b/MediaBrowser.Model/Dlna/ProfileConditionValue.cs
new file mode 100644
index 0000000000..56a322f5ad
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/ProfileConditionValue.cs
@@ -0,0 +1,19 @@
+namespace MediaBrowser.Model.Dlna
+{
+    public enum ProfileConditionValue
+    {
+        AudioChannels,
+        AudioBitrate,
+        AudioProfile,
+        Width,
+        Height,
+        Has64BitOffsets,
+        PacketLength,
+        VideoBitDepth,
+        VideoBitrate,
+        VideoFramerate,
+        VideoLevel,
+        VideoProfile,
+        VideoTimestamp
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/SearchCriteria.cs b/MediaBrowser.Model/Dlna/SearchCriteria.cs
index d3f8b83322..bb4221b513 100644
--- a/MediaBrowser.Model/Dlna/SearchCriteria.cs
+++ b/MediaBrowser.Model/Dlna/SearchCriteria.cs
@@ -37,13 +37,4 @@ namespace MediaBrowser.Model.Dlna
             }
         }
     }
-
-    public enum SearchType
-    {
-        Unknown = 0,
-        Audio = 1,
-        Image = 2,
-        Video = 3,
-        Playlist = 4
-    }
 }
diff --git a/MediaBrowser.Model/Dlna/SearchType.cs b/MediaBrowser.Model/Dlna/SearchType.cs
new file mode 100644
index 0000000000..68c047603d
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/SearchType.cs
@@ -0,0 +1,11 @@
+namespace MediaBrowser.Model.Dlna
+{
+    public enum SearchType
+    {
+        Unknown = 0,
+        Audio = 1,
+        Image = 2,
+        Video = 3,
+        Playlist = 4
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index ae9806f974..9af3689b22 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -403,47 +403,4 @@ namespace MediaBrowser.Model.Dlna
             }
         }
     }
-
-    /// <summary>
-    /// Class AudioOptions.
-    /// </summary>
-    public class AudioOptions
-    {
-        public string ItemId { get; set; }
-        public List<MediaSourceInfo> MediaSources { get; set; }
-        public DeviceProfile Profile { get; set; }
-
-        /// <summary>
-        /// Optional. Only needed if a specific AudioStreamIndex or SubtitleStreamIndex are requested.
-        /// </summary>
-        public string MediaSourceId { get; set; }
-
-        public string DeviceId { get; set; }
-
-        /// <summary>
-        /// Allows an override of supported number of audio channels
-        /// Example: DeviceProfile supports five channel, but user only has stereo speakers
-        /// </summary>
-        public int? MaxAudioChannels { get; set; }
-
-        /// <summary>
-        /// The application's configured quality setting
-        /// </summary>
-        public int? MaxBitrate { get; set; }
-    }
-
-    /// <summary>
-    /// Class VideoOptions.
-    /// </summary>
-    public class VideoOptions : AudioOptions
-    {
-        public int? AudioStreamIndex { get; set; }
-        public int? SubtitleStreamIndex { get; set; }
-        public int? MaxAudioTranscodingBitrate { get; set; }
-
-        public VideoOptions()
-        {
-            MaxAudioTranscodingBitrate = 128000;
-        }
-    }
 }
diff --git a/MediaBrowser.Model/Dlna/TranscodeSeekInfo.cs b/MediaBrowser.Model/Dlna/TranscodeSeekInfo.cs
new file mode 100644
index 0000000000..564ce5c605
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/TranscodeSeekInfo.cs
@@ -0,0 +1,8 @@
+namespace MediaBrowser.Model.Dlna
+{
+    public enum TranscodeSeekInfo
+    {
+        Auto = 0,
+        Bytes = 1
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/TranscodingProfile.cs b/MediaBrowser.Model/Dlna/TranscodingProfile.cs
index ba02e9be25..162d62718a 100644
--- a/MediaBrowser.Model/Dlna/TranscodingProfile.cs
+++ b/MediaBrowser.Model/Dlna/TranscodingProfile.cs
@@ -38,10 +38,4 @@ namespace MediaBrowser.Model.Dlna
             return (AudioCodec ?? string.Empty).Split(',').Where(i => !string.IsNullOrEmpty(i)).ToList();
         }
     }
-
-    public enum TranscodeSeekInfo
-    {
-        Auto = 0,
-        Bytes = 1
-    }
 }
diff --git a/MediaBrowser.Model/Dlna/VideoOptions.cs b/MediaBrowser.Model/Dlna/VideoOptions.cs
new file mode 100644
index 0000000000..39a5ab1b1c
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/VideoOptions.cs
@@ -0,0 +1,17 @@
+namespace MediaBrowser.Model.Dlna
+{
+    /// <summary>
+    /// Class VideoOptions.
+    /// </summary>
+    public class VideoOptions : AudioOptions
+    {
+        public int? AudioStreamIndex { get; set; }
+        public int? SubtitleStreamIndex { get; set; }
+        public int? MaxAudioTranscodingBitrate { get; set; }
+
+        public VideoOptions()
+        {
+            MaxAudioTranscodingBitrate = 128000;
+        }
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/XmlAttribute.cs b/MediaBrowser.Model/Dlna/XmlAttribute.cs
new file mode 100644
index 0000000000..e8e13ba0de
--- /dev/null
+++ b/MediaBrowser.Model/Dlna/XmlAttribute.cs
@@ -0,0 +1,13 @@
+using System.Xml.Serialization;
+
+namespace MediaBrowser.Model.Dlna
+{
+    public class XmlAttribute
+    {
+        [XmlAttribute("name")]
+        public string Name { get; set; }
+
+        [XmlAttribute("value")]
+        public string Value { get; set; }
+    }
+}
\ No newline at end of file