From 875392c77fce26f2b51142f65998a1d73727310b Mon Sep 17 00:00:00 2001 From: Andrew Rabert Date: Sat, 19 Jan 2019 22:38:41 -0500 Subject: [PATCH] Combine Emby.Drawing and Emby.Drawing.Skia --- Emby.Drawing.Skia/Emby.Drawing.Skia.csproj | 24 --------------- Emby.Drawing.Skia/Properties/AssemblyInfo.cs | 21 -------------- Emby.Drawing/Emby.Drawing.csproj | 29 ++++++++++--------- .../PercentPlayedDrawer.cs | 2 +- .../PlayedIndicatorDrawer.cs | 2 +- .../SkiaEncoder.cs | 2 +- .../StripCollageBuilder.cs | 2 +- .../UnplayedCountIndicator.cs | 2 +- Jellyfin.Server/Jellyfin.Server.csproj | 1 - Jellyfin.Server/Program.cs | 1 - MediaBrowser.sln | 6 ---- 11 files changed, 21 insertions(+), 71 deletions(-) delete mode 100644 Emby.Drawing.Skia/Emby.Drawing.Skia.csproj delete mode 100644 Emby.Drawing.Skia/Properties/AssemblyInfo.cs rename {Emby.Drawing.Skia => Emby.Drawing}/PercentPlayedDrawer.cs (97%) rename {Emby.Drawing.Skia => Emby.Drawing}/PlayedIndicatorDrawer.cs (98%) rename {Emby.Drawing.Skia => Emby.Drawing}/SkiaEncoder.cs (99%) rename {Emby.Drawing.Skia => Emby.Drawing}/StripCollageBuilder.cs (99%) rename {Emby.Drawing.Skia => Emby.Drawing}/UnplayedCountIndicator.cs (98%) diff --git a/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj b/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj deleted file mode 100644 index c36d42194f..0000000000 --- a/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj +++ /dev/null @@ -1,24 +0,0 @@ - - - - netstandard2.0 - false - - - - - - - - - - - - - - - - - - - diff --git a/Emby.Drawing.Skia/Properties/AssemblyInfo.cs b/Emby.Drawing.Skia/Properties/AssemblyInfo.cs deleted file mode 100644 index 521010cdbd..0000000000 --- a/Emby.Drawing.Skia/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Reflection; -using System.Resources; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Emby.Drawing.Skia")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Jellyfin Project")] -[assembly: AssemblyProduct("Jellyfin: The Free Software Media System")] -[assembly: AssemblyCopyright("Copyright © 2019 Jellyfin Contributors. Code released under the GNU General Public License Version 2")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: NeutralResourcesLanguage("en")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] diff --git a/Emby.Drawing/Emby.Drawing.csproj b/Emby.Drawing/Emby.Drawing.csproj index 542d7f5639..c36d42194f 100644 --- a/Emby.Drawing/Emby.Drawing.csproj +++ b/Emby.Drawing/Emby.Drawing.csproj @@ -1,21 +1,24 @@ - - - - - - - - - - - - - netstandard2.0 false + + + + + + + + + + + + + + + + diff --git a/Emby.Drawing.Skia/PercentPlayedDrawer.cs b/Emby.Drawing/PercentPlayedDrawer.cs similarity index 97% rename from Emby.Drawing.Skia/PercentPlayedDrawer.cs rename to Emby.Drawing/PercentPlayedDrawer.cs index a204999fe3..3ab5f34bc3 100644 --- a/Emby.Drawing.Skia/PercentPlayedDrawer.cs +++ b/Emby.Drawing/PercentPlayedDrawer.cs @@ -2,7 +2,7 @@ using System; using MediaBrowser.Model.Drawing; using SkiaSharp; -namespace Emby.Drawing.Skia +namespace Emby.Drawing { public class PercentPlayedDrawer { diff --git a/Emby.Drawing.Skia/PlayedIndicatorDrawer.cs b/Emby.Drawing/PlayedIndicatorDrawer.cs similarity index 98% rename from Emby.Drawing.Skia/PlayedIndicatorDrawer.cs rename to Emby.Drawing/PlayedIndicatorDrawer.cs index 7e9cb8c5cb..92a164a5fe 100644 --- a/Emby.Drawing.Skia/PlayedIndicatorDrawer.cs +++ b/Emby.Drawing/PlayedIndicatorDrawer.cs @@ -4,7 +4,7 @@ using MediaBrowser.Model.Drawing; using MediaBrowser.Model.IO; using SkiaSharp; -namespace Emby.Drawing.Skia +namespace Emby.Drawing { public class PlayedIndicatorDrawer { diff --git a/Emby.Drawing.Skia/SkiaEncoder.cs b/Emby.Drawing/SkiaEncoder.cs similarity index 99% rename from Emby.Drawing.Skia/SkiaEncoder.cs rename to Emby.Drawing/SkiaEncoder.cs index 8f517681e8..dc571f4a04 100644 --- a/Emby.Drawing.Skia/SkiaEncoder.cs +++ b/Emby.Drawing/SkiaEncoder.cs @@ -13,7 +13,7 @@ using MediaBrowser.Model.IO; using Microsoft.Extensions.Logging; using SkiaSharp; -namespace Emby.Drawing.Skia +namespace Emby.Drawing { public class SkiaEncoder : IImageEncoder { diff --git a/Emby.Drawing.Skia/StripCollageBuilder.cs b/Emby.Drawing/StripCollageBuilder.cs similarity index 99% rename from Emby.Drawing.Skia/StripCollageBuilder.cs rename to Emby.Drawing/StripCollageBuilder.cs index 8d984de116..dd342998b4 100644 --- a/Emby.Drawing.Skia/StripCollageBuilder.cs +++ b/Emby.Drawing/StripCollageBuilder.cs @@ -5,7 +5,7 @@ using MediaBrowser.Common.Configuration; using MediaBrowser.Model.IO; using SkiaSharp; -namespace Emby.Drawing.Skia +namespace Emby.Drawing { public class StripCollageBuilder { diff --git a/Emby.Drawing.Skia/UnplayedCountIndicator.cs b/Emby.Drawing/UnplayedCountIndicator.cs similarity index 98% rename from Emby.Drawing.Skia/UnplayedCountIndicator.cs rename to Emby.Drawing/UnplayedCountIndicator.cs index e1d1ecff83..caa3e465be 100644 --- a/Emby.Drawing.Skia/UnplayedCountIndicator.cs +++ b/Emby.Drawing/UnplayedCountIndicator.cs @@ -5,7 +5,7 @@ using MediaBrowser.Model.Drawing; using MediaBrowser.Model.IO; using SkiaSharp; -namespace Emby.Drawing.Skia +namespace Emby.Drawing { public class UnplayedCountIndicator { diff --git a/Jellyfin.Server/Jellyfin.Server.csproj b/Jellyfin.Server/Jellyfin.Server.csproj index f17e06e69e..897d933396 100644 --- a/Jellyfin.Server/Jellyfin.Server.csproj +++ b/Jellyfin.Server/Jellyfin.Server.csproj @@ -43,7 +43,6 @@ - diff --git a/Jellyfin.Server/Program.cs b/Jellyfin.Server/Program.cs index 51ad537499..d077616199 100644 --- a/Jellyfin.Server/Program.cs +++ b/Jellyfin.Server/Program.cs @@ -9,7 +9,6 @@ using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; using Emby.Drawing; -using Emby.Drawing.Skia; using Emby.Server.Implementations; using Emby.Server.Implementations.EnvironmentInfo; using Emby.Server.Implementations.IO; diff --git a/MediaBrowser.sln b/MediaBrowser.sln index f1976c3c7e..0f0c24a25f 100644 --- a/MediaBrowser.sln +++ b/MediaBrowser.sln @@ -34,8 +34,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RSSDP", "RSSDP\RSSDP.csproj EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emby.Dlna", "Emby.Dlna\Emby.Dlna.csproj", "{805844AB-E92F-45E6-9D99-4F6D48D129A5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emby.Drawing.Skia", "Emby.Drawing.Skia\Emby.Drawing.Skia.csproj", "{2312DA6D-FF86-4597-9777-BCEEC32D96DD}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Nat", "Mono.Nat\Mono.Nat.csproj", "{CB7F2326-6497-4A3D-BA03-48513B17A7BE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SocketHttpListener", "SocketHttpListener\SocketHttpListener.csproj", "{1D74413B-E7CF-455B-B021-F52BDF881542}" @@ -130,10 +128,6 @@ Global {805844AB-E92F-45E6-9D99-4F6D48D129A5}.Debug|Any CPU.Build.0 = Debug|Any CPU {805844AB-E92F-45E6-9D99-4F6D48D129A5}.Release|Any CPU.ActiveCfg = Release|Any CPU {805844AB-E92F-45E6-9D99-4F6D48D129A5}.Release|Any CPU.Build.0 = Release|Any CPU - {2312DA6D-FF86-4597-9777-BCEEC32D96DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2312DA6D-FF86-4597-9777-BCEEC32D96DD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2312DA6D-FF86-4597-9777-BCEEC32D96DD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2312DA6D-FF86-4597-9777-BCEEC32D96DD}.Release|Any CPU.Build.0 = Release|Any CPU {CB7F2326-6497-4A3D-BA03-48513B17A7BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CB7F2326-6497-4A3D-BA03-48513B17A7BE}.Debug|Any CPU.Build.0 = Debug|Any CPU {CB7F2326-6497-4A3D-BA03-48513B17A7BE}.Release|Any CPU.ActiveCfg = Release|Any CPU