diff options
| author | Tim Hobbs <jesus.tesh@gmail.com> | 2014-05-18 15:45:16 -0700 |
|---|---|---|
| committer | Tim Hobbs <jesus.tesh@gmail.com> | 2014-05-18 15:45:16 -0700 |
| commit | 6e1082563173b6b71b96fc8e38ff974f49c07add (patch) | |
| tree | ebdf2c12344afd856c040b8396b288dc6be8f8e2 /MediaBrowser.Model/Configuration | |
| parent | 0bf6fdb5a4050f30ac8100210a9fe9e2a48f63e2 (diff) | |
| parent | 708d5a416ed373c158b3dc45952a1fd123fb74e8 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser into upstream-master
Diffstat (limited to 'MediaBrowser.Model/Configuration')
| -rw-r--r-- | MediaBrowser.Model/Configuration/LiveTvOptions.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Model/Configuration/NotificationType.cs | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/MediaBrowser.Model/Configuration/LiveTvOptions.cs b/MediaBrowser.Model/Configuration/LiveTvOptions.cs index ae8aeb200e..575f0b8637 100644 --- a/MediaBrowser.Model/Configuration/LiveTvOptions.cs +++ b/MediaBrowser.Model/Configuration/LiveTvOptions.cs @@ -3,5 +3,6 @@ public class LiveTvOptions { public int? GuideDays { get; set; } + public string ActiveService { get; set; } } }
\ No newline at end of file diff --git a/MediaBrowser.Model/Configuration/NotificationType.cs b/MediaBrowser.Model/Configuration/NotificationType.cs index 0ddcf42517..d8043b0e14 100644 --- a/MediaBrowser.Model/Configuration/NotificationType.cs +++ b/MediaBrowser.Model/Configuration/NotificationType.cs @@ -6,6 +6,10 @@ namespace MediaBrowser.Model.Configuration ApplicationUpdateInstalled, AudioPlayback, GamePlayback, + VideoPlayback, + AudioPlaybackStopped, + GamePlaybackStopped, + VideoPlaybackStopped, InstallationFailed, PluginError, PluginInstalled, @@ -14,7 +18,6 @@ namespace MediaBrowser.Model.Configuration NewLibraryContent, NewLibraryContentMultiple, ServerRestartRequired, - TaskFailed, - VideoPlayback + TaskFailed } }
\ No newline at end of file |