* build Channellist from /web/epgnow which allows to add EPG-Information to it.

diff --git a/webinterface/src/web-data/streaminterface.html b/webinterface/src/web-data/streaminterface.html
index 629417f..385b364 100644 (file)
--- a/webinterface/src/web-data/streaminterface.html
+++ b/webinterface/src/web-data/streaminterface.html
@@ -130,15 +130,16 @@
 <!--                                           <button onClick="teletext()" title="Teletext">-->
 <!--                                                   <img src="/web-data/tpl/default/streaminterface/img/text_align_center.png" alt="Teletext" />-->
 <!--                                           </button>-->
-                                               <button onClick="vlcVolumeUp()"  title="Volume Up">
-                                                       <img src="/web-data/tpl/default/streaminterface/img/sound_add.png" alt="Vol+" />
+                                               <button onClick="vlcVolumeDown()" title="Volume Down">
+                                                       <img src="/web-data/tpl/default/streaminterface/img/sound_delete.png" alt="Vol-" />
                                                </button>
                                                <button onClick="vlcToogleMute()"  title="Mute Audio">
                                                        <img src="/web-data/tpl/default/streaminterface/img/sound_mute.png" alt="Mute" />                                                       
                                                </button>
-                                               <button onClick="vlcVolumeDown()" title="Volume Down">
-                                                       <img src="/web-data/tpl/default/streaminterface/img/sound_delete.png" alt="Vol-" />
+                                               <button onClick="vlcVolumeUp()"  title="Volume Up">
+                                                       <img src="/web-data/tpl/default/streaminterface/img/sound_add.png" alt="Vol+" />
                                                </button>
+                                               
                                                <br>
                                                <span id="bouquetList"></span>
                                                <span id="channelList"></span>

diff --git a/webinterface/src/web-data/tpl/default/streaminterface/tplServiceList.htm b/webinterface/src/web-data/tpl/default/streaminterface/tplServiceList.htm
index 6fb8c50..0613e4a 100644 (file)
--- a/webinterface/src/web-data/tpl/default/streaminterface/tplServiceList.htm
+++ b/webinterface/src/web-data/tpl/default/streaminterface/tplServiceList.htm
@@ -1,5 +1,5 @@
 <select id="channelSelect" onChange="onServiceSelected()" width="100px">
        {for s in services}
-       <option id="${s.servicereference}" >${s.servicename}</option>
+       <option id="${s.servicereference}" >${s.servicename} (${s.eventname}) +${s.duration} min</option>
        {/for}
 </select>
\ No newline at end of file

diff --git a/webinterface/src/web-data/vlcplayer.js b/webinterface/src/web-data/vlcplayer.js
index c6259c0..8fbc16d 100644 (file)
--- a/webinterface/src/web-data/vlcplayer.js
+++ b/webinterface/src/web-data/vlcplayer.js
@@ -26,21 +26,52 @@ function onBouquetSelected(){
 function loadEPG(servicereference){
        doRequest(url_epgservice+servicereference, incomingVLCServiceEPG);
 }
- 
+
+function incomingVLCEpgNow(request){
+       if (request.readyState == 4) {
+               var events = getXML(request).getElementsByTagName("e2eventlist").item(0).getElementsByTagName("e2event");                       
+
+               var namespace = [];
+
+               for(var i = 0; i < events.length; i++){
+                       var event = new EPGEvent(events.item(i));
+                       var eventname = event.getTitle();
+               
+                       if(eventname.length > 40){
+                               eventname = eventname.substring(0, 40) + '...';
+                       }
+                       
+                       namespace[i] = {
+                               'servicereference' : event.getServiceReference(),
+                               'servicename' : event.getServiceName(),
+                               'eventname' : eventname,
+                               'duration' : ( parseInt( (event.duration/60) , 10) )
+                       };
+               }
+               
+               var data = { 'services' : namespace };          
+               processTpl('streaminterface/tplServiceList', data, 'channelList');
+       }       
+}
+
+function loadVLCEpgNow(bouquetreference){
+       doRequest(url_epgnow+bouquetreference, incomingVLCEpgNow);
+}
+
+
 function incomingVLCServiceEPG(request){
        if (request.readyState == 4) {
-               var EPGItems = getXML(request).getElementsByTagName("e2eventlist").item(0).getElementsByTagName("e2event");                     
-               var epg_current =new EPGEvent(EPGItems.item(0));
+               var events = getXML(request).getElementsByTagName("e2eventlist").item(0).getElementsByTagName("e2event");                       
+               
+               var event =new EPGEvent(events.item(0));
                var namespace = {
-                               'servicename' : epg_current.getServiceName(),
-                               'eventname': epg_current.getTitle(),
-                               'duration': (parseInt(epg_current.duration)/60, 10)                             
+                               'servicename' : event.getServiceName(),
+                               'eventname': event.getTitle(),
+                               'duration': ( parseInt( (event.duration/60) , 10) )                             
                                };
                
-               var data = { 'current' : namespace };
-               
-               processTpl('streaminterface/tplCurrent', data, 'current');
-               
+               var data = { 'current' : namespace };           
+               processTpl('streaminterface/tplCurrent', data, 'current');              
        }
 }
 
@@ -66,8 +97,7 @@ function incomingVLCBouquetList(request){
 
 
 function loadVLCBouquet(servicereference){ 
-       servicereftoloadepgnow = servicereference;
-       doRequest(url_getServices+servicereference, incomingVLCChannellist);
+       loadVLCEpgNow(servicereference);
 }
 
 function incomingVLCChannellist(request){
@@ -79,9 +109,9 @@ function incomingVLCChannellist(request){
                namespace = [];
                
                for ( var i = 0; i < services.length ; i++){
-                       var reference = services[i];
-                       namespace[i] = {        'servicereference': reference.getServiceReference(),
-                                                               'servicename': reference.getServiceName() 
+                       var service = services[i];
+                       namespace[i] = {        'servicereference': service.getServiceReference(),
+                                                               'servicename': service.getServiceName() 
                                                        };