Merge branch 1.0-bugfix

[vlc] / projects / mozilla / test.html

diff --git a/projects/mozilla/test.html b/projects/mozilla/test.html
index 5c26ced69e0051d3b249c1503ed5e43a6df247e3..e73ffecdd6c1a48be0350d166161dda7977b4208 100644 (file)
--- a/projects/mozilla/test.html
+++ b/projects/mozilla/test.html
@@ -168,17 +168,6 @@ Insert Slider widget
 <INPUT size=4 value="" id="removeid"><INPUT type=submit value="Delete" onClick="doRemoveItem(document.getElementById('removeid').value);">\r
 </TD>\r
 </TR>\r
-<TR><TD>Messages:\r
-<INPUT type=button value="Messages" onClick='doMessages();'>\r
-Verbosity:\r
-<INPUT size=2 value="1" id="verbosity" onClick="doVerbosity(document.getElementById('verbosity').value);">\r
-<INPUT type=button value=" + " onClick='doVerbosity(1);'>\r
-<INPUT type=button value=" - " onClick='doVerbosity(-1);'>\r
-</TD>\r
-<TD>\r
-<DIV id="message" style="text-align:center">no message</DIV>\r
-</TD>\r
-</TR>\r
 <TR><TD>Audio Channel:\r
   <SELECT readonly onClick='doAudioChannel(this.value);'>\r
     <OPTION value=1>Stereo</OPTION>\r
@@ -253,16 +242,6 @@ function doReverse(rate)
         vlc.input.rate = -1.0 * vlc.input.rate;\r
 }\r
 \r
-function doVerbosity(value)\r
-{\r
-    var vlc = getVLC("vlc");\r
-    if( vlc )\r
-    {\r
-        vlc.log.verbosity = vlc.log.verbosity + value;\r
-        document.getElementById("verbosity").value = vlc.log.verbosity;\r
-    }\r
-}\r
-\r
 function doAudioChannel(value)\r
 {\r
     var vlc = getVLC("vlc");\r
@@ -355,30 +334,6 @@ function doPlaylistClearAll()
     }\r
 }\r
 \r
-function doMessages()\r
-{\r
-    var vlc = getVLC("vlc");\r
-\r
-    if( vlc )\r
-    {\r
-        if( vlc.log.messages.count > 0 )\r
-        {\r
-            // there is one or more messages in the log\r
-            var iter = vlc.log.messages.iterator();\r
-            while( iter.hasNext )\r
-            {\r
-                var msg = iter.next();\r
-                if( msg.severity <= 1 )\r
-                {\r
-                    document.getElementById("message").innerHTML = msg.message;\r
-                }\r
-            }\r
-            // clear the log once finished to avoid clogging\r
-            vlc.log.messages.clear();\r
-        }\r
-    }\r
-}\r
-\r
 function updateVolume(deltaVol)\r
 {\r
     var vlc = getVLC("vlc");\r
@@ -467,23 +422,6 @@ function monitor()
     if( vlc )\r
     {\r
         newState = vlc.input.state;\r
-\r
-        if( vlc.log.messages.count > 0 )\r
-        {\r
-            // there is one or more messages in the log\r
-            var iter = vlc.log.messages.iterator();\r
-            while( iter.hasNext )\r
-            {\r
-                var msg = iter.next();\r
-                if( msg.severity == 1 )\r
-                {\r
-                    alert( msg.message );\r
-                }\r
-                document.getElementById("message").innerHTML = msg.message;\r
-            }\r
-            // clear the log once finished to avoid clogging\r
-            vlc.log.messages.clear();\r
-        }\r
     }\r
 \r
     if( prevState != newState )\r
@@ -559,9 +497,6 @@ function doGo(targetURL)
         var itemId = vlc.playlist.add(targetURL,"",options);\r
         if( itemId != -1 )\r
         {\r
-            // clear the message log and enable error logging\r
-            vlc.log.verbosity = 1;\r
-            vlc.log.messages.clear();\r
             // play MRL\r
             vlc.playlist.playItem(itemId);\r
             if( monitorTimerId == 0 )\r
@@ -571,8 +506,6 @@ function doGo(targetURL)
         }\r
         else\r
         {\r
-            // disable log\r
-            vlc.log.verbosity = -1;\r
             alert("cannot play at the moment !");\r
         }\r
         doItemCount();\r
@@ -602,16 +535,11 @@ function doPlayOrPause()
         }\r
         else if( vlc.playlist.items.count > 0 )\r
         {\r
-            // clear the message log and enable error logging\r
-            vlc.log.verbosity = 1;\r
-            vlc.log.messages.clear();\r
             vlc.playlist.play();\r
             monitor();\r
         }\r
         else\r
         {\r
-            // disable log\r
-            vlc.log.verbosity = -1;\r
             alert('nothing to play !');\r
         }\r
     }\r
@@ -728,10 +656,7 @@ function onPause()
 \r
 function onStop()\r
 {\r
-    // disable logging\r
     var vlc = getVLC("vlc");\r
-    if( vlc )\r
-        vlc.log.verbosity = -1;\r
 \r
     if( inputTracker )\r
     {\r
@@ -752,25 +677,6 @@ function onError()
     var vlc = getVLC("vlc");\r
 \r
     document.getElementById("state").innerHTML = "Error...";\r
-    if( vlc )\r
-    {\r
-        if( vlc.log.messages.count > 0 )\r
-        {\r
-            // there is one or more messages in the log\r
-            var iter = vlc.log.messages.iterator();\r
-            while( iter.hasNext )\r
-            {\r
-                var msg = iter.next();\r
-                if( msg.severity <= 1 )\r
-                {\r
-                    alert( msg.message );\r
-                }\r
-                document.getElementById("message").innerHTML = msg.message;\r
-            }\r
-            // clear the log once finished to avoid clogging\r
-            vlc.log.messages.clear();\r
-        }\r
-    }\r
 }\r
 \r
 function onInputTrackerScrollStart()\r