Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source
This commit is contained in:
Luke Pulverenti 2013-11-21 15:48:32 -05:00
commit ae63a3c2f7
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,12 +36,13 @@ namespace MediaBrowser.Controller.LiveTv
/// <summary> /// <summary>
/// Schedules the recording asynchronous. /// Schedules the recording asynchronous.
/// </summary> /// </summary>
/// <param name="name">The name for the recording</param>
/// <param name="channelId">The channel identifier.</param> /// <param name="channelId">The channel identifier.</param>
/// <param name="startTime">The start time.</param> /// <param name="startTime">The start time.</param>
/// <param name="duration">The duration.</param> /// <param name="duration">The duration.</param>
/// <param name="cancellationToken">The cancellation token.</param> /// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task.</returns> /// <returns>Task.</returns>
Task ScheduleRecordingAsync(string channelId, DateTime startTime, TimeSpan duration, CancellationToken cancellationToken); Task ScheduleRecordingAsync(string name,string channelId, DateTime startTime, TimeSpan duration, CancellationToken cancellationToken);
/// <summary> /// <summary>
/// Gets the channel image asynchronous. /// Gets the channel image asynchronous.

3
MediaBrowser.sln
View File

@ -237,7 +237,4 @@ Global
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(Performance) = preSolution
HasPerformanceSessions = true
EndGlobalSection
EndGlobal EndGlobal