aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Model')
-rw-r--r--MediaBrowser.Model/ApiClient/IApiClient.cs2
-rw-r--r--MediaBrowser.Model/Configuration/DlnaOptions.cs4
-rw-r--r--MediaBrowser.Model/Dto/StreamOptions.cs68
-rw-r--r--MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs104
-rw-r--r--MediaBrowser.Model/LiveTv/TimerInfoDto.cs92
5 files changed, 57 insertions, 213 deletions
diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs
index 91ac67a1f..8de54f34a 100644
--- a/MediaBrowser.Model/ApiClient/IApiClient.cs
+++ b/MediaBrowser.Model/ApiClient/IApiClient.cs
@@ -1030,7 +1030,7 @@ namespace MediaBrowser.Model.ApiClient
/// <param name="timer">The timer.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task.</returns>
- Task CreateLiveTvTimerAsync(TimerInfoDto timer, CancellationToken cancellationToken);
+ Task CreateLiveTvTimerAsync(BaseTimerInfoDto timer, CancellationToken cancellationToken);
/// <summary>
/// Updates the live tv timer asynchronous.
diff --git a/MediaBrowser.Model/Configuration/DlnaOptions.cs b/MediaBrowser.Model/Configuration/DlnaOptions.cs
index b2503ebc7..b6398239f 100644
--- a/MediaBrowser.Model/Configuration/DlnaOptions.cs
+++ b/MediaBrowser.Model/Configuration/DlnaOptions.cs
@@ -4,11 +4,13 @@ namespace MediaBrowser.Model.Configuration
public class DlnaOptions
{
public bool EnablePlayTo { get; set; }
- public bool EnablePlayToDebugLogging { get; set; }
+ public bool EnableDebugLogging { get; set; }
+ public int ClientDiscoveryIntervalSeconds { get; set; }
public DlnaOptions()
{
EnablePlayTo = true;
+ ClientDiscoveryIntervalSeconds = 60;
}
}
}
diff --git a/MediaBrowser.Model/Dto/StreamOptions.cs b/MediaBrowser.Model/Dto/StreamOptions.cs
index 17fd06cb6..c38707e53 100644
--- a/MediaBrowser.Model/Dto/StreamOptions.cs
+++ b/MediaBrowser.Model/Dto/StreamOptions.cs
@@ -10,7 +10,7 @@
/// Omit to copy
/// </summary>
/// <value>The video codec.</value>
- public VideoCodecs? VideoCodec { get; set; }
+ public string VideoCodec { get; set; }
/// <summary>
/// Gets or sets the video bit rate.
@@ -113,7 +113,7 @@
/// Omit to copy the original stream
/// </summary>
/// <value>The audio encoding format.</value>
- public AudioCodecs? AudioCodec { get; set; }
+ public string AudioCodec { get; set; }
/// <summary>
/// Gets or sets the item id.
@@ -158,68 +158,4 @@
/// <value>The device id.</value>
public string DeviceId { get; set; }
}
-
- /// <summary>
- /// These are the codecs the api is capable of encoding to
- /// </summary>
- public enum AudioCodecs
- {
- /// <summary>
- /// The aac
- /// </summary>
- Aac,
- /// <summary>
- /// The MP3
- /// </summary>
- Mp3,
- /// <summary>
- /// The vorbis
- /// </summary>
- Vorbis,
- /// <summary>
- /// The wma
- /// </summary>
- Wma,
- /// <summary>
- /// The copy
- /// </summary>
- Copy
- }
-
- /// <summary>
- /// Enum VideoCodecs
- /// </summary>
- public enum VideoCodecs
- {
- H263,
-
- /// <summary>
- /// The H264
- /// </summary>
- H264,
-
- /// <summary>
- /// The mpeg4
- /// </summary>
- Mpeg4,
-
- /// <summary>
- /// The theora
- /// </summary>
- Theora,
-
- /// <summary>
- /// The VPX
- /// </summary>
- Vpx,
-
- /// <summary>
- /// The WMV
- /// </summary>
- Wmv,
- /// <summary>
- /// The copy
- /// </summary>
- Copy
- }
}
diff --git a/MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs b/MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs
index 0198cc399..393233c1b 100644
--- a/MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs
@@ -1,81 +1,15 @@
-using System;
+using MediaBrowser.Model.Entities;
+using System;
using System.Collections.Generic;
-using System.ComponentModel;
using System.Diagnostics;
using System.Runtime.Serialization;
-using MediaBrowser.Model.Entities;
namespace MediaBrowser.Model.LiveTv
{
[DebuggerDisplay("Name = {Name}")]
- public class SeriesTimerInfoDto : INotifyPropertyChanged
+ public class SeriesTimerInfoDto : BaseTimerInfoDto
{
/// <summary>
- /// Id of the recording.
- /// </summary>
- public string Id { get; set; }
-
- /// <summary>
- /// Gets or sets the external identifier.
- /// </summary>
- /// <value>The external identifier.</value>
- public string ExternalId { get; set; }
-
- /// <summary>
- /// ChannelId of the recording.
- /// </summary>
- public string ChannelId { 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>
- /// Gets or sets the external channel identifier.
- /// </summary>
- /// <value>The external channel identifier.</value>
- public string ExternalChannelId { get; set; }
-
- /// <summary>
- /// ChannelName of the recording.
- /// </summary>
- public string ChannelName { get; set; }
-
- /// <summary>
- /// Gets or sets the program identifier.
- /// </summary>
- /// <value>The program identifier.</value>
- public string ProgramId { get; set; }
-
- /// <summary>
- /// Gets or sets the external program identifier.
- /// </summary>
- /// <value>The external program identifier.</value>
- public string ExternalProgramId { get; set; }
-
- /// <summary>
- /// Name of the recording.
- /// </summary>
- public string Name { get; set; }
-
- /// <summary>
- /// Description of the recording.
- /// </summary>
- public string Overview { get; set; }
-
- /// <summary>
- /// The start date of the recording, in UTC.
- /// </summary>
- public DateTime StartDate { get; set; }
-
- /// <summary>
- /// The end date of the recording, in UTC.
- /// </summary>
- public DateTime EndDate { get; set; }
-
- /// <summary>
/// Gets or sets a value indicating whether [record any time].
/// </summary>
/// <value><c>true</c> if [record any time]; otherwise, <c>false</c>.</value>
@@ -106,36 +40,6 @@ namespace MediaBrowser.Model.LiveTv
public DayPattern? DayPattern { get; set; }
/// <summary>
- /// Gets or sets the priority.
- /// </summary>
- /// <value>The priority.</value>
- public int Priority { get; set; }
-
- /// <summary>
- /// Gets or sets the pre padding seconds.
- /// </summary>
- /// <value>The pre padding seconds.</value>
- public int PrePaddingSeconds { get; set; }
-
- /// <summary>
- /// Gets or sets the post padding seconds.
- /// </summary>
- /// <value>The post padding seconds.</value>
- public int PostPaddingSeconds { get; set; }
-
- /// <summary>
- /// Gets or sets a value indicating whether this instance is pre padding required.
- /// </summary>
- /// <value><c>true</c> if this instance is pre padding required; otherwise, <c>false</c>.</value>
- public bool IsPrePaddingRequired { get; set; }
-
- /// <summary>
- /// Gets or sets a value indicating whether this instance is post padding required.
- /// </summary>
- /// <value><c>true</c> if this instance is post padding required; otherwise, <c>false</c>.</value>
- public bool IsPostPaddingRequired { get; set; }
-
- /// <summary>
/// Gets or sets the image tags.
/// </summary>
/// <value>The image tags.</value>
@@ -156,7 +60,5 @@ namespace MediaBrowser.Model.LiveTv
ImageTags = new Dictionary<ImageType, Guid>();
Days = new List<DayOfWeek>();
}
-
- public event PropertyChangedEventHandler PropertyChanged;
}
}
diff --git a/MediaBrowser.Model/LiveTv/TimerInfoDto.cs b/MediaBrowser.Model/LiveTv/TimerInfoDto.cs
index a330f44d8..137c95719 100644
--- a/MediaBrowser.Model/LiveTv/TimerInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/TimerInfoDto.cs
@@ -3,9 +3,48 @@ using System.ComponentModel;
namespace MediaBrowser.Model.LiveTv
{
- public class TimerInfoDto : INotifyPropertyChanged
+ public class TimerInfoDto : BaseTimerInfoDto
{
/// <summary>
+ /// Gets or sets the status.
+ /// </summary>
+ /// <value>The status.</value>
+ public RecordingStatus Status { get; set; }
+
+ /// <summary>
+ /// Gets or sets the series timer identifier.
+ /// </summary>
+ /// <value>The series timer identifier.</value>
+ public string SeriesTimerId { get; set; }
+
+ /// <summary>
+ /// Gets or sets the external series timer identifier.
+ /// </summary>
+ /// <value>The external series timer identifier.</value>
+ public string ExternalSeriesTimerId { get; set; }
+
+ /// <summary>
+ /// Gets or sets the run time ticks.
+ /// </summary>
+ /// <value>The run time ticks.</value>
+ public long? RunTimeTicks { get; set; }
+
+ /// <summary>
+ /// Gets or sets the program information.
+ /// </summary>
+ /// <value>The program information.</value>
+ public ProgramInfoDto ProgramInfo { get; set; }
+
+ }
+
+ public class BaseTimerInfoDto : INotifyPropertyChanged
+ {
+ /// <summary>
+ /// Occurs when a property value changes.
+ /// </summary>
+ public event PropertyChangedEventHandler PropertyChanged;
+
+ /// <summary>
/// Id of the recording.
/// </summary>
public string Id { get; set; }
@@ -26,19 +65,13 @@ namespace MediaBrowser.Model.LiveTv
/// </summary>
/// <value>The external channel identifier.</value>
public string ExternalChannelId { get; set; }
-
+
/// <summary>
/// ChannelName of the recording.
/// </summary>
public string ChannelName { 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>
/// Gets or sets the program identifier.
/// </summary>
/// <value>The program identifier.</value>
@@ -49,7 +82,7 @@ namespace MediaBrowser.Model.LiveTv
/// </summary>
/// <value>The external program identifier.</value>
public string ExternalProgramId { get; set; }
-
+
/// <summary>
/// Name of the recording.
/// </summary>
@@ -71,22 +104,16 @@ namespace MediaBrowser.Model.LiveTv
public DateTime EndDate { get; set; }
/// <summary>
- /// Gets or sets the status.
- /// </summary>
- /// <value>The status.</value>
- public RecordingStatus Status { get; set; }
-
- /// <summary>
- /// Gets or sets the series timer identifier.
+ /// Gets or sets the name of the service.
/// </summary>
- /// <value>The series timer identifier.</value>
- public string SeriesTimerId { get; set; }
+ /// <value>The name of the service.</value>
+ public string ServiceName { get; set; }
/// <summary>
- /// Gets or sets the external series timer identifier.
+ /// Gets or sets the priority.
/// </summary>
- /// <value>The external series timer identifier.</value>
- public string ExternalSeriesTimerId { get; set; }
+ /// <value>The priority.</value>
+ public int Priority { get; set; }
/// <summary>
/// Gets or sets the pre padding seconds.
@@ -111,28 +138,5 @@ namespace MediaBrowser.Model.LiveTv
/// </summary>
/// <value><c>true</c> if this instance is post padding required; otherwise, <c>false</c>.</value>
public bool IsPostPaddingRequired { get; set; }
-
- /// <summary>
- /// Gets or sets the run time ticks.
- /// </summary>
- /// <value>The run time ticks.</value>
- public long? RunTimeTicks { get; set; }
-
- /// <summary>
- /// Gets or sets the priority.
- /// </summary>
- /// <value>The priority.</value>
- public int Priority { get; set; }
-
- /// <summary>
- /// Gets or sets the program information.
- /// </summary>
- /// <value>The program information.</value>
- public ProgramInfoDto ProgramInfo { get; set; }
-
- /// <summary>
- /// Occurs when a property value changes.
- /// </summary>
- public event PropertyChangedEventHandler PropertyChanged;
}
}
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-05 21:28:10 +0000