moved new image options to the model

9 files changed, 74 insertions, 17 deletions

diff --git a/MediaBrowser.Api/Images/ImageRequest.cs b/MediaBrowser.Api/Images/ImageRequest.cs
index 1302b5000..fcb731f59 100644
--- a/MediaBrowser.Api/Images/ImageRequest.cs
+++ b/MediaBrowser.Api/Images/ImageRequest.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Controller.Drawing;
+using MediaBrowser.Model.Drawing;
 using MediaBrowser.Model.Entities;
 using ServiceStack.ServiceHost;
 
diff --git a/MediaBrowser.Api/Images/ImageService.cs b/MediaBrowser.Api/Images/ImageService.cs
index 0a76175fd..298d26a13 100644
--- a/MediaBrowser.Api/Images/ImageService.cs
+++ b/MediaBrowser.Api/Images/ImageService.cs
@@ -7,6 +7,7 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Drawing;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using ServiceStack.ServiceHost;
diff --git a/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs b/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs
index b7f092fb8..b639d0b9c 100644
--- a/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs
+++ b/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs
@@ -1,5 +1,6 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Drawing;
 using MediaBrowser.Model.Entities;
 using System;
 using System.Collections.Generic;
@@ -36,19 +37,4 @@ namespace MediaBrowser.Controller.Drawing
 
         public ImageOverlay Indicator { get; set; }
     }
-
-    public enum ImageOutputFormat
-    {
-        Original,
-        Bmp,
-        Gif,
-        Jpg,
-        Png
-    }
-
-    public enum ImageOverlay
-    {
-        None,
-        Watched
-    }
 }
diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
index 2098007d2..eefabce76 100644
--- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
+++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
@@ -83,6 +83,12 @@
     <Compile Include="..\MediaBrowser.Model\Drawing\DrawingUtils.cs">
       <Link>Drawing\DrawingUtils.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Drawing\ImageOutputFormat.cs">
+      <Link>Drawing\ImageOutputFormat.cs</Link>
+    </Compile>
+    <Compile Include="..\MediaBrowser.Model\Drawing\ImageOverlay.cs">
+      <Link>Drawing\ImageOverlay.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Dto\BaseItemDto.cs">
       <Link>Dto\BaseItemDto.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
index 4286c91eb..9a491bcd4 100644
--- a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
+++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
@@ -67,6 +67,12 @@
     <Compile Include="..\MediaBrowser.Model\Drawing\DrawingUtils.cs">
       <Link>Drawing\DrawingUtils.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Drawing\ImageOutputFormat.cs">
+      <Link>Drawing\ImageOutputFormat.cs</Link>
+    </Compile>
+    <Compile Include="..\MediaBrowser.Model\Drawing\ImageOverlay.cs">
+      <Link>Drawing\ImageOverlay.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Dto\BaseItemDto.cs">
       <Link>Dto\BaseItemDto.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model/Drawing/ImageOutputFormat.cs b/MediaBrowser.Model/Drawing/ImageOutputFormat.cs
new file mode 100644
index 000000000..6cbe75a7a
--- /dev/null
+++ b/MediaBrowser.Model/Drawing/ImageOutputFormat.cs
@@ -0,0 +1,30 @@
+
+namespace MediaBrowser.Model.Drawing
+{
+    /// <summary>
+    /// Enum ImageOutputFormat
+    /// </summary>
+    public enum ImageOutputFormat
+    {
+        /// <summary>
+        /// The original
+        /// </summary>
+        Original,
+        /// <summary>
+        /// The BMP
+        /// </summary>
+        Bmp,
+        /// <summary>
+        /// The GIF
+        /// </summary>
+        Gif,
+        /// <summary>
+        /// The JPG
+        /// </summary>
+        Jpg,
+        /// <summary>
+        /// The PNG
+        /// </summary>
+        Png
+    }
+}
diff --git a/MediaBrowser.Model/Drawing/ImageOverlay.cs b/MediaBrowser.Model/Drawing/ImageOverlay.cs
new file mode 100644
index 000000000..9b6400f1c
--- /dev/null
+++ b/MediaBrowser.Model/Drawing/ImageOverlay.cs
@@ -0,0 +1,18 @@
+
+namespace MediaBrowser.Model.Drawing
+{
+    /// <summary>
+    /// Enum ImageOverlay
+    /// </summary>
+    public enum ImageOverlay
+    {
+        /// <summary>
+        /// The none
+        /// </summary>
+        None,
+        /// <summary>
+        /// The watched
+        /// </summary>
+        Watched
+    }
+}
diff --git a/MediaBrowser.Model/Dto/ImageOptions.cs b/MediaBrowser.Model/Dto/ImageOptions.cs
index 8e1610d1f..427656186 100644
--- a/MediaBrowser.Model/Dto/ImageOptions.cs
+++ b/MediaBrowser.Model/Dto/ImageOptions.cs
@@ -1,5 +1,6 @@
-using System;
+using MediaBrowser.Model.Drawing;
 using MediaBrowser.Model.Entities;
+using System;
 
 namespace MediaBrowser.Model.Dto
 {
@@ -69,9 +70,16 @@ namespace MediaBrowser.Model.Dto
         /// <value><c>true</c> if [enable image enhancers]; otherwise, <c>false</c>.</value>
         public bool EnableImageEnhancers { get; set; }
 
+        public ImageOutputFormat Format { get; set; }
+
+        public ImageOverlay Indicator { get; set; }
+        
         public ImageOptions()
         {
             EnableImageEnhancers = true;
+
+            Format = ImageOutputFormat.Original;
+            Indicator = ImageOverlay.None;
         }
     }
 }
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index d0e7ffd7b..0822bfbc3 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -46,6 +46,8 @@
     <Compile Include="Configuration\BaseApplicationConfiguration.cs" />
     <Compile Include="Configuration\ManualLoginCategory.cs" />
     <Compile Include="Configuration\ServerConfiguration.cs" />
+    <Compile Include="Drawing\ImageOverlay.cs" />
+    <Compile Include="Drawing\ImageOutputFormat.cs" />
     <Compile Include="Dto\BaseItemPerson.cs" />
     <Compile Include="Dto\ChapterInfoDto.cs" />
     <Compile Include="Dto\IItemDto.cs" />