aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/Session
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2013-05-30 18:22:15 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2013-05-30 18:22:15 -0400
commit300c3b7fd6718c4ccc0847e78547a01d5f1b6f71 (patch)
treed4b68bee1ef47beb581a15b8cf0993a7d748ef31 /MediaBrowser.Server.Implementations/Session
parent3387dac01d7125f830a77f5d0446fda336e294cd (diff)
standardize knowledge of supported image extensions
Diffstat (limited to 'MediaBrowser.Server.Implementations/Session')
-rw-r--r--MediaBrowser.Server.Implementations/Session/SessionManager.cs2
-rw-r--r--MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs12
2 files changed, 7 insertions, 7 deletions
diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index 6c1768fd8..29ce2698c 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -185,7 +185,7 @@ namespace MediaBrowser.Server.Implementations.Session
connection.DeviceName = deviceName;
- connection.UserId = user == null ? (Guid?)null : user.Id;
+ connection.User = user;
return connection;
}
diff --git a/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs b/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs
index 532436c07..c649fd474 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs
@@ -99,18 +99,18 @@ namespace MediaBrowser.Server.Implementations.Session
{
var session = _sessionManager.Sessions.FirstOrDefault(i => i.WebSockets.Contains(message.Connection));
- if (session != null && session.UserId.HasValue)
+ if (session != null && session.User != null)
{
var item = DtoBuilder.GetItemByClientId(message.Data, _userManager, _libraryManager);
- _sessionManager.OnPlaybackStart(_userManager.GetUserById(session.UserId.Value), item, session.Client, session.DeviceId, session.DeviceName);
+ _sessionManager.OnPlaybackStart(_userManager.GetUserById(session.User.Id), item, session.Client, session.DeviceId, session.DeviceName);
}
}
else if (string.Equals(message.MessageType, "PlaybackProgress", StringComparison.OrdinalIgnoreCase))
{
var session = _sessionManager.Sessions.FirstOrDefault(i => i.WebSockets.Contains(message.Connection));
- if (session != null && session.UserId.HasValue)
+ if (session != null && session.User != null)
{
var vals = message.Data.Split('|');
@@ -130,14 +130,14 @@ namespace MediaBrowser.Server.Implementations.Session
var isPaused = vals.Length > 2 && string.Equals(vals[2], "true", StringComparison.OrdinalIgnoreCase);
- _sessionManager.OnPlaybackProgress(_userManager.GetUserById(session.UserId.Value), item, positionTicks, isPaused, session.Client, session.DeviceId, session.DeviceName);
+ _sessionManager.OnPlaybackProgress(_userManager.GetUserById(session.User.Id), item, positionTicks, isPaused, session.Client, session.DeviceId, session.DeviceName);
}
}
else if (string.Equals(message.MessageType, "PlaybackStopped", StringComparison.OrdinalIgnoreCase))
{
var session = _sessionManager.Sessions.FirstOrDefault(i => i.WebSockets.Contains(message.Connection));
- if (session != null && session.UserId.HasValue)
+ if (session != null && session.User != null)
{
var vals = message.Data.Split('|');
@@ -155,7 +155,7 @@ namespace MediaBrowser.Server.Implementations.Session
}
}
- _sessionManager.OnPlaybackStopped(_userManager.GetUserById(session.UserId.Value), item, positionTicks, session.Client, session.DeviceId, session.DeviceName);
+ _sessionManager.OnPlaybackStopped(_userManager.GetUserById(session.User.Id), item, positionTicks, session.Client, session.DeviceId, session.DeviceName);
}
}