From 750a927b7fd699c50c451c7a95b42ddc041762db Mon Sep 17 00:00:00 2001 From: mossroy Date: Sat, 2 Jul 2011 14:51:32 -0700 Subject: [PATCH] Add a few TLDs that are necessary to use latest dvb-apps files. Modify detection of regions so that auto-* files can be handled in a generic region --- src/muxbuilder/main.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/muxbuilder/main.c b/src/muxbuilder/main.c index 79d1f9ce..042e59a8 100644 --- a/src/muxbuilder/main.c +++ b/src/muxbuilder/main.c @@ -279,10 +279,14 @@ static const struct { const char *name; } tldlist[] = { + {"auto", "--Generic--"}, {"ad", "Andorra"}, {"at", "Austria"}, {"au", "Australia"}, + {"ax", "Aland Islands"}, {"be", "Belgium"}, + {"br", "Brazil"}, + {"ca", "Canada"}, {"ch", "Switzerland"}, {"cz", "Czech Republic"}, {"de", "Germany"}, @@ -307,6 +311,7 @@ static const struct { {"pl", "Poland"}, {"ro", "Romania"}, {"se", "Sweden"}, + {"si", "Slovenia"}, {"sk", "Slovakia"}, {"tw", "Taiwan"}, {"uk", "United Kingdom"}, @@ -367,10 +372,16 @@ scan_file(char *fname) co = find_region("geo", "Geosynchronous Orbit"); } else { - displayname = name + 3; - buf[0] = name[0]; - buf[1] = name[1]; - buf[2] = 0; + l = 0; + c = 0; + while(*name && c != '-') { + c = *name++; + if (c != '-') { + buf[l++] = c; + } + } + buf[l] = 0; + displayname = name; co = find_region(buf, tldcode2longname(buf)); } @@ -534,4 +545,4 @@ main(int argc, char **argv) dump_regions(); return 0; -} +} \ No newline at end of file