Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-11-03 19:17:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

update sync processes

Browse Source
This commit is contained in:
Luke Pulverenti 2015-09-09 13:49:44 -04:00
parent 0d45ab8d64
commit 38ff6565c6
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
View File

@ -109,7 +109,7 @@ namespace MediaBrowser.Api.Playback.Hls
throw; throw;
} }
await WaitForMinimumSegmentCount(playlist, 2, cancellationTokenSource.Token).ConfigureAwait(false); await WaitForMinimumSegmentCount(playlist, 3, cancellationTokenSource.Token).ConfigureAwait(false);
} }
} }
finally finally

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

@ -74,7 +74,7 @@ namespace MediaBrowser.Api.Playback
{ {
get get
{ {
return ReadInputAtNativeFramerate ? 1000 : 0; return 0;
} }
} }

1
MediaBrowser.WebDashboard/Api/PackageCreator.cs
View File

@ -521,7 +521,6 @@ namespace MediaBrowser.WebDashboard.Api
"thirdparty/jquery.unveil-custom.js", "thirdparty/jquery.unveil-custom.js",
"apiclient/logger.js", "apiclient/logger.js",
"apiclient/md5.js", "apiclient/md5.js",
"apiclient/sha1.js",
"apiclient/store.js", "apiclient/store.js",
"apiclient/device.js", "apiclient/device.js",
"apiclient/credentials.js", "apiclient/credentials.js",

15
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -87,6 +87,15 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="dashboard-ui\apiclient\sync\contentuploader.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\apiclient\sync\multiserversync.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\apiclient\sync\serversync.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\bower_components\fastclick\lib\fastclick.js"> <Content Include="dashboard-ui\bower_components\fastclick\lib\fastclick.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@ -150,6 +159,9 @@
<Content Include="dashboard-ui\cordova\android\logging.js"> <Content Include="dashboard-ui\cordova\android\logging.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\cordova\localassetmanager.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\cordova\searchmenu.js"> <Content Include="dashboard-ui\cordova\searchmenu.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@ -527,9 +539,6 @@
<Content Include="dashboard-ui\apiclient\ajax.js"> <Content Include="dashboard-ui\apiclient\ajax.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\apiclient\alt\ajax.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\apiclient\alt\bean.js"> <Content Include="dashboard-ui\apiclient\alt\bean.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>