Merge pull request #1078 from MediaBrowser/master

master

4 files changed, 84 insertions, 25 deletions

diff --git a/MediaBrowser.Server.Mac/ImageMagickSharp.dll.config b/MediaBrowser.Server.Mac/ImageMagickSharp.dll.config
new file mode 100644
index 000000000..0ad6d1e60
--- /dev/null
+++ b/MediaBrowser.Server.Mac/ImageMagickSharp.dll.config
@@ -0,0 +1,3 @@
+<configuration>
+  <dllmap dll="CORE_RL_Wand_.dll" target="libMagickWand-6.Q8.dylib" os="osx"/>
+</configuration>
\ No newline at end of file
diff --git a/MediaBrowser.Server.Mac/Imazen.WebP.dll.config b/MediaBrowser.Server.Mac/Imazen.WebP.dll.config
deleted file mode 100644
index 1b6270fd5..000000000
--- a/MediaBrowser.Server.Mac/Imazen.WebP.dll.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<configuration>
-  <dllmap dll="libwebp" target="libwebp.5.dylib" os="osx"/>
-</configuration>
\ No newline at end of file
diff --git a/MediaBrowser.Server.Mac/Info.plist b/MediaBrowser.Server.Mac/Info.plist
index 3e058c72f..ffb4b31ee 100644
--- a/MediaBrowser.Server.Mac/Info.plist
+++ b/MediaBrowser.Server.Mac/Info.plist
@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleDisplayName</key>
-	<string>Media Browser</string>
 	<key>CFBundleIconFile</key>
 	<string>appicon</string>
 	<key>CFBundleIdentifier</key>
@@ -26,5 +24,7 @@
 	<string>NSApplication</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
+	<key>CFBundleDisplayName</key>
+	<string>Emby</string>
 </dict>
 </plist>
diff --git a/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj b/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj
index 66a0897a5..a31006744 100644
--- a/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj
+++ b/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj
@@ -110,10 +110,10 @@
     <None Include="MediaBrowser.MediaInfo.dll.config">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </None>

-    <None Include="Imazen.WebP.dll.config">

+    <None Include="packages.config" />

+    <None Include="ImageMagickSharp.dll.config">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </None>

-    <None Include="packages.config" />

   </ItemGroup>

   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

   <ItemGroup>

@@ -186,18 +186,50 @@
       <IsCxx>False</IsCxx>

       <Kind>Dynamic</Kind>

     </NativeReference>

-    <NativeReference Include="..\ThirdParty\libwebp\osx\libwebp.5.dylib">

+    <NativeReference Include="..\ThirdParty\SQLite3\osx\libsqlite3.0.dylib">

       <IsCxx>False</IsCxx>

       <Kind>Dynamic</Kind>

     </NativeReference>

-    <NativeReference Include="..\ThirdParty\SQLite3\osx\libsqlite3.0.dylib">

+    <NativeReference Include="..\ThirdParty\SQLite3\osx\libsqlite3.dylib">

       <IsCxx>False</IsCxx>

       <Kind>Dynamic</Kind>

     </NativeReference>

-    <NativeReference Include="..\ThirdParty\SQLite3\osx\libsqlite3.dylib">

+    <NativeReference Include="..\ThirdParty\ImageMagick\osx\libMagick++-6.Q16.5.dylib">

+      <IsCxx>False</IsCxx>

+      <Kind>Dynamic</Kind>

+    </NativeReference>

+    <NativeReference Include="..\ThirdParty\ImageMagick\osx\libMagick++-6.Q16.dylib">

+      <IsCxx>False</IsCxx>

+      <Kind>Dynamic</Kind>

+    </NativeReference>

+    <NativeReference Include="..\ThirdParty\ImageMagick\osx\libMagick++-6.Q16.la">

+      <IsCxx>False</IsCxx>

+      <Kind>Static</Kind>

+    </NativeReference>

+    <NativeReference Include="..\ThirdParty\ImageMagick\osx\libMagickCore-6.Q16.2.dylib">

+      <IsCxx>False</IsCxx>

+      <Kind>Dynamic</Kind>

+    </NativeReference>

+    <NativeReference Include="..\ThirdParty\ImageMagick\osx\libMagickCore-6.Q16.dylib">

+      <IsCxx>False</IsCxx>

+      <Kind>Dynamic</Kind>

+    </NativeReference>

+    <NativeReference Include="..\ThirdParty\ImageMagick\osx\libMagickCore-6.Q16.la">

+      <IsCxx>False</IsCxx>

+      <Kind>Static</Kind>

+    </NativeReference>

+    <NativeReference Include="..\ThirdParty\ImageMagick\osx\libMagickWand-6.Q16.2.dylib">

+      <IsCxx>False</IsCxx>

+      <Kind>Dynamic</Kind>

+    </NativeReference>

+    <NativeReference Include="..\ThirdParty\ImageMagick\osx\libMagickWand-6.Q16.dylib">

       <IsCxx>False</IsCxx>

       <Kind>Dynamic</Kind>

     </NativeReference>

+    <NativeReference Include="..\ThirdParty\ImageMagick\osx\libMagickWand-6.Q16.la">

+      <IsCxx>False</IsCxx>

+      <Kind>Static</Kind>

+    </NativeReference>

   </ItemGroup>

   <ItemGroup>

     <BundleResource Include="..\ThirdParty\ServiceStack\swagger-ui\index.html">

@@ -271,6 +303,9 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\advanced.html">

       <Link>Resources\dashboard-ui\advanced.html</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\appservices.html">

+      <Link>Resources\dashboard-ui\appservices.html</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\autoorganizelog.html">

       <Link>Resources\dashboard-ui\autoorganizelog.html</Link>

     </BundleResource>

@@ -388,6 +423,9 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\itemlist.html">

       <Link>Resources\dashboard-ui\itemlist.html</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\kids.html">

+      <Link>Resources\dashboard-ui\kids.html</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\library.html">

       <Link>Resources\dashboard-ui\library.html</Link>

     </BundleResource>

@@ -406,6 +444,9 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\livetvguide.html">

       <Link>Resources\dashboard-ui\livetvguide.html</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\livetvitems.html">

+      <Link>Resources\dashboard-ui\livetvitems.html</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\livetvnewrecording.html">

       <Link>Resources\dashboard-ui\livetvnewrecording.html</Link>

     </BundleResource>

@@ -535,9 +576,6 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\playbackconfiguration.html">

       <Link>Resources\dashboard-ui\playbackconfiguration.html</Link>

     </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\playlist.html">

-      <Link>Resources\dashboard-ui\playlist.html</Link>

-    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\playlistedit.html">

       <Link>Resources\dashboard-ui\playlistedit.html</Link>

     </BundleResource>

@@ -706,6 +744,9 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\userimage.css">

       <Link>Resources\dashboard-ui\css\userimage.css</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\fonts\Montserrat.woff">

+      <Link>Resources\dashboard-ui\css\fonts\Montserrat.woff</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\fonts\RobotoBold.woff">

       <Link>Resources\dashboard-ui\css\fonts\RobotoBold.woff</Link>

     </BundleResource>

@@ -721,9 +762,6 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\fonts\RobotoThin.woff">

       <Link>Resources\dashboard-ui\css\fonts\RobotoThin.woff</Link>

     </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\fonts\mblogo.woff">

-      <Link>Resources\dashboard-ui\css\fonts\mblogo.woff</Link>

-    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\checkmarkblack.png">

       <Link>Resources\dashboard-ui\css\images\checkmarkblack.png</Link>

     </BundleResource>

@@ -820,6 +858,9 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\clients\android.png">

       <Link>Resources\dashboard-ui\css\images\clients\android.png</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\clients\androidtv-tile.png">

+      <Link>Resources\dashboard-ui\css\images\clients\androidtv-tile.png</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\clients\chrome.png">

       <Link>Resources\dashboard-ui\css\images\clients\chrome.png</Link>

     </BundleResource>

@@ -997,6 +1038,9 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\items\searchhintsv2\tv.png">

       <Link>Resources\dashboard-ui\css\images\items\searchhintsv2\tv.png</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\kids\bg.jpg">

+      <Link>Resources\dashboard-ui\css\images\kids\bg.jpg</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\media\chapterflyout.png">

       <Link>Resources\dashboard-ui\css\images\media\chapterflyout.png</Link>

     </BundleResource>

@@ -1132,6 +1176,9 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\alphapicker.js">

       <Link>Resources\dashboard-ui\scripts\alphapicker.js</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\appservices.js">

+      <Link>Resources\dashboard-ui\scripts\appservices.js</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\autoorganizelog.js">

       <Link>Resources\dashboard-ui\scripts\autoorganizelog.js</Link>

     </BundleResource>

@@ -1261,6 +1308,9 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\itemlistpage.js">

       <Link>Resources\dashboard-ui\scripts\itemlistpage.js</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\kids.js">

+      <Link>Resources\dashboard-ui\scripts\kids.js</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\librarybrowser.js">

       <Link>Resources\dashboard-ui\scripts\librarybrowser.js</Link>

     </BundleResource>

@@ -1285,6 +1335,9 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\livetvguide.js">

       <Link>Resources\dashboard-ui\scripts\livetvguide.js</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\livetvitems.js">

+      <Link>Resources\dashboard-ui\scripts\livetvitems.js</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\livetvnewrecording.js">

       <Link>Resources\dashboard-ui\scripts\livetvnewrecording.js</Link>

     </BundleResource>

@@ -1429,9 +1482,6 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\playbackconfiguration.js">

       <Link>Resources\dashboard-ui\scripts\playbackconfiguration.js</Link>

     </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\playlist.js">

-      <Link>Resources\dashboard-ui\scripts\playlist.js</Link>

-    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\playlistedit.js">

       <Link>Resources\dashboard-ui\scripts\playlistedit.js</Link>

     </BundleResource>

@@ -1573,6 +1623,9 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\ajax.js">

       <Link>Resources\dashboard-ui\thirdparty\apiclient\ajax.js</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\apiclient.js">

+      <Link>Resources\dashboard-ui\thirdparty\apiclient\apiclient.js</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\connectionmanager.js">

       <Link>Resources\dashboard-ui\thirdparty\apiclient\connectionmanager.js</Link>

     </BundleResource>

@@ -1585,9 +1638,6 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\deferred.js">

       <Link>Resources\dashboard-ui\thirdparty\apiclient\deferred.js</Link>

     </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\deferredAlt.js">

-      <Link>Resources\dashboard-ui\thirdparty\apiclient\deferredAlt.js</Link>

-    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\device.js">

       <Link>Resources\dashboard-ui\thirdparty\apiclient\device.js</Link>

     </BundleResource>

@@ -1600,9 +1650,6 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\md5.js">

       <Link>Resources\dashboard-ui\thirdparty\apiclient\md5.js</Link>

     </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\mediabrowser.apiclient.js">

-      <Link>Resources\dashboard-ui\thirdparty\apiclient\mediabrowser.apiclient.js</Link>

-    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\network.js">

       <Link>Resources\dashboard-ui\thirdparty\apiclient\network.js</Link>

     </BundleResource>

@@ -1615,6 +1662,18 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\store.js">

       <Link>Resources\dashboard-ui\thirdparty\apiclient\store.js</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\alt\ajax.js">

+      <Link>Resources\dashboard-ui\thirdparty\apiclient\alt\ajax.js</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\alt\bean.js">

+      <Link>Resources\dashboard-ui\thirdparty\apiclient\alt\bean.js</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\alt\deferred.js">

+      <Link>Resources\dashboard-ui\thirdparty\apiclient\alt\deferred.js</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\alt\events.js">

+      <Link>Resources\dashboard-ui\thirdparty\apiclient\alt\events.js</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\fontawesome\css\font-awesome.css">

       <Link>Resources\dashboard-ui\thirdparty\fontawesome\css\font-awesome.css</Link>

     </BundleResource>