michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated nuget + live tv

Browse Source
This commit is contained in:
Luke Pulverenti 2013-12-14 10:49:11 -05:00
parent e65726e6f9
commit 0eea77b837
9 changed files with 49 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
MediaBrowser.Controller/LiveTv/ILiveTvService.cs
View File

@ -72,12 +72,20 @@ namespace MediaBrowser.Controller.LiveTv
Task<ImageResponseInfo> GetChannelImageAsync(string channelId, CancellationToken cancellationToken); Task<ImageResponseInfo> GetChannelImageAsync(string channelId, CancellationToken cancellationToken);
/// <summary> /// <summary>
/// Gets the program image asynchronous. /// Gets the recording image asynchronous.
/// </summary> /// </summary>
/// <param name="programId">The program identifier.</param> /// <param name="channelId">The channel identifier.</param>
/// <param name="cancellationToken">The cancellation token.</param> /// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task{ImageResponseInfo}.</returns> /// <returns>Task{ImageResponseInfo}.</returns>
Task<ImageResponseInfo> GetProgramImageAsync(string programId, CancellationToken cancellationToken); Task<ImageResponseInfo> GetRecordingImageAsync(string channelId, CancellationToken cancellationToken);
/// <summary>
/// Gets the program image asynchronous.
/// </summary>
/// <param name="channelId">The channel identifier.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task{ImageResponseInfo}.</returns>
Task<ImageResponseInfo> GetProgramImageAsync(string channelId, CancellationToken cancellationToken);
/// <summary> /// <summary>
/// Gets the recordings asynchronous. /// Gets the recordings asynchronous.

6
MediaBrowser.Controller/LiveTv/ImageResponseInfo.cs
View File

@ -15,5 +15,11 @@ namespace MediaBrowser.Controller.LiveTv
/// </summary> /// </summary>
/// <value>The type of the MIME.</value> /// <value>The type of the MIME.</value>
public string MimeType { get; set; } public string MimeType { get; set; }
/// <summary>
/// Gets or sets the image path.
/// </summary>
/// <value>The image path.</value>
public string ImagePath { get; set; }
} }
} }

7
MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
View File

@ -109,6 +109,11 @@ namespace MediaBrowser.Model.LiveTv
public enum ProgramAudio public enum ProgramAudio
{ {
Stereo Unspecified,
Mono,
Stereo,
Dolby,
DolbyDigital,
Thx
} }
} }

11
MediaBrowser.Model/LiveTv/RecordingStatus.cs
View File

@ -3,12 +3,15 @@ namespace MediaBrowser.Model.LiveTv
{ {
public enum RecordingStatus public enum RecordingStatus
{ {
Pending, New,
Scheduled,
InProgress, InProgress,
Completed, Completed,
CompletedWithError, Abored,
Conflicted, Cancelled,
Deleted ConflictedOk,
ConflictedNotOk,
Error
} }
public enum RecurrenceType public enum RecurrenceType

2
MediaBrowser.WebDashboard/Api/DashboardService.cs
View File

@ -481,6 +481,8 @@ namespace MediaBrowser.WebDashboard.Api
"livetvrecording.js", "livetvrecording.js",
"livetvrecordings.js", "livetvrecordings.js",
"livetvtimer.js", "livetvtimer.js",
"livetvseriestimer.js",
"livetvseriestimers.js",
"livetvtimers.js", "livetvtimers.js",
"loginpage.js", "loginpage.js",
"logpage.js", "logpage.js",

12
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -97,6 +97,9 @@
<Content Include="dashboard-ui\livetvrecording.html"> <Content Include="dashboard-ui\livetvrecording.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\livetvseriestimer.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\livetvtimers.html"> <Content Include="dashboard-ui\livetvtimers.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@ -361,6 +364,9 @@
<Content Include="dashboard-ui\scripts\livetvrecording.js"> <Content Include="dashboard-ui\scripts\livetvrecording.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\scripts\livetvseriestimer.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\scripts\livetvtimer.js"> <Content Include="dashboard-ui\scripts\livetvtimer.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@ -385,6 +391,9 @@
<Content Include="dashboard-ui\scripts\episodes.js"> <Content Include="dashboard-ui\scripts\episodes.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\scripts\livetvseriestimers.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\scripts\tvupcoming.js"> <Content Include="dashboard-ui\scripts\tvupcoming.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@ -397,6 +406,9 @@
<Content Include="dashboard-ui\scripts\wizardsettings.js"> <Content Include="dashboard-ui\scripts\wizardsettings.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\livetvseriestimers.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\tvupcoming.html"> <Content Include="dashboard-ui\tvupcoming.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>

4
Nuget/MediaBrowser.Common.Internal.nuspec
View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata> <metadata>
<id>MediaBrowser.Common.Internal</id> <id>MediaBrowser.Common.Internal</id>
<version>3.0.268</version> <version>3.0.269</version>
<title>MediaBrowser.Common.Internal</title> <title>MediaBrowser.Common.Internal</title>
<authors>Luke</authors> <authors>Luke</authors>
<owners>ebr,Luke,scottisafool</owners> <owners>ebr,Luke,scottisafool</owners>
@ -12,7 +12,7 @@
<description>Contains common components shared by Media Browser Theater and Media Browser Server. Not intended for plugin developer consumption.</description> <description>Contains common components shared by Media Browser Theater and Media Browser Server. Not intended for plugin developer consumption.</description>
<copyright>Copyright © Media Browser 2013</copyright> <copyright>Copyright © Media Browser 2013</copyright>
<dependencies> <dependencies>
<dependency id="MediaBrowser.Common" version="3.0.268" /> <dependency id="MediaBrowser.Common" version="3.0.269" />
<dependency id="NLog" version="2.1.0" /> <dependency id="NLog" version="2.1.0" />
<dependency id="SimpleInjector" version="2.4.0" /> <dependency id="SimpleInjector" version="2.4.0" />
<dependency id="sharpcompress" version="0.10.2" /> <dependency id="sharpcompress" version="0.10.2" />

2
Nuget/MediaBrowser.Common.nuspec
View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata> <metadata>
<id>MediaBrowser.Common</id> <id>MediaBrowser.Common</id>
<version>3.0.268</version> <version>3.0.269</version>
<title>MediaBrowser.Common</title> <title>MediaBrowser.Common</title>
<authors>Media Browser Team</authors> <authors>Media Browser Team</authors>
<owners>ebr,Luke,scottisafool</owners> <owners>ebr,Luke,scottisafool</owners>

4
Nuget/MediaBrowser.Server.Core.nuspec
View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata> <metadata>
<id>MediaBrowser.Server.Core</id> <id>MediaBrowser.Server.Core</id>
<version>3.0.268</version> <version>3.0.269</version>
<title>Media Browser.Server.Core</title> <title>Media Browser.Server.Core</title>
<authors>Media Browser Team</authors> <authors>Media Browser Team</authors>
<owners>ebr,Luke,scottisafool</owners> <owners>ebr,Luke,scottisafool</owners>
@ -12,7 +12,7 @@
<description>Contains core components required to build plugins for Media Browser Server.</description> <description>Contains core components required to build plugins for Media Browser Server.</description>
<copyright>Copyright © Media Browser 2013</copyright> <copyright>Copyright © Media Browser 2013</copyright>
<dependencies> <dependencies>
<dependency id="MediaBrowser.Common" version="3.0.268" /> <dependency id="MediaBrowser.Common" version="3.0.269" />
</dependencies> </dependencies>
</metadata> </metadata>
<files> <files>