aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Mac
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Server.Mac')
-rw-r--r--MediaBrowser.Server.Mac/Emby.Server.Mac.csproj (renamed from MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj)81
-rw-r--r--MediaBrowser.Server.Mac/ImageMagickSharp.dll.config3
-rw-r--r--MediaBrowser.Server.Mac/Imazen.WebP.dll.config3
-rw-r--r--MediaBrowser.Server.Mac/Info.plist6
-rw-r--r--MediaBrowser.Server.Mac/Main.cs4
5 files changed, 64 insertions, 33 deletions
diff --git a/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
index 66a0897a50..8592fc460e 100644
--- a/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj
+++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
@@ -13,6 +13,7 @@
<ReleaseVersion>
</ReleaseVersion>
<StartupObject>MediaBrowser.Server.Mac.MainClass</StartupObject>
+ <Description>A personal media server</Description>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -30,6 +31,7 @@
<EnableCodeSigning>false</EnableCodeSigning>
<CreatePackage>true</CreatePackage>
<PackageSigningKey>Developer ID Installer</PackageSigningKey>
+ <UseRefCounting>false</UseRefCounting>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<Optimize>true</Optimize>
@@ -44,6 +46,7 @@
<EnableCodeSigning>false</EnableCodeSigning>
<CreatePackage>true</CreatePackage>
<PackageSigningKey>Developer ID Installer</PackageSigningKey>
+ <UseRefCounting>false</UseRefCounting>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|AnyCPU' ">
<DebugType>full</DebugType>
@@ -59,6 +62,7 @@
<CodeSigningKey>3rd Party Mac Developer Application</CodeSigningKey>
<EnableCodeSigning>false</EnableCodeSigning>
<EnablePackageSigning>false</EnablePackageSigning>
+ <UseRefCounting>false</UseRefCounting>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -110,10 +114,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,10 +190,6 @@
<IsCxx>False</IsCxx>
<Kind>Dynamic</Kind>
</NativeReference>
- <NativeReference Include="..\ThirdParty\libwebp\osx\libwebp.5.dylib">
- <IsCxx>False</IsCxx>
- <Kind>Dynamic</Kind>
- </NativeReference>
<NativeReference Include="..\ThirdParty\SQLite3\osx\libsqlite3.0.dylib">
<IsCxx>False</IsCxx>
<Kind>Dynamic</Kind>
@@ -271,6 +271,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 +391,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 +412,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>
@@ -472,9 +481,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\movies.html">
<Link>Resources\dashboard-ui\movies.html</Link>
</BundleResource>
- <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\movieslatest.html">
- <Link>Resources\dashboard-ui\movieslatest.html</Link>
- </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\moviesrecommended.html">
<Link>Resources\dashboard-ui\moviesrecommended.html</Link>
</BundleResource>
@@ -535,9 +541,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>
@@ -568,6 +571,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\songs.html">
<Link>Resources\dashboard-ui\songs.html</Link>
</BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\streamingsettings.html">
+ <Link>Resources\dashboard-ui\streamingsettings.html</Link>
+ </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\support.html">
<Link>Resources\dashboard-ui\support.html</Link>
</BundleResource>
@@ -706,6 +712,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 +730,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 +826,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 +1006,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 +1144,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 +1276,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 +1303,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>
@@ -1366,9 +1387,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\movies.js">
<Link>Resources\dashboard-ui\scripts\movies.js</Link>
</BundleResource>
- <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\movieslatest.js">
- <Link>Resources\dashboard-ui\scripts\movieslatest.js</Link>
- </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\moviesrecommended.js">
<Link>Resources\dashboard-ui\scripts\moviesrecommended.js</Link>
</BundleResource>
@@ -1429,9 +1447,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>
@@ -1477,6 +1492,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\songs.js">
<Link>Resources\dashboard-ui\scripts\songs.js</Link>
</BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\streamingsettings.js">
+ <Link>Resources\dashboard-ui\scripts\streamingsettings.js</Link>
+ </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\supporterkeypage.js">
<Link>Resources\dashboard-ui\scripts\supporterkeypage.js</Link>
</BundleResource>
@@ -1573,6 +1591,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 +1606,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 +1618,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 +1630,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>
diff --git a/MediaBrowser.Server.Mac/ImageMagickSharp.dll.config b/MediaBrowser.Server.Mac/ImageMagickSharp.dll.config
new file mode 100644
index 0000000000..0ad6d1e600
--- /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 1b6270fd5c..0000000000
--- 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 3e058c72fb..73c2036b12 100644
--- a/MediaBrowser.Server.Mac/Info.plist
+++ b/MediaBrowser.Server.Mac/Info.plist
@@ -2,12 +2,10 @@
<!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>
- <string>com.MediaBrowser.MediaBrowser.Server.Mac</string>
+ <string>com.emby.server</string>
<key>CFBundleName</key>
<string>Media Browser</string>
<key>CFBundleShortVersionString</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/Main.cs b/MediaBrowser.Server.Mac/Main.cs
index 0a1fd1b3d3..b4184f3b19 100644
--- a/MediaBrowser.Server.Mac/Main.cs
+++ b/MediaBrowser.Server.Mac/Main.cs
@@ -62,6 +62,10 @@ namespace MediaBrowser.Server.Mac
{
// TODO: Use CommonApplicationData? Will we always have write access?
programDataPath = Path.Combine(Environment.GetFolderPath (Environment.SpecialFolder.ApplicationData), "mediabrowser-server");
+
+ if (!Directory.Exists (programDataPath)) {
+ programDataPath = Path.Combine(Environment.GetFolderPath (Environment.SpecialFolder.ApplicationData), "emby-server");
+ }
}
// Within the mac bundle, go uo two levels then down into Resources folder
generated by cgit v1.2.3 (git 2.46.0) at 2026-05-01 23:12:57 +0000