The branch, eden-pre has been updated
via d6f1bbf21039017e138753cf5f99bf5ae25ca623 (commit)
from b8c093cdb5cae1b978ade1537716fd570ae0974b (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=d6f1bbf21039017e138753cf5f99bf5ae25ca623
commit d6f1bbf21039017e138753cf5f99bf5ae25ca623
Author: beenje <[email protected]>
Date: Fri Feb 3 14:25:47 2012 +0100
[plugin.video.eyetv.parser] updated to version 2.1.1
diff --git a/plugin.video.eyetv.parser/addon.xml
b/plugin.video.eyetv.parser/addon.xml
index 9601dae..7368512 100644
--- a/plugin.video.eyetv.parser/addon.xml
+++ b/plugin.video.eyetv.parser/addon.xml
@@ -1,18 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.eyetv.parser"
name="EyeTV parser"
- version="2.0.2"
+ version="2.1.1"
provider-name="beenje">
<requires>
<import addon="xbmc.python" version="2.0"/>
+ <import addon="script.module.xbmcswift" version="0.2.0"/>
+ <import addon="script.module.simplejson" version="2.0.10"/>
</requires>
<extension point="xbmc.python.pluginsource"
- library="default.py">
+ library="addon.py">
<provides>video</provides>
</extension>
<extension point="xbmc.addon.metadata">
- <summary lang="en">Access video from your EyeTV library</summary>
- <description lang="en">EyeTV parser is a video addon that let you browse
all the recordings from your EyeTV Library. Recordings are listed with their
description and icon (if any).</description>
+ <summary lang="en">Access live TV and video from your EyeTV
library</summary>
+ <description lang="en">EyeTV parser is a video addon that let you watch
live TV and browse all the recordings from your EyeTV Library. Recordings are
listed with their description and icon (if any).</description>
<disclaimer lang="en">EyeTV is a registered trademark of Elgato Systems
GmbH</disclaimer>
<platform>all</platform>
</extension>
diff --git a/plugin.video.eyetv.parser/changelog.txt
b/plugin.video.eyetv.parser/changelog.txt
index 0e56ed5..bfe5ab4 100644
--- a/plugin.video.eyetv.parser/changelog.txt
+++ b/plugin.video.eyetv.parser/changelog.txt
@@ -1,3 +1,11 @@
+[B]Version 2.1.1[/B]
+
+- Added birate setting for live TV
+
+[B]Version 2.1.0[/B]
+
+- Added live TV
+
[B]Version 2.0.2[/B]
- Fixed broken dependency in eden (use xml.etree.ElementTree available in
python 2.5)
diff --git a/plugin.video.eyetv.parser/resources/language/English/strings.xml
b/plugin.video.eyetv.parser/resources/language/English/strings.xml
index 3f22fed..cfdec12 100644
--- a/plugin.video.eyetv.parser/resources/language/English/strings.xml
+++ b/plugin.video.eyetv.parser/resources/language/English/strings.xml
@@ -3,13 +3,32 @@
<!--Settings-->
<string id="30001">EyeTV Archive path</string>
+ <string id="30002">EyeTV Server</string>
+ <string id="30003">Use password protection</string>
+ <string id="30004">Password</string>
<string id="30010">Sort by</string>
<string id="30011">recorded date</string>
<string id="30012">reverse recorded date</string>
<string id="30013">title</string>
+ <string id="30014">Bit rate (kbit/s)</string>
+ <string id="30015">320</string>
+ <string id="30016">800</string>
+ <string id="30017">1200</string>
+ <string id="30018">2540</string>
+ <string id="30019">4540</string>
+
+ <!--Category-->
+ <string id="30020">Live TV</string>
+ <string id="30021">Recordings</string>
<!--Errors-->
<string id="30100">Could not parse 'EyeTV Archive.xml'</string>
<string id="30101">Check your EyeTV Archive path</string>
+ <string id="30110">EyeTV Error</string>
+ <string id="30111">EyeTV is not running</string>
+ <string id="30112">iPhone access is disabled</string>
+ <string id="30113">Device is busy</string>
+ <string id="30114">EyeTV Server is unreachable</string>
+ <string id="30115">Authorization Required</string>
</strings>
diff --git a/plugin.video.eyetv.parser/resources/settings.xml
b/plugin.video.eyetv.parser/resources/settings.xml
index 339e444..a5bf5ca 100644
--- a/plugin.video.eyetv.parser/resources/settings.xml
+++ b/plugin.video.eyetv.parser/resources/settings.xml
@@ -1,7 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<settings>
- <!--General-->
- <category>
+ <!--Live TV-->
+ <category label="30020">
+ <setting id="server" type="ipaddress" default="127.0.0.1"
label="30002" />
+ <setting id="bitrate" type="enum"
lvalues="30015|30016|30017|30018|30019" default="4" label="30014" />
+ <setting id="passwdEnabled" type="bool" default="false" label="30003"
/>
+ <setting id="password" type="text" option="hidden" default=""
enable="eq(-1,true)" label="30004" />
+ </category>
+ <category label="30021">
<setting id="archivePath" type="folder" source="auto" default=""
option="writeable" label="30001" />
<setting id="sortMethod" type="enum" label="30010" default="0"
lvalues="30011|30012|30013" />
</category>
-----------------------------------------------------------------------
Summary of changes:
plugin.video.eyetv.parser/addon.py | 96 ++++++++++++++
plugin.video.eyetv.parser/addon.xml | 10 +-
plugin.video.eyetv.parser/changelog.txt | 8 ++
plugin.video.eyetv.parser/config.py | 25 ++++
.../resources/__init__.py | 0
.../resources/language/English/strings.xml | 19 +++
.../resources/lib}/__init__.py | 0
.../resources/lib/eyetv_live.py | 130 ++++++++++++++++++++
.../{default.py => resources/lib/eyetv_parser.py} | 67 +++-------
plugin.video.eyetv.parser/resources/settings.xml | 10 ++-
10 files changed, 312 insertions(+), 53 deletions(-)
create mode 100755 plugin.video.eyetv.parser/addon.py
create mode 100644 plugin.video.eyetv.parser/config.py
copy {plugin.audio.radio_de =>
plugin.video.eyetv.parser}/resources/__init__.py (100%)
copy {plugin.audio.radio_de/resources =>
plugin.video.eyetv.parser/resources/lib}/__init__.py (100%)
create mode 100644 plugin.video.eyetv.parser/resources/lib/eyetv_live.py
rename plugin.video.eyetv.parser/{default.py => resources/lib/eyetv_parser.py}
(70%)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons