Small fixes here and there

Author: wberube

res/index.html

@@ -200,14 +200,21 @@
 						continue;
 					} else if (!elem) continue;
 
-					if (elem.tagName == 'INPUT' || elem.tagName == 'SELECT') {
+					if (elem.tagName == 'INPUT') {
 						elem.value = dec[key];
 						if (elem.type == 'range') {
 							var valElem = document.getElementById(elem.id + '_val');
 							if (valElem) valElem.innerHTML = dec[key];
 						}
 						if (typeof updateOsdSummary === 'function' && (elem.id.indexOf('_text') > -1 || elem.id.indexOf('_img') > -1))
 							updateOsdSummary(elem.id);
+					} else if (elem.tagName == 'SELECT') {
+						for (var i = 0; i < elem.options.length; i++) {
+							if (elem.options[i].value == dec[key] + '') {
+								elem.selectedIndex = i;
+								break;
+							}
+						}
 					} else {
 						elem.innerHTML = dec[key];
 					}

src/app_config.c

@@ -446,12 +446,10 @@ enum ConfigError parse_app_config(void) {
         int count, val;
         parse_int(&ini, "stream", "udp_srcport", 0, USHRT_MAX, &val);
         if (err != CONFIG_OK) app_config.stream_udp_srcport = (unsigned short)val;
-        err = parse_list(&ini, "stream", "dest",
+        parse_list(&ini, "stream", "dest",
             sizeof(app_config.stream_dests) / sizeof(*app_config.stream_dests),
             &count, app_config.stream_dests);
         *app_config.stream_dests[count] = '\0';
-        if (err != CONFIG_OK)
-            goto RET_ERR;
     }
 
     parse_bool(&ini, "audio", "enable", &app_config.audio_enable);

src/hal/hisi/v1_vpss.h

@@ -41,7 +41,7 @@ typedef struct {
     int (*fnCreateGroup)(int group, v1_vpss_grp *config);
     int (*fnDestroyGroup)(int group);
     int (*fnResetGroup)(int group);
-    int (*fnSetGroupConfig)(int channel, v1_vpss_grp *config);
+    int (*fnSetGroupConfig)(int group, v1_vpss_grp *config);
     int (*fnStartGroup)(int group);
     int (*fnStopGroup)(int group);
 
@@ -94,7 +94,7 @@ static int v1_vpss_load(v1_vpss_impl *vpss_lib) {
     if (!(vpss_lib->fnSetChannelMode = (int(*)(int group, int channel, v1_vpss_mode *config))
         hal_symbol_load("v1_vpss", vpss_lib->handle, "HI_MPI_VPSS_SetChnMode")))
         return EXIT_FAILURE;
-    
+
     return EXIT_SUCCESS;
 }
 

src/hal/hisi/v2_vpss.h

@@ -40,7 +40,7 @@ typedef struct {
     int (*fnCreateGroup)(int group, v2_vpss_grp *config);
     int (*fnDestroyGroup)(int group);
     int (*fnResetGroup)(int group);
-    int (*fnSetGroupConfig)(int channel, v2_vpss_grp *config);
+    int (*fnSetGroupConfig)(int group, v2_vpss_grp *config);
     int (*fnStartGroup)(int group);
     int (*fnStopGroup)(int group);
 
@@ -93,7 +93,7 @@ static int v2_vpss_load(v2_vpss_impl *vpss_lib) {
     if (!(vpss_lib->fnSetChannelMode = (int(*)(int group, int channel, v2_vpss_mode *config))
         hal_symbol_load("v2_vpss", vpss_lib->handle, "HI_MPI_VPSS_SetChnMode")))
         return EXIT_FAILURE;
-    
+
     return EXIT_SUCCESS;
 }
 

src/hal/hisi/v3_vpss.h

@@ -41,7 +41,7 @@ typedef struct {
     int (*fnCreateGroup)(int group, v3_vpss_grp *config);
     int (*fnDestroyGroup)(int group);
     int (*fnResetGroup)(int group);
-    int (*fnSetGroupConfig)(int channel, v3_vpss_grp *config);
+    int (*fnSetGroupConfig)(int group, v3_vpss_grp *config);
     int (*fnStartGroup)(int group);
     int (*fnStopGroup)(int group);
 
@@ -94,7 +94,7 @@ static int v3_vpss_load(v3_vpss_impl *vpss_lib) {
     if (!(vpss_lib->fnSetChannelMode = (int(*)(int group, int channel, v3_vpss_mode *config))
         hal_symbol_load("v3_vpss", vpss_lib->handle, "HI_MPI_VPSS_SetChnMode")))
         return EXIT_FAILURE;
-    
+
     return EXIT_SUCCESS;
 }
 

src/hal/hisi/v4_vpss.h

@@ -54,7 +54,7 @@ typedef struct {
     int (*fnCreateGroup)(int group, v4_vpss_grp *config);
     int (*fnDestroyGroup)(int group);
     int (*fnResetGroup)(int group);
-    int (*fnSetGroupConfig)(int channel, v4_vpss_grp *config);
+    int (*fnSetGroupConfig)(int group, v4_vpss_grp *config);
     int (*fnStartGroup)(int group);
     int (*fnStopGroup)(int group);
 
@@ -105,7 +105,7 @@ static int v4_vpss_load(v4_vpss_impl *vpss_lib) {
     if (!(vpss_lib->fnSetChannelConfig = (int(*)(int group, int channel, v4_vpss_chn *config))
         hal_symbol_load("v4_vpss", vpss_lib->handle, "HI_MPI_VPSS_SetChnAttr")))
         return EXIT_FAILURE;
-    
+
     return EXIT_SUCCESS;
 }