increase version

About: make videoAspect readable
About: add videoSize

diff --git a/webinterface/src/WebComponents/Sources/About.py b/webinterface/src/WebComponents/Sources/About.py
index 3808c1e..9778a8c 100644 (file)
--- a/webinterface/src/WebComponents/Sources/About.py
+++ b/webinterface/src/WebComponents/Sources/About.py
@@ -91,7 +91,19 @@ class About( Source):
         # Get Service Info
         if svinfo is not None:
             list.append(svinfo.getInfoString(iServiceInformation.sProvider))
         # Get Service Info
         if svinfo is not None:
             list.append(svinfo.getInfoString(iServiceInformation.sProvider))

-            list.append(svinfo.getInfo(iServiceInformation.sAspect))
+            
+            aspect = svinfo.getInfo(iServiceInformation.sAspect)
+            if aspect in ( 1, 2, 5, 6, 9, 0xA, 0xD, 0xE ):
+                aspect = "4:3"
+            else:
+                aspect = "16:9"
+            list.append(aspect)
+
+            width = svinfo and svinfo.getInfo(iServiceInformation.sVideoWidth) or -1
+            height = svinfo and svinfo.getInfo(iServiceInformation.sVideoHeight) or -1
+            videosize = "%dx%d" %(width, height)
+            list.append(videosize)
+            

             list.append(hex(svinfo.getInfo(iServiceInformation.sNamespace)))
 
             # Get PIDs
             list.append(hex(svinfo.getInfo(iServiceInformation.sNamespace)))
 
             # Get PIDs


@@ -141,15 +153,15 @@ class About( Source):
            ,"serviceName": 4
            ,"serviceProvider": 5
            ,"serviceAspect": 6
            ,"serviceName": 4
            ,"serviceProvider": 5
            ,"serviceAspect": 6

-           ,"serviceNamespace": 7
-           ,"vPID": 8
-           ,"aPID": 9
-           ,"pcrID": 10
-           ,"pmtPID": 11
-           ,"txtPID": 12
-           ,"tsID": 13
-           ,"onID": 14
-           ,"sid": 15
-           ,"WebIfVersion": 16
-           }
-
+           ,"serviceVideosize": 7
+           ,"serviceNamespace": 8
+           ,"vPID": 9
+           ,"aPID": 10
+           ,"pcrID": 11
+           ,"pmtPID": 12
+           ,"txtPID": 13
+           ,"tsID": 14
+           ,"onID": 15
+           ,"sid": 16
+           ,"WebIfVersion": 17
+           }
\ No newline at end of file

diff --git a/webinterface/src/plugin.py b/webinterface/src/plugin.py
index 91d0641..c05093a 100644 (file)
--- a/webinterface/src/plugin.py
+++ b/webinterface/src/plugin.py
@@ -1,5 +1,5 @@
 Version = '$Header$';
 Version = '$Header$';

-__version__ = "Beta 0.95.1"
+__version__ = "Beta 0.98.1"

 from Plugins.Plugin import PluginDescriptor
 from Components.config import config, ConfigSubsection, ConfigInteger,ConfigYesNo,ConfigText
 from Components.Network import Network
 from Plugins.Plugin import PluginDescriptor
 from Components.config import config, ConfigSubsection, ConfigInteger,ConfigYesNo,ConfigText
 from Components.Network import Network

diff --git a/webinterface/src/web-data/templates.js b/webinterface/src/web-data/templates.js
index 45bbce7..fb8ecea 100644 (file)
--- a/webinterface/src/web-data/templates.js
+++ b/webinterface/src/web-data/templates.js
@@ -426,6 +426,10 @@ var tplAbout  = '<table cellspacing="0" cellpadding="0" class="aboutSection">\n'
        tplAbout += '<td class="aboutElementRight">%(serviceAspect)</td>\n';
        tplAbout += '</tr>\n';
        tplAbout += '<tr>\n';
        tplAbout += '<td class="aboutElementRight">%(serviceAspect)</td>\n';
        tplAbout += '</tr>\n';
        tplAbout += '<tr>\n';

+       tplAbout += '<td class="aboutElementLeft">Videosize:</td>\n';
+       tplAbout += '<td class="aboutElementRight">%(serviceVideosize)</td>\n';
+       tplAbout += '</tr>\n';
+       tplAbout += '<tr>\n';

        tplAbout += '<td class="aboutElementLeft">Namespace:</td>\n';
        tplAbout += '<td class="aboutElementRight">%(serviceNamespace)</td>\n';
        tplAbout += '</tr>\n';
        tplAbout += '<td class="aboutElementLeft">Namespace:</td>\n';
        tplAbout += '<td class="aboutElementRight">%(serviceNamespace)</td>\n';
        tplAbout += '</tr>\n';

diff --git a/webinterface/src/web-data/tools.js b/webinterface/src/web-data/tools.js
index a176d5d..5827f0d 100644 (file)
--- a/webinterface/src/web-data/tools.js
+++ b/webinterface/src/web-data/tools.js
@@ -997,6 +997,7 @@ function incomingAbout(request) {
                                        ,'serviceName': xml.getElementsByTagName('e2servicename').item(0).firstChild.data
                                        ,'serviceProvider': xml.getElementsByTagName('e2serviceprovider').item(0).firstChild.data
                                        ,'serviceAspect': xml.getElementsByTagName('e2serviceaspect').item(0).firstChild.data
                                        ,'serviceName': xml.getElementsByTagName('e2servicename').item(0).firstChild.data
                                        ,'serviceProvider': xml.getElementsByTagName('e2serviceprovider').item(0).firstChild.data
                                        ,'serviceAspect': xml.getElementsByTagName('e2serviceaspect').item(0).firstChild.data

+                                       ,'serviceVideosize': xml.getElementsByTagName('e2servicevideosize').item(0).firstChild.data

                                        ,'serviceNamespace': xml.getElementsByTagName('e2servicenamespace').item(0).firstChild.data
                                        ,'vPIDh': '0x'+d2h(xml.getElementsByTagName('e2vpid').item(0).firstChild.data, 4)
                                         ,'vPID': ownLazyNumber(xml.getElementsByTagName('e2vpid').item(0).firstChild.data)
                                        ,'serviceNamespace': xml.getElementsByTagName('e2servicenamespace').item(0).firstChild.data
                                        ,'vPIDh': '0x'+d2h(xml.getElementsByTagName('e2vpid').item(0).firstChild.data, 4)
                                         ,'vPID': ownLazyNumber(xml.getElementsByTagName('e2vpid').item(0).firstChild.data)

diff --git a/webinterface/src/web/about.xml b/webinterface/src/web/about.xml
index a561cad..70c5b2d 100644 (file)
--- a/webinterface/src/web/about.xml
+++ b/webinterface/src/web/about.xml
@@ -18,6 +18,7 @@
                &lt;e2servicename><e2:item name="serviceName"  filter="xml"/>&lt;/e2servicename>
                &lt;e2serviceprovider><e2:item name="serviceProvider"  filter="xml"/>  &lt;/e2serviceprovider>
                &lt;e2serviceaspect><e2:item name="serviceAspect"  filter="xml"/>&lt;/e2serviceaspect>
                &lt;e2servicename><e2:item name="serviceName"  filter="xml"/>&lt;/e2servicename>
                &lt;e2serviceprovider><e2:item name="serviceProvider"  filter="xml"/>  &lt;/e2serviceprovider>
                &lt;e2serviceaspect><e2:item name="serviceAspect"  filter="xml"/>&lt;/e2serviceaspect>

+               &lt;e2servicevideosize><e2:item name="serviceVideosize"  filter="xml"/>&lt;/e2servicevideosize>

                &lt;e2servicenamespace><e2:item name="serviceNamespace"  filter="xml"/>&lt;/e2servicenamespace>
                &lt;e2vpid><e2:item name="vPID"  filter="xml"/>&lt;/e2vpid>
                &lt;e2apid><e2:item name="aPID"  filter="xml"/>&lt;/e2apid>
                &lt;e2servicenamespace><e2:item name="serviceNamespace"  filter="xml"/>&lt;/e2servicenamespace>
                &lt;e2vpid><e2:item name="vPID"  filter="xml"/>&lt;/e2vpid>
                &lt;e2apid><e2:item name="aPID"  filter="xml"/>&lt;/e2apid>