diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-03-12 11:51:48 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-03-12 11:51:48 -0400 |
| commit | e62b663ae049548b5f2169a9fbf984f1fa539183 (patch) | |
| tree | 797af872e4be8b3509c8afb6ffd96ea0e2e2888a /MediaBrowser.Controller | |
| parent | 028a0a857ab6d7f42544e2ae3a3f79f5632844fc (diff) | |
remove more reliance on ActiveService
Diffstat (limited to 'MediaBrowser.Controller')
6 files changed, 16 insertions, 6 deletions
diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvItem.cs b/MediaBrowser.Controller/LiveTv/ILiveTvItem.cs new file mode 100644 index 0000000000..d3334e8ea0 --- /dev/null +++ b/MediaBrowser.Controller/LiveTv/ILiveTvItem.cs @@ -0,0 +1,8 @@ + +namespace MediaBrowser.Controller.LiveTv +{ + public interface ILiveTvItem + { + string ServiceName { get; set; } + } +} diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs b/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs index 3a0045f4b4..93e1e576ac 100644 --- a/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs +++ b/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs @@ -7,10 +7,8 @@ using System.Threading.Tasks; namespace MediaBrowser.Controller.LiveTv { - public interface ILiveTvRecording : IHasImages, IHasMediaSources, IHasUserData + public interface ILiveTvRecording : IHasImages, IHasMediaSources, IHasUserData, ILiveTvItem { - string ServiceName { get; set; } - string MediaType { get; } string Container { get; } diff --git a/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs b/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs index eaea6cfa45..75e418bcc9 100644 --- a/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs +++ b/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs @@ -11,7 +11,7 @@ using System.Runtime.Serialization; namespace MediaBrowser.Controller.LiveTv { - public class LiveTvChannel : BaseItem, IHasMediaSources + public class LiveTvChannel : BaseItem, IHasMediaSources, ILiveTvItem { /// <summary> /// Gets the user data key. @@ -58,6 +58,10 @@ namespace MediaBrowser.Controller.LiveTv /// <value>The type of the channel.</value> public ChannelType ChannelType { get; set; } + /// <summary> + /// Gets or sets the name of the service. + /// </summary> + /// <value>The name of the service.</value> public string ServiceName { get; set; } /// <summary> diff --git a/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs b/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs index ee85ce20b0..2f9673db20 100644 --- a/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs +++ b/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs @@ -11,7 +11,7 @@ using System.Threading.Tasks; namespace MediaBrowser.Controller.LiveTv { - public class LiveTvProgram : BaseItem + public class LiveTvProgram : BaseItem, ILiveTvItem { /// <summary> /// Gets the user data key. diff --git a/MediaBrowser.Controller/LiveTv/RecordingGroup.cs b/MediaBrowser.Controller/LiveTv/RecordingGroup.cs index d7250d9d2f..175cf162b4 100644 --- a/MediaBrowser.Controller/LiveTv/RecordingGroup.cs +++ b/MediaBrowser.Controller/LiveTv/RecordingGroup.cs @@ -1,5 +1,4 @@ using MediaBrowser.Controller.Entities; -using MediaBrowser.Model.Configuration; using MediaBrowser.Model.Users; namespace MediaBrowser.Controller.LiveTv diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index 314b981d52..f046c76fc9 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -185,6 +185,7 @@ <Compile Include="Library\MetadataConfigurationStore.cs" /> <Compile Include="Library\PlaybackStopEventArgs.cs" /> <Compile Include="Library\UserDataSaveEventArgs.cs" /> + <Compile Include="LiveTv\ILiveTvItem.cs" /> <Compile Include="LiveTv\RecordingGroup.cs" /> <Compile Include="LiveTv\RecordingStatusChangedEventArgs.cs" /> <Compile Include="LiveTv\ILiveTvRecording.cs" /> |