Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 47

dab-mini.changes Changed

qt-dab.changes Changed

dab-mini.spec Changed

qt-dab.spec Changed

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

@@ -1,316 +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, 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/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,

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

@@ -1,14 +1,14 @@
-# Qt-DAB-4.4.1 !Build Status(https://travis-ci.com/JvanKatwijk/qt-dab.svg?branch=master)(https://travis-ci.com/JvanKatwijk/qt-dab)
+# Qt-DAB-4.4.2 !Build Status(https://travis-ci.com/JvanKatwijk/qt-dab.svg?branch=master)(https://travis-ci.com/JvanKatwijk/qt-dab)
 
-Qt-DAB-4.4 is software for Linux, Windows and Raspberry Pi for listening to terrestrial Digital Audio Broadcasting (DAB and DAB+). Qt-DAB is accompanied by its little sister dabMini, built on the same set of sources.
+Qt-DAB-4.4-2 is software for Linux, Windows and Raspberry Pi for listening to terrestrial Digital Audio Broadcasting (DAB and DAB+). Qt-DAB is accompanied by its little sister dabMini, built on the same set of sources.
 
-!4.4(/qt-dab-maps.png?raw=true)
+!4.4(/qt-dab-screen.png?raw=true)
 
 ----------------------------------------------------------------
-What is new in Qt-DAB 4.4.1
+What is new in Qt-DAB 4.4.2
 ----------------------------------------------------------------
 
-The difference between 4.4.1 and 4.4 is is the map handling.
+The difference between 4.4 and 4.4.2 is is the map handling.
 
 I was completely bored with searching on a map where the transmitter
 location was that was detected by the Qt-DAB software.
@@ -30,6 +30,10 @@
 A separate program exists to transform the "javascript/html" into
 such a table.
 
+After 4.4.1 was released a pretty large number of small changes was
+made to the map, that is why 4.4.1 was declared obsolete and replaced
+by 4.4.2
+
 ----------------------------------------------------------------
 Building an executable for qt-dab: a few notes
 ----------------------------------------------------------------

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

qt-dab-4.4.1.tar.gz/dab-maxi/converted_map.h -> qt-dab-4.4.2.tar.gz/dab-maxi/converted_map.h Changed

@@ -102,168 +102,211 @@
 	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, 
+	9, 61, 32, 48, 59, 10, 10, 9, 32, 32, 32, 99, 111, 110, 115, 
+	116, 32, 77, 65, 80, 95, 82, 69, 83, 69, 84, 9, 61, 32, 48, 
+	59, 10, 9, 32, 32, 32, 99, 111, 110, 115, 116, 32, 77, 65, 80, 
+	95, 70, 82, 65, 77, 69, 9, 61, 32, 49, 59, 10, 9, 32, 32, 
+	32, 99, 111, 110, 115, 116, 32, 77, 65, 80, 95, 77, 65, 88, 95, 
+	84, 82, 65, 78, 83, 9, 61, 32, 50, 59, 10, 9, 32, 32, 32, 
+	99, 111, 110, 115, 116, 32, 77, 65, 80, 95, 78, 79, 82, 77, 95, 
+	84, 82, 65, 78, 83, 32, 61, 32, 52, 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, 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, 
+	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, 108, 101, 116, 32, 116, 116, 
+	116, 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, 99, 117, 114, 114, 101, 110, 116, 39, 41, 59, 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, 
+	10, 9, 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, 
+	116, 93, 59, 10, 9, 32, 32, 32, 32, 32, 32, 32, 32, 32, 105, 
+	102, 32, 40, 116, 97, 114, 103, 101, 116, 46, 32, 116, 121, 112, 101, 
+	32, 61, 61, 32, 77, 65, 80, 95, 82, 69, 83, 69, 84, 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, 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, 
-	32, 32, 39, 110, 117, 109, 98, 101, 114, 32, 111, 102, 32, 116, 114, 
-	97, 110, 115, 109, 105, 116, 116, 101, 114, 115, 32, 39, 32, 43, 32, 
+	108, 67, 111, 117, 110, 116, 39, 41, 59, 10, 9, 32, 32, 32, 32,

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

@@ -46,12 +46,12 @@
 
 	httpHandler::httpHandler (RadioInterface *parent, int port,
 	 std::complex<float> address,
-	 bool autoBrowse,
+	 bool autoBrowser_off,
 	 const QString &browserAddress) {
 	this	-> parent	= parent;
 	this	-> port		= port;
 	this	-> homeAddress	= address;
-	this	-> autoBrowse	= autoBrowse;
+	this	-> autoBrowser_off	= autoBrowser_off;
 #ifdef	__MINGW32__
 	this	-> browserAddress	= browserAddress. toStdWString ();
 #else
@@ -63,6 +63,7 @@
 	start ();
 }
 
+
 	httpHandler::~httpHandler	() {
 	if (running. load ()) {
 	 running. store (false);
@@ -72,7 +73,7 @@
 
 void	httpHandler::start	() {
 	threadHandle = std::thread (&httpHandler::run, this);
-	if (!autoBrowse)
+	if (autoBrowser_off)
 	 return;
 #ifdef	__MINGW32__
 	ShellExecute (NULL, L"open", browserAddress. c_str (),
@@ -240,6 +241,7 @@
 	hints.ai_flags		= AI_PASSIVE;
 
 //	Resolve the server address and port
+	
 	iResult = getaddrinfo (NULL, "8080", &hints, &result);
 	if (iResult != 0 ) {
 WSACleanup();
@@ -436,7 +438,7 @@
 temp s. size () = 0;
 return std::string (temp);
 }
-
+//
 std::string httpHandler::coordinatesToJson (std::vector<httpData> &t) {
 std::complex<float> home;
 std::complex<float> target = std::complex<float> (0, 0);
@@ -449,22 +451,27 @@
 	locker. lock ();
 //	the Target
 	snprintf (buf, 512, 
-	 "{\"lat\":%s, \"lon\":%s, \"name\":\"%s\", \"channel\":\"%s\", \"dist\":%d}",
+	 "{\"type\":%d, \"lat\":%s, \"lon\":%s, \"name\":\"%s\", \"channel\":\"%s\", \"dist\":%d, \"azimuth\":%d}",
+	 t 0. type,
 	 dotNumber (real (t 0. coords)). c_str (),
 	 dotNumber (imag (t 0. coords)). c_str (),
 	 t 0. transmitterName. toUtf8 (). data (),
 	 t 0. channelName. toUtf8 (). data (),
-	 t 0. distance);
-	
+	 t 0. distance,
+	 t 0. azimuth);
 	Jsontxt += QString (buf);
+//
+//	
 	for (int i = 1; i < t. size (); i ++) {
 	 snprintf (buf, 512, 
-	 ",\n{\"lat\":%s, \"lon\":%s, \"name\":\"%s\", \"channel\":\"%s\", \"dist\":%d}",
+	 ",\n{\"type\":%d, \"lat\":%s, \"lon\":%s, \"name\":\"%s\", \"channel\":\"%s\", \"dist\":%d, \"azimuth\":%d}",
+	 t i. type,
 	 dotNumber (real (t i. coords)). c_str (),
 	 dotNumber (imag (t i. coords)). c_str (),
 	 t i. transmitterName. toUtf8 (). data (),
 	 t i. channelName. toUtf8 (). data (),
-	 t i. distance);
+	 t i. distance,
+	 t i. azimuth);
 	 Jsontxt += QString (buf);
 	}
 	t. resize (0);
@@ -474,19 +481,23 @@
 	return Jsontxt. toStdString ();
 }
 
-void	httpHandler::putData	(std::complex<float> target,
+void	httpHandler::putData	(uint8_t	type,
+	 std::complex<float> target,
 	 QString transmitterName,
 	 QString channelName,
-	 int distance) {
+	 int distance,
+	 int azimuth) {
 	for (int i = 0; i < transmitterList. size (); i ++)
 	 if (transmitterList i. coords == target)
 	 return;
 	 
 	httpData t;
+	t. type			= type;
 	t. coords		= target;
 	t. transmitterName	= transmitterName;
 	t. channelName		= channelName;
 	t. distance		= distance;
+	t. azimuth		= azimuth;
 	locker. lock ();
 	transmitterList. push_back (t);
 	locker. unlock ();

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

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

@@ -51,6 +51,11 @@
 	 var Transmitters = {};
 	 var transmitterIndex	= 0;
 
+	 const MAP_RESET	= 0;
+	 const MAP_FRAME	= 1;
+	 const MAP_MAX_TRANS	= 2;
+	 const MAP_NORM_TRANS = 4;
+
 	 function getIconForHome () {
 	 var he = document. createElement ("P");
 	 he.innerHTML = '*';
@@ -77,8 +82,10 @@
 
 	 function fetchData () {
 	 $.getJSON ('/data.json', function (data) {
+	 let ttt = document. getElementById ('current');
 	 for (var t = 0; t < data. length; t ++) {
-	 if (data t. lat == 0) {
+	 let target = data t;
+	 if (target. type == MAP_RESET) {
 	 for (var i = 0; i < transmitterIndex; i ++) {
 	 Map. removeLayer (Transmitters i. marker);
 	 delete Transmitters i;
@@ -90,52 +97,82 @@
 	 let yy = document. getElementById ('selCount');
 	 yy. innerHTML =
 	 'number of transmitters ' + transmitterIndex;
+	 let zz = document. getElementById ('distance');
+ zz. innerHTML = '';
+	 continue;
 	 }
 	 else
-	 if (data t. lat == -1) {
+	 if (target. type == MAP_FRAME) {
 	 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;
+	 if (Transmitters i. status == true) {
+	 Transmitters i. status = false;
+	 Map. removeLayer (Transmitters i. marker);
+	 let icon = getIconForTransmitter (0);
+	 let element = Transmitters i;
+	 let elementMarker = L.marker (element.lat,
+	 element.lon, {icon: icon}).addTo(Map);
+	 elementMarker.
+	 addEventListener ('click',
+	 function () { selectTransmitterCallback (element);});
+	 Transmitters i. marker = elementMarker;
+	 }
 	 }
+	 continue;
 	 }
-	 else {
-	 let target = data t;
+	 else 
+	 if ((target. type == MAP_MAX_TRANS) ||
+	 (target. type == MAP_NORM_TRANS)) {
 	 var alreadyThere = false;
-	 for (var i = 0; i < transmitterIndex; i ++) {
-	 if ((Transmitters i. lat == target. lat) &&
-	 (Transmitters i. lon == target. lon) &&
-	 (Transmitters i. channel == target. channel)) {
+	 for (var j = 0; j < transmitterIndex; j ++) {
+	 if ((Transmitters j. lat == target. lat) &&
+	 (Transmitters j. lon == target. lon) &&
+	 (Transmitters j. channel == target. channel)) {
 	 alreadyThere = true;
 	 break;
 	 }
 	 }
-
-	 if (alreadyThere)
+	 if (alreadyThere) {
 	 continue;
+	 }
+
+	 let firstOne = transmitterIndex == 0;
 	 let icon = getIconForTransmitter (1);
-	 let targetMarker = L.marker(target.lat, target.lon, {icon: icon}).addTo(Map);
+	 let targetMarker = L. marker(target.lat, target.lon,
+	 {icon: icon}) .addTo(Map);
 	 target. marker = targetMarker;
-	 Transmitters transmitterIndex = target;
-	 transmitterIndex ++;
+	 target. status = true;
 	 target. marker.
 	 addEventListener ('click',
 	 function () { selectTransmitterCallback (target);});
 	 let newChannel = '' + target. channel + '';
+	 Transmitters transmitterIndex = target;
+	 transmitterIndex ++;
 	 let coords = '' +
 	 target. lat + '--' +
 	 target. lon + '';
 	 let xx = document. getElementById ('selinfo');
+	 if (firstOne)
+	 xx. innerHTML = 
+	 '' + 'Transmitters ' + '';
 	 xx. innerHTML += newChannel + '=>' +
 	 target. name + ' ' +
-	 coords + ' ';
+	 coords + ' ' +
+	 'Distance to home ' +
+	 target. dist + 'km ' + 
+	 target. azimuth + '&#xb0' + ' ';
 	 let yy = document. getElementById ('selCount');
-	 yy. innerHTML = 'number of transmitters ' + transmitterIndex;
+	 yy. innerHTML = '' + 'Number of transmitters' + '' + ' ' + transmitterIndex + ' ';
+
+	 if (target. type == MAP_MAX_TRANS) {
+	 let aa = document. getElementById ('distance');
+	 aa. innerHTML = '' + 'Furthest distance by ' + '' +
+	 newChannel + '=>' +
+	 target. name + ' ' +
+	 coords + ' ' +
+	 'Distance to home ' +
+	 target. dist + 'km ' + 
+	 target. azimuth + '&#xb0' + ' ';
+	 }
 	 }
 	 }
 	 });
@@ -167,11 +204,12 @@
 	 let coords = '' +
 	 target. lat + '--' +
 	 target. lon + '';
-	 xx. innerHTML = 'Selected: ' + ' ' +
+	 xx. innerHTML = '' + 'Selected: ' + ' ' +
 	 newChannel + '=>' +
 	 target. name + ' ' +
 	 coords + ' ' +
-	 'Distance to home ' + target. dist + 'km ';
+	 'Distance to home ' + target. dist + 'km ' +
+	 target. azimuth + '&#xb0' + ' '
 	}
 
 </script>
@@ -181,9 +219,11 @@
 	<div id="info">
 	<div>
 	 <h1>Qt-DAB</h1>
-	 
-	 
 	 
+	 
+	 
+	 
+	 
 	</div>
 	</div>
 </body>

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

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

@@ -256,6 +256,7 @@
 	isSynced		= false;
 	stereoSetting		= false;
 	serviceCount		= -1;
+	maxDistance		= -1;
 	my_contentTable		= nullptr;
 	my_scanTable		= nullptr;
 	mapHandler		= nullptr;
@@ -309,11 +310,13 @@
 	filePath	= dabSettings -> value ("filePath", ""). toString ();
 	if ((filePath != "") && (!filePath. endsWith ("/")))
 	 filePath = filePath + "/";
-	setWindowFlags (windowFlags () | Qt::WindowStaysOnTopHint);
+//
+//	set on top or not? checked at start up
+	if (dabSettings -> value ("onTop", 0). toInt () == 1) 
+	 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);
 	techData. timeTable_button -> hide ();
@@ -322,6 +325,10 @@
 	epgLabel	-> setStyleSheet ("QLabel {background-color : yellow}");
 //	configDisplay	= new QFrame (nullptr);
 	configWidget. setupUi (&configDisplay);
+//
+//	Now we can set the checkbox as saved in the settings
+	if (dabSettings -> value ("onTop", 0). toInt () == 1) 
+	 configWidget. onTop -> setChecked (true);
 
 	int x = dabSettings -> value ("muteTime", 2). toInt ();
 	configWidget. muteTimeSetting -> setValue (x);
@@ -363,6 +370,8 @@
 	connect (configWidget. loadTableButton, SIGNAL (clicked ()),
 	 this, SLOT (loadTable ()));
 
+	connect (configWidget. onTop, SIGNAL (stateChanged (int)),
+	 this, SLOT (handle_onTop (int)));
 	logFile		= nullptr;
 	int scanMode	=
 	 dabSettings -> value ("scanMode", SINGLE_SCAN). toInt ();
@@ -390,17 +399,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");
+	if (dabSettings -> value ("autoBrowser", 1). toInt () == 1)
+	 configWidget. autoBrowser -> setChecked (true);
+	if (dabSettings -> value ("transmitterTags", 1). toInt () == 1)
+	 configWidget. transmitterTags -> setChecked (true);
+	connect (configWidget. autoBrowser, SIGNAL (stateChanged (int)),
+	 this, SLOT (handle_autoBrowser (int)));
+	connect (configWidget. transmitterTags, SIGNAL (stateChanged (int)),	
+	 this, SLOT (handle_transmitterTags (int)));
+
+	autoBrowser_off		= configWidget. autoBrowser -> isChecked ();
+	transmitterTags_local	= configWidget. transmitterTags -> isChecked ();
 	motSlides		= nullptr;
 	dataDisplay. hide ();
 	stillMuting		-> hide ();
@@ -586,8 +595,6 @@
 	 channel. tiiFile = tiiProcessor. tiiFile (tiiFileName);
 	 if (!channel. tiiFile) {
 	 httpButton -> hide ();
-	 configWidget. autoBrowser -> hide ();
-	 configWidget. transmitterTags -> hide ();
 	 }
 	}
 
@@ -2103,79 +2110,97 @@
 	 channel. transmitterName = "";
 	}
 
-	if (channel. tiiFile) {
-	 if (tiiChange || (channel. transmitterName == "")) {
-	 if (!tiiProcessor. is_black (channel. Eid, mainId, subId)) {
-	 QString theName =
-	 tiiProcessor.
-	 get_transmitterName (channel. realChannel?
-	 channel. channelName :
-	 "any",
-//	 channel. countryName,
-	 channel. Eid,
-	 mainId, subId);
-	 if (theName == "") {
-	 tiiProcessor. set_black (channel. Eid, mainId, subId);
-	 LOG ("Not found ",
-	 QString::number (channel. Eid, 16) + " " +
-	 QString::number (mainId) + " " +
-	 QString::number (subId));
-	 }
-	 else 
-	 if (theName != channel. transmitterName) {
-	 channel. transmitterName = theName;
-	 float latitude, longitude;
-	 tiiProcessor. get_coordinates (&latitude,
-	 &longitude,
-	 channel. realChannel ?
+	if ((country != "") && (country != channel. countryName)) {
+	 transmitter_country	-> setText (country);
+	 channel. countryName	= country;
+	 LOG ("country", channel. countryName);
+	}
+
+	if (!channel. tiiFile) 
+	 return;
+
+	if (!(tiiChange || (channel. transmitterName == "")))
+	 return;
+
+	if (tiiProcessor. is_black (channel. Eid, mainId, subId)) 
+	 return;
+
+	QString theName =
+	 tiiProcessor. get_transmitterName (channel. realChannel?
 	 channel. channelName :
 	 "any",
-	 theName);
-	 channel. targetPos	= std::complex<float> (latitude,
-	 longitude);
-	 LOG ("transmitter ", channel. transmitterName);
-	 LOG ("coordinates ", 
-	 QString::number (latitude) + " " +
-	 QString::number (longitude));
-	 LOG ("current SNR ",
-	 QString::number (snrDisplay -> value ()));
-	 QString labelText = channel. transmitterName;
+//	 channel. countryName,
+	 channel. Eid,
+	 mainId, subId);
+	if (theName == "") {
+	 tiiProcessor. set_black (channel. Eid, mainId, subId);
+	 LOG ("Not found ", QString::number (channel. Eid, 16) + " " +
+	 QString::number (mainId) + " " +
+	 QString::number (subId));
+	 return;
+	}
+
+	if (theName == channel. transmitterName) // already there
+	 return;
+
+	channel. transmitterName = theName;
+	float latitude, longitude;
+	tiiProcessor. get_coordinates (&latitude, &longitude,
+	 channel. realChannel ?
+	 channel. channelName :
+	 "any",
+	 theName);
+	channel. targetPos	= std::complex<float> (latitude, longitude);
+	LOG ("transmitter ", channel. transmitterName);
+	LOG ("coordinates ", QString::number (latitude) + " " +
+	 QString::number (longitude));
+	LOG ("current SNR ", QString::number (snrDisplay -> value ()));
+	QString labelText = channel. transmitterName;
 //
 // if our own position is known, we show the distance
- float ownLatitude = real (channel. localPos);
- float ownLongitude = imag (channel. localPos);
- if ((ownLatitude != 0) && (ownLongitude != 0)) {
-	 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);
-	 LOG ("distance ", QString::number (distance));
-	 LOG ("corner ", QString::number (hoek));
-	 labelText += + " " +
-	 QString::number (distance) + " km" +
+//
+	float ownLatitude	= real (channel. localPos);
+	float ownLongitude	= imag (channel. localPos);
+
+	if ((ownLatitude == 0) || (ownLongitude == 0))
+	 return;
+
+	int distance	= tiiProcessor. distance (latitude,
+	 longitude,
+	 ownLatitude,
+	 ownLongitude);
+	int hoek	 = tiiProcessor. corner (latitude,

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

@@ -163,6 +163,7 @@
 	QSettings		*dabSettings;
 	dabService		currentService;
 	dabService		nextService;
+	int			maxDistance;
 //	dabService		secondService;
 	std::vector<dabService> backgroundServices;
 	QByteArray		transmitters;
@@ -327,8 +328,8 @@
 void new_channelIndex (int);
 
 	std::mutex		locker;
-	bool			autoBrowser_on;
-	bool			transmitterTags_on;
+	bool			autoBrowser_off;
+	bool			transmitterTags_local;
 signals:
 	void set_newChannel		(int);
 void set_newPresetIndex (int);
@@ -388,8 +389,6 @@
 	
 	void			http_terminate		();
 
-	void			handle_autoBrowser	();
- void			handle_transmitterTags	();;
 
 //	Somehow, these must be connected to the GUI
 private slots:
@@ -434,6 +433,9 @@
 	void			handle_hideButton	();
 	void			handle_scheduleButton	();
 	void			handle_httpButton	();
+	void			handle_onTop		(int);
+	void			handle_autoBrowser	(int);
+ void			handle_transmitterTags	(int);
 
 //
 //	color handlers

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

@@ -7,7 +7,7 @@
 <x>0</x>
 <y>0</y>
 <width>343</width>
- <height>609</height>
+ <height>666</height>
 </rect>
 </property>
 <property name="windowTitle">
@@ -163,6 +163,36 @@
 </widget>
 </item>
 <item>
+ <widget class="QCheckBox" name="onTop">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set in the configuration whether or not the main widget should ALWAYS be op top. Note that setting will be applied the next time the program will start.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string>main widget on top</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="autoBrowser">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set in the configuration that on starting the http service a browser will have to be started manually. Default is browser starts automatically. Effective immediately&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string>start browser manually</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="transmitterTags">
+ <property name="toolTip">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set in the configuration that - rather than showing all ttransmitters on a map - only the transmitters that are seen for the currrent channel are made visible.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="text">
+ <string>show transmitters of current channel</string>
+ </property>
+ </widget>
+ </item>
+ <item>
 <widget class="QPushButton" name="loadTableButton">
 <property name="toolTip">
 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Touching this button instructs the software to (try to) load a so-called tii table, a table with the&lt;/p&gt;&lt;p&gt;encodings of tii data.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -238,24 +268,6 @@
 </item>
 </layout>
 </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="QPushButton" name="autoBrowser">
- <property name="text">
- <string>autobrowser</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="transmitterTags">
- <property name="text">
- <string>all transmitters</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
 </layout>
 </widget>
 <customwidgets>

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

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

qt-dab-4.4.1.tar.gz/qt-dab-screen.png -> qt-dab-4.4.2.tar.gz/qt-dab-screen.png Changed