2 files changed, 18 insertions, 46 deletions
diff --git a/MediaBrowser.Api/NewsService.cs b/MediaBrowser.Api/NewsService.cs
deleted file mode 100644
index cbc77bfc9..000000000
--- a/MediaBrowser.Api/NewsService.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using MediaBrowser.Model.News;
-using MediaBrowser.Model.Querying;
-using MediaBrowser.Model.Services;
-
-namespace MediaBrowser.Api
-{
-    [Route("/News/Product", "GET", Summary = "Gets the latest product news.")]
-    public class GetProductNews : IReturn<QueryResult<NewsItem>>
-    {
-        /// <summary>
-        /// Skips over a given number of items within the results. Use for paging.
-        /// </summary>
-        /// <value>The start index.</value>
-        [ApiMember(Name = "StartIndex", Description = "Optional. The record index to start at. All items with a lower index will be dropped from the results.", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
-        public int? StartIndex { get; set; }
-
-        /// <summary>
-        /// The maximum number of items to return
-        /// </summary>
-        /// <value>The limit.</value>
-        [ApiMember(Name = "Limit", Description = "Optional. The maximum number of records to return", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "GET")]
-        public int? Limit { get; set; }
-    }
-
-    public class NewsService : BaseApiService
-    {
-        private readonly INewsService _newsService;
-
-        public NewsService(INewsService newsService)
-        {
-            _newsService = newsService;
-        }
-
-        public object Get(GetProductNews request)
-        {
-            var result = _newsService.GetProductNews(new NewsQuery
-            {
-                StartIndex = request.StartIndex,
-                Limit = request.Limit
-
-            });
-
-            return ToOptimizedResult(result);
-        }
-    }
-}
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index 28e75bf55..fa6502bda 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -590,6 +590,22 @@ namespace MediaBrowser.Api.Playback
         }
 
         /// <summary>
+        /// Parses query parameters as StreamOptions
+        /// <summary>
+        /// <param name="request">The stream request.</param>
+        private void ParseStreamOptions(StreamRequest request)
+        {
+            foreach (var param in Request.QueryString) {
+                if (Char.IsLower(param.Name[0])) {
+                    // This was probably not parsed initially and should be a StreamOptions
+                    // TODO: This should be incorporated either in the lower framework for parsing requests
+                    // or the generated URL should correctly serialize it
+                    request.StreamOptions[param.Name] = param.Value;
+                }
+            }
+        }
+
+        /// <summary>
         /// Parses the dlna headers.
         /// </summary>
         /// <param name="request">The request.</param>
@@ -667,6 +683,8 @@ namespace MediaBrowser.Api.Playback
                 ParseParams(request);
             }
 
+            ParseStreamOptions(request);
+
             var url = Request.PathInfo;
 
             if (string.IsNullOrEmpty(request.AudioCodec))