Packman Build Service PMBS

qt-dab.changes Changed

dab-mini.spec Changed

qt-dab.spec Changed

qt-dab-qt-dab-4.4.tar.gz/README.md -> qt-dab-4.4.1.tar.gz/README.md Changed

qt-dab-qt-dab-4.4.tar.gz/dab-maxi/CMakeLists.txt -> qt-dab-4.4.1.tar.gz/dab-maxi/CMakeLists.txt Changed

qt-dab-4.4.1.tar.gz/dab-maxi/converted_map.h Added

@@ -0,0 +1,466 @@
+#
+#include <stdint.h>
+// generated map 
+static uint8_t qt_map  = {
+60, 33, 68, 79, 67, 84, 89, 80, 69, 32, 104, 116, 109, 108, 62, 
+	10, 10, 60, 104, 116, 109, 108, 62, 10, 32, 32, 60, 104, 101, 97, 
+	100, 62, 10, 32, 32, 32, 32, 60, 109, 101, 116, 97, 32, 110, 97, 
+	109, 101, 61, 34, 118, 105, 101, 119, 112, 111, 114, 116, 34, 32, 99, 
+	111, 110, 116, 101, 110, 116, 61, 34, 105, 110, 105, 116, 105, 97, 108, 
+	45, 115, 99, 97, 108, 101, 61, 49, 46, 48, 44, 32, 117, 115, 101, 
+	114, 45, 115, 99, 97, 108, 97, 98, 108, 101, 61, 110, 111, 34, 32, 
+	47, 62, 10, 32, 32, 32, 32, 32, 60, 108, 105, 110, 107, 32, 114, 
+	101, 108, 61, 34, 115, 116, 121, 108, 101, 115, 104, 101, 101, 116, 34, 
+	32, 104, 114, 101, 102, 61, 34, 104, 116, 116, 112, 115, 58, 47, 47, 
+	117, 110, 112, 107, 103, 46, 99, 111, 109, 47, 108, 101, 97, 102, 108, 
+	101, 116, 64, 49, 46, 54, 46, 48, 47, 100, 105, 115, 116, 47, 108, 
+	101, 97, 102, 108, 101, 116, 46, 99, 115, 115, 34, 32, 105, 110, 116, 
+	101, 103, 114, 105, 116, 121, 61, 34, 115, 104, 97, 53, 49, 50, 45, 
+	120, 119, 69, 47, 65, 122, 57, 122, 114, 106, 66, 73, 112, 104, 65, 
+	99, 66, 98, 51, 70, 54, 74, 86, 113, 120, 102, 52, 54, 43, 67, 
+	68, 76, 119, 102, 76, 77, 72, 108, 111, 78, 117, 54, 75, 69, 81, 
+	67, 65, 87, 105, 54, 72, 99, 68, 85, 98, 101, 79, 102, 66, 73, 
+	112, 116, 70, 55, 116, 99, 67, 122, 117, 115, 75, 70, 106, 70, 119, 
+	50, 121, 117, 118, 69, 112, 68, 76, 57, 119, 81, 61, 61, 34, 32, 
+	99, 114, 111, 115, 115, 111, 114, 105, 103, 105, 110, 61, 34, 34, 47, 
+	62, 10, 9, 60, 108, 105, 110, 107, 32, 114, 101, 108, 61, 34, 105, 
+	99, 111, 110, 34, 32, 104, 114, 101, 102, 61, 34, 100, 97, 116, 97, 
+	58, 44, 34, 62, 10, 9, 60, 115, 116, 121, 108, 101, 32, 116, 121, 
+	112, 101, 61, 34, 116, 101, 120, 116, 47, 99, 115, 115, 34, 62, 10, 
+	9, 32, 32, 32, 104, 116, 109, 108, 32, 123, 32, 104, 101, 105, 103, 
+	104, 116, 58, 32, 49, 48, 48, 37, 32, 125, 10, 9, 32, 32, 32, 
+	98, 111, 100, 121, 32, 123, 32, 104, 101, 105, 103, 104, 116, 58, 32, 
+	49, 48, 48, 37, 59, 32, 109, 97, 114, 103, 105, 110, 58, 32, 48, 
+	59, 32, 112, 97, 100, 100, 105, 110, 103, 58, 32, 48, 32, 125, 10, 
+	9, 32, 32, 32, 46, 116, 114, 97, 110, 115, 109, 105, 116, 116, 101, 
+	114, 45, 105, 99, 111, 110, 32, 123, 10, 9, 32, 32, 32, 32, 32, 
+	32, 112, 97, 100, 100, 105, 110, 103, 58, 48, 112, 120, 59, 10, 9, 
+	32, 32, 32, 32, 32, 32, 109, 97, 114, 103, 105, 110, 58, 48, 112, 
+	120, 59, 10, 9, 32, 32, 32, 125, 10, 9, 32, 32, 32, 35, 109, 
+	97, 112, 95, 99, 97, 110, 118, 97, 115, 32, 123, 32, 104, 101, 105, 
+	103, 104, 116, 58, 32, 49, 48, 48, 37, 32, 125, 10, 9, 32, 32, 
+	32, 35, 105, 110, 102, 111, 32, 123, 10, 9, 32, 32, 32, 32, 32, 
+	32, 112, 111, 115, 105, 116, 105, 111, 110, 58, 32, 97, 98, 115, 111, 
+	108, 117, 116, 101, 59, 10, 9, 32, 32, 32, 32, 32, 32, 119, 105, 
+	100, 116, 104, 58, 50, 48, 37, 59, 10, 9, 32, 32, 32, 32, 32, 
+	32, 104, 101, 105, 103, 104, 116, 58, 49, 48, 48, 37, 59, 10, 9, 
+	32, 32, 32, 32, 32, 32, 98, 111, 116, 116, 111, 109, 58, 48, 112, 
+	120, 59, 10, 9, 32, 32, 32, 32, 32, 32, 114, 105, 103, 104, 116, 
+	58, 48, 112, 120, 59, 10, 9, 32, 32, 32, 32, 32, 32, 116, 111, 
+	112, 58, 48, 112, 120, 59, 10, 9, 32, 32, 32, 32, 32, 32, 98, 
+	97, 99, 107, 103, 114, 111, 117, 110, 100, 45, 99, 111, 108, 111, 114, 
+	58, 32, 119, 104, 105, 116, 101, 59, 10, 9, 32, 32, 32, 32, 32, 
+	32, 98, 111, 114, 100, 101, 114, 45, 108, 101, 102, 116, 58, 49, 112, 
+	120, 32, 35, 54, 54, 54, 32, 115, 111, 108, 105, 100, 59, 10, 9, 
+	32, 32, 32, 32, 32, 32, 102, 111, 110, 116, 45, 102, 97, 109, 105, 
+	108, 121, 58, 72, 101, 108, 118, 101, 116, 105, 99, 97, 59, 10, 9, 
+	32, 32, 32, 125, 10, 9, 32, 32, 32, 35, 105, 110, 102, 111, 32, 
+	100, 105, 118, 32, 123, 10, 9, 32, 32, 32, 32, 32, 32, 112, 97, 
+	100, 100, 105, 110, 103, 58, 48, 112, 120, 59, 10, 9, 32, 32, 32, 
+	32, 32, 32, 112, 97, 100, 100, 105, 110, 103, 45, 108, 101, 102, 116, 
+	58, 49, 48, 112, 120, 59, 10, 9, 32, 32, 32, 32, 32, 32, 109, 
+	97, 114, 103, 105, 110, 58, 48, 112, 120, 59, 10, 9, 32, 32, 32, 
+	125, 10, 9, 32, 32, 32, 35, 105, 110, 102, 111, 32, 100, 105, 118, 
+	32, 104, 49, 32, 123, 10, 9, 32, 32, 32, 32, 32, 32, 109, 97, 
+	114, 103, 105, 110, 45, 116, 111, 112, 58, 49, 48, 112, 120, 59, 10, 
+	9, 32, 32, 32, 32, 32, 32, 102, 111, 110, 116, 45, 115, 105, 122, 
+	101, 58, 49, 54, 112, 120, 59, 10, 9, 32, 32, 32, 125, 10, 9, 
+	32, 32, 32, 35, 105, 110, 102, 111, 32, 100, 105, 118, 32, 112, 32, 
+	123, 10, 9, 32, 32, 32, 32, 32, 32, 102, 111, 110, 116, 45, 115, 
+	105, 122, 101, 58, 49, 52, 112, 120, 59, 10, 9, 32, 32, 32, 32, 
+	32, 32, 99, 111, 108, 111, 114, 58, 35, 51, 51, 51, 59, 10, 9, 
+	32, 32, 32, 125, 10, 9, 32, 32, 32, 46, 99, 111, 108, 111, 114, 
+	105, 110, 103, 32, 123, 10, 9, 32, 32, 32, 32, 32, 32, 99, 111, 
+	108, 111, 114, 58, 32, 114, 101, 100, 10, 9, 32, 32, 32, 125, 10, 
+	9, 60, 47, 115, 116, 121, 108, 101, 62, 10, 10, 9, 60, 115, 99, 
+	114, 105, 112, 116, 32, 115, 114, 99, 61, 34, 104, 116, 116, 112, 115, 
+	58, 47, 47, 97, 106, 97, 120, 46, 103, 111, 111, 103, 108, 101, 97, 
+	112, 105, 115, 46, 99, 111, 109, 47, 97, 106, 97, 120, 47, 108, 105, 
+	98, 115, 47, 106, 113, 117, 101, 114, 121, 47, 51, 46, 52, 46, 49, 
+	47, 106, 113, 117, 101, 114, 121, 46, 109, 105, 110, 46, 106, 115, 34, 
+	62, 60, 47, 115, 99, 114, 105, 112, 116, 62, 10, 9, 60, 115, 99, 
+	114, 105, 112, 116, 32, 115, 114, 99, 61, 34, 104, 116, 116, 112, 115, 
+	58, 47, 47, 117, 110, 112, 107, 103, 46, 99, 111, 109, 47, 108, 101, 
+	97, 102, 108, 101, 116, 64, 49, 46, 54, 46, 48, 47, 100, 105, 115, 
+	116, 47, 108, 101, 97, 102, 108, 101, 116, 46, 106, 115, 34, 32, 105, 
+	110, 116, 101, 103, 114, 105, 116, 121, 61, 34, 115, 104, 97, 53, 49, 
+	50, 45, 103, 90, 119, 73, 71, 57, 120, 51, 119, 85, 88, 103, 50, 
+	104, 100, 88, 70, 54, 43, 114, 86, 107, 76, 70, 47, 48, 86, 105, 
+	57, 85, 56, 68, 50, 78, 116, 103, 52, 71, 97, 53, 73, 53, 66, 
+	90, 112, 86, 107, 86, 120, 108, 74, 87, 98, 83, 81, 116, 88, 80, 
+	83, 105, 85, 84, 116, 67, 48, 84, 106, 116, 71, 79, 109, 120, 97, 
+	49, 65, 74, 80, 117, 86, 48, 67, 80, 116, 104, 101, 119, 61, 61, 
+	34, 32, 99, 114, 111, 115, 115, 111, 114, 105, 103, 105, 110, 61, 34, 
+	34, 62, 60, 47, 115, 99, 114, 105, 112, 116, 62, 10, 9, 60, 115, 
+	99, 114, 105, 112, 116, 32, 116, 121, 112, 101, 61, 34, 116, 101, 120, 
+	116, 47, 106, 97, 118, 97, 115, 99, 114, 105, 112, 116, 34, 62, 10, 
+	9, 32, 32, 32, 77, 97, 112, 32, 61, 32, 110, 117, 108, 108, 59, 
+	10, 9, 32, 32, 32, 118, 97, 114, 32, 104, 111, 109, 101, 76, 97, 
+	116, 105, 116, 117, 100, 101, 32, 61, 32, 36, 59, 10, 9, 32, 32, 
+	32, 118, 97, 114, 32, 104, 111, 109, 101, 76, 111, 110, 103, 105, 116, 
+	117, 100, 101, 32, 61, 32, 36, 59, 10, 9, 32, 32, 32, 118, 97, 
+	114, 32, 84, 114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 115, 32, 
+	61, 32, 123, 125, 59, 10, 9, 32, 32, 32, 118, 97, 114, 32, 116, 
+	114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 73, 110, 100, 101, 120, 
+	9, 61, 32, 48, 59, 10, 10, 9, 32, 32, 32, 102, 117, 110, 99, 
+	116, 105, 111, 110, 32, 103, 101, 116, 73, 99, 111, 110, 70, 111, 114, 
+	72, 111, 109, 101, 32, 40, 41, 32, 123, 10, 9, 32, 32, 32, 32, 
+	32, 32, 118, 97, 114, 32, 104, 101, 32, 61, 32, 100, 111, 99, 117, 
+	109, 101, 110, 116, 46, 32, 99, 114, 101, 97, 116, 101, 69, 108, 101, 
+	109, 101, 110, 116, 32, 40, 34, 80, 34, 41, 59, 10, 9, 32, 32, 
+	32, 32, 32, 32, 104, 101, 46, 105, 110, 110, 101, 114, 72, 84, 77, 
+	76, 32, 61, 32, 39, 42, 39, 59, 10, 9, 32, 32, 32, 32, 32, 
+	32, 118, 97, 114, 32, 115, 101, 108, 104, 116, 109, 108, 32, 61, 32, 
+	39, 39, 59, 10, 9, 32, 32, 32, 32, 32, 32, 104, 101, 32, 61, 
+	32, 39, 60, 100, 105, 118, 32, 115, 116, 121, 108, 101, 61, 34, 102, 
+	111, 110, 116, 45, 115, 105, 122, 101, 58, 49, 114, 101, 109, 34, 62, 
+	38, 35, 120, 50, 66, 53, 53, 60, 47, 100, 105, 118, 62, 39, 59, 
+	10, 9, 32, 32, 32, 32, 32, 32, 118, 97, 114, 32, 105, 99, 111, 
+	110, 32, 61, 32, 76, 46, 100, 105, 118, 73, 99, 111, 110, 32, 40, 
+	123, 104, 116, 109, 108, 58, 32, 104, 101, 44, 32, 99, 108, 97, 115, 
+	115, 78, 97, 109, 101, 58, 32, 39, 104, 111, 109, 101, 45, 105, 99, 
+	111, 110, 39, 125, 41, 59, 10, 9, 32, 32, 32, 32, 32, 32, 114, 
+	101, 116, 117, 114, 110, 32, 105, 99, 111, 110, 59, 10, 9, 32, 32, 
+	32, 125, 10, 10, 9, 32, 32, 32, 102, 117, 110, 99, 116, 105, 111, 
+	110, 32, 103, 101, 116, 73, 99, 111, 110, 70, 111, 114, 84, 114, 97, 
+	110, 115, 109, 105, 116, 116, 101, 114, 32, 40, 107, 101, 121, 41, 32, 
+	123, 10, 9, 32, 32, 32, 32, 32, 32, 118, 97, 114, 32, 104, 101, 
+	32, 61, 32, 100, 111, 99, 117, 109, 101, 110, 116, 46, 32, 99, 114, 
+	101, 97, 116, 101, 69, 108, 101, 109, 101, 110, 116, 32, 40, 34, 80, 
+	34, 41, 59, 10, 47, 47, 9, 32, 32, 32, 32, 32, 32, 104, 101, 
+	46, 105, 110, 110, 101, 114, 72, 84, 77, 76, 32, 61, 32, 39, 42, 
+	39, 59, 10, 10, 9, 32, 32, 32, 32, 32, 32, 118, 97, 114, 32, 
+	115, 101, 108, 104, 116, 109, 108, 32, 61, 32, 39, 39, 59, 10, 9, 
+	32, 32, 32, 32, 32, 32, 105, 102, 32, 40, 107, 101, 121, 32, 61, 
+	61, 32, 48, 41, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 
+	104, 101, 32, 61, 32, 39, 60, 100, 105, 118, 32, 115, 116, 121, 108, 
+	101, 61, 34, 102, 111, 110, 116, 45, 115, 105, 122, 101, 32, 58, 49, 
+	46, 50, 114, 101, 109, 34, 62, 32, 38, 35, 120, 50, 55, 50, 52, 
+	60, 47, 100, 105, 118, 62, 39, 59, 10, 47, 47, 9, 32, 32, 32, 
+	32, 32, 32, 32, 32, 32, 104, 101, 32, 61, 32, 39, 60, 100, 105, 
+	118, 32, 115, 116, 121, 108, 101, 61, 34, 102, 111, 110, 116, 45, 115, 
+	105, 122, 101, 32, 58, 49, 46, 49, 114, 101, 109, 34, 62, 32, 38, 
+	35, 120, 50, 53, 65, 51, 60, 47, 100, 105, 118, 62, 39, 59, 10, 
+	9, 32, 32, 32, 32, 32, 32, 101, 108, 115, 101, 10, 9, 32, 32, 
+	32, 32, 32, 32, 32, 32, 32, 104, 101, 32, 61, 32, 39, 60, 100, 
+	105, 118, 32, 115, 116, 121, 108, 101, 61, 34, 102, 111, 110, 116, 45, 
+	115, 105, 122, 101, 32, 58, 48, 46, 55, 114, 101, 109, 59, 34, 62, 
+	32, 38, 35, 120, 50, 54, 65, 66, 60, 47, 100, 105, 118, 62, 39, 
+	59, 10, 47, 47, 9, 32, 32, 32, 32, 32, 32, 104, 101, 32, 61, 
+	32, 39, 60, 100, 105, 118, 32, 115, 116, 121, 108, 101, 61, 34, 39, 
+	43, 115, 101, 108, 104, 116, 109, 108, 43, 39, 34, 62, 32, 38, 35, 
+	120, 50, 54, 65, 66, 60, 47, 100, 105, 118, 62, 39, 59, 10, 9, 
+	32, 32, 32, 32, 32, 32, 118, 97, 114, 32, 105, 99, 111, 110, 32, 
+	61, 32, 76, 46, 100, 105, 118, 73, 99, 111, 110, 32, 40, 123, 104, 
+	116, 109, 108, 58, 32, 104, 101, 44, 32, 99, 108, 97, 115, 115, 78, 
+	97, 109, 101, 58, 32, 39, 116, 114, 97, 110, 115, 109, 105, 116, 116, 
+	101, 114, 45, 105, 99, 111, 110, 39, 125, 41, 59, 10, 9, 32, 32, 
+	32, 32, 32, 32, 114, 101, 116, 117, 114, 110, 32, 105, 99, 111, 110, 
+	59, 10, 9, 32, 32, 32, 125, 10, 10, 9, 32, 32, 32, 102, 117, 
+	110, 99, 116, 105, 111, 110, 32, 102, 101, 116, 99, 104, 68, 97, 116, 
+	97, 32, 40, 41, 32, 123, 10, 9, 32, 32, 32, 32, 32, 32, 36, 
+	46, 103, 101, 116, 74, 83, 79, 78, 32, 40, 39, 47, 100, 97, 116, 
+	97, 46, 106, 115, 111, 110, 39, 44, 32, 102, 117, 110, 99, 116, 105, 
+	111, 110, 32, 40, 100, 97, 116, 97, 41, 32, 123, 10, 9, 32, 32, 
+	32, 32, 32, 32, 102, 111, 114, 32, 40, 118, 97, 114, 32, 116, 32, 
+	61, 32, 48, 59, 32, 116, 32, 60, 32, 100, 97, 116, 97, 46, 32, 
+	108, 101, 110, 103, 116, 104, 59, 32, 116, 32, 43, 43, 41, 32, 123, 
+	10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 105, 102, 32, 40, 
+	100, 97, 116, 97, 32, 91, 116, 93, 46, 32, 108, 97, 116, 32, 61, 
+	61, 32, 48, 41, 32, 123, 10, 9, 32, 32, 32, 32, 32, 32, 32, 
+	32, 32, 32, 32, 32, 102, 111, 114, 32, 40, 118, 97, 114, 32, 105, 
+	32, 61, 32, 48, 59, 32, 105, 32, 60, 32, 116, 114, 97, 110, 115, 
+	109, 105, 116, 116, 101, 114, 73, 110, 100, 101, 120, 59, 32, 105, 32, 
+	43, 43, 41, 32, 123, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 
+	32, 32, 32, 32, 32, 32, 32, 77, 97, 112, 46, 32, 114, 101, 109, 
+	111, 118, 101, 76, 97, 121, 101, 114, 32, 40, 84, 114, 97, 110, 115, 
+	109, 105, 116, 116, 101, 114, 115, 32, 91, 105, 93, 46, 32, 109, 97, 
+	114, 107, 101, 114, 41, 59, 10, 9, 32, 32, 32, 32, 32, 32, 32, 
+	32, 32, 32, 32, 32, 32, 32, 32, 100, 101, 108, 101, 116, 101, 32, 
+	84, 114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 115, 32, 91, 105, 
+	93, 59, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 
+	32, 125, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 
+	32, 84, 114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 115, 32, 61, 
+	32, 123, 125, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 
+	32, 32, 116, 114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 73, 110, 
+	100, 101, 120, 32, 61, 32, 48, 59, 10, 9, 32, 32, 32, 32, 32, 
+	32, 32, 32, 32, 32, 32, 32, 108, 101, 116, 32, 120, 120, 32, 61, 
+	32, 100, 111, 99, 117, 109, 101, 110, 116, 46, 32, 103, 101, 116, 69, 
+	108, 101, 109, 101, 110, 116, 66, 121, 73, 100, 32, 40, 39, 115, 101, 
+	108, 105, 110, 102, 111, 39, 41, 59, 10, 9, 32, 32, 32, 32, 32, 
+	32, 32, 32, 32, 32, 32, 32, 120, 120, 32, 46, 32, 105, 110, 110, 
+	101, 114, 72, 84, 77, 76, 32, 61, 32, 39, 32, 39, 59, 10, 9, 
+	32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 108, 101, 116, 
+	32, 121, 121, 32, 61, 32, 100, 111, 99, 117, 109, 101, 110, 116, 46, 
+	32, 103, 101, 116, 69, 108, 101, 109, 101, 110, 116, 66, 121, 73, 100, 
+	32, 40, 39, 115, 101, 108, 67, 111, 117, 110, 116, 39, 41, 59, 10, 
+	9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 121, 121, 
+	46, 32, 105, 110, 110, 101, 114, 72, 84, 77, 76, 32, 61, 10, 9, 
+	32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,

qt-dab-qt-dab-4.4.tar.gz/dab-maxi/http-handler.cpp -> qt-dab-4.4.1.tar.gz/dab-maxi/http-handler.cpp Changed

@@ -42,13 +42,21 @@
 #include	"http-handler.h"
 #include	"radio.h"
 
-#include	"converted_map.cpp"
+#include	"converted_map.h"
 
 	httpHandler::httpHandler (RadioInterface *parent, int port,
-	                          std::complex<float> address) {
+	                          std::complex<float> address,
+	                          bool autoBrowse,
+	                          const QString &browserAddress) {
 	this	-> parent	= parent;
-	this	-> homeAddress	= address;
 	this	-> port		= port;
+	this	-> homeAddress	= address;
+	this	-> autoBrowse	= autoBrowse;
+#ifdef	__MINGW32__
+	this	-> browserAddress	= browserAddress. toStdWString ();
+#else
+	this	-> browserAddress	= browserAddress. toStdString ();
+#endif
 	this	-> running. store (false);
 	connect (this, SIGNAL (terminating ()),
 	         parent, SLOT (http_terminate ()));
@@ -64,6 +72,15 @@
 
 void	httpHandler::start	() {
 	threadHandle = std::thread (&httpHandler::run, this);
+	if (!autoBrowse)
+	   return;
+#ifdef	__MINGW32__
+	ShellExecute (NULL, L"open", browserAddress. c_str (),
+	                                       NULL, NULL, SW_SHOWNORMAL);
+#else
+	std::string x = "xdg-open " + browserAddress;
+	system (x. c_str ());
+#endif
 }
 
 void	httpHandler::stop	() {
@@ -78,46 +95,50 @@
 char	buffer 4096;
 bool	keepalive;
 char	*url;
-int one = 1, ListenSocket;
+int one = 1, ClientSocket, ListenSocket;
 struct sockaddr_in svr_addr, cli_addr;
 std::string	content;
 std::string	ctype;
 
 	running. store (true);
 	socklen_t sin_len = sizeof (cli_addr);
-	int sock = socket (AF_INET, SOCK_STREAM, 0);
-	if (sock < 0) {
+	ListenSocket = socket (AF_INET, SOCK_STREAM, 0);
+	if (ListenSocket < 0) {
 	   running. store (false);
 	   terminating ();
 	   return;
 	}
 
-	int flags	= fcntl (sock, F_GETFL);
-	fcntl (sock, F_SETFL, flags | O_NONBLOCK);
-	setsockopt (sock, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(int));
+	int flags	= fcntl (ListenSocket, F_GETFL);
+	fcntl (ListenSocket, F_SETFL, flags | O_NONBLOCK);
+	setsockopt (ListenSocket, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(int));
 	svr_addr.sin_family = AF_INET;
 	svr_addr.sin_addr.s_addr = INADDR_ANY;
 	svr_addr.sin_port = htons (port);
  
-	if (bind(sock, (struct sockaddr *) &svr_addr,
-	                                  sizeof(svr_addr)) == -1) {
-	   close (sock);
+	if (bind (ListenSocket, (struct sockaddr *) &svr_addr,
+	                                  sizeof (svr_addr)) == -1) {
+	   close (ListenSocket);
 	   running. store (false);
 	   terminating ();
 	   return;
 	}
+//
+//	Now, we are listening to port 8080, ready to accept a
+//	socket for anyone who needs us
 
-	listen (sock, 5);
+	listen (ListenSocket, 5);
 	while (running. load ()) {
-	   ListenSocket = accept (sock,
+	   ClientSocket = accept (ListenSocket,
 	                    (struct sockaddr *) &cli_addr, &sin_len);
-	   if (ListenSocket == -1) {
+	   if (ClientSocket == -1) {
 	      usleep (2000000);
 	      continue;
 	   }
-
+//
+//	someone needs us, let us see what (s)he wants
 	   while (running. load ()) {
-	      if (read (ListenSocket, buffer, 4096) < 0) {
+	      if (read (ClientSocket, buffer, 4096) < 0) {
 	         running. store (false);
 	         break;
 	      }
@@ -131,7 +152,7 @@
 	         keepalive = strstr (buffer, "Connection: keep-alive") != NULL;
 
 /*	Identify the URL. */
-	      char *p = strchr (buffer,' ');
+	      char *p = strchr (buffer, ' ');
 	      if (p == NULL) 
 	         break;
 	      url = ++p; // Now this should point to the requested URL. 
@@ -145,7 +166,7 @@
 //	 "/data.json" -> Our ajax request to update planes. */
 	      bool jsonUpdate	= false;
 	      if (strstr (url, "/data.json")) {
-	         content	= coordinatesToJson (transmitter);
+	         content	= coordinatesToJson (transmitterList);
 	         if (content != "") {
 	            ctype	= "application/json;charset=utf-8";
 	            jsonUpdate	= true;
@@ -176,8 +197,8 @@
 //	         fprintf (stderr, "%s\n", content. c_str ());
 	      }
 //	and send the reply
-	      if (write (ListenSocket, hdr, hdrlen) != hdrlen ||
-	          write (ListenSocket, content. c_str (),
+	      if (write (ClientSocket, hdr, hdrlen) != hdrlen ||
+	          write (ClientSocket, content. c_str (),
 	                          content. size ()) != content. size ())  {
 //	         fprintf (stderr, "WRITE PROBLEM\n");
 //	         break;
@@ -186,7 +207,7 @@
 	}
 	fprintf (stderr, "mapServer quits\n");
 	close (ListenSocket);
-	close (sock);
+	close (ClientSocket);
 	emit terminating ();
 }
 #else
@@ -212,7 +233,7 @@
 	   return;
 	}
 
-	ZeroMemory(&hints, sizeof(hints));
+	ZeroMemory (&hints, sizeof(hints));
 	hints.ai_family		= AF_INET;
 	hints.ai_socktype	= SOCK_STREAM;
 	hints.ai_protocol	= IPPROTO_TCP;
@@ -235,6 +256,8 @@
 	   terminating ();
 	   return;
 	}
+	unsigned long mode = 1;
+	ioctlsocket (ListenSocket, FIONBIO, &mode);
 
 // Setup the TCP listening socket
 	iResult = bind (ListenSocket, result -> ai_addr,
@@ -255,9 +278,8 @@
 	while (running. load ()) {
 	   ClientSocket = accept (ListenSocket, NULL, NULL);
 	   if (ClientSocket == -1)  {
-	      running. store (false);
-	      terminating ();
-	      return;
+	      usleep (2000000);
+	      continue;
 	   }
 	   
 	   while (running. load ()) {
@@ -309,11 +331,11 @@
 //	 "/data.json" -> Our ajax request to update transmitters. */
 	      bool jsonUpdate	= false;
 	      if (strstr (url, "/data.json")) {
-	         content	= coordinatesToJson (transmitter);
+	         content	= coordinatesToJson (transmitterList);
 	         if (content != "") {
 	            ctype	= "application/json;charset=utf-8";
 	            jsonUpdate	= true;
-	            fprintf (stderr, "%s will be sent\n", content. c_str ());
+//	            fprintf (stderr, "%s will be sent\n", content. c_str ());
 	         }
 	      }
 	      else {
@@ -334,7 +356,6 @@
 	               keepalive ? "keep-alive" : "close",
 	               (int)(strlen (content. c_str ())));
 	      int hdrlen = strlen (hdr);
-//		  parent->show_text(std::string(hdr));
 //	      if (jsonUpdate) {
 //	         parent -> show_text (std::string ("Json update requested\n"));
 //	         parent -> show_text (content);
@@ -358,7 +379,6 @@
 #endif
 
 std::string	httpHandler::theMap (std::complex<float> homeAddress) {

qt-dab-qt-dab-4.4.tar.gz/dab-maxi/http-handler.h -> qt-dab-4.4.1.tar.gz/dab-maxi/http-handler.h Changed

@@ -36,32 +36,42 @@
 
 typedef struct {
 	std::complex<float> coords;
-	QString name;
+	QString transmitterName;
+	QString channelName;
+	int	distance;
 } httpData;
 
 class	httpHandler: public QObject {
 Q_OBJECT
 public:
 		httpHandler	(RadioInterface *,
-	                         int port, std::complex<float> address);
+	                         int port,
+	                         std::complex<float> address,
+	                         bool	autoBrowse,
+	                         const QString &browserAddress);
 		~httpHandler	();
 	void	start		();
 	void	stop		();
 	void	run		();
 	void	putData		(std::complex<float>target,
-	                         QString name);
+	                         QString transmittername,
+	                         QString channelName, int distance);
 private:
 	RadioInterface		*parent;
 	int		port;
 	std::complex<float> homeAddress;
+#ifdef	__MINGW32__
+	std::wstring	browserAddress;
+#else
+	std::string	browserAddress;
+#endif
 	std::atomic<bool>	running;
 	std::thread	threadHandle;
-//	std::string     theMap		(const std::string &fileName,
-	std::string     theMap		(
-	                                 std::complex<float> address);
-	std::string	coordinatesToJson (httpData &t);
-	httpData	transmitter;
+	std::string     theMap		(std::complex<float> address);
+	std::string	coordinatesToJson (std::vector<httpData> &t);
+	std::vector<httpData>	transmitterList;
 	std::mutex	locker;
+	bool		autoBrowse;
 signals:
 	void		terminating	();
 };

qt-dab-4.4.1.tar.gz/dab-maxi/map/converted_map.cpp Added

@@ -0,0 +1,316 @@
+#
+#include <stdint.h>
+// generated map 
+static uint8_t qt_map  = {
+60, 33, 68, 79, 67, 84, 89, 80, 69, 32, 104, 116, 109, 108, 62, 
+	10, 10, 60, 104, 116, 109, 108, 62, 10, 32, 32, 60, 104, 101, 97, 
+	100, 62, 10, 32, 32, 32, 32, 60, 109, 101, 116, 97, 32, 110, 97, 
+	109, 101, 61, 34, 118, 105, 101, 119, 112, 111, 114, 116, 34, 32, 99, 
+	111, 110, 116, 101, 110, 116, 61, 34, 105, 110, 105, 116, 105, 97, 108, 
+	45, 115, 99, 97, 108, 101, 61, 49, 46, 48, 44, 32, 117, 115, 101, 
+	114, 45, 115, 99, 97, 108, 97, 98, 108, 101, 61, 110, 111, 34, 32, 
+	47, 62, 10, 32, 32, 32, 32, 32, 60, 108, 105, 110, 107, 32, 114, 
+	101, 108, 61, 34, 115, 116, 121, 108, 101, 115, 104, 101, 101, 116, 34, 
+	32, 104, 114, 101, 102, 61, 34, 104, 116, 116, 112, 115, 58, 47, 47, 
+	117, 110, 112, 107, 103, 46, 99, 111, 109, 47, 108, 101, 97, 102, 108, 
+	101, 116, 64, 49, 46, 54, 46, 48, 47, 100, 105, 115, 116, 47, 108, 
+	101, 97, 102, 108, 101, 116, 46, 99, 115, 115, 34, 32, 105, 110, 116, 
+	101, 103, 114, 105, 116, 121, 61, 34, 115, 104, 97, 53, 49, 50, 45, 
+	120, 119, 69, 47, 65, 122, 57, 122, 114, 106, 66, 73, 112, 104, 65, 
+	99, 66, 98, 51, 70, 54, 74, 86, 113, 120, 102, 52, 54, 43, 67, 
+	68, 76, 119, 102, 76, 77, 72, 108, 111, 78, 117, 54, 75, 69, 81, 
+	67, 65, 87, 105, 54, 72, 99, 68, 85, 98, 101, 79, 102, 66, 73, 
+	112, 116, 70, 55, 116, 99, 67, 122, 117, 115, 75, 70, 106, 70, 119, 
+	50, 121, 117, 118, 69, 112, 68, 76, 57, 119, 81, 61, 61, 34, 32, 
+	99, 114, 111, 115, 115, 111, 114, 105, 103, 105, 110, 61, 34, 34, 47, 
+	62, 10, 9, 60, 108, 105, 110, 107, 32, 114, 101, 108, 61, 34, 105, 
+	99, 111, 110, 34, 32, 104, 114, 101, 102, 61, 34, 100, 97, 116, 97, 
+	58, 44, 34, 62, 10, 9, 60, 115, 116, 121, 108, 101, 32, 116, 121, 
+	112, 101, 61, 34, 116, 101, 120, 116, 47, 99, 115, 115, 34, 62, 10, 
+	9, 32, 32, 32, 104, 116, 109, 108, 32, 123, 32, 104, 101, 105, 103, 
+	104, 116, 58, 32, 49, 48, 48, 37, 32, 125, 10, 9, 32, 32, 32, 
+	98, 111, 100, 121, 32, 123, 32, 104, 101, 105, 103, 104, 116, 58, 32, 
+	49, 48, 48, 37, 59, 32, 109, 97, 114, 103, 105, 110, 58, 32, 48, 
+	59, 32, 112, 97, 100, 100, 105, 110, 103, 58, 32, 48, 32, 125, 10, 
+	9, 32, 32, 32, 46, 116, 114, 97, 110, 115, 109, 105, 116, 116, 101, 
+	114, 45, 105, 99, 111, 110, 32, 123, 10, 9, 32, 32, 32, 32, 32, 
+	32, 112, 97, 100, 100, 105, 110, 103, 58, 48, 112, 120, 59, 10, 9, 
+	32, 32, 32, 32, 32, 32, 109, 97, 114, 103, 105, 110, 58, 48, 112, 
+	120, 59, 10, 9, 32, 32, 32, 125, 10, 9, 32, 32, 32, 35, 109, 
+	97, 112, 95, 99, 97, 110, 118, 97, 115, 32, 123, 32, 104, 101, 105, 
+	103, 104, 116, 58, 32, 49, 48, 48, 37, 32, 125, 10, 9, 32, 32, 
+	32, 35, 105, 110, 102, 111, 32, 123, 10, 9, 32, 32, 32, 32, 32, 
+	32, 112, 111, 115, 105, 116, 105, 111, 110, 58, 32, 97, 98, 115, 111, 
+	108, 117, 116, 101, 59, 10, 9, 32, 32, 32, 32, 32, 32, 119, 105, 
+	100, 116, 104, 58, 50, 48, 37, 59, 10, 9, 32, 32, 32, 32, 32, 
+	32, 104, 101, 105, 103, 104, 116, 58, 49, 48, 48, 37, 59, 10, 9, 
+	32, 32, 32, 32, 32, 32, 98, 111, 116, 116, 111, 109, 58, 48, 112, 
+	120, 59, 10, 9, 32, 32, 32, 32, 32, 32, 114, 105, 103, 104, 116, 
+	58, 48, 112, 120, 59, 10, 9, 32, 32, 32, 32, 32, 32, 116, 111, 
+	112, 58, 48, 112, 120, 59, 10, 9, 32, 32, 32, 32, 32, 32, 98, 
+	97, 99, 107, 103, 114, 111, 117, 110, 100, 45, 99, 111, 108, 111, 114, 
+	58, 32, 119, 104, 105, 116, 101, 59, 10, 9, 32, 32, 32, 32, 32, 
+	32, 98, 111, 114, 100, 101, 114, 45, 108, 101, 102, 116, 58, 49, 112, 
+	120, 32, 35, 54, 54, 54, 32, 115, 111, 108, 105, 100, 59, 10, 9, 
+	32, 32, 32, 32, 32, 32, 102, 111, 110, 116, 45, 102, 97, 109, 105, 
+	108, 121, 58, 72, 101, 108, 118, 101, 116, 105, 99, 97, 59, 10, 9, 
+	32, 32, 32, 125, 10, 9, 32, 32, 32, 35, 105, 110, 102, 111, 32, 
+	100, 105, 118, 32, 123, 10, 9, 32, 32, 32, 32, 32, 32, 112, 97, 
+	100, 100, 105, 110, 103, 58, 48, 112, 120, 59, 10, 9, 32, 32, 32, 
+	32, 32, 32, 112, 97, 100, 100, 105, 110, 103, 45, 108, 101, 102, 116, 
+	58, 49, 48, 112, 120, 59, 10, 9, 32, 32, 32, 32, 32, 32, 109, 
+	97, 114, 103, 105, 110, 58, 48, 112, 120, 59, 10, 9, 32, 32, 32, 
+	125, 10, 9, 32, 32, 32, 35, 105, 110, 102, 111, 32, 100, 105, 118, 
+	32, 104, 49, 32, 123, 10, 9, 32, 32, 32, 32, 32, 32, 109, 97, 
+	114, 103, 105, 110, 45, 116, 111, 112, 58, 49, 48, 112, 120, 59, 10, 
+	9, 32, 32, 32, 32, 32, 32, 102, 111, 110, 116, 45, 115, 105, 122, 
+	101, 58, 49, 54, 112, 120, 59, 10, 9, 32, 32, 32, 125, 10, 9, 
+	32, 32, 32, 35, 105, 110, 102, 111, 32, 100, 105, 118, 32, 112, 32, 
+	123, 10, 9, 32, 32, 32, 32, 32, 32, 102, 111, 110, 116, 45, 115, 
+	105, 122, 101, 58, 49, 52, 112, 120, 59, 10, 9, 32, 32, 32, 32, 
+	32, 32, 99, 111, 108, 111, 114, 58, 35, 51, 51, 51, 59, 10, 9, 
+	32, 32, 32, 125, 10, 9, 60, 47, 115, 116, 121, 108, 101, 62, 10, 
+	10, 9, 60, 115, 99, 114, 105, 112, 116, 32, 115, 114, 99, 61, 34, 
+	104, 116, 116, 112, 115, 58, 47, 47, 97, 106, 97, 120, 46, 103, 111, 
+	111, 103, 108, 101, 97, 112, 105, 115, 46, 99, 111, 109, 47, 97, 106, 
+	97, 120, 47, 108, 105, 98, 115, 47, 106, 113, 117, 101, 114, 121, 47, 
+	51, 46, 52, 46, 49, 47, 106, 113, 117, 101, 114, 121, 46, 109, 105, 
+	110, 46, 106, 115, 34, 62, 60, 47, 115, 99, 114, 105, 112, 116, 62, 
+	10, 9, 60, 115, 99, 114, 105, 112, 116, 32, 115, 114, 99, 61, 34, 
+	104, 116, 116, 112, 115, 58, 47, 47, 117, 110, 112, 107, 103, 46, 99, 
+	111, 109, 47, 108, 101, 97, 102, 108, 101, 116, 64, 49, 46, 54, 46, 
+	48, 47, 100, 105, 115, 116, 47, 108, 101, 97, 102, 108, 101, 116, 46, 
+	106, 115, 34, 32, 105, 110, 116, 101, 103, 114, 105, 116, 121, 61, 34, 
+	115, 104, 97, 53, 49, 50, 45, 103, 90, 119, 73, 71, 57, 120, 51, 
+	119, 85, 88, 103, 50, 104, 100, 88, 70, 54, 43, 114, 86, 107, 76, 
+	70, 47, 48, 86, 105, 57, 85, 56, 68, 50, 78, 116, 103, 52, 71, 
+	97, 53, 73, 53, 66, 90, 112, 86, 107, 86, 120, 108, 74, 87, 98, 
+	83, 81, 116, 88, 80, 83, 105, 85, 84, 116, 67, 48, 84, 106, 116, 
+	71, 79, 109, 120, 97, 49, 65, 74, 80, 117, 86, 48, 67, 80, 116, 
+	104, 101, 119, 61, 61, 34, 32, 99, 114, 111, 115, 115, 111, 114, 105, 
+	103, 105, 110, 61, 34, 34, 62, 60, 47, 115, 99, 114, 105, 112, 116, 
+	62, 10, 9, 60, 115, 99, 114, 105, 112, 116, 32, 116, 121, 112, 101, 
+	61, 34, 116, 101, 120, 116, 47, 106, 97, 118, 97, 115, 99, 114, 105, 
+	112, 116, 34, 62, 10, 9, 32, 32, 32, 77, 97, 112, 32, 61, 32, 
+	110, 117, 108, 108, 59, 10, 9, 32, 32, 32, 118, 97, 114, 32, 104, 
+	111, 109, 101, 76, 97, 116, 105, 116, 117, 100, 101, 32, 61, 32, 36, 
+	59, 10, 9, 32, 32, 32, 118, 97, 114, 32, 104, 111, 109, 101, 76, 
+	111, 110, 103, 105, 116, 117, 100, 101, 32, 61, 32, 36, 59, 10, 9, 
+	32, 32, 32, 118, 97, 114, 32, 84, 114, 97, 110, 115, 109, 105, 116, 
+	116, 101, 114, 115, 32, 61, 32, 123, 125, 59, 10, 9, 32, 32, 32, 
+	118, 97, 114, 32, 116, 114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 
+	73, 110, 100, 101, 120, 9, 61, 32, 48, 59, 10, 10, 9, 32, 32, 
+	32, 102, 117, 110, 99, 116, 105, 111, 110, 32, 103, 101, 116, 73, 99, 
+	111, 110, 70, 111, 114, 72, 111, 109, 101, 32, 40, 41, 32, 123, 10, 
+	9, 32, 32, 32, 32, 32, 32, 118, 97, 114, 32, 104, 101, 32, 61, 
+	32, 100, 111, 99, 117, 109, 101, 110, 116, 46, 32, 99, 114, 101, 97, 
+	116, 101, 69, 108, 101, 109, 101, 110, 116, 32, 40, 34, 80, 34, 41, 
+	59, 10, 9, 32, 32, 32, 32, 32, 32, 104, 101, 46, 105, 110, 110, 
+	101, 114, 72, 84, 77, 76, 32, 61, 32, 39, 42, 39, 59, 10, 9, 
+	32, 32, 32, 32, 32, 32, 118, 97, 114, 32, 115, 101, 108, 104, 116, 
+	109, 108, 32, 61, 32, 39, 39, 59, 10, 9, 32, 32, 32, 32, 32, 
+	32, 104, 101, 32, 61, 32, 39, 60, 100, 105, 118, 32, 115, 116, 121, 
+	108, 101, 61, 34, 102, 111, 110, 116, 45, 115, 105, 122, 101, 58, 49, 
+	114, 101, 109, 34, 62, 38, 35, 120, 50, 66, 53, 53, 60, 47, 100, 
+	105, 118, 62, 39, 59, 10, 9, 32, 32, 32, 32, 32, 32, 118, 97, 
+	114, 32, 105, 99, 111, 110, 32, 61, 32, 76, 46, 100, 105, 118, 73, 
+	99, 111, 110, 32, 40, 123, 104, 116, 109, 108, 58, 32, 104, 101, 44, 
+	32, 99, 108, 97, 115, 115, 78, 97, 109, 101, 58, 32, 39, 104, 111, 
+	109, 101, 45, 105, 99, 111, 110, 39, 125, 41, 59, 10, 9, 32, 32, 
+	32, 32, 32, 32, 114, 101, 116, 117, 114, 110, 32, 105, 99, 111, 110, 
+	59, 10, 9, 32, 32, 32, 125, 10, 10, 9, 32, 32, 32, 102, 117, 
+	110, 99, 116, 105, 111, 110, 32, 103, 101, 116, 73, 99, 111, 110, 70, 
+	111, 114, 84, 114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 32, 40, 
+	41, 32, 123, 10, 9, 32, 32, 32, 32, 32, 32, 118, 97, 114, 32, 
+	104, 101, 32, 61, 32, 100, 111, 99, 117, 109, 101, 110, 116, 46, 32, 
+	99, 114, 101, 97, 116, 101, 69, 108, 101, 109, 101, 110, 116, 32, 40, 
+	34, 80, 34, 41, 59, 10, 9, 32, 32, 32, 32, 32, 32, 104, 101, 
+	46, 105, 110, 110, 101, 114, 72, 84, 77, 76, 32, 61, 32, 39, 42, 
+	39, 59, 10, 9, 32, 32, 32, 32, 32, 32, 118, 97, 114, 32, 115, 
+	101, 108, 104, 116, 109, 108, 32, 61, 32, 39, 39, 59, 10, 9, 32, 
+	32, 32, 32, 32, 32, 104, 101, 32, 61, 32, 39, 60, 100, 105, 118, 
+	32, 115, 116, 121, 108, 101, 61, 34, 102, 111, 110, 116, 45, 115, 105, 
+	122, 101, 32, 58, 48, 46, 55, 114, 101, 109, 34, 62, 32, 38, 35, 
+	120, 50, 54, 65, 66, 60, 47, 100, 105, 118, 62, 39, 59, 10, 47, 
+	47, 9, 32, 32, 32, 32, 32, 32, 104, 101, 32, 61, 32, 39, 60, 
+	100, 105, 118, 32, 115, 116, 121, 108, 101, 61, 34, 39, 43, 115, 101, 
+	108, 104, 116, 109, 108, 43, 39, 34, 62, 32, 38, 35, 120, 50, 54, 
+	65, 66, 60, 47, 100, 105, 118, 62, 39, 59, 10, 9, 32, 32, 32, 
+	32, 32, 32, 118, 97, 114, 32, 105, 99, 111, 110, 32, 61, 32, 76, 
+	46, 100, 105, 118, 73, 99, 111, 110, 32, 40, 123, 104, 116, 109, 108, 
+	58, 32, 104, 101, 44, 32, 99, 108, 97, 115, 115, 78, 97, 109, 101, 
+	58, 32, 39, 116, 114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 45, 
+	105, 99, 111, 110, 39, 125, 41, 59, 10, 9, 32, 32, 32, 32, 32, 
+	32, 114, 101, 116, 117, 114, 110, 32, 105, 99, 111, 110, 59, 10, 9, 
+	32, 32, 32, 125, 10, 10, 9, 32, 32, 32, 102, 117, 110, 99, 116, 
+	105, 111, 110, 32, 102, 101, 116, 99, 104, 68, 97, 116, 97, 32, 40, 
+	41, 32, 123, 10, 9, 32, 32, 32, 32, 32, 32, 36, 46, 103, 101, 
+	116, 74, 83, 79, 78, 32, 40, 39, 47, 100, 97, 116, 97, 46, 106, 
+	115, 111, 110, 39, 44, 32, 102, 117, 110, 99, 116, 105, 111, 110, 32, 
+	40, 100, 97, 116, 97, 41, 32, 123, 10, 9, 32, 32, 32, 32, 32, 
+	32, 105, 102, 32, 40, 100, 97, 116, 97, 46, 32, 108, 101, 110, 103, 
+	116, 104, 32, 62, 32, 48, 41, 32, 123, 10, 9, 32, 32, 32, 32, 
+	32, 32, 32, 32, 32, 105, 102, 32, 40, 100, 97, 116, 97, 32, 91, 
+	48, 93, 46, 32, 108, 97, 116, 32, 61, 61, 32, 48, 41, 32, 123, 
+	10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 102, 
+	111, 114, 32, 40, 118, 97, 114, 32, 105, 32, 61, 32, 48, 59, 32, 
+	105, 32, 60, 32, 116, 114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 
+	73, 110, 100, 101, 120, 59, 32, 105, 32, 43, 43, 41, 32, 123, 10, 
+	9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 
+	32, 77, 97, 112, 46, 32, 114, 101, 109, 111, 118, 101, 76, 97, 121, 
+	101, 114, 32, 40, 84, 114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 
+	115, 32, 91, 105, 93, 46, 32, 109, 97, 114, 107, 101, 114, 41, 59, 
+	10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 
+	32, 32, 100, 101, 108, 101, 116, 101, 32, 84, 114, 97, 110, 115, 109, 
+	105, 116, 116, 101, 114, 115, 32, 91, 105, 93, 59, 10, 9, 32, 32, 
+	32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 125, 10, 9, 32, 32, 
+	32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 84, 114, 97, 110, 115, 
+	109, 105, 116, 116, 101, 114, 115, 32, 61, 32, 123, 125, 10, 9, 32, 
+	32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 116, 114, 97, 110, 
+	115, 109, 105, 116, 116, 101, 114, 73, 110, 100, 101, 120, 32, 61, 32, 
+	48, 59, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 
+	32, 108, 101, 116, 32, 120, 120, 32, 61, 32, 100, 111, 99, 117, 109, 
+	101, 110, 116, 46, 32, 103, 101, 116, 69, 108, 101, 109, 101, 110, 116, 
+	66, 121, 73, 100, 32, 40, 39, 115, 101, 108, 105, 110, 102, 111, 39, 
+	41, 59, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 
+	32, 120, 120, 32, 46, 32, 105, 110, 110, 101, 114, 72, 84, 77, 76, 
+	32, 61, 32, 39, 32, 39, 59, 10, 10, 9, 32, 32, 32, 32, 32, 
+	32, 32, 32, 32, 125, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 
+	32, 101, 108, 115, 101, 32, 123, 10, 9, 32, 32, 32, 32, 32, 32, 
+	32, 32, 32, 32, 32, 32, 108, 101, 116, 32, 116, 97, 114, 103, 101, 
+	116, 32, 61, 32, 100, 97, 116, 97, 32, 91, 48, 93, 59, 10, 9, 
+	32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 102, 111, 114, 
+	32, 40, 118, 97, 114, 32, 105, 32, 61, 32, 48, 59, 32, 105, 32, 
+	60, 32, 116, 114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 73, 110, 
+	100, 101, 120, 59, 32, 105, 32, 43, 43, 41, 32, 10, 9, 32, 32, 
+	32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 105, 102, 
+	32, 40, 40, 84, 114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 115, 
+	32, 91, 105, 93, 46, 32, 108, 97, 116, 32, 61, 61, 32, 116, 97, 
+	114, 103, 101, 116, 46, 32, 108, 97, 116, 41, 32, 38, 38, 10, 9, 
+	32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 
+	32, 32, 32, 32, 40, 84, 114, 97, 110, 115, 109, 105, 116, 116, 101, 
+	114, 115, 32, 91, 105, 93, 46, 32, 108, 111, 110, 32, 61, 61, 32, 
+	116, 97, 114, 103, 101, 116, 46, 32, 108, 111, 110, 41, 41, 10, 9, 
+	32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 
+	32, 32, 32, 114, 101, 116, 117, 114, 110, 59, 10, 10, 9, 32, 32, 
+	32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 108, 101, 116, 32, 105, 
+	99, 111, 110, 32, 61, 32, 103, 101, 116, 73, 99, 111, 110, 70, 111, 
+	114, 84, 114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 32, 40, 41, 
+	59, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,

qt-dab-4.4.1.tar.gz/dab-maxi/map/mapConverter Added

qt-dab-qt-dab-4.4.tar.gz/dab-maxi/map/mapConverter.cpp -> qt-dab-4.4.1.tar.gz/dab-maxi/map/mapConverter.cpp Changed

qt-dab-qt-dab-4.4.tar.gz/dab-maxi/map/qt-map.html -> qt-dab-4.4.1.tar.gz/dab-maxi/map/qt-map.html Changed

@@ -37,6 +37,9 @@
 	      font-size:14px;
 	      color:#333;
 	   }
+	   .coloring {
+	      color: red
+	   }
 	</style>
 
 	<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
@@ -57,11 +60,16 @@
 	      return icon;
 	   }
 
-	   function getIconForTransmitter () {
+	   function getIconForTransmitter (key) {
 	      var he = document. createElement ("P");
-	      he.innerHTML = '*';
+//	      he.innerHTML = '*';
+
 	      var selhtml = '';
-	      he = '<div style="font-size :1rem"> &#x26AB</div>';
+	      if (key == 0)
+	         he = '<div style="font-size :1.2rem"> &#x2724</div>';
+//	         he = '<div style="font-size :1.1rem"> &#x25A3</div>';
+	      else
+	         he = '<div style="font-size :0.7rem;"> &#x26AB</div>';
 //	      he = '<div style="'+selhtml+'"> &#x26AB</div>';
 	      var icon = L.divIcon ({html: he, className: 'transmitter-icon'});
 	      return icon;
@@ -69,8 +77,8 @@
 
 	   function fetchData () {
 	      $.getJSON ('/data.json', function (data) {
-	      if (data. length > 0) {
-	         if (data 0. lat == 0) {
+	      for (var t = 0; t < data. length; t ++) {
+	         if (data t. lat == 0) {
 	            for (var i = 0; i < transmitterIndex; i ++) {
 	               Map. removeLayer (Transmitters i. marker);
 	               delete Transmitters i;
@@ -79,25 +87,55 @@
 	            transmitterIndex = 0;
 	            let xx = document. getElementById ('selinfo');
 	            xx . innerHTML = ' ';
-
+	            let yy = document. getElementById ('selCount');
+	            yy. innerHTML =
+	                 'number of transmitters ' + transmitterIndex;
+	         }
+	         else
+	         if (data t. lat == -1) {
+	            for (var i = 0; i < transmitterIndex; i ++) {
+	               Map. removeLayer (Transmitters i. marker);
+	               let icon = getIconForTransmitter (0);
+	               let target = Transmitters i;
+	               let targetMarker = L.marker(target.lat, target.lon, {icon: icon}).addTo(Map);
+	               targetMarker.
+	                    addEventListener ('click',
+	                                       function () { selectTransmitterCallback (target);});
+	               Transmitters i. marker = targetMarker;
+	            }
 	         }
 	         else {
-	            let target = data 0;
-	            for (var i = 0; i < transmitterIndex; i ++) 
+	            let target = data t;
+	            var alreadyThere = false;
+	            for (var i = 0; i < transmitterIndex; i ++) {
 	               if ((Transmitters i. lat == target. lat) &&
-	                   (Transmitters i. lon == target. lon))
-	                  return;
+	                   (Transmitters i. lon == target. lon) &&
+	                   (Transmitters i. channel == target. channel)) {
+	                  alreadyThere = true;
+	                  break;
+	               }
+	            }
 
-	            let icon = getIconForTransmitter ();
+	            if (alreadyThere)
+	               continue;
+	            let icon = getIconForTransmitter (1);
 	            let targetMarker = L.marker(target.lat, target.lon, {icon: icon}).addTo(Map);
 	            target. marker = targetMarker;
-//	            target. on ('click',
-//	                         selectTransmitterCallback (target. name));
 	            Transmitters transmitterIndex = target;
 	            transmitterIndex ++;
+	            target. marker.
+	                    addEventListener ('click',
+	                                       function () { selectTransmitterCallback (target);});
+	            let newChannel = '<span style=\"font-weight:bold;font-size:120%\">' + target. channel + '</span>';
+	            let coords = '<span style=\"font-style: italic;\">' +
+	                          target. lat + '--' +
+	                          target. lon +  '</span>';
 	            let xx = document. getElementById ('selinfo');
-	            xx . innerHTML += target. name + '<br>'+
-	                              target. lat + ' ' + target. lon + '<br>';
+	            xx. innerHTML += newChannel + '=>' +
+	                             target. name    + '<br>' +
+	                             coords + '<br>';
+	            let yy = document. getElementById ('selCount');
+	            yy. innerHTML = 'number of transmitters ' + transmitterIndex;
 	         }
 	      }
 	   });
@@ -120,12 +158,20 @@
 /* Setup our timer to poll from the server. */
 	   window.setInterval(function () {
 	      fetchData ();
-	   }, 100);
+	   }, 2000);
 	}
 
-	function selectTransmitterCallback (name) {
-	   let xx = document. getElementById ('selinfo');
-	   xx. innerHTML = name +'<br>';
+	function selectTransmitterCallback (target) {
+	   let xx = document. getElementById ('selected');
+	   let newChannel = '<span style=\"font-weight:bold;font-size:120%\">' + target. channel + '</span>';
+	   let coords = '<span style=\"font-style: italic;\">' +
+	                          target. lat + '--' +
+	                          target. lon +  '</span>';
+	   xx. innerHTML = 'Selected:  ' + '<br>' +
+	                    newChannel + '=>' +
+	                    target. name    + '<br>' +
+	                    coords + '<br>' +
+	                    'Distance to home ' + target. dist + 'km<br>';
 	}
 
 </script>
@@ -136,6 +182,8 @@
 	<div>
 	   <h1>Qt-DAB</h1>
 	   <p id="selinfo"></p>
+	   <p id="selCount"></p>
+	   <p id="selected"></p>
 	</div>
 	</div>
   </body>

qt-dab-qt-dab-4.4.tar.gz/dab-maxi/map/qt-map.html-old -> qt-dab-4.4.1.tar.gz/dab-maxi/map/qt-map.html-old Changed

@@ -4,6 +4,7 @@
   <head>
     <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
      <link rel="stylesheet" href="https://unpkg.com/leaflet@1.6.0/dist/leaflet.css" integrity="sha512-xwE/Az9zrjBIphAcBb3F6JVqxf46+CDLwfLMHloNu6KEQCAWi6HcDUbeOfBIptF7tcCzusKFjFw2yuvEpDL9wQ==" crossorigin=""/>
+	<link rel="icon" href="data:,">
 	<style type="text/css">
 	   html { height: 100% }
 	   body { height: 100%; margin: 0; padding: 0 }
@@ -42,14 +43,17 @@
 	<script src="https://unpkg.com/leaflet@1.6.0/dist/leaflet.js" integrity="sha512-gZwIG9x3wUXg2hdXF6+rVkLF/0Vi9U8D2Ntg4Ga5I5BZpVkVxlJWbSQtXPSiUTtC0TjtGOmxa1AJPuV0CPthew==" crossorigin=""></script>
 	<script type="text/javascript">
 	   Map = null;
-	   Transmitters = {};
+	   var homeLatitude = $;
+	   var homeLongitude = $;
+	   var Transmitters = {};
+	   var transmitterIndex	= 0;
 
 	   function getIconForHome () {
 	      var he = document. createElement ("P");
 	      he.innerHTML = '*';
 	      var selhtml = '';
-	      he = '<div style="'+selhtml+'">&#x2B55</div>';
-	      var icon = L.divIcon ({html: he, className: 'transmitter-icon'});
+	      he = '<div style="font-size:1rem">&#x2B55</div>';
+	      var icon = L.divIcon ({html: he, className: 'home-icon'});
 	      return icon;
 	   }
 
@@ -57,53 +61,50 @@
 	      var he = document. createElement ("P");
 	      he.innerHTML = '*';
 	      var selhtml = '';
-	      he = '<div style="'+selhtml+'">&#x26AB</div>';
+	      he = '<div style="font-size :0.7rem"> &#x26AB</div>';
+//	      he = '<div style="'+selhtml+'"> &#x26AB</div>';
 	      var icon = L.divIcon ({html: he, className: 'transmitter-icon'});
 	      return icon;
 	   }
 
 	   function fetchData () {
 	      $.getJSON ('/data.json', function (data) {
-	      console. log (data. length);
-	      if (data.length == 1) {
-	         for (var i in Transmitters) {
-	            Map. removeLayer (Transmitters i. marker);
-	         }
-	         Transmitters = {};	
-	         var home = data 0;
-	         var icon = getIconForHome ();
-	         var homeMarker = L.marker(home.lat, home.lon, {icon: icon}).addTo(Map);
-	         home.marker = homeMarker;
-	         Transmitters 0 = home;
-	      }
-	      if (data. length == 2) {
-	         for (var i in Transmitters) {
-	            Map. removeLayer (Transmitters i. marker);
-	         }
-	         Transmitters = {}
-	         var home = data 0;
-	         var icon = getIconForHome ();
-	         var homeMarker = L.marker(home.lat, home.lon, {icon: icon}).addTo(Map);
-	         home.marker = homeMarker;
-	         Transmitters 0 = home;
+	      if (data. length > 0) {
+	         if (data 0. lat == 0) {
+	            for (var i = 0; i < transmitterIndex; i ++) {
+	               Map. removeLayer (Transmitters i. marker);
+	               delete Transmitters i;
+	            }
+	            Transmitters = {}
+	            transmitterIndex = 0;
+	            let xx = document. getElementById ('selinfo');
+	            xx . innerHTML = ' ';
 
-	         var target = data 1;
-	         for (var i in Transmitters) 
-	            if ((Transmitters i. lat == target. lat) &&
-	                (Transmitters i. lon == target. lon))
-	               return;
+	         }
+	         else {
+	            let target = data 0;
+	            for (var i = 0; i < transmitterIndex; i ++) 
+	               if ((Transmitters i. lat == target. lat) &&
+	                   (Transmitters i. lon == target. lon))
+	                  return;
 
-	         var icon = getIconForTransmitter ();
-	         var targetMarker = L.marker(target.lat, target.lon, {icon: icon}).addTo(Map);
-	         target. marker = targetMarker;
-	         Transmitters Transmitters. length = target;
-	         console. log ("item " + Transmitters. length);
+	            let icon = getIconForTransmitter ();
+	            let targetMarker = L.marker(target.lat, target.lon, {icon: icon}).addTo(Map);
+	            target. marker = targetMarker;
+//	            target. on ('click',
+//	                         selectTransmitterCallback (target. name));
+	            Transmitters transmitterIndex = target;
+	            transmitterIndex ++;
+	            let xx = document. getElementById ('selinfo');
+	            xx . innerHTML += target. channel + ':' + target.name + '<br>'+
+	                              target.lat + ' ' + target.lon + '<br>';
+	         }
 	      }
 	   });
 	   }
 
 	   function initialize () {
-	      Map = L.map ('map_canvas').setView(52.0, 4.4, 8);
+	      Map = L.map ('map_canvas').setView(homeLatitude, homeLongitude, 8);
 
 	      L.tileLayer ('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
 	      attribution: 'Map data &copy; <a href="https://www.openstreetmap.org/">OpenStreetMap</a> contributors, <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="https://www.mapbox.com/">Mapbox</a>',
@@ -112,12 +113,21 @@
 	       accessToken: 'your.mapbox.access.token'
 	   }).addTo(Map);
 
+	   var icon = getIconForHome ();
+	   var homeMarker = L.marker(homeLatitude,
+	                              homeLongitude, {icon: icon}).addTo(Map);
+
 /* Setup our timer to poll from the server. */
-	   window.setInterval(function() {
+	   window.setInterval(function () {
 	      fetchData ();
 	   }, 100);
 	}
 
+	function selectTransmitterCallback (name) {
+	   let xx = document. getElementById ('selinfo');
+	   xx. innerHTML = name +'<br>';
+	}
+
 </script>
 </head>
 	<body onload="initialize()">
@@ -125,6 +135,7 @@
 	<div id="info">
 	<div>
 	   <h1>Qt-DAB</h1>
+	   <p id="selinfo"></p>
 	</div>
 	</div>
   </body>

qt-dab-qt-dab-4.4.tar.gz/dab-maxi/qt-dab.pro -> qt-dab-4.4.1.tar.gz/dab-maxi/qt-dab.pro Changed

qt-dab-qt-dab-4.4.tar.gz/dab-maxi/radio.cpp -> qt-dab-4.4.1.tar.gz/dab-maxi/radio.cpp Changed

@@ -302,12 +302,17 @@
 	if (saveSlides != 0)
 	   set_picturePath ();
 
+	browserAddress		=
+	                  dabSettings -> value ("browserAddress",
+	                                "http://localhost:8080"). toString ();
+	
 	filePath	= dabSettings -> value ("filePath", ""). toString ();
 	if ((filePath != "") && (!filePath. endsWith ("/")))
 	   filePath = filePath + "/";
-
+	setWindowFlags (windowFlags () | Qt::WindowStaysOnTopHint);
 //	The settings are done, now creation of the GUI parts
 	setupUi (this);
+	QWidget::raise ();
 //
 //	dataDisplay	= new QFrame (nullptr);
 	techData. setupUi (&dataDisplay);
@@ -385,6 +390,17 @@
 	else
 	   configWidget. ordersubChannelIds -> setChecked (true);
 
+	connect (configWidget. autoBrowser, SIGNAL (clicked ()),
+	         this, SLOT (handle_autoBrowser      ()));
+	connect (configWidget. transmitterTags, SIGNAL (clicked ()),	
+	         this, SLOT (handle_transmitterTags  ()));
+
+	b = dabSettings -> value ("autoBrowser", 1). toInt () == 1;
+	autoBrowser_on		= b;
+	configWidget. autoBrowser -> setText (b ? "browser auto" : "browser man");
+	b	= dabSettings -> value ("transmitterTags", 0). toInt () == 1;
+	transmitterTags_on	= b;
+	configWidget. transmitterTags -> setText (b ? "all transm" : "local transm");
 	motSlides		= nullptr;
 	dataDisplay. hide ();
 	stillMuting		-> hide ();
@@ -568,8 +584,11 @@
 	channel. tiiFile	= false;
 	if (tiiFileName != "") {
 	   channel. tiiFile = tiiProcessor. tiiFile (tiiFileName);
-	   if (!channel. tiiFile)
+	   if (!channel. tiiFile) {
 	      httpButton -> hide ();
+	      configWidget. autoBrowser -> hide ();
+	      configWidget. transmitterTags -> hide ();
+	   }
 	}
 
 //	and start the timer(s)
@@ -2114,9 +2133,6 @@
 	                                           theName);
 	            channel. targetPos	= std::complex<float> (latitude,
 	                                                       longitude);
-	            if (mapHandler != nullptr)
-	               mapHandler -> putData (channel. targetPos, 
-	                                           channel. transmitterName);
 	            LOG ("transmitter ", channel. transmitterName);
 	            LOG ("coordinates ", 
 	                         QString::number (latitude) + " " +
@@ -2132,6 +2148,11 @@
 	               int distance = tiiProcessor.
 	                                  distance (latitude, longitude,
 	                                            ownLatitude, ownLongitude);
+	            if (mapHandler != nullptr)
+	               mapHandler -> putData (channel. targetPos, 
+	                                      channel. transmitterName,
+	                                      channel. channelName,
+	                                      distance);
 	               int hoek	 = tiiProcessor.
 	                               corner (latitude, longitude,
 	                                       ownLatitude, ownLongitude);
@@ -3393,8 +3414,11 @@
 	channel. channelName	= theChannel;
 	channel. frequency	= tunedFrequency / 1000;
 	channel. targetPos	= std::complex<float> (0, 0);
+	if (!transmitterTags_on  && (mapHandler != nullptr))
+	   mapHandler -> putData (std::complex<float> (0, 0), "", "", 0);
+	else
 	if (mapHandler != nullptr)
-	   mapHandler -> putData (channel. targetPos, "");
+	   mapHandler -> putData (std::complex<float>(-1, -1), "", "", 0);
 	show_for_safety ();
 	int	switchDelay	=
 	                  dabSettings -> value ("switchDelay", 8). toInt ();
@@ -3452,8 +3476,8 @@
 	channel. has_ecc	= false;
 	channel. transmitterName = "";
 	channel. targetPos	= std::complex<float> (0, 0);
-	if (mapHandler != nullptr)
-	   mapHandler -> putData (channel. targetPos, "");
+	if (!transmitterTags_on && (mapHandler != nullptr))
+	   mapHandler -> putData (channel. targetPos, "", "", 0);
 	transmitter_country     -> setText ("");
         transmitter_coordinates -> setText ("");
 
@@ -4618,7 +4642,9 @@
 	if (mapHandler == nullptr)  {
 	   mapHandler = new httpHandler (this,
 	                                 this -> httpPort,
-	                                 channel. localPos);
+	                                 channel. localPos,
+	                                 autoBrowser_on,
+	                                 browserAddress);
 	   if (mapHandler != nullptr)
 	      httpButton -> setText ("http-on");
 	}
@@ -4641,5 +4667,20 @@
 	httpButton -> setText ("http");
 }
 
-	   
-	  
+void	RadioInterface::handle_autoBrowser      () {
+	autoBrowser_on = !autoBrowser_on;
+	configWidget. autoBrowser ->
+	           setText (autoBrowser_on ? "browser auto" : "browser man");
+	dabSettings -> setValue ("autoBrowser", autoBrowser_on ? 1 : 0);
+}
+
+void	RadioInterface::handle_transmitterTags  () {
+	transmitterTags_on = !transmitterTags_on;
+	configWidget. transmitterTags ->
+	           setText (transmitterTags_on ? "all transm" : "local transm");
+	dabSettings -> setValue ("transmitterTags", transmitterTags_on  ? 1 : 0);
+	channel. targetPos	= std::complex<float> (0, 0);
+	if ((!transmitterTags_on) && (mapHandler != nullptr))
+	   mapHandler -> putData (channel. targetPos, "", "", 0);
+}
+

qt-dab-qt-dab-4.4.tar.gz/dab-maxi/radio.h -> qt-dab-4.4.1.tar.gz/dab-maxi/radio.h Changed

qt-dab-qt-dab-4.4.tar.gz/docs/manual.pdf -> qt-dab-4.4.1.tar.gz/docs/manual.pdf Changed

qt-dab-qt-dab-4.4.tar.gz/forms/config-helper.ui -> qt-dab-4.4.1.tar.gz/forms/config-helper.ui Changed

qt-dab-qt-dab-4.4.tar.gz/forms/dabradio.ui -> qt-dab-4.4.1.tar.gz/forms/dabradio.ui Changed

qt-dab-qt-dab-4.4.tar.gz/includes/dab-constants.h -> qt-dab-4.4.1.tar.gz/includes/dab-constants.h Changed

qt-dab-qt-dab-4.4.tar.gz/dab-maxi/converted_map.cpp Deleted

@@ -1,314 +0,0 @@
-#
-#include <stdint.h>
-// generated map 
-static uint8_t qt_map  = {
-60, 33, 68, 79, 67, 84, 89, 80, 69, 32, 104, 116, 109, 108, 62, 
-	10, 10, 60, 104, 116, 109, 108, 62, 10, 32, 32, 60, 104, 101, 97, 
-	100, 62, 10, 32, 32, 32, 32, 60, 109, 101, 116, 97, 32, 110, 97, 
-	109, 101, 61, 34, 118, 105, 101, 119, 112, 111, 114, 116, 34, 32, 99, 
-	111, 110, 116, 101, 110, 116, 61, 34, 105, 110, 105, 116, 105, 97, 108, 
-	45, 115, 99, 97, 108, 101, 61, 49, 46, 48, 44, 32, 117, 115, 101, 
-	114, 45, 115, 99, 97, 108, 97, 98, 108, 101, 61, 110, 111, 34, 32, 
-	47, 62, 10, 32, 32, 32, 32, 32, 60, 108, 105, 110, 107, 32, 114, 
-	101, 108, 61, 34, 115, 116, 121, 108, 101, 115, 104, 101, 101, 116, 34, 
-	32, 104, 114, 101, 102, 61, 34, 104, 116, 116, 112, 115, 58, 47, 47, 
-	117, 110, 112, 107, 103, 46, 99, 111, 109, 47, 108, 101, 97, 102, 108, 
-	101, 116, 64, 49, 46, 54, 46, 48, 47, 100, 105, 115, 116, 47, 108, 
-	101, 97, 102, 108, 101, 116, 46, 99, 115, 115, 34, 32, 105, 110, 116, 
-	101, 103, 114, 105, 116, 121, 61, 34, 115, 104, 97, 53, 49, 50, 45, 
-	120, 119, 69, 47, 65, 122, 57, 122, 114, 106, 66, 73, 112, 104, 65, 
-	99, 66, 98, 51, 70, 54, 74, 86, 113, 120, 102, 52, 54, 43, 67, 
-	68, 76, 119, 102, 76, 77, 72, 108, 111, 78, 117, 54, 75, 69, 81, 
-	67, 65, 87, 105, 54, 72, 99, 68, 85, 98, 101, 79, 102, 66, 73, 
-	112, 116, 70, 55, 116, 99, 67, 122, 117, 115, 75, 70, 106, 70, 119, 
-	50, 121, 117, 118, 69, 112, 68, 76, 57, 119, 81, 61, 61, 34, 32, 
-	99, 114, 111, 115, 115, 111, 114, 105, 103, 105, 110, 61, 34, 34, 47, 
-	62, 10, 9, 60, 108, 105, 110, 107, 32, 114, 101, 108, 61, 34, 105, 
-	99, 111, 110, 34, 32, 104, 114, 101, 102, 61, 34, 100, 97, 116, 97, 
-	58, 44, 34, 62, 10, 9, 60, 115, 116, 121, 108, 101, 32, 116, 121, 
-	112, 101, 61, 34, 116, 101, 120, 116, 47, 99, 115, 115, 34, 62, 10, 
-	9, 32, 32, 32, 104, 116, 109, 108, 32, 123, 32, 104, 101, 105, 103, 
-	104, 116, 58, 32, 49, 48, 48, 37, 32, 125, 10, 9, 32, 32, 32, 
-	98, 111, 100, 121, 32, 123, 32, 104, 101, 105, 103, 104, 116, 58, 32, 
-	49, 48, 48, 37, 59, 32, 109, 97, 114, 103, 105, 110, 58, 32, 48, 
-	59, 32, 112, 97, 100, 100, 105, 110, 103, 58, 32, 48, 32, 125, 10, 
-	9, 32, 32, 32, 46, 116, 114, 97, 110, 115, 109, 105, 116, 116, 101, 
-	114, 45, 105, 99, 111, 110, 32, 123, 10, 9, 32, 32, 32, 32, 32, 
-	32, 112, 97, 100, 100, 105, 110, 103, 58, 48, 112, 120, 59, 10, 9, 
-	32, 32, 32, 32, 32, 32, 109, 97, 114, 103, 105, 110, 58, 48, 112, 
-	120, 59, 10, 9, 32, 32, 32, 125, 10, 9, 32, 32, 32, 35, 109, 
-	97, 112, 95, 99, 97, 110, 118, 97, 115, 32, 123, 32, 104, 101, 105, 
-	103, 104, 116, 58, 32, 49, 48, 48, 37, 32, 125, 10, 9, 32, 32, 
-	32, 35, 105, 110, 102, 111, 32, 123, 10, 9, 32, 32, 32, 32, 32, 
-	32, 112, 111, 115, 105, 116, 105, 111, 110, 58, 32, 97, 98, 115, 111, 
-	108, 117, 116, 101, 59, 10, 9, 32, 32, 32, 32, 32, 32, 119, 105, 
-	100, 116, 104, 58, 50, 48, 37, 59, 10, 9, 32, 32, 32, 32, 32, 
-	32, 104, 101, 105, 103, 104, 116, 58, 49, 48, 48, 37, 59, 10, 9, 
-	32, 32, 32, 32, 32, 32, 98, 111, 116, 116, 111, 109, 58, 48, 112, 
-	120, 59, 10, 9, 32, 32, 32, 32, 32, 32, 114, 105, 103, 104, 116, 
-	58, 48, 112, 120, 59, 10, 9, 32, 32, 32, 32, 32, 32, 116, 111, 
-	112, 58, 48, 112, 120, 59, 10, 9, 32, 32, 32, 32, 32, 32, 98, 
-	97, 99, 107, 103, 114, 111, 117, 110, 100, 45, 99, 111, 108, 111, 114, 
-	58, 32, 119, 104, 105, 116, 101, 59, 10, 9, 32, 32, 32, 32, 32, 
-	32, 98, 111, 114, 100, 101, 114, 45, 108, 101, 102, 116, 58, 49, 112, 
-	120, 32, 35, 54, 54, 54, 32, 115, 111, 108, 105, 100, 59, 10, 9, 
-	32, 32, 32, 32, 32, 32, 102, 111, 110, 116, 45, 102, 97, 109, 105, 
-	108, 121, 58, 72, 101, 108, 118, 101, 116, 105, 99, 97, 59, 10, 9, 
-	32, 32, 32, 125, 10, 9, 32, 32, 32, 35, 105, 110, 102, 111, 32, 
-	100, 105, 118, 32, 123, 10, 9, 32, 32, 32, 32, 32, 32, 112, 97, 
-	100, 100, 105, 110, 103, 58, 48, 112, 120, 59, 10, 9, 32, 32, 32, 
-	32, 32, 32, 112, 97, 100, 100, 105, 110, 103, 45, 108, 101, 102, 116, 
-	58, 49, 48, 112, 120, 59, 10, 9, 32, 32, 32, 32, 32, 32, 109, 
-	97, 114, 103, 105, 110, 58, 48, 112, 120, 59, 10, 9, 32, 32, 32, 
-	125, 10, 9, 32, 32, 32, 35, 105, 110, 102, 111, 32, 100, 105, 118, 
-	32, 104, 49, 32, 123, 10, 9, 32, 32, 32, 32, 32, 32, 109, 97, 
-	114, 103, 105, 110, 45, 116, 111, 112, 58, 49, 48, 112, 120, 59, 10, 
-	9, 32, 32, 32, 32, 32, 32, 102, 111, 110, 116, 45, 115, 105, 122, 
-	101, 58, 49, 54, 112, 120, 59, 10, 9, 32, 32, 32, 125, 10, 9, 
-	32, 32, 32, 35, 105, 110, 102, 111, 32, 100, 105, 118, 32, 112, 32, 
-	123, 10, 9, 32, 32, 32, 32, 32, 32, 102, 111, 110, 116, 45, 115, 
-	105, 122, 101, 58, 49, 52, 112, 120, 59, 10, 9, 32, 32, 32, 32, 
-	32, 32, 99, 111, 108, 111, 114, 58, 35, 51, 51, 51, 59, 10, 9, 
-	32, 32, 32, 125, 10, 9, 60, 47, 115, 116, 121, 108, 101, 62, 10, 
-	10, 9, 60, 115, 99, 114, 105, 112, 116, 32, 115, 114, 99, 61, 34, 
-	104, 116, 116, 112, 115, 58, 47, 47, 97, 106, 97, 120, 46, 103, 111, 
-	111, 103, 108, 101, 97, 112, 105, 115, 46, 99, 111, 109, 47, 97, 106, 
-	97, 120, 47, 108, 105, 98, 115, 47, 106, 113, 117, 101, 114, 121, 47, 
-	51, 46, 52, 46, 49, 47, 106, 113, 117, 101, 114, 121, 46, 109, 105, 
-	110, 46, 106, 115, 34, 62, 60, 47, 115, 99, 114, 105, 112, 116, 62, 
-	10, 9, 60, 115, 99, 114, 105, 112, 116, 32, 115, 114, 99, 61, 34, 
-	104, 116, 116, 112, 115, 58, 47, 47, 117, 110, 112, 107, 103, 46, 99, 
-	111, 109, 47, 108, 101, 97, 102, 108, 101, 116, 64, 49, 46, 54, 46, 
-	48, 47, 100, 105, 115, 116, 47, 108, 101, 97, 102, 108, 101, 116, 46, 
-	106, 115, 34, 32, 105, 110, 116, 101, 103, 114, 105, 116, 121, 61, 34, 
-	115, 104, 97, 53, 49, 50, 45, 103, 90, 119, 73, 71, 57, 120, 51, 
-	119, 85, 88, 103, 50, 104, 100, 88, 70, 54, 43, 114, 86, 107, 76, 
-	70, 47, 48, 86, 105, 57, 85, 56, 68, 50, 78, 116, 103, 52, 71, 
-	97, 53, 73, 53, 66, 90, 112, 86, 107, 86, 120, 108, 74, 87, 98, 
-	83, 81, 116, 88, 80, 83, 105, 85, 84, 116, 67, 48, 84, 106, 116, 
-	71, 79, 109, 120, 97, 49, 65, 74, 80, 117, 86, 48, 67, 80, 116, 
-	104, 101, 119, 61, 61, 34, 32, 99, 114, 111, 115, 115, 111, 114, 105, 
-	103, 105, 110, 61, 34, 34, 62, 60, 47, 115, 99, 114, 105, 112, 116, 
-	62, 10, 9, 60, 115, 99, 114, 105, 112, 116, 32, 116, 121, 112, 101, 
-	61, 34, 116, 101, 120, 116, 47, 106, 97, 118, 97, 115, 99, 114, 105, 
-	112, 116, 34, 62, 10, 9, 32, 32, 32, 77, 97, 112, 32, 61, 32, 
-	110, 117, 108, 108, 59, 10, 9, 32, 32, 32, 118, 97, 114, 32, 104, 
-	111, 109, 101, 76, 97, 116, 105, 116, 117, 100, 101, 32, 61, 32, 36, 
-	59, 10, 9, 32, 32, 32, 118, 97, 114, 32, 104, 111, 109, 101, 76, 
-	111, 110, 103, 105, 116, 117, 100, 101, 32, 61, 32, 36, 59, 10, 9, 
-	32, 32, 32, 118, 97, 114, 32, 84, 114, 97, 110, 115, 109, 105, 116, 
-	116, 101, 114, 115, 32, 61, 32, 123, 125, 59, 10, 9, 32, 32, 32, 
-	118, 97, 114, 32, 116, 114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 
-	73, 110, 100, 101, 120, 9, 61, 32, 48, 59, 10, 10, 9, 32, 32, 
-	32, 102, 117, 110, 99, 116, 105, 111, 110, 32, 103, 101, 116, 73, 99, 
-	111, 110, 70, 111, 114, 72, 111, 109, 101, 32, 40, 41, 32, 123, 10, 
-	9, 32, 32, 32, 32, 32, 32, 118, 97, 114, 32, 104, 101, 32, 61, 
-	32, 100, 111, 99, 117, 109, 101, 110, 116, 46, 32, 99, 114, 101, 97, 
-	116, 101, 69, 108, 101, 109, 101, 110, 116, 32, 40, 34, 80, 34, 41, 
-	59, 10, 9, 32, 32, 32, 32, 32, 32, 104, 101, 46, 105, 110, 110, 
-	101, 114, 72, 84, 77, 76, 32, 61, 32, 39, 42, 39, 59, 10, 9, 
-	32, 32, 32, 32, 32, 32, 118, 97, 114, 32, 115, 101, 108, 104, 116, 
-	109, 108, 32, 61, 32, 39, 39, 59, 10, 9, 32, 32, 32, 32, 32, 
-	32, 104, 101, 32, 61, 32, 39, 60, 100, 105, 118, 32, 115, 116, 121, 
-	108, 101, 61, 34, 102, 111, 110, 116, 45, 115, 105, 122, 101, 58, 49, 
-	114, 101, 109, 34, 62, 38, 35, 120, 50, 66, 53, 53, 60, 47, 100, 
-	105, 118, 62, 39, 59, 10, 9, 32, 32, 32, 32, 32, 32, 118, 97, 
-	114, 32, 105, 99, 111, 110, 32, 61, 32, 76, 46, 100, 105, 118, 73, 
-	99, 111, 110, 32, 40, 123, 104, 116, 109, 108, 58, 32, 104, 101, 44, 
-	32, 99, 108, 97, 115, 115, 78, 97, 109, 101, 58, 32, 39, 104, 111, 
-	109, 101, 45, 105, 99, 111, 110, 39, 125, 41, 59, 10, 9, 32, 32, 
-	32, 32, 32, 32, 114, 101, 116, 117, 114, 110, 32, 105, 99, 111, 110, 
-	59, 10, 9, 32, 32, 32, 125, 10, 10, 9, 32, 32, 32, 102, 117, 
-	110, 99, 116, 105, 111, 110, 32, 103, 101, 116, 73, 99, 111, 110, 70, 
-	111, 114, 84, 114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 32, 40, 
-	41, 32, 123, 10, 9, 32, 32, 32, 32, 32, 32, 118, 97, 114, 32, 
-	104, 101, 32, 61, 32, 100, 111, 99, 117, 109, 101, 110, 116, 46, 32, 
-	99, 114, 101, 97, 116, 101, 69, 108, 101, 109, 101, 110, 116, 32, 40, 
-	34, 80, 34, 41, 59, 10, 9, 32, 32, 32, 32, 32, 32, 104, 101, 
-	46, 105, 110, 110, 101, 114, 72, 84, 77, 76, 32, 61, 32, 39, 42, 
-	39, 59, 10, 9, 32, 32, 32, 32, 32, 32, 118, 97, 114, 32, 115, 
-	101, 108, 104, 116, 109, 108, 32, 61, 32, 39, 39, 59, 10, 9, 32, 
-	32, 32, 32, 32, 32, 104, 101, 32, 61, 32, 39, 60, 100, 105, 118, 
-	32, 115, 116, 121, 108, 101, 61, 34, 102, 111, 110, 116, 45, 115, 105, 
-	122, 101, 32, 58, 49, 114, 101, 109, 34, 62, 32, 38, 35, 120, 50, 
-	54, 65, 66, 60, 47, 100, 105, 118, 62, 39, 59, 10, 47, 47, 9, 
-	32, 32, 32, 32, 32, 32, 104, 101, 32, 61, 32, 39, 60, 100, 105, 
-	118, 32, 115, 116, 121, 108, 101, 61, 34, 39, 43, 115, 101, 108, 104, 
-	116, 109, 108, 43, 39, 34, 62, 32, 38, 35, 120, 50, 54, 65, 66, 
-	60, 47, 100, 105, 118, 62, 39, 59, 10, 9, 32, 32, 32, 32, 32, 
-	32, 118, 97, 114, 32, 105, 99, 111, 110, 32, 61, 32, 76, 46, 100, 
-	105, 118, 73, 99, 111, 110, 32, 40, 123, 104, 116, 109, 108, 58, 32, 
-	104, 101, 44, 32, 99, 108, 97, 115, 115, 78, 97, 109, 101, 58, 32, 
-	39, 116, 114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 45, 105, 99, 
-	111, 110, 39, 125, 41, 59, 10, 9, 32, 32, 32, 32, 32, 32, 114, 
-	101, 116, 117, 114, 110, 32, 105, 99, 111, 110, 59, 10, 9, 32, 32, 
-	32, 125, 10, 10, 9, 32, 32, 32, 102, 117, 110, 99, 116, 105, 111, 
-	110, 32, 102, 101, 116, 99, 104, 68, 97, 116, 97, 32, 40, 41, 32, 
-	123, 10, 9, 32, 32, 32, 32, 32, 32, 36, 46, 103, 101, 116, 74, 
-	83, 79, 78, 32, 40, 39, 47, 100, 97, 116, 97, 46, 106, 115, 111, 
-	110, 39, 44, 32, 102, 117, 110, 99, 116, 105, 111, 110, 32, 40, 100, 
-	97, 116, 97, 41, 32, 123, 10, 9, 32, 32, 32, 32, 32, 32, 105, 
-	102, 32, 40, 100, 97, 116, 97, 46, 32, 108, 101, 110, 103, 116, 104, 
-	32, 62, 32, 48, 41, 32, 123, 10, 9, 32, 32, 32, 32, 32, 32, 
-	32, 32, 32, 105, 102, 32, 40, 100, 97, 116, 97, 32, 91, 48, 93, 
-	46, 32, 108, 97, 116, 32, 61, 61, 32, 48, 41, 32, 123, 10, 9, 
-	32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 102, 111, 114, 
-	32, 40, 118, 97, 114, 32, 105, 32, 61, 32, 48, 59, 32, 105, 32, 
-	60, 32, 116, 114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 73, 110, 
-	100, 101, 120, 59, 32, 105, 32, 43, 43, 41, 32, 123, 10, 9, 32, 
-	32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 77, 
-	97, 112, 46, 32, 114, 101, 109, 111, 118, 101, 76, 97, 121, 101, 114, 
-	32, 40, 84, 114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 115, 32, 
-	91, 105, 93, 46, 32, 109, 97, 114, 107, 101, 114, 41, 59, 10, 9, 
-	32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 
-	100, 101, 108, 101, 116, 101, 32, 84, 114, 97, 110, 115, 109, 105, 116, 
-	116, 101, 114, 115, 32, 91, 105, 93, 59, 10, 9, 32, 32, 32, 32, 
-	32, 32, 32, 32, 32, 32, 32, 32, 125, 10, 9, 32, 32, 32, 32, 
-	32, 32, 32, 32, 32, 32, 32, 32, 84, 114, 97, 110, 115, 109, 105, 
-	116, 116, 101, 114, 115, 32, 61, 32, 123, 125, 10, 9, 32, 32, 32, 
-	32, 32, 32, 32, 32, 32, 32, 32, 32, 116, 114, 97, 110, 115, 109, 
-	105, 116, 116, 101, 114, 73, 110, 100, 101, 120, 32, 61, 32, 48, 59, 
-	10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 108, 
-	101, 116, 32, 120, 120, 32, 61, 32, 100, 111, 99, 117, 109, 101, 110, 
-	116, 46, 32, 103, 101, 116, 69, 108, 101, 109, 101, 110, 116, 66, 121, 
-	73, 100, 32, 40, 39, 115, 101, 108, 105, 110, 102, 111, 39, 41, 59, 
-	10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 120, 
-	120, 32, 46, 32, 105, 110, 110, 101, 114, 72, 84, 77, 76, 32, 61, 
-	32, 39, 32, 39, 59, 10, 10, 9, 32, 32, 32, 32, 32, 32, 32, 
-	32, 32, 125, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 101, 
-	108, 115, 101, 32, 123, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 
-	32, 32, 32, 32, 108, 101, 116, 32, 116, 97, 114, 103, 101, 116, 32, 
-	61, 32, 100, 97, 116, 97, 32, 91, 48, 93, 59, 10, 9, 32, 32, 
-	32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 102, 111, 114, 32, 40, 
-	118, 97, 114, 32, 105, 32, 61, 32, 48, 59, 32, 105, 32, 60, 32, 
-	116, 114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 73, 110, 100, 101, 
-	120, 59, 32, 105, 32, 43, 43, 41, 32, 10, 9, 32, 32, 32, 32, 
-	32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 105, 102, 32, 40, 
-	40, 84, 114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 115, 32, 91, 
-	105, 93, 46, 32, 108, 97, 116, 32, 61, 61, 32, 116, 97, 114, 103, 
-	101, 116, 46, 32, 108, 97, 116, 41, 32, 38, 38, 10, 9, 32, 32, 
-	32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 
-	32, 32, 40, 84, 114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 115, 
-	32, 91, 105, 93, 46, 32, 108, 111, 110, 32, 61, 61, 32, 116, 97, 
-	114, 103, 101, 116, 46, 32, 108, 111, 110, 41, 41, 10, 9, 32, 32, 
-	32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 
-	32, 114, 101, 116, 117, 114, 110, 59, 10, 10, 9, 32, 32, 32, 32, 
-	32, 32, 32, 32, 32, 32, 32, 32, 108, 101, 116, 32, 105, 99, 111, 
-	110, 32, 61, 32, 103, 101, 116, 73, 99, 111, 110, 70, 111, 114, 84, 
-	114, 97, 110, 115, 109, 105, 116, 116, 101, 114, 32, 40, 41, 59, 10, 
-	9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 108, 101,

Changes of Revision 45