some js-lint stuff.

respect boundaries in vlcNext()/vlcPrev()

diff --git a/webinterface/src/web-data/streaminterface.html b/webinterface/src/web-data/streaminterface.html
index ad5292c..85c2fed 100644 (file)
--- a/webinterface/src/web-data/streaminterface.html
+++ b/webinterface/src/web-data/streaminterface.html
@@ -104,34 +104,34 @@
                                                </embed>
                                        </div>
                                        <div id="vlcButtons">
-<!--                                           <button onClick="prev()" title="Previous">-->
-<!--                                                   <img src="/web-data/tpl/default/streaminterface/img/control_start_blue.png" alt="&lt;&lt;" />-->
-<!--                                           </button>-->
-                                               <button onClick="play()" title="Play">
+                                               <button onClick="vlcPrev()" title="Previous Service">
+                                                       <img src="/web-data/tpl/default/streaminterface/img/control_start_blue.png" alt="&lt;&lt;" />
+                                               </button>
+                                               <button onClick="vlcPlay()" title="Play">
                                                        <img src="/web-data/tpl/default/streaminterface/img/control_play_blue.png" alt="&gt;" />
                                                </button>
-<!--                                           <button onClick="next()" title="Next">-->
-<!--                                                   <img src="/web-data/tpl/default/streaminterface/img/control_end_blue.png" alt="&gt;&gt;" />-->
-<!--                                           </button>-->
-                                               <button onClick="pause()" title="Pause">
-                                                       <img src="/web-data/tpl/default/streaminterface/img/control_pause_blue.png" alt="||" />
+                                               <button onClick="vlcNext()" title="Next Service">
+                                                       <img src="/web-data/tpl/default/streaminterface/img/control_end_blue.png" alt="&lt;&lt;" />
                                                </button>
-                                               <button onClick="stop()" title="Stop">
+<!--                                           <button onClick="vlcPause()" title="Pause">-->
+<!--                                                   <img src="/web-data/tpl/default/streaminterface/img/control_pause_blue.png" alt="||" />-->
+<!--                                           </button>-->
+                                               <button onClick="vlcStop()" title="Stop">
                                                        <img src="/web-data/tpl/default/streaminterface/img/control_stop_blue.png" alt="Stop" />
                                                </button>
-                                               <button onClick="fullscreen()" title="Fullscren">
+                                               <button onClick="vlcFullscreen()" title="Fullscren">
                                                        <img src="/web-data/tpl/default/streaminterface/img/monitor.png" alt="Fullscreen" />
                                                </button>
 <!--                                           <button onClick="teletext()" title="Teletext">-->
 <!--                                                   <img src="/web-data/tpl/default/streaminterface/img/text_align_center.png" alt="Teletext" />-->
 <!--                                           </button>-->
-                                               <button onClick="volumeUpVLC()"  title="Volume Up">
+                                               <button onClick="vlcVolumeUp()"  title="Volume Up">
                                                        <img src="/web-data/tpl/default/streaminterface/img/sound_add.png" alt="Vol+" />
                                                </button>
-                                               <button onClick="toogleMuteVLC()"  title="Mute Audio">
+                                               <button onClick="vlcToogleMute()"  title="Mute Audio">
                                                        <img src="/web-data/tpl/default/streaminterface/img/sound_mute.png" alt="Mute" />                                                       
                                                </button>
-                                               <button onClick="volumeDownVLC()" title="Volume Down">
+                                               <button onClick="vlcVolumeDown()" title="Volume Down">
                                                        <img src="/web-data/tpl/default/streaminterface/img/sound_delete.png" alt="Vol-" />
                                                </button>
                                                <br>

diff --git a/webinterface/src/web-data/vlcplayer.js b/webinterface/src/web-data/vlcplayer.js
index 1735250..530d4d3 100644 (file)
--- a/webinterface/src/web-data/vlcplayer.js
+++ b/webinterface/src/web-data/vlcplayer.js
@@ -30,7 +30,7 @@ function loadEPG(servicereference){
 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 epg_current =new EPGEvent(EPGItems.item(0));
                var namespace = {
                                'title': epg_current.getTitle(),
                                'starttime': epg_current.getTimeStartString(),
@@ -52,7 +52,7 @@ function incomingVLCBouquetList(request){
                        namespace[i] = {
                                        "servicereference"      : bouquet.getServiceReference(),
                                        "servicename"           : bouquet.getServiceName()
-                       }
+                       };
                }
                data = { bouquets : namespace };
                
@@ -89,47 +89,47 @@ function incomingVLCChannellist(request){
        }
 }
 
-function play(){
-       vlc.playlist.play();
-       
-       iterator = vlc.log.messages.iterator();
-       while(iterator.hasNext)
-       {
-               debug("Message: " + iterator.next().message);
-       }
+function vlcPlay(){
+       onServiceSelected();
 }
 
-function prev(){
-       vlc.playlist.prev();
+function vlcPrev(){
+       if(     $('channelSelect').selectedIndex > 0 ){ 
+               $('channelSelect').selectedIndex -= 1;
+               onServiceSelected();
+       }
 }
 
-function next(){
-       vlc.playlist.next();
+function vlcNext(){
+       if($('channelSelect').selectedIndex < $('channelSelect').length - 1 ){
+               $('channelSelect').selectedIndex += 1;
+               onServiceSelected();
+       }
 }
 
-function pause(){
-       vlc.playlist.togglePause()
+function vlcPause(){
+       vlc.playlist.togglePause();
 }
 
-function stop(){
+function vlcStop(){
        vlc.playlist.stop();
 }
 
-function volumeUpVLC(){
+function vlcVolumeUp(){
        debug("Volume: " + vlc.audio.volume);
        vlc.audio.volume += 10;
 }
 
-function volumeDownVLC(){
+function vlcVolumeDown(){
        debug("Volume: " + vlc.audio.volume);
        vlc.audio.volume -= 10;
 }
 
-function toogleMuteVLC(){
+function vlcToogleMute(){
        vlc.audio.mute = !vlc.audio.mute;
 }
 
-function fullscreen(){
+function vlcFullscreen(){
        try{
                vlc.video.fullscreen = true;
        }catch(e){
@@ -137,7 +137,7 @@ function fullscreen(){
        }
 }
 
-function teletext(){
+function vlcTeletext(){
        try{
                vlc.video.teletext = 100;
        } catch(e) {
@@ -157,13 +157,13 @@ function setStreamTarget(servicereference){
        if(vlc.playlist.isPlaying){
                vlc.playlist.next();
        } else {
-               play();
+               vlc.playlist.play();
        }
 }
 
 function loadBouquets(){
        url = url_getServices + bouquetsTv;
-       doRequest(url, incomingVLCBouquetList)
+       doRequest(url, incomingVLCBouquetList);
 }
 
 function initWebTv(){