mirror of https://github.com/jellyfin/jellyfin.git
moved new image options to the model
This commit is contained in:
parent
06a7eb78ee
commit
088df67fca
|
@ -1,4 +1,4 @@
|
||||||
using MediaBrowser.Controller.Drawing;
|
using MediaBrowser.Model.Drawing;
|
||||||
using MediaBrowser.Model.Entities;
|
using MediaBrowser.Model.Entities;
|
||||||
using ServiceStack.ServiceHost;
|
using ServiceStack.ServiceHost;
|
||||||
|
|
||||||
|
|
|
@ -7,6 +7,7 @@ using MediaBrowser.Controller.Entities;
|
||||||
using MediaBrowser.Controller.Library;
|
using MediaBrowser.Controller.Library;
|
||||||
using MediaBrowser.Controller.Persistence;
|
using MediaBrowser.Controller.Persistence;
|
||||||
using MediaBrowser.Controller.Providers;
|
using MediaBrowser.Controller.Providers;
|
||||||
|
using MediaBrowser.Model.Drawing;
|
||||||
using MediaBrowser.Model.Dto;
|
using MediaBrowser.Model.Dto;
|
||||||
using MediaBrowser.Model.Entities;
|
using MediaBrowser.Model.Entities;
|
||||||
using ServiceStack.ServiceHost;
|
using ServiceStack.ServiceHost;
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
using MediaBrowser.Controller.Entities;
|
using MediaBrowser.Controller.Entities;
|
||||||
using MediaBrowser.Controller.Providers;
|
using MediaBrowser.Controller.Providers;
|
||||||
|
using MediaBrowser.Model.Drawing;
|
||||||
using MediaBrowser.Model.Entities;
|
using MediaBrowser.Model.Entities;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
@ -36,19 +37,4 @@ namespace MediaBrowser.Controller.Drawing
|
||||||
|
|
||||||
public ImageOverlay Indicator { get; set; }
|
public ImageOverlay Indicator { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public enum ImageOutputFormat
|
|
||||||
{
|
|
||||||
Original,
|
|
||||||
Bmp,
|
|
||||||
Gif,
|
|
||||||
Jpg,
|
|
||||||
Png
|
|
||||||
}
|
|
||||||
|
|
||||||
public enum ImageOverlay
|
|
||||||
{
|
|
||||||
None,
|
|
||||||
Watched
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -83,6 +83,12 @@
|
||||||
<Compile Include="..\MediaBrowser.Model\Drawing\DrawingUtils.cs">
|
<Compile Include="..\MediaBrowser.Model\Drawing\DrawingUtils.cs">
|
||||||
<Link>Drawing\DrawingUtils.cs</Link>
|
<Link>Drawing\DrawingUtils.cs</Link>
|
||||||
</Compile>
|
</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">
|
<Compile Include="..\MediaBrowser.Model\Dto\BaseItemDto.cs">
|
||||||
<Link>Dto\BaseItemDto.cs</Link>
|
<Link>Dto\BaseItemDto.cs</Link>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
|
|
@ -67,6 +67,12 @@
|
||||||
<Compile Include="..\MediaBrowser.Model\Drawing\DrawingUtils.cs">
|
<Compile Include="..\MediaBrowser.Model\Drawing\DrawingUtils.cs">
|
||||||
<Link>Drawing\DrawingUtils.cs</Link>
|
<Link>Drawing\DrawingUtils.cs</Link>
|
||||||
</Compile>
|
</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">
|
<Compile Include="..\MediaBrowser.Model\Dto\BaseItemDto.cs">
|
||||||
<Link>Dto\BaseItemDto.cs</Link>
|
<Link>Dto\BaseItemDto.cs</Link>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
|
|
@ -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
|
||||||
|
}
|
||||||
|
}
|
|
@ -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
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,5 +1,6 @@
|
||||||
using System;
|
using MediaBrowser.Model.Drawing;
|
||||||
using MediaBrowser.Model.Entities;
|
using MediaBrowser.Model.Entities;
|
||||||
|
using System;
|
||||||
|
|
||||||
namespace MediaBrowser.Model.Dto
|
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>
|
/// <value><c>true</c> if [enable image enhancers]; otherwise, <c>false</c>.</value>
|
||||||
public bool EnableImageEnhancers { get; set; }
|
public bool EnableImageEnhancers { get; set; }
|
||||||
|
|
||||||
|
public ImageOutputFormat Format { get; set; }
|
||||||
|
|
||||||
|
public ImageOverlay Indicator { get; set; }
|
||||||
|
|
||||||
public ImageOptions()
|
public ImageOptions()
|
||||||
{
|
{
|
||||||
EnableImageEnhancers = true;
|
EnableImageEnhancers = true;
|
||||||
|
|
||||||
|
Format = ImageOutputFormat.Original;
|
||||||
|
Indicator = ImageOverlay.None;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,6 +46,8 @@
|
||||||
<Compile Include="Configuration\BaseApplicationConfiguration.cs" />
|
<Compile Include="Configuration\BaseApplicationConfiguration.cs" />
|
||||||
<Compile Include="Configuration\ManualLoginCategory.cs" />
|
<Compile Include="Configuration\ManualLoginCategory.cs" />
|
||||||
<Compile Include="Configuration\ServerConfiguration.cs" />
|
<Compile Include="Configuration\ServerConfiguration.cs" />
|
||||||
|
<Compile Include="Drawing\ImageOverlay.cs" />
|
||||||
|
<Compile Include="Drawing\ImageOutputFormat.cs" />
|
||||||
<Compile Include="Dto\BaseItemPerson.cs" />
|
<Compile Include="Dto\BaseItemPerson.cs" />
|
||||||
<Compile Include="Dto\ChapterInfoDto.cs" />
|
<Compile Include="Dto\ChapterInfoDto.cs" />
|
||||||
<Compile Include="Dto\IItemDto.cs" />
|
<Compile Include="Dto\IItemDto.cs" />
|
||||||
|
|
Loading…
Reference in New Issue