1 files changed, 8 insertions, 0 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index f872b7274..394ca69d5 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -1007,6 +1007,13 @@ namespace MediaBrowser.Api.Playback
                 throw new InvalidOperationException("You asked for a debug error, you got one.");
             }
 
+            var user = AuthorizationRequestFilterAttribute.GetCurrentUser(Request, UserManager);
+
+            if (user != null && !user.Configuration.EnableMediaPlayback)
+            {
+                throw new ArgumentException(string.Format("{0} is not allowed to play media.", user.Name));
+            }
+
             var url = Request.PathInfo;
 
             if (!request.AudioCodec.HasValue)
@@ -1060,6 +1067,7 @@ namespace MediaBrowser.Api.Playback
 
                 //state.RunTimeTicks = recording.RunTimeTicks;
                 state.ReadInputAtNativeFramerate = recording.RecordingInfo.Status == RecordingStatus.InProgress;
+                state.SendInputOverStandardInput = recording.RecordingInfo.Status == RecordingStatus.InProgress;
                 state.AudioSync = 1000;
                 state.DeInterlace = true;
             }