Merge branch 'master' into transcoding-logic-rework

components/liveTv/LoadChannelsTask.brs

@@ -8,8 +8,8 @@ sub init()
   
       params = {
       UserId: get_setting("active_user")
-      limit: m.top.limit,
-      StartIndex: m.top.startIndex
+     'limit: m.top.limit,
+     'StartIndex: m.top.startIndex
     }
   
     url = "LiveTv/Channels"
@@ -31,4 +31,4 @@ sub init()
   
     m.top.channels = results
   
-  end sub
+  end sub

components/liveTv/LoadChannelsTask.xml

@@ -2,7 +2,7 @@
 
 <component name="LoadChannelsTask" extends="Task">
   <interface>
-    <field id="limit" type="integer" value="500" />
+    <field id="limit" type="integer" value="" />
     <field id="startIndex" type="integer" value="0" />
     
     <!-- Total records available from server-->
@@ -12,4 +12,4 @@
   <script type="text/brightscript" uri="pkg:/source/api/baserequest.brs" />
   <script type="text/brightscript" uri="pkg:/source/utils/config.brs" />
   <!-- <script type="text/brightscript" uri="pkg:/source/api/Image.brs" /> -->
-</component>
+</component>

components/search/SearchRow.brs

@@ -46,8 +46,9 @@ function getData()
     ' todo - Or get the old data? I can't remember...
     data = CreateObject("roSGNode", "ContentNode")
     ' Do this to keep the ordering, AssociateArrays have no order
-    type_array = ["Movie", "Series", "Episode", "AlbumArtist", "Album", "Audio", "Person"]
+    type_array = ["Movie", "Series", "TvChannel", "Episode", "AlbumArtist", "Album", "Audio", "Person"]
     content_types = {
+        "TvChannel": {"label": "Channels", "count": 0},
         "Movie": {"label": "Movies", "count": 0},
         "Series": {"label": "Shows", "count": 0},
         "Episode": {"label": "Episodes", "count": 0},

source/api/Items.brs

@@ -45,11 +45,12 @@ function SearchMedia(query as string)
     "IncludeGenres": false,
     "IncludeStudios": false,
     "IncludeArtists": false,
-    ' "IncludeItemTypes: "Movie",
+    "IncludeItemTypes": "TvChannel,Movie,BoxSet,Series,Episode,Video"
     "EnableTotalRecordCount": false,
     "ImageTypeLimit": 1,
     "Recursive": true
   })
+
   data = getJson(resp)
   results = []
   for each item in data.Items