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

Merge pull request #996 from MediaBrowser/master

Browse Source 
Merge master changes
This commit is contained in:
Luke 2015-01-31 22:33:08 -05:00
commit 599c898c0c
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Api/Playback/BifService.cs
View File

@ -155,7 +155,7 @@ namespace MediaBrowser.Api.Playback
private byte[] GetBytes(int value)
{
byte[] bytes = BitConverter.GetBytes(value);
if (BitConverter.IsLittleEndian)
if (!BitConverter.IsLittleEndian)
Array.Reverse(bytes);
return bytes;
}

16
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View File

@ -503,7 +503,21 @@ namespace MediaBrowser.MediaEncoding.Encoder
process.Start();
var ranToCompletion = process.WaitForExit(120000);
// Need to give ffmpeg enough time to make all the thumbnails, which could be a while,
// but we still need to detect if the process hangs.
// Making the assumption that as long as new jpegs are showing up, everything is good.
bool isResponsive = true;
int lastCount = 0;
while (isResponsive && !process.WaitForExit(120000))
{
int jpegCount = Directory.GetFiles(targetDirectory, "*.jpg").Count();
isResponsive = (jpegCount > lastCount);
lastCount = jpegCount;
}
bool ranToCompletion = process.HasExited;
if (!ranToCompletion)
{

6
MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj
View File

@ -735,12 +735,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\mblogoicon.png">
<Link>Resources\dashboard-ui\css\images\mblogoicon.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\mblogotextblack.png">
<Link>Resources\dashboard-ui\css\images\mblogotextblack.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\mblogotextwhite.png">
<Link>Resources\dashboard-ui\css\images\mblogotextwhite.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\rightarrow.png">
<Link>Resources\dashboard-ui\css\images\rightarrow.png</Link>
</BundleResource>

2
MediaBrowser.Server.Mac/Native/BaseMonoApp.cs
View File

@ -67,7 +67,7 @@ namespace MediaBrowser.Server.Mac
return list;
}
public void AuthorizeServer(int udpPort, int httpServerPort, string tempDirectory)
public void AuthorizeServer(int udpPort, int httpServerPort, int httpsPort, string tempDirectory)
{
}