syntax corrections and version bump
This commit is contained in:
parent
dab2624c88
commit
ad4637f4cf
15 changed files with 1960 additions and 1950 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1,2 +1,3 @@
|
||||||
*.pyo
|
*.pyo
|
||||||
*.pyc
|
*.pyc
|
||||||
|
.*
|
|
@ -1,6 +1,9 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||||
<addon id="plugin.makemkvbluray" name="BluRay Player with MakeMKV"
|
<addon
|
||||||
version="1.1.0" provider-name="Magnetism">
|
id="plugin.makemkvbluray"
|
||||||
|
name="BluRay Player with MakeMKV"
|
||||||
|
version="1.1.1"
|
||||||
|
provider-name="desolat">
|
||||||
<requires>
|
<requires>
|
||||||
<import addon="xbmc.python" version="2.0" />
|
<import addon="xbmc.python" version="2.0" />
|
||||||
</requires>
|
</requires>
|
||||||
|
@ -11,7 +14,7 @@
|
||||||
</extension>
|
</extension>
|
||||||
<extension point="xbmc.addon.metadata">
|
<extension point="xbmc.addon.metadata">
|
||||||
<summary>Play BluRays from XBMC with MakeMKV</summary>
|
<summary>Play BluRays from XBMC with MakeMKV</summary>
|
||||||
<description>Awesomeness </description>
|
<description>Uses MakeMKV streaming ability to play BlueRay Discs</description>
|
||||||
<platform>all</platform>
|
<platform>all</platform>
|
||||||
</extension>
|
</extension>
|
||||||
</addon>
|
</addon>
|
||||||
|
|
|
@ -83,7 +83,7 @@ class BluRayStarter:
|
||||||
def handleListing(self):
|
def handleListing(self):
|
||||||
mode = self.settings.paramMode
|
mode = self.settings.paramMode
|
||||||
_log.info( 'mode: ' + str(mode))
|
_log.info( 'mode: ' + str(mode))
|
||||||
if mode ==None:
|
if mode == None:
|
||||||
_log.info('Showing categories')
|
_log.info('Showing categories')
|
||||||
self.CATEGORIES()
|
self.CATEGORIES()
|
||||||
_log.info('Showing categories done')
|
_log.info('Showing categories done')
|
||||||
|
|
5
resources/lib/__init__.py
Normal file
5
resources/lib/__init__.py
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
'''
|
||||||
|
Created on 06.10.2012
|
||||||
|
|
||||||
|
@author: desolat
|
||||||
|
'''
|
|
@ -107,7 +107,7 @@ class MakeMkvInteraction:
|
||||||
self.log.info("MakeMkvCon found!")
|
self.log.info("MakeMkvCon found!")
|
||||||
return True
|
return True
|
||||||
else:
|
else:
|
||||||
self.log.info('MakeMkvcon seems not to be configured properly : %s' %(self.settings.mkvLocation))
|
self.log.info('MakeMkvcon seems not to be configured properly : %s'
|
||||||
|
% (self.settings.mkvLocation))
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
|
@ -20,6 +20,7 @@ _log = brlog.BrLog('tracker service')
|
||||||
|
|
||||||
_log.info('Starting the BluRay tracker service')
|
_log.info('Starting the BluRay tracker service')
|
||||||
|
|
||||||
|
|
||||||
class MyPlayer(xbmc.Player):
|
class MyPlayer(xbmc.Player):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
xbmc.Player.__init__(self)
|
xbmc.Player.__init__(self)
|
||||||
|
@ -37,7 +38,7 @@ class MyPlayer(xbmc.Player):
|
||||||
myPlayer = MyPlayer()
|
myPlayer = MyPlayer()
|
||||||
xbmc.sleep(4)
|
xbmc.sleep(4)
|
||||||
if not makemkv.MakeMkvInteraction().makeMkvExists():
|
if not makemkv.MakeMkvInteraction().makeMkvExists():
|
||||||
imagePath = os.path.join(__addon__.getAddonInfo('path'),'resources','images', 'alerticon.png')
|
imagePath = os.path.join(__addon__.getAddonInfo('path'), 'resources', 'images', 'alerticon.png')
|
||||||
xbmc.executebuiltin('Notification("MakeMkv", "The MakeMKV bluray plugin cannot find MakeMkv. Please configure the plugin to point to it", "15000", "%s")' % (imagePath))
|
xbmc.executebuiltin('Notification("MakeMkv", "The MakeMKV bluray plugin cannot find MakeMkv. Please configure the plugin to point to it", "15000", "%s")' % (imagePath))
|
||||||
|
|
||||||
while (not xbmc.abortRequested):
|
while (not xbmc.abortRequested):
|
||||||
|
|
Loading…
Reference in a new issue