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

support headroom with guide

Browse Source
This commit is contained in:
Luke Pulverenti 2016-04-26 22:59:43 -04:00
parent 403ac43b4f
commit 371cbc0c1d
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@ -1546,7 +1546,7 @@ namespace MediaBrowser.Controller.Entities
if (itemByPath == null) if (itemByPath == null)
{ {
Logger.Warn("Unable to find linked item at path {0}", info.Path); //Logger.Warn("Unable to find linked item at path {0}", info.Path);
} }
return itemByPath; return itemByPath;

12
MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs
View File

@ -215,6 +215,12 @@ namespace MediaBrowser.Server.Implementations.EntryPoints.Notifications
return; return;
} }
var video = e.Item as Video;
if (video != null && video.IsThemeMedia)
{
return;
}
var type = GetPlaybackNotificationType(item.MediaType); var type = GetPlaybackNotificationType(item.MediaType);
SendPlaybackNotification(type, e); SendPlaybackNotification(type, e);
@ -230,6 +236,12 @@ namespace MediaBrowser.Server.Implementations.EntryPoints.Notifications
return; return;
} }
var video = e.Item as Video;
if (video != null && video.IsThemeMedia)
{
return;
}
var type = GetPlaybackStoppedNotificationType(item.MediaType); var type = GetPlaybackStoppedNotificationType(item.MediaType);
SendPlaybackNotification(type, e); SendPlaybackNotification(type, e);

3
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -1712,6 +1712,9 @@
<None Include="dashboard-ui\strings\fr-CA.json"> <None Include="dashboard-ui\strings\fr-CA.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
<None Include="dashboard-ui\strings\fr-FR.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="dashboard-ui\strings\hu.json"> <None Include="dashboard-ui\strings\hu.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>