lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1085 from MediaBrowser/master

Browse Source 
merge
This commit is contained in:
Luke 2015-04-17 01:25:58 -04:00
commit 78ef021e94
5 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Server.Mac.sln
View File

@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Server.Mac", "MediaBrowser.Server.Mac\MediaBrowser.Server.Mac.csproj", "{C97B98FA-00D4-4880-88B8-C76017A418AB}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emby.Server.Mac", "MediaBrowser.Server.Mac\Emby.Server.Mac.csproj", "{C97B98FA-00D4-4880-88B8-C76017A418AB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Api", "MediaBrowser.Api\MediaBrowser.Api.csproj", "{4FD51AC5-2C16-4308-A993-C3A84F3B4582}"
EndProject

31
MediaBrowser.Server.Mac.userprefs
View File

@ -1,26 +1,20 @@
<Properties>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.Workbench ActiveDocument="MediaBrowser.Server.Mac/Main.cs">
<MonoDevelop.Ide.Workspace ActiveConfiguration="Release" />
<MonoDevelop.Ide.Workbench ActiveDocument="MediaBrowser.Common/Properties/AssemblyInfo.cs">
<Files>
<File FileName="MediaBrowser.Server.Mac/AppController.cs" Line="4" Column="4" />
<File FileName="MediaBrowser.Server.Mac/Main.cs" Line="18" Column="18" />
<File FileName="MediaBrowser.Server.Startup.Common/ApplicationHost.cs" Line="22" Column="22" />
<File FileName="MediaBrowser.Common.Implementations/BaseApplicationHost.cs" Line="14" Column="14" />
<File FileName="MediaBrowser.Common.Implementations/Logging/NlogManager.cs" Line="24" Column="24" />
<File FileName="MediaBrowser.Server.Mac/ImageMagickSharp.dll.config" Line="1" Column="1" />
<File FileName="MediaBrowser.Server.Startup.Common/ApplicationHost.cs" Line="1" Column="18" />
<File FileName="MediaBrowser.Api/ConnectService.cs" Line="7" Column="22" />
<File FileName="MediaBrowser.Server.Mac/AppController.cs" Line="22" Column="1" />
<File FileName="MediaBrowser.Server.Mac/AppDelegate.cs" Line="24" Column="1" />
<File FileName="MediaBrowser.Server.Mac/Main.cs" Line="60" Column="4" />
<File FileName="SharedVersion.cs" Line="1" Column="1" />
<File FileName="MediaBrowser.Common/Properties/AssemblyInfo.cs" Line="9" Column="12" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State expanded="True">
<Node name="MediaBrowser.Common.Implementations" expanded="True">
<Node name="Logging" expanded="True" />
</Node>
<Node name="MediaBrowser.Model" expanded="True">
<Node name="Logging" expanded="True" />
</Node>
<Node name="MediaBrowser.Server.Mac" expanded="True" selected="True" />
<Node name="MediaBrowser.Server.Startup.Common" expanded="True" />
<Node name="MediaBrowser.WebDashboard" expanded="True" />
<Node name="MediaBrowser.XbmcMetadata" expanded="True" />
<Node name="Emby.Server.Mac" selected="True" />
<Node name="OpenSubtitlesHandler" expanded="True" />
</State>
</Pad>
@ -32,4 +26,7 @@
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
<StartupItems>
<String>MediaBrowser.Server.Mac/Emby.Server.Mac.csproj</String>
</StartupItems>
</Properties>

1
MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj → MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
View File

@ -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>

2
MediaBrowser.Server.Mac/Info.plist
View File

@ -5,7 +5,7 @@
<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>

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

@ -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