Fix EQ HTTP UI partially

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

modules/lua/libs/equalizer.c

@@ -175,7 +175,7 @@ static int vlclua_equalizer_get( lua_State *L )
             return 0;
         lua_pushstring( L, str );
         free(str);
-        if( asprintf( &str , "band_%d", i++ ) == -1 )
+        if( asprintf( &str , "band id=\"%d\"", i++ ) == -1 )
             return 0;
         lua_setfield( L , -2 , str );
         free( str );
@@ -302,7 +302,7 @@ static int vlclua_equalizer_get_presets( lua_State *L )
     for( int i = 0 ; i < NB_PRESETS ; i++ )
     {
         lua_pushstring( L, preset_list_text[i] );
-        if( asprintf( &str , "id_%d",i ) == -1 )
+        if( asprintf( &str , "preset id=\"%d\"",i ) == -1 )
             return 0;
         lua_setfield( L , -2 , str );
         free(str);

share/lua/http/js/common.js

@@ -50,14 +50,6 @@ function setIntv() {
     }
 }
 
-function convertHz(value) {
-    if (value >= 1000) {
-        return Math.round(value / 1000, 2) + 'kHz';
-    } else {
-        return Math.round(value, 2) + 'Hz';
-    }
-}
-
 function isMobile() {
     var a = navigator.userAgent || navigator.vendor || window.opera;
     if (/android|avantgo|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i.test(a) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|e\-|e\/|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(di|rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|xda(\-|2|g)|yas\-|your|zeto|zte\-/i.test(a.substr(0, 4))) {

share/lua/http/js/controlers.js

@@ -74,10 +74,10 @@ function updateStatus() {
             }
             $('band', data).each(function () {
                 var id = $(this).attr('id');
-                var freq = convertHz($(this).attr('freqency'));
                 var value = $(this).text() ? $(this).text() : 0;
+                var freq = ["60 Hz","170 Hz", "310 Hz", "600 Hz", "1 kHz","3 kHz", "6 kHz", "12 kHz" , "14 kHz" , "16 kHz" ];
                 if (!$('#eq_container' + id).length) {
-                    $('#window_equalizer').append('<div style="float:left;width:44px;" align="center" id="eq_container' + id + '"><div id="eq' + id + '_txt">' + value + 'dB</div><div class="eqBand" id="eq' + id + '" style="font-size: 18px;"></div><div>' + freq + '</div></div>');
+                    $('#window_equalizer').append('<div style="float:left;width:44px;" align="center" id="eq_container' + id + '"><div id="eq' + id + '_txt">' + value + 'dB</div><div class="eqBand" id="eq' + id + '" style="font-size: 18px;"></div><div>' + freq[id] + '</div></div>');
                     $('#eq' + id).slider({
                         min: -20,
                         max: 20,
@@ -342,14 +342,14 @@ function updateStreams() {
 
 function updateEQ() {
     $.ajax({
-        url: 'requests/equalizer.xml',
+        url: 'requests/status.xml',
         success: function (data, status, jqXHR) {
             $('band', data).each(function () {
+                var freq = ["60 Hz","170 Hz", "310 Hz", "600 Hz", "1 kHz","3 kHz", "6 kHz", "12 kHz" , "14 kHz" , "16 kHz" ];
                 var id = $(this).attr('id');
-                var freq = convertHz($(this).attr('freqency'));
                 var value = $(this).text() ? $(this).text() : 0;
                 if (!$('#eq_container' + id).length) {
-                    $('#window_equalizer').append('<div style="float:left;width:44px;" align="center" id="eq_container' + id + '"><div id="eq' + id + '_txt">' + value + 'dB</div><div class="eqBand" id="eq' + id + '" style="font-size: 18px;"></div><div>' + freq + '</div></div>');
+                    $('#window_equalizer').append('<div style="float:left;width:44px;" align="center" id="eq_container' + id + '"><div id="eq' + id + '_txt">' + value + 'dB</div><div class="eqBand" id="eq' + id + '" style="font-size: 18px;"></div><div>' + freq[id] + '</div></div>');
                     $('#eq' + id).slider({
                         min: -20,
                         max: 20,
@@ -436,7 +436,7 @@ function sendBatchVLMCmd(command, append) {
 
 function sendEQCmd(params) {
     $.ajax({
-        url: 'requests/equalizer.xml',
+        url: 'requests/status.xml',
         data: params,
         success: function (data, status, jqXHR) {
             updateEQ();

share/lua/intf/modules/httprequests.lua

@@ -236,7 +236,14 @@ local printXmlKeyValue = function (k,v,indent)
     end
 
     if (k) then
-        print("</"..xmlString(k)..">")
+        xs=xmlString(k)
+        space_loc=string.find(xs," ")
+        if space_loc == nil then
+            print("</"..xs..">")
+        else
+            xs=string.sub(xs,1,space_loc)
+            print("</"..xs..">")
+        end
     end
 end