Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-21 05:00:39 +02:00
Code Issues 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
parent a85cc6db21 e7037a9b80
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) private byte[] GetBytes(int value)
{ {
byte[] bytes = BitConverter.GetBytes(value); byte[] bytes = BitConverter.GetBytes(value);
if (BitConverter.IsLittleEndian) if (!BitConverter.IsLittleEndian)
Array.Reverse(bytes); Array.Reverse(bytes);
return bytes; return bytes;
} }

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

@ -503,7 +503,21 @@ namespace MediaBrowser.MediaEncoding.Encoder
process.Start(); 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) 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"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\mblogoicon.png">
<Link>Resources\dashboard-ui\css\images\mblogoicon.png</Link> <Link>Resources\dashboard-ui\css\images\mblogoicon.png</Link>
</BundleResource> </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"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\rightarrow.png">
<Link>Resources\dashboard-ui\css\images\rightarrow.png</Link> <Link>Resources\dashboard-ui\css\images\rightarrow.png</Link>
</BundleResource> </BundleResource>

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

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