Your ROOT_URL in app.ini is https://git.cloudchain.link/ but you are visiting https://dash.bss.nz/open-source-mirrors/jellyfin/commit/23324028410dab2a2c9e7925a053e3077251f474
You should set ROOT_URL correctly, otherwise the web may not work correctly.
7 changed files with
23 additions and
8 deletions
@ -345,9 +345,9 @@ namespace MediaBrowser.Controller.LiveTv
/// </summary>
/// <param name="item">The item.</param>
/// <param name="dto">The dto.</param>
/// <param name=" addChannelInfo">if set to <c>true</c> [add channel information] .</param>
/// <param name=" fields">The fields .</param>
/// <param name="user">The user.</param>
void AddInfoToProgramDto ( BaseItem item , BaseItemDto dto , bool addChannelInfo , User user = null ) ;
void AddInfoToProgramDto ( BaseItem item , BaseItemDto dto , List < ItemFields > fields , User user = null ) ;
/// <summary>
/// Saves the tuner host.
/// </summary>
@ -192,6 +192,7 @@ namespace MediaBrowser.Model.Dto
/// <value>The channel identifier.</value>
public string ChannelId { get ; set ; }
public string ChannelName { get ; set ; }
public string ServiceName { get ; set ; }
/// <summary>
/// Gets or sets the overview.
@ -253,6 +253,11 @@
/// <summary>
/// The season user data
/// </summary>
SeasonUserData
SeasonUserData ,
/// <summary>
/// The service name
/// </summary>
ServiceName
}
}
@ -395,7 +395,7 @@ namespace MediaBrowser.Server.Implementations.Dto
else if ( item is LiveTvProgram )
{
_livetvManager ( ) . AddInfoToProgramDto ( item , dto , fields .Contains ( ItemFields . ChannelInfo ) , user ) ;
_livetvManager ( ) . AddInfoToProgramDto ( item , dto , fields , user ) ;
}
return dto ;
@ -845,7 +845,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
{
if ( GetConfiguration ( ) . EnableRecordingEncoding )
{
var regInfo = await _security . GetRegistrationStatus ( "embytv series recordings") . ConfigureAwait ( false ) ;
var regInfo = await _security . GetRegistrationStatus ( "embytv recordingconver sion ") . ConfigureAwait ( false ) ;
if ( regInfo . IsValid )
{
@ -147,7 +147,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
private bool EncodeVideo ( MediaSourceInfo mediaSource )
{
var mediaStreams = mediaSource . MediaStreams ? ? new List < MediaStream > ( ) ;
return ! mediaStreams . Any ( i = > i . Type = = MediaStreamType . Video & & string . Equals ( i . Codec , "h264" , StringComparison . OrdinalIgnoreCase ) ) ;
return ! mediaStreams . Any ( i = > i . Type = = MediaStreamType . Video & & string . Equals ( i . Codec , "h264" , StringComparison . OrdinalIgnoreCase ) & & ! i . IsInterlaced ) ;
}
protected string GetOutputSizeParam ( )
@ -1467,7 +1467,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
} ;
}
public void AddInfoToProgramDto ( BaseItem item , BaseItemDto dto , bool addChannelInfo , User user = null )
public void AddInfoToProgramDto ( BaseItem item , BaseItemDto dto , List < ItemFields > fields , User user = null )
{
var program = ( LiveTvProgram ) item ;
@ -1507,7 +1507,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
dto . IsPremiere = program . IsPremiere ;
}
if ( addChannelInfo )
if ( fields. Contains ( ItemFields . ChannelInfo ) )
{
var channel = GetInternalChannel ( program . ChannelId ) ;
@ -1522,6 +1522,15 @@ namespace MediaBrowser.Server.Implementations.LiveTv
}
}
}
if ( fields . Contains ( ItemFields . ServiceName ) )
{
var service = GetService ( program ) ;
if ( service ! = null )
{
dto . ServiceName = service . Name ;
}
}
}
public void AddInfoToRecordingDto ( BaseItem item , BaseItemDto dto , User user = null )