diff options
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Entities/MediaStream.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Model/MediaBrowser.Model.csproj | 1 | ||||
| -rw-r--r-- | MediaBrowser.Model/Sync/SyncJob.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/Sync/SyncJobRequest.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Model/Sync/SyncScheduleRequest.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Model/Sync/SyncTarget.cs | 17 |
6 files changed, 27 insertions, 7 deletions
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs index fe05483e7..f525ae5e0 100644 --- a/MediaBrowser.Model/Entities/MediaStream.cs +++ b/MediaBrowser.Model/Entities/MediaStream.cs @@ -1,6 +1,5 @@ using MediaBrowser.Model.Extensions; using System.Diagnostics; -using System.Runtime.Serialization; namespace MediaBrowser.Model.Entities { @@ -138,8 +137,11 @@ namespace MediaBrowser.Model.Entities string codec = Codec ?? string.Empty; + // sub = external .sub file + return StringHelper.IndexOfIgnoreCase(codec, "pgs") == -1 && - StringHelper.IndexOfIgnoreCase(codec, "dvd") == -1; + StringHelper.IndexOfIgnoreCase(codec, "dvd") == -1 && + !StringHelper.EqualsIgnoreCase(codec, "sub"); } } diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index a2f2b1318..3c265ff91 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -304,6 +304,7 @@ <Compile Include="Sync\SyncSchedule.cs" /> <Compile Include="Sync\SyncScheduleQuery.cs" /> <Compile Include="Sync\SyncScheduleRequest.cs" /> + <Compile Include="Sync\SyncTarget.cs" /> <Compile Include="System\LogFile.cs" /> <Compile Include="Themes\AppTheme.cs" /> <Compile Include="Themes\AppThemeInfo.cs" /> diff --git a/MediaBrowser.Model/Sync/SyncJob.cs b/MediaBrowser.Model/Sync/SyncJob.cs index 09049a196..34809834c 100644 --- a/MediaBrowser.Model/Sync/SyncJob.cs +++ b/MediaBrowser.Model/Sync/SyncJob.cs @@ -12,7 +12,7 @@ namespace MediaBrowser.Model.Sync /// Gets or sets the device identifier. /// </summary> /// <value>The device identifier.</value> - public string DeviceId { get; set; } + public string TargetId { get; set; } /// <summary> /// Gets or sets the item identifier. /// </summary> diff --git a/MediaBrowser.Model/Sync/SyncJobRequest.cs b/MediaBrowser.Model/Sync/SyncJobRequest.cs index 9871f976d..42b744db6 100644 --- a/MediaBrowser.Model/Sync/SyncJobRequest.cs +++ b/MediaBrowser.Model/Sync/SyncJobRequest.cs @@ -8,7 +8,7 @@ namespace MediaBrowser.Model.Sync /// Gets or sets the device identifier. /// </summary> /// <value>The device identifier.</value> - public List<string> DeviceIds { get; set; } + public List<string> TargetIds { get; set; } /// <summary> /// Gets or sets the item identifier. /// </summary> @@ -22,7 +22,7 @@ namespace MediaBrowser.Model.Sync public SyncJobRequest() { - DeviceIds = new List<string>(); + TargetIds = new List<string>(); } } } diff --git a/MediaBrowser.Model/Sync/SyncScheduleRequest.cs b/MediaBrowser.Model/Sync/SyncScheduleRequest.cs index e1ba4b115..076548f57 100644 --- a/MediaBrowser.Model/Sync/SyncScheduleRequest.cs +++ b/MediaBrowser.Model/Sync/SyncScheduleRequest.cs @@ -8,7 +8,7 @@ namespace MediaBrowser.Model.Sync /// Gets or sets the device identifier. /// </summary> /// <value>The device identifier.</value> - public List<string> DeviceIds { get; set; } + public List<string> TargetIds { get; set; } /// <summary> /// Gets or sets the quality. /// </summary> @@ -17,7 +17,7 @@ namespace MediaBrowser.Model.Sync public SyncScheduleRequest() { - DeviceIds = new List<string>(); + TargetIds = new List<string>(); } } } diff --git a/MediaBrowser.Model/Sync/SyncTarget.cs b/MediaBrowser.Model/Sync/SyncTarget.cs new file mode 100644 index 000000000..8901f0f27 --- /dev/null +++ b/MediaBrowser.Model/Sync/SyncTarget.cs @@ -0,0 +1,17 @@ + +namespace MediaBrowser.Model.Sync +{ + public class SyncTarget + { + /// <summary> + /// Gets or sets the name. + /// </summary> + /// <value>The name.</value> + public string Name { get; set; } + /// <summary> + /// Gets or sets the identifier. + /// </summary> + /// <value>The identifier.</value> + public string Id { get; set; } + } +} |
