diff options
| author | Tim Hobbs <jesus.tesh@gmail.com> | 2014-03-13 06:36:39 -0700 |
|---|---|---|
| committer | Tim Hobbs <jesus.tesh@gmail.com> | 2014-03-13 06:36:39 -0700 |
| commit | 9976857e785d7e76807e02798480a063f9f3defa (patch) | |
| tree | 0335c9e5ffabc49fd88150b297860af4fe04a0d6 /MediaBrowser.Model/Session | |
| parent | a402d3ea9232799b136b0dc8e9936ebfb286b7f5 (diff) | |
| parent | b7bcc2450694105de9f9fc8cc07d2cfc4d9d7c96 (diff) | |
Merge remote-tracking branch 'upstream/master' into ribbons
Diffstat (limited to 'MediaBrowser.Model/Session')
| -rw-r--r-- | MediaBrowser.Model/Session/BrowseRequest.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Model/Session/MessageCommand.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Model/Session/PlayRequest.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/Session/PlaystateCommand.cs | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/MediaBrowser.Model/Session/BrowseRequest.cs b/MediaBrowser.Model/Session/BrowseRequest.cs index abb3a30abf..e2cdcc1b28 100644 --- a/MediaBrowser.Model/Session/BrowseRequest.cs +++ b/MediaBrowser.Model/Session/BrowseRequest.cs @@ -23,7 +23,7 @@ namespace MediaBrowser.Model.Session /// </summary> /// <value>The name of the item.</value> public string ItemName { get; set; } - + /// <summary> /// Gets or sets the context (Movies, Music, Tv, etc) /// Applicable to genres, studios and persons only because the context of items and artists can be inferred. @@ -40,4 +40,4 @@ namespace MediaBrowser.Model.Session public const string TvShows = "TvShows"; public const string Games = "Games"; } -} +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Session/MessageCommand.cs b/MediaBrowser.Model/Session/MessageCommand.cs index 5ab5808151..b028765ed2 100644 --- a/MediaBrowser.Model/Session/MessageCommand.cs +++ b/MediaBrowser.Model/Session/MessageCommand.cs @@ -4,9 +4,9 @@ namespace MediaBrowser.Model.Session public class MessageCommand { public string Header { get; set; } - + public string Text { get; set; } public long? TimeoutMs { get; set; } } -} +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Session/PlayRequest.cs b/MediaBrowser.Model/Session/PlayRequest.cs index c9bb586931..57f6c37f57 100644 --- a/MediaBrowser.Model/Session/PlayRequest.cs +++ b/MediaBrowser.Model/Session/PlayRequest.cs @@ -43,4 +43,4 @@ namespace MediaBrowser.Model.Session /// </summary> PlayLast } -} +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Session/PlaystateCommand.cs b/MediaBrowser.Model/Session/PlaystateCommand.cs index 7e85d9d276..918f4f70f4 100644 --- a/MediaBrowser.Model/Session/PlaystateCommand.cs +++ b/MediaBrowser.Model/Session/PlaystateCommand.cs @@ -38,4 +38,4 @@ namespace MediaBrowser.Model.Session public long? SeekPositionTicks { get; set; } } -} +}
\ No newline at end of file |
