Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-11-04 03:27:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2932 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2017-10-02 00:54:33 -04:00 committed by GitHub
commit 39894b51e5
3 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
View File

@ -96,8 +96,8 @@
<HintPath>..\packages\ServiceStack.Text.4.5.8\lib\net45\ServiceStack.Text.dll</HintPath> <HintPath>..\packages\ServiceStack.Text.4.5.8\lib\net45\ServiceStack.Text.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="SharpCompress, Version=0.14.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="SharpCompress, Version=0.18.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SharpCompress.0.14.0\lib\net45\SharpCompress.dll</HintPath> <HintPath>..\packages\SharpCompress.0.18.2\lib\net45\SharpCompress.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="SimpleInjector, Version=4.0.8.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL"> <Reference Include="SimpleInjector, Version=4.0.8.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
@ -109,7 +109,7 @@
<HintPath>..\ThirdParty\taglib\TagLib.Portable.dll</HintPath> <HintPath>..\ThirdParty\taglib\TagLib.Portable.dll</HintPath>
</Reference> </Reference>
<Reference Include="SkiaSharp"> <Reference Include="SkiaSharp">
<HintPath>..\packages\SkiaSharp.1.58.0\lib\net45\SkiaSharp.dll</HintPath> <HintPath>..\packages\SkiaSharp.1.58.1\lib\net45\SkiaSharp.dll</HintPath>
</Reference> </Reference>
<Reference Include="SQLitePCLRaw.core"> <Reference Include="SQLitePCLRaw.core">
<HintPath>..\packages\SQLitePCLRaw.core.1.1.8\lib\net45\SQLitePCLRaw.core.dll</HintPath> <HintPath>..\packages\SQLitePCLRaw.core.1.1.8\lib\net45\SQLitePCLRaw.core.dll</HintPath>
@ -435,9 +435,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\plugins.html"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\plugins.html">
<Link>Resources\dashboard-ui\plugins.html</Link> <Link>Resources\dashboard-ui\plugins.html</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\reports.html">
<Link>Resources\dashboard-ui\reports.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\robots.txt"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\robots.txt">
<Link>Resources\dashboard-ui\robots.txt</Link> <Link>Resources\dashboard-ui\robots.txt</Link>
</BundleResource> </BundleResource>
@ -675,9 +672,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\browserdeviceprofile.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\browserdeviceprofile.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\browserdeviceprofile.js</Link> <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\browserdeviceprofile.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\chromecastplayer.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\chromecastplayer.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\clearbutton.css"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\clearbutton.css">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\clearbutton.css</Link> <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\clearbutton.css</Link>
</BundleResource> </BundleResource>
@ -828,6 +822,12 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\cardbuilder\roundcard.css"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\cardbuilder\roundcard.css">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\cardbuilder\roundcard.css</Link> <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\cardbuilder\roundcard.css</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\chromecast\chromecasthelpers.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\chromecast\chromecasthelpers.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\chromecast\chromecastplayer.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\chromecast\chromecastplayer.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\collectioneditor\collectioneditor.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\collectioneditor\collectioneditor.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\collectioneditor\collectioneditor.js</Link> <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\collectioneditor\collectioneditor.js</Link>
</BundleResource> </BundleResource>
@ -1038,6 +1038,15 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\images\style.css"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\images\style.css">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\images\style.css</Link> <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\images\style.css</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\imageuploader\imageuploader.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\imageuploader\imageuploader.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\imageuploader\imageuploader.template.html">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\imageuploader\imageuploader.template.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\imageuploader\style.css">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\imageuploader\style.css</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\indicators\indicators.css"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\indicators\indicators.css">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\indicators\indicators.css</Link> <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\indicators\indicators.css</Link>
</BundleResource> </BundleResource>
@ -1197,6 +1206,12 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\playback\volumeosd.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\playback\volumeosd.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\playback\volumeosd.js</Link> <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\playback\volumeosd.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\playbacksettings\playbacksettings.js">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\playbacksettings\playbacksettings.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\playbacksettings\playbacksettings.template.html">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\playbacksettings\playbacksettings.template.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\playerstats\playerstats.css"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\playerstats\playerstats.css">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\playerstats\playerstats.css</Link> <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\playerstats\playerstats.css</Link>
</BundleResource> </BundleResource>
@ -1524,6 +1539,15 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\themes\dark-red\theme.css"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\themes\dark-red\theme.css">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\themes\dark-red\theme.css</Link> <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\themes\dark-red\theme.css</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\themes\halloween\bg.jpg">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\themes\halloween\bg.jpg</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\themes\halloween\logo.png">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\themes\halloween\logo.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\themes\halloween\theme.css">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\themes\halloween\theme.css</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\themes\light\logo.png"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\themes\light\logo.png">
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\themes\light\logo.png</Link> <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\themes\light\logo.png</Link>
</BundleResource> </BundleResource>
@ -1740,9 +1764,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\categorysyncbuttons.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\categorysyncbuttons.js">
<Link>Resources\dashboard-ui\components\categorysyncbuttons.js</Link> <Link>Resources\dashboard-ui\components\categorysyncbuttons.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\chromecasthelpers.js">
<Link>Resources\dashboard-ui\components\chromecasthelpers.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\favoriteitems.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\favoriteitems.js">
<Link>Resources\dashboard-ui\components\favoriteitems.js</Link> <Link>Resources\dashboard-ui\components\favoriteitems.js</Link>
</BundleResource> </BundleResource>
@ -1809,12 +1830,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\guestinviter\guestinviter.template.html"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\guestinviter\guestinviter.template.html">
<Link>Resources\dashboard-ui\components\guestinviter\guestinviter.template.html</Link> <Link>Resources\dashboard-ui\components\guestinviter\guestinviter.template.html</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\imageuploader\imageuploader.js">
<Link>Resources\dashboard-ui\components\imageuploader\imageuploader.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\imageuploader\imageuploader.template.html">
<Link>Resources\dashboard-ui\components\imageuploader\imageuploader.template.html</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\libraryoptionseditor\libraryoptionseditor.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\libraryoptionseditor\libraryoptionseditor.js">
<Link>Resources\dashboard-ui\components\libraryoptionseditor\libraryoptionseditor.js</Link> <Link>Resources\dashboard-ui\components\libraryoptionseditor\libraryoptionseditor.js</Link>
</BundleResource> </BundleResource>
@ -2625,12 +2640,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\strings\zh-tw.json"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\strings\zh-tw.json">
<Link>Resources\dashboard-ui\strings\zh-tw.json</Link> <Link>Resources\dashboard-ui\strings\zh-tw.json</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\themes\halloween\bg.jpg">
<Link>Resources\dashboard-ui\themes\halloween\bg.jpg</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\themes\halloween\style.css">
<Link>Resources\dashboard-ui\themes\halloween\style.css</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\themes\halloween\theme.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\themes\halloween\theme.js">
<Link>Resources\dashboard-ui\themes\halloween\theme.js</Link> <Link>Resources\dashboard-ui\themes\halloween\theme.js</Link>
</BundleResource> </BundleResource>
@ -2672,7 +2681,7 @@
</BundleResource> </BundleResource>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<NativeReference Include="..\packages\SkiaSharp.1.58.0\runtimes\osx\native\libSkiaSharp.dylib"> <NativeReference Include="..\packages\SkiaSharp.1.58.1\runtimes\osx\native\libSkiaSharp.dylib">
<Kind>Dynamic</Kind> <Kind>Dynamic</Kind>
<SmartLink>False</SmartLink> <SmartLink>False</SmartLink>
</NativeReference> </NativeReference>

1
MediaBrowser.Server.Mac/MacAppHost.cs
View File

@ -1,7 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Reflection; using System.Reflection;
using Emby.Server.Core;
using Emby.Server.Implementations; using Emby.Server.Implementations;
using Emby.Server.Implementations.FFMpeg; using Emby.Server.Implementations.FFMpeg;
using MediaBrowser.Model.IO; using MediaBrowser.Model.IO;

2
MediaBrowser.Server.Mac/Main.cs
View File

@ -16,8 +16,6 @@ using System.Threading;
using MonoMac.AppKit; using MonoMac.AppKit;
using MonoMac.Foundation; using MonoMac.Foundation;
using MonoMac.ObjCRuntime; using MonoMac.ObjCRuntime;
using Emby.Server.Core;
using Emby.Server.Core.Cryptography;
using Emby.Server.Implementations; using Emby.Server.Implementations;
using Emby.Server.Implementations.Logging; using Emby.Server.Implementations.Logging;
using Emby.Server.Mac.Native; using Emby.Server.Mac.Native;