Skip to content
This repository has been archived by the owner on Oct 21, 2024. It is now read-only.

Commit

Permalink
Use inputstream.adaptive for playback (#25)
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelarnauts authored Apr 20, 2020
1 parent 78bfae2 commit 121ea88
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
1 change: 1 addition & 0 deletions addon.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<import addon="script.module.pysocks" version="1.6.8" optional="true"/>
<import addon="script.module.requests" version="2.22.0"/>
<import addon="script.module.routing" version="0.2.0"/>
<import addon="inputstream.adaptive" version="2.4.3"/>
</requires>
<extension point="xbmc.python.pluginsource" library="addon_entry.py">
<provides>video</provides>
Expand Down
18 changes: 13 additions & 5 deletions resources/lib/kodiutils.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
from __future__ import absolute_import, division, unicode_literals

import logging

import xbmc
import xbmcaddon
import xbmcgui
Expand Down Expand Up @@ -118,7 +117,7 @@ def url_for(name, *args, **kwargs):


def show_listing(title_items, category=None, sort=None, content=None, cache=True):
""" Show a virtual directory in Kodi """
"""Show a virtual directory in Kodi"""
from resources.lib.addon import routing

if content:
Expand Down Expand Up @@ -200,11 +199,20 @@ def play(stream, title=None, art_dict=None, info_dict=None, prop_dict=None):
if prop_dict:
play_item.setProperties(prop_dict)

# Setup Inputstream Adaptive
if kodi_version_major() >= 19:
play_item.setProperty('inputstream', 'inputstream.adaptive')
else:
play_item.setProperty('inputstreamaddon', 'inputstream.adaptive')
play_item.setProperty('inputstream.adaptive.manifest_type', 'hls')
play_item.setMimeType('application/vnd.apple.mpegurl')
play_item.setContentLookup(False)

xbmcplugin.setResolvedUrl(routing.handle, True, listitem=play_item)


def get_search_string(heading='', message=''):
""" Ask the user for a search string """
"""Ask the user for a search string"""
search_string = None
keyboard = xbmc.Keyboard(message, heading)
keyboard.doModal()
Expand Down Expand Up @@ -265,15 +273,15 @@ def create(self, heading, message=''): # pylint: disable=arguments-differ
"""Create and show a progress dialog"""
if kodi_version_major() < 19:
lines = message.split('\n', 2)
line1, line2, line3 = (lines + [None] * (3-len(lines)))
line1, line2, line3 = (lines + [None] * (3 - len(lines)))
return super(progress, self).create(heading, line1=line1, line2=line2, line3=line3)
return super(progress, self).create(heading, message=message)

def update(self, percent, message=''): # pylint: disable=arguments-differ
"""Update the progress dialog"""
if kodi_version_major() < 19:
lines = message.split('\n', 2)
line1, line2, line3 = (lines + [None] * (3-len(lines)))
line1, line2, line3 = (lines + [None] * (3 - len(lines)))
return super(progress, self).update(percent, line1=line1, line2=line2, line3=line3)
return super(progress, self).update(percent, message=message)

Expand Down

0 comments on commit 121ea88

Please sign in to comment.