diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-11-21 15:48:32 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-11-21 15:48:32 -0500 |
| commit | ae63a3c2f79599bae9c82cf5f755a5641a5921ae (patch) | |
| tree | 379114c1d2281c079c6caeab865918981999b07c | |
| parent | 17bacee0890cb03a579f9469e435d922bbdfdd50 (diff) | |
| parent | ef96c30ba55a3ab964df8d8bbf83ebb06bac5d39 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
| -rw-r--r-- | MediaBrowser.Controller/LiveTv/ILiveTvService.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.sln | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvService.cs b/MediaBrowser.Controller/LiveTv/ILiveTvService.cs index 3d68a4ec7..03584240e 100644 --- a/MediaBrowser.Controller/LiveTv/ILiveTvService.cs +++ b/MediaBrowser.Controller/LiveTv/ILiveTvService.cs @@ -36,12 +36,13 @@ namespace MediaBrowser.Controller.LiveTv /// <summary> /// Schedules the recording asynchronous. /// </summary> + /// <param name="name">The name for the recording</param> /// <param name="channelId">The channel identifier.</param> /// <param name="startTime">The start time.</param> /// <param name="duration">The duration.</param> /// <param name="cancellationToken">The cancellation token.</param> /// <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> /// Gets the channel image asynchronous. diff --git a/MediaBrowser.sln b/MediaBrowser.sln index 0c5360b49..744debbcd 100644 --- a/MediaBrowser.sln +++ b/MediaBrowser.sln @@ -237,7 +237,4 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(Performance) = preSolution - HasPerformanceSessions = true - EndGlobalSection EndGlobal |