diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-04-27 16:43:52 -0400 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2017-04-27 16:43:52 -0400 |
| commit | fd99329a00d02635c58847c94c41000b5956b790 (patch) | |
| tree | 4affbda494f24b33530085f5bae521c2e661d280 | |
| parent | 0f07d97031f8680dc9df0ad8752141c46bbc9c2b (diff) | |
update mac project
| -rw-r--r-- | MediaBrowser.Server.Mac/Emby.Server.Mac.csproj | 9 | ||||
| -rw-r--r-- | MediaBrowser.Server.Mac/Main.cs | 8 |
2 files changed, 5 insertions, 12 deletions
diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index 0cf488bd0..6b599953d 100644 --- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -2345,9 +2345,6 @@ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\moviesrecommended.js">
<Link>Resources\dashboard-ui\scripts\moviesrecommended.js</Link>
</BundleResource>
- <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\moviestudios.js">
- <Link>Resources\dashboard-ui\scripts\moviestudios.js</Link>
- </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\movietrailers.js">
<Link>Resources\dashboard-ui\scripts\movietrailers.js</Link>
</BundleResource>
@@ -2357,12 +2354,12 @@ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\musicartists.js">
<Link>Resources\dashboard-ui\scripts\musicartists.js</Link>
</BundleResource>
- <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\musicfolders.js">
- <Link>Resources\dashboard-ui\scripts\musicfolders.js</Link>
- </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\musicgenres.js">
<Link>Resources\dashboard-ui\scripts\musicgenres.js</Link>
</BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\musicplaylists.js">
+ <Link>Resources\dashboard-ui\scripts\musicplaylists.js</Link>
+ </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\musicrecommended.js">
<Link>Resources\dashboard-ui\scripts\musicrecommended.js</Link>
</BundleResource>
diff --git a/MediaBrowser.Server.Mac/Main.cs b/MediaBrowser.Server.Mac/Main.cs index d703f7d0d..2acbe7ce4 100644 --- a/MediaBrowser.Server.Mac/Main.cs +++ b/MediaBrowser.Server.Mac/Main.cs @@ -32,6 +32,7 @@ using Mono.Unix.Native; using MediaBrowser.Model.System; using MediaBrowser.Model.IO; using Emby.Server.Core.Logging; +using Emby.Drawing.Net; namespace MediaBrowser.Server.Mac { @@ -111,12 +112,7 @@ namespace MediaBrowser.Server.Mac _fileSystem = fileSystem; - var imageEncoder = ImageEncoderHelper.GetImageEncoder(_logger, - logManager, - fileSystem, - options, - () => AppHost.HttpClient, - appPaths); + var imageEncoder = new GDIImageEncoder(fileSystem, logManager.GetLogger("GDI")); AppHost = new MacAppHost(appPaths, logManager, |