diff options
| author | LukePulverenti <luke.pulverenti@gmail.com> | 2013-03-20 12:54:32 -0400 |
|---|---|---|
| committer | LukePulverenti <luke.pulverenti@gmail.com> | 2013-03-20 12:54:32 -0400 |
| commit | e25258e1c062865ad50cbffb9e31284068c36811 (patch) | |
| tree | 70aa67ffe134c2fbafffaab1e5c467bb32dab112 | |
| parent | 679143cffbc0c4f174be33dafb42290b27cdb62a (diff) | |
moved playback event args object
| -rw-r--r-- | MediaBrowser.Controller/Library/PlaybackProgressEventArgs.cs (renamed from MediaBrowser.Controller/Entities/PlaybackProgressEventArgs.cs) | 8 | ||||
| -rw-r--r-- | MediaBrowser.Controller/MediaBrowser.Controller.csproj | 2 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/Library/UserManager.cs | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/MediaBrowser.Controller/Entities/PlaybackProgressEventArgs.cs b/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); |