aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.UI/Playback
diff options
context:
space:
mode:
authorScottIsAFool <scottisafool@live.co.uk>2013-02-21 17:50:46 +0000
committerScottIsAFool <scottisafool@live.co.uk>2013-02-21 17:50:46 +0000
commitec621df5f6ced7339873652197eb77ac1c386419 (patch)
tree5b437df423aa40ae5e63e0c2dbf73d3720612d0f /MediaBrowser.UI/Playback
parentfbf963b68f06ad6547c3e051afb2b2695ba4cf2b (diff)
Renamed Dto objects
Updated Fody Renamed Dto objects
Diffstat (limited to 'MediaBrowser.UI/Playback')
-rw-r--r--MediaBrowser.UI/Playback/BaseMediaPlayer.cs22
-rw-r--r--MediaBrowser.UI/Playback/ExternalPlayer/BaseExternalPlayer.cs12
-rw-r--r--MediaBrowser.UI/Playback/ExternalPlayer/GenericExternalPlayer.cs4
-rw-r--r--MediaBrowser.UI/Playback/InternalPlayer/BaseInternalMediaPlayer.cs4
-rw-r--r--MediaBrowser.UI/Playback/NVlc/InternalMediaPlayerNVlc.cs10
-rw-r--r--MediaBrowser.UI/Playback/PlayOptions.cs4
-rw-r--r--MediaBrowser.UI/Playback/PlaybackEventArgs.cs4
-rw-r--r--MediaBrowser.UI/Playback/PlaybackManager.cs22
8 files changed, 41 insertions, 41 deletions
diff --git a/MediaBrowser.UI/Playback/BaseMediaPlayer.cs b/MediaBrowser.UI/Playback/BaseMediaPlayer.cs
index 4d466e3cb4..dded1b0a08 100644
--- a/MediaBrowser.UI/Playback/BaseMediaPlayer.cs
+++ b/MediaBrowser.UI/Playback/BaseMediaPlayer.cs
@@ -1,6 +1,6 @@
using MediaBrowser.Common.Events;
using MediaBrowser.Common.Logging;
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Net;
using MediaBrowser.UI.Configuration;
@@ -60,7 +60,7 @@ namespace MediaBrowser.UI.Playback
/// <summary>
/// The currently playing items
/// </summary>
- public List<DtoBaseItem> Playlist = new List<DtoBaseItem>();
+ public List<BaseItemDto> Playlist = new List<BaseItemDto>();
/// <summary>
/// The _play state
@@ -135,7 +135,7 @@ namespace MediaBrowser.UI.Playback
/// </summary>
/// <param name="item">The item.</param>
/// <returns><c>true</c> if this instance can play the specified item; otherwise, <c>false</c>.</returns>
- public abstract bool CanPlay(DtoBaseItem item);
+ public abstract bool CanPlay(BaseItemDto item);
/// <summary>
/// Gets a value indicating whether this instance can change volume.
@@ -180,7 +180,7 @@ namespace MediaBrowser.UI.Playback
/// Gets the current media.
/// </summary>
/// <value>The current media.</value>
- public DtoBaseItem CurrentMedia
+ public BaseItemDto CurrentMedia
{
get
{
@@ -248,13 +248,13 @@ namespace MediaBrowser.UI.Playback
/// <param name="items">The items.</param>
/// <param name="options">The options.</param>
/// <param name="playerConfiguration">The player configuration.</param>
- protected abstract void PlayInternal(List<DtoBaseItem> items, PlayOptions options, PlayerConfiguration playerConfiguration);
+ protected abstract void PlayInternal(List<BaseItemDto> items, PlayOptions options, PlayerConfiguration playerConfiguration);
/// <summary>
/// Queues the internal.
/// </summary>
/// <param name="items">The items.</param>
- protected virtual void QueueInternal(List<DtoBaseItem> items)
+ protected virtual void QueueInternal(List<BaseItemDto> items)
{
}
@@ -393,7 +393,7 @@ namespace MediaBrowser.UI.Playback
/// <param name="items">The items.</param>
/// <exception cref="System.ArgumentNullException">items</exception>
/// <exception cref="System.InvalidOperationException"></exception>
- internal void Queue(List<DtoBaseItem> items)
+ internal void Queue(List<BaseItemDto> items)
{
if (items == null)
{
@@ -632,7 +632,7 @@ namespace MediaBrowser.UI.Playback
/// Sends the playback start check in.
/// </summary>
/// <param name="item">The item.</param>
- protected async void SendPlaybackStartCheckIn(DtoBaseItem item)
+ protected async void SendPlaybackStartCheckIn(BaseItemDto item)
{
if (string.IsNullOrEmpty(item.Id))
{
@@ -656,7 +656,7 @@ namespace MediaBrowser.UI.Playback
/// </summary>
/// <param name="item">The item.</param>
/// <param name="positionTicks">The position ticks.</param>
- protected async void SendPlaybackProgressCheckIn(DtoBaseItem item, long? positionTicks)
+ protected async void SendPlaybackProgressCheckIn(BaseItemDto item, long? positionTicks)
{
if (string.IsNullOrEmpty(item.Id))
{
@@ -681,7 +681,7 @@ namespace MediaBrowser.UI.Playback
/// </summary>
/// <param name="item">The item.</param>
/// <param name="positionTicks">The position ticks.</param>
- protected async void SendPlaybackStopCheckIn(DtoBaseItem item, long? positionTicks)
+ protected async void SendPlaybackStopCheckIn(BaseItemDto item, long? positionTicks)
{
if (string.IsNullOrEmpty(item.Id))
{
@@ -705,7 +705,7 @@ namespace MediaBrowser.UI.Playback
/// Marks the watched.
/// </summary>
/// <param name="items">The items.</param>
- protected async void MarkWatched(IEnumerable<DtoBaseItem> items)
+ protected async void MarkWatched(IEnumerable<BaseItemDto> items)
{
var idList = items.Where(i => !string.IsNullOrEmpty(i.Id)).Select(i => i.Id);
diff --git a/MediaBrowser.UI/Playback/ExternalPlayer/BaseExternalPlayer.cs b/MediaBrowser.UI/Playback/ExternalPlayer/BaseExternalPlayer.cs
index ca7f333f52..0b05a64820 100644
--- a/MediaBrowser.UI/Playback/ExternalPlayer/BaseExternalPlayer.cs
+++ b/MediaBrowser.UI/Playback/ExternalPlayer/BaseExternalPlayer.cs
@@ -1,5 +1,5 @@
using MediaBrowser.Common.Logging;
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
using MediaBrowser.UI.Configuration;
using MediaBrowser.UI.UserInput;
using System;
@@ -71,7 +71,7 @@ namespace MediaBrowser.UI.Playback.ExternalPlayer
/// <param name="options">The options.</param>
/// <param name="playerConfiguration">The player configuration.</param>
/// <returns>ProcessStartInfo.</returns>
- protected virtual ProcessStartInfo GetProcessStartInfo(List<DtoBaseItem> items, PlayOptions options, PlayerConfiguration playerConfiguration)
+ protected virtual ProcessStartInfo GetProcessStartInfo(List<BaseItemDto> items, PlayOptions options, PlayerConfiguration playerConfiguration)
{
return new ProcessStartInfo
{
@@ -87,7 +87,7 @@ namespace MediaBrowser.UI.Playback.ExternalPlayer
/// <param name="options">The options.</param>
/// <param name="playerConfiguration">The player configuration.</param>
/// <returns>System.String.</returns>
- protected virtual string GetCommandArguments(List<DtoBaseItem> items, PlayOptions options, PlayerConfiguration playerConfiguration)
+ protected virtual string GetCommandArguments(List<BaseItemDto> items, PlayOptions options, PlayerConfiguration playerConfiguration)
{
var args = playerConfiguration.Args;
@@ -105,7 +105,7 @@ namespace MediaBrowser.UI.Playback.ExternalPlayer
/// <param name="items">The items.</param>
/// <param name="formatString">The format string.</param>
/// <returns>System.String.</returns>
- protected string GetCommandArguments(List<DtoBaseItem> items, string formatString)
+ protected string GetCommandArguments(List<BaseItemDto> items, string formatString)
{
var paths = items.Select(i => "\"" + GetPathForCommandLine(i) + "\"");
@@ -117,7 +117,7 @@ namespace MediaBrowser.UI.Playback.ExternalPlayer
/// </summary>
/// <param name="item">The item.</param>
/// <returns>System.String.</returns>
- protected virtual string GetPathForCommandLine(DtoBaseItem item)
+ protected virtual string GetPathForCommandLine(BaseItemDto item)
{
return item.Path;
}
@@ -155,7 +155,7 @@ namespace MediaBrowser.UI.Playback.ExternalPlayer
/// <param name="items">The items.</param>
/// <param name="options">The options.</param>
/// <param name="playerConfiguration">The player configuration.</param>
- protected override void PlayInternal(List<DtoBaseItem> items, PlayOptions options, PlayerConfiguration playerConfiguration)
+ protected override void PlayInternal(List<BaseItemDto> items, PlayOptions options, PlayerConfiguration playerConfiguration)
{
CurrentProcess = new Process
{
diff --git a/MediaBrowser.UI/Playback/ExternalPlayer/GenericExternalPlayer.cs b/MediaBrowser.UI/Playback/ExternalPlayer/GenericExternalPlayer.cs
index 5b5e248bd0..0144ce47a2 100644
--- a/MediaBrowser.UI/Playback/ExternalPlayer/GenericExternalPlayer.cs
+++ b/MediaBrowser.UI/Playback/ExternalPlayer/GenericExternalPlayer.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
using System.ComponentModel.Composition;
namespace MediaBrowser.UI.Playback.ExternalPlayer
@@ -23,7 +23,7 @@ namespace MediaBrowser.UI.Playback.ExternalPlayer
/// </summary>
/// <param name="item">The item.</param>
/// <returns><c>true</c> if this instance can play the specified item; otherwise, <c>false</c>.</returns>
- public override bool CanPlay(DtoBaseItem item)
+ public override bool CanPlay(BaseItemDto item)
{
return false;
}
diff --git a/MediaBrowser.UI/Playback/InternalPlayer/BaseInternalMediaPlayer.cs b/MediaBrowser.UI/Playback/InternalPlayer/BaseInternalMediaPlayer.cs
index 0c75190ce7..2ff17b7897 100644
--- a/MediaBrowser.UI/Playback/InternalPlayer/BaseInternalMediaPlayer.cs
+++ b/MediaBrowser.UI/Playback/InternalPlayer/BaseInternalMediaPlayer.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
using MediaBrowser.UI.Configuration;
using System.Collections.Generic;
using System.Windows;
@@ -21,7 +21,7 @@ namespace MediaBrowser.UI.Playback.InternalPlayer
/// <param name="items">The items.</param>
/// <param name="options">The options.</param>
/// <param name="playerConfiguration">The player configuration.</param>
- protected override void PlayInternal(List<DtoBaseItem> items, PlayOptions options, PlayerConfiguration playerConfiguration)
+ protected override void PlayInternal(List<BaseItemDto> items, PlayOptions options, PlayerConfiguration playerConfiguration)
{
App.Instance.ApplicationWindow.Dispatcher.Invoke(() =>
{
diff --git a/MediaBrowser.UI/Playback/NVlc/InternalMediaPlayerNVlc.cs b/MediaBrowser.UI/Playback/NVlc/InternalMediaPlayerNVlc.cs
index c055f49d91..08c9acfcb0 100644
--- a/MediaBrowser.UI/Playback/NVlc/InternalMediaPlayerNVlc.cs
+++ b/MediaBrowser.UI/Playback/NVlc/InternalMediaPlayerNVlc.cs
@@ -3,7 +3,7 @@ using Declarations.Events;
using Declarations.Media;
using Declarations.Players;
using Implementation;
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities;
using MediaBrowser.UI.Configuration;
using MediaBrowser.UI.Playback.InternalPlayer;
@@ -183,7 +183,7 @@ namespace MediaBrowser.UI.Playback.NVlc
/// </summary>
/// <param name="item">The item.</param>
/// <returns><c>true</c> if this instance can play the specified item; otherwise, <c>false</c>.</returns>
- public override bool CanPlay(DtoBaseItem item)
+ public override bool CanPlay(BaseItemDto item)
{
return item.IsVideo || item.IsAudio;
}
@@ -203,7 +203,7 @@ namespace MediaBrowser.UI.Playback.NVlc
/// <param name="items">The items.</param>
/// <param name="options">The options.</param>
/// <param name="playerConfiguration">The player configuration.</param>
- protected override void PlayInternal(List<DtoBaseItem> items, PlayOptions options, PlayerConfiguration playerConfiguration)
+ protected override void PlayInternal(List<BaseItemDto> items, PlayOptions options, PlayerConfiguration playerConfiguration)
{
EnsureMediaPlayerCreated();
@@ -234,7 +234,7 @@ namespace MediaBrowser.UI.Playback.NVlc
/// </summary>
/// <param name="item">The item.</param>
/// <returns>System.String.</returns>
- private string GetPlayablePath(DtoBaseItem item)
+ private string GetPlayablePath(BaseItemDto item)
{
if (item.VideoType.HasValue && item.VideoType.Value == VideoType.BluRay)
{
@@ -289,7 +289,7 @@ namespace MediaBrowser.UI.Playback.NVlc
/// Queues the internal.
/// </summary>
/// <param name="items">The items.</param>
- protected override void QueueInternal(List<DtoBaseItem> items)
+ protected override void QueueInternal(List<BaseItemDto> items)
{
}
diff --git a/MediaBrowser.UI/Playback/PlayOptions.cs b/MediaBrowser.UI/Playback/PlayOptions.cs
index b5e3301689..276e611b9c 100644
--- a/MediaBrowser.UI/Playback/PlayOptions.cs
+++ b/MediaBrowser.UI/Playback/PlayOptions.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
using System;
using System.Collections.Generic;
@@ -13,7 +13,7 @@ namespace MediaBrowser.UI.Playback
/// Gets or sets the items.
/// </summary>
/// <value>The items.</value>
- public List<DtoBaseItem> Items { get; set; }
+ public List<BaseItemDto> Items { get; set; }
/// <summary>
/// If true, the PlayableItems will be shuffled before playback
diff --git a/MediaBrowser.UI/Playback/PlaybackEventArgs.cs b/MediaBrowser.UI/Playback/PlaybackEventArgs.cs
index 0793313e4a..a2eef782a6 100644
--- a/MediaBrowser.UI/Playback/PlaybackEventArgs.cs
+++ b/MediaBrowser.UI/Playback/PlaybackEventArgs.cs
@@ -1,5 +1,5 @@
using System.Collections.Generic;
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
using MediaBrowser.UI.Configuration;
using System;
@@ -44,6 +44,6 @@ namespace MediaBrowser.UI.Playback
/// Gets or sets the items.
/// </summary>
/// <value>The items.</value>
- public List<DtoBaseItem> Items { get; set; }
+ public List<BaseItemDto> Items { get; set; }
}
}
diff --git a/MediaBrowser.UI/Playback/PlaybackManager.cs b/MediaBrowser.UI/Playback/PlaybackManager.cs
index 5ad1c9f557..808d605e94 100644
--- a/MediaBrowser.UI/Playback/PlaybackManager.cs
+++ b/MediaBrowser.UI/Playback/PlaybackManager.cs
@@ -1,7 +1,7 @@
using MediaBrowser.Common.Events;
using MediaBrowser.Common.Extensions;
using MediaBrowser.Common.Kernel;
-using MediaBrowser.Model.DTO;
+using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Net;
using MediaBrowser.UI.Configuration;
@@ -64,7 +64,7 @@ namespace MediaBrowser.UI.Playback
/// </summary>
/// <param name="player">The player.</param>
/// <param name="items">The items.</param>
- internal void OnPlaybackCompleted(BaseMediaPlayer player, List<DtoBaseItem> items)
+ internal void OnPlaybackCompleted(BaseMediaPlayer player, List<BaseItemDto> items)
{
EventHelper.QueueEventIfNotNull(PlaybackCompleted, this, new PlaybackStopEventArgs
{
@@ -167,10 +167,10 @@ namespace MediaBrowser.UI.Playback
/// Gets the playable item.
/// </summary>
/// <param name="path">The path.</param>
- /// <returns>DtoBaseItem.</returns>
- public DtoBaseItem GetPlayableItem(string path)
+ /// <returns>BaseItemDto.</returns>
+ public BaseItemDto GetPlayableItem(string path)
{
- return new DtoBaseItem
+ return new BaseItemDto
{
Path = path,
Name = Path.GetFileName(path),
@@ -185,10 +185,10 @@ namespace MediaBrowser.UI.Playback
/// </summary>
/// <param name="uri">The URI.</param>
/// <param name="name">The name.</param>
- /// <returns>DtoBaseItem.</returns>
- public DtoBaseItem GetPlayableItem(Uri uri, string name)
+ /// <returns>BaseItemDto.</returns>
+ public BaseItemDto GetPlayableItem(Uri uri, string name)
{
- return new DtoBaseItem
+ return new BaseItemDto
{
Path = uri.ToString(),
Name = name,
@@ -215,7 +215,7 @@ namespace MediaBrowser.UI.Playback
/// </summary>
/// <param name="items">The items.</param>
/// <returns>BaseMediaPlayer.</returns>
- private Tuple<BaseMediaPlayer, PlayerConfiguration> GetPlayer(List<DtoBaseItem> items)
+ private Tuple<BaseMediaPlayer, PlayerConfiguration> GetPlayer(List<BaseItemDto> items)
{
var player = GetConfiguredPlayer(items);
@@ -240,7 +240,7 @@ namespace MediaBrowser.UI.Playback
/// </summary>
/// <param name="items">The items.</param>
/// <returns>BaseMediaPlayer.</returns>
- private Tuple<BaseMediaPlayer, PlayerConfiguration> GetConfiguredPlayer(List<DtoBaseItem> items)
+ private Tuple<BaseMediaPlayer, PlayerConfiguration> GetConfiguredPlayer(List<BaseItemDto> items)
{
if (UIKernel.Instance.Configuration.MediaPlayers == null)
{
@@ -258,7 +258,7 @@ namespace MediaBrowser.UI.Playback
/// <param name="configuration">The configuration.</param>
/// <param name="items">The items.</param>
/// <returns><c>true</c> if [is configured to play] [the specified configuration]; otherwise, <c>false</c>.</returns>
- private bool IsConfiguredToPlay(PlayerConfiguration configuration, List<DtoBaseItem> items)
+ private bool IsConfiguredToPlay(PlayerConfiguration configuration, List<BaseItemDto> items)
{
if (configuration.ItemTypes != null && configuration.ItemTypes.Length > 0)
{