From e25258e1c062865ad50cbffb9e31284068c36811 Mon Sep 17 00:00:00 2001
From: LukePulverenti <luke.pulverenti@gmail.com>
Date: Wed, 20 Mar 2013 12:54:32 -0400
Subject: [PATCH] moved playback event args object

---
 .../{Entities => Library}/PlaybackProgressEventArgs.cs    | 8 +++++---
 MediaBrowser.Controller/MediaBrowser.Controller.csproj    | 2 +-
 .../Library/UserManager.cs                                | 6 +++---
 3 files changed, 9 insertions(+), 7 deletions(-)
 rename MediaBrowser.Controller/{Entities => Library}/PlaybackProgressEventArgs.cs (51%)

diff --git a/MediaBrowser.Controller/Entities/PlaybackProgressEventArgs.cs b/MediaBrowser.Controller/Library/PlaybackProgressEventArgs.cs
similarity index 51%
rename from MediaBrowser.Controller/Entities/PlaybackProgressEventArgs.cs
rename to MediaBrowser.Controller/Library/PlaybackProgressEventArgs.cs
index bbec606ae2..7cf9b1d690 100644
--- a/MediaBrowser.Controller/Entities/PlaybackProgressEventArgs.cs
+++ b/MediaBrowser.Controller/Library/PlaybackProgressEventArgs.cs
@@ -1,13 +1,15 @@
-using MediaBrowser.Common.Events;
+using System;
+using MediaBrowser.Controller.Entities;
 
-namespace MediaBrowser.Controller.Entities
+namespace MediaBrowser.Controller.Library
 {
     /// <summary>
     /// Holds information about a playback progress event
     /// </summary>
-    public class PlaybackProgressEventArgs : GenericEventArgs<BaseItem>
+    public class PlaybackProgressEventArgs : EventArgs
     {
         public User User { get; set; }
         public long? PlaybackPositionTicks { get; set; }
+        public BaseItem Item { get; set; }
     }
 }
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 54ba9be55d..656f9d5670 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -88,7 +88,7 @@
     <Compile Include="Entities\Movies\BoxSet.cs" />
     <Compile Include="Entities\Movies\Movie.cs" />
     <Compile Include="Entities\Person.cs" />
-    <Compile Include="Entities\PlaybackProgressEventArgs.cs" />
+    <Compile Include="Library\PlaybackProgressEventArgs.cs" />
     <Compile Include="Entities\Studio.cs" />
     <Compile Include="Entities\Trailer.cs" />
     <Compile Include="Entities\TV\Episode.cs" />
diff --git a/MediaBrowser.Server.Implementations/Library/UserManager.cs b/MediaBrowser.Server.Implementations/Library/UserManager.cs
index 5cfd01ee0d..e2c8115dc4 100644
--- a/MediaBrowser.Server.Implementations/Library/UserManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserManager.cs
@@ -558,7 +558,7 @@ namespace MediaBrowser.Server.Implementations.Library
             // Fire events to inform plugins
             EventHelper.QueueEventIfNotNull(PlaybackStart, this, new PlaybackProgressEventArgs
             {
-                Argument = item,
+                Item = item,
                 User = user
             }, _logger);
         }
@@ -597,7 +597,7 @@ namespace MediaBrowser.Server.Implementations.Library
 
             EventHelper.QueueEventIfNotNull(PlaybackProgress, this, new PlaybackProgressEventArgs
             {
-                Argument = item,
+                Item = item,
                 User = user,
                 PlaybackPositionTicks = positionTicks
             }, _logger);
@@ -644,7 +644,7 @@ namespace MediaBrowser.Server.Implementations.Library
 
             EventHelper.QueueEventIfNotNull(PlaybackStopped, this, new PlaybackProgressEventArgs
             {
-                Argument = item,
+                Item = item,
                 User = user,
                 PlaybackPositionTicks = positionTicks
             }, _logger);