aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Model')
-rw-r--r--MediaBrowser.Model/ApiClient/IApiClient.cs10
-rw-r--r--MediaBrowser.Model/ApiClient/IServerEvents.cs2
-rw-r--r--MediaBrowser.Model/ApiClient/ServerEventArgs.cs10
-rw-r--r--MediaBrowser.Model/Configuration/ServerConfiguration.cs4
-rw-r--r--MediaBrowser.Model/Globalization/CountryInfo.cs6
-rw-r--r--MediaBrowser.Model/LiveTv/ChannelInfoDto.cs3
-rw-r--r--MediaBrowser.Model/LiveTv/ChannelQuery.cs6
-rw-r--r--MediaBrowser.Model/LiveTv/RecordingInfoDto.cs11
-rw-r--r--MediaBrowser.Model/MediaBrowser.Model.csproj3
-rw-r--r--MediaBrowser.Model/Session/GeneralCommand.cs (renamed from MediaBrowser.Model/Session/GenericCommand.cs)6
-rw-r--r--MediaBrowser.Model/Session/PlayRequest.cs14
-rw-r--r--MediaBrowser.Model/Session/SystemCommand.cs14
-rw-r--r--MediaBrowser.Model/System/SystemInfo.cs6
13 files changed, 57 insertions, 38 deletions
diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs
index 28c5822e9..dc5e26be3 100644
--- a/MediaBrowser.Model/ApiClient/IApiClient.cs
+++ b/MediaBrowser.Model/ApiClient/IApiClient.cs
@@ -593,17 +593,9 @@ namespace MediaBrowser.Model.ApiClient
/// Sends the command asynchronous.
/// </summary>
/// <param name="sessionId">The session identifier.</param>
- /// <param name="request">The request.</param>
- /// <returns>Task.</returns>
- Task SendCommandAsync(string sessionId, GenericCommand request);
-
- /// <summary>
- /// Sends a system command to the client
- /// </summary>
- /// <param name="sessionId">The session id.</param>
/// <param name="command">The command.</param>
/// <returns>Task.</returns>
- Task SendSystemCommandAsync(string sessionId, SystemCommand command);
+ Task SendCommandAsync(string sessionId, GeneralCommand command);
/// <summary>
/// Instructs the client to display a message to the user
diff --git a/MediaBrowser.Model/ApiClient/IServerEvents.cs b/MediaBrowser.Model/ApiClient/IServerEvents.cs
index 0a38c63ad..e13f3cc2c 100644
--- a/MediaBrowser.Model/ApiClient/IServerEvents.cs
+++ b/MediaBrowser.Model/ApiClient/IServerEvents.cs
@@ -66,7 +66,7 @@ namespace MediaBrowser.Model.ApiClient
/// <summary>
/// Occurs when [system command].
/// </summary>
- event EventHandler<SystemCommandEventArgs> SystemCommand;
+ event EventHandler<GeneralCommandEventArgs> GeneralCommand;
/// <summary>
/// Occurs when [notification added].
/// </summary>
diff --git a/MediaBrowser.Model/ApiClient/ServerEventArgs.cs b/MediaBrowser.Model/ApiClient/ServerEventArgs.cs
index d3212caf4..6637edd74 100644
--- a/MediaBrowser.Model/ApiClient/ServerEventArgs.cs
+++ b/MediaBrowser.Model/ApiClient/ServerEventArgs.cs
@@ -152,13 +152,19 @@ namespace MediaBrowser.Model.ApiClient
/// <summary>
/// Class SystemCommandEventArgs
/// </summary>
- public class SystemCommandEventArgs : EventArgs
+ public class GeneralCommandEventArgs : EventArgs
{
/// <summary>
/// Gets or sets the command.
/// </summary>
/// <value>The command.</value>
- public SystemCommand Command { get; set; }
+ public GeneralCommand Command { get; set; }
+
+ /// <summary>
+ /// Gets or sets the type of the known command.
+ /// </summary>
+ /// <value>The type of the known command.</value>
+ public GeneralCommandType? KnownCommandType { get; set; }
}
/// <summary>
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index d0caa3ad2..932d5d63d 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -218,6 +218,8 @@ namespace MediaBrowser.Model.Configuration
public string ServerName { get; set; }
public string WanDdns { get; set; }
+ public string UICulture { get; set; }
+
public DlnaOptions DlnaOptions { get; set; }
/// <summary>
@@ -281,6 +283,8 @@ namespace MediaBrowser.Model.Configuration
MetadataOptions = options.ToArray();
DlnaOptions = new DlnaOptions();
+
+ UICulture = "en-us";
}
}
diff --git a/MediaBrowser.Model/Globalization/CountryInfo.cs b/MediaBrowser.Model/Globalization/CountryInfo.cs
index 16aea8436..9f5f00d80 100644
--- a/MediaBrowser.Model/Globalization/CountryInfo.cs
+++ b/MediaBrowser.Model/Globalization/CountryInfo.cs
@@ -30,4 +30,10 @@ namespace MediaBrowser.Model.Globalization
/// <value>The name of the three letter ISO region.</value>
public string ThreeLetterISORegionName { get; set; }
}
+
+ public class LocalizatonOption
+ {
+ public string Name { get; set; }
+ public string Value { get; set; }
+ }
}
diff --git a/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs b/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
index d17e2a7f9..fe6faf363 100644
--- a/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
@@ -33,6 +33,8 @@ namespace MediaBrowser.Model.LiveTv
/// <value>The external identifier.</value>
public string ExternalId { get; set; }
+ public List<MediaSourceInfo> MediaSources { get; set; }
+
/// <summary>
/// Gets or sets the image tags.
/// </summary>
@@ -112,6 +114,7 @@ namespace MediaBrowser.Model.LiveTv
public ChannelInfoDto()
{
ImageTags = new Dictionary<ImageType, Guid>();
+ MediaSources = new List<MediaSourceInfo>();
}
public event PropertyChangedEventHandler PropertyChanged;
diff --git a/MediaBrowser.Model/LiveTv/ChannelQuery.cs b/MediaBrowser.Model/LiveTv/ChannelQuery.cs
index eb3b20ce3..9079ebacd 100644
--- a/MediaBrowser.Model/LiveTv/ChannelQuery.cs
+++ b/MediaBrowser.Model/LiveTv/ChannelQuery.cs
@@ -13,6 +13,12 @@ namespace MediaBrowser.Model.LiveTv
public ChannelType? ChannelType { get; set; }
/// <summary>
+ /// Gets or sets a value indicating whether this instance is favorite.
+ /// </summary>
+ /// <value><c>null</c> if [is favorite] contains no value, <c>true</c> if [is favorite]; otherwise, <c>false</c>.</value>
+ public bool? IsFavorite { get; set; }
+
+ /// <summary>
/// Gets or sets the user identifier.
/// </summary>
/// <value>The user identifier.</value>
diff --git a/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs b/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
index 40aa5710e..de07382c0 100644
--- a/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
@@ -1,11 +1,11 @@
-using System.Diagnostics;
-using System.Runtime.Serialization;
-using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Library;
using System;
using System.Collections.Generic;
using System.ComponentModel;
-using MediaBrowser.Model.Library;
+using System.Diagnostics;
+using System.Runtime.Serialization;
namespace MediaBrowser.Model.LiveTv
{
@@ -248,10 +248,13 @@ namespace MediaBrowser.Model.LiveTv
/// <value>The type.</value>
public string Type { get; set; }
+ public List<MediaSourceInfo> MediaSources { get; set; }
+
public RecordingInfoDto()
{
Genres = new List<string>();
ImageTags = new Dictionary<ImageType, Guid>();
+ MediaSources = new List<MediaSourceInfo>();
}
public event PropertyChangedEventHandler PropertyChanged;
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 207543fe8..0859f6999 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -132,7 +132,7 @@
<Compile Include="Querying\UserQuery.cs" />
<Compile Include="Search\SearchQuery.cs" />
<Compile Include="Session\BrowseRequest.cs" />
- <Compile Include="Session\GenericCommand.cs" />
+ <Compile Include="Session\GeneralCommand.cs" />
<Compile Include="Session\MessageCommand.cs" />
<Compile Include="Session\PlaybackReports.cs" />
<Compile Include="Session\PlayRequest.cs" />
@@ -171,7 +171,6 @@
<Compile Include="Serialization\IXmlSerializer.cs" />
<Compile Include="Session\SessionCapabilities.cs" />
<Compile Include="Session\SessionInfoDto.cs" />
- <Compile Include="Session\SystemCommand.cs" />
<Compile Include="Session\UserDataChangeInfo.cs" />
<Compile Include="Themes\AppTheme.cs" />
<Compile Include="Themes\ThemeImage.cs" />
diff --git a/MediaBrowser.Model/Session/GenericCommand.cs b/MediaBrowser.Model/Session/GeneralCommand.cs
index f7ea0a84a..0de7d6dd8 100644
--- a/MediaBrowser.Model/Session/GenericCommand.cs
+++ b/MediaBrowser.Model/Session/GeneralCommand.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
namespace MediaBrowser.Model.Session
{
- public class GenericCommand
+ public class GeneralCommand
{
public string Name { get; set; }
@@ -11,7 +11,7 @@ namespace MediaBrowser.Model.Session
public Dictionary<string, string> Arguments { get; set; }
- public GenericCommand()
+ public GeneralCommand()
{
Arguments = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
}
@@ -20,7 +20,7 @@ namespace MediaBrowser.Model.Session
/// <summary>
/// This exists simply to identify a set of known commands.
/// </summary>
- public enum CoreGenericCommand
+ public enum GeneralCommandType
{
MoveUp = 0,
MoveDown = 1,
diff --git a/MediaBrowser.Model/Session/PlayRequest.cs b/MediaBrowser.Model/Session/PlayRequest.cs
index 949274a5d..74d7a70a3 100644
--- a/MediaBrowser.Model/Session/PlayRequest.cs
+++ b/MediaBrowser.Model/Session/PlayRequest.cs
@@ -39,14 +39,22 @@ namespace MediaBrowser.Model.Session
/// <summary>
/// The play now
/// </summary>
- PlayNow,
+ PlayNow = 0,
/// <summary>
/// The play next
/// </summary>
- PlayNext,
+ PlayNext = 1,
/// <summary>
/// The play last
/// </summary>
- PlayLast
+ PlayLast = 2,
+ /// <summary>
+ /// The play instant mix
+ /// </summary>
+ PlayInstantMix = 3,
+ /// <summary>
+ /// The play shuffle
+ /// </summary>
+ PlayShuffle = 4
}
} \ No newline at end of file
diff --git a/MediaBrowser.Model/Session/SystemCommand.cs b/MediaBrowser.Model/Session/SystemCommand.cs
deleted file mode 100644
index 2fcaef6e3..000000000
--- a/MediaBrowser.Model/Session/SystemCommand.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-
-namespace MediaBrowser.Model.Session
-{
- public enum SystemCommand
- {
- GoHome,
- GoToSettings,
- VolumeUp,
- VolumeDown,
- Mute,
- Unmute,
- ToggleMute
- }
-}
diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs
index ec31c5529..5b1e7d6bb 100644
--- a/MediaBrowser.Model/System/SystemInfo.cs
+++ b/MediaBrowser.Model/System/SystemInfo.cs
@@ -117,6 +117,12 @@ namespace MediaBrowser.Model.System
public string LogPath { get; set; }
/// <summary>
+ /// Gets or sets the internal metadata path.
+ /// </summary>
+ /// <value>The internal metadata path.</value>
+ public string InternalMetadataPath { get; set; }
+
+ /// <summary>
/// Gets or sets the transcoding temporary path.
/// </summary>
/// <value>The transcoding temporary path.</value>
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-04 18:57:16 +0000