Add parameter -r, -r 0 disables radiochannels from vdrlist scan -h shows usage
-- [EMAIL PROTECTED] * Let all cats bloom * The Olde Farthe * Chinese prowerb *
--- Begin Message ---Index: DVB/apps/scan/dump-vdr.c =================================================================== RCS file: /cvs/linuxtv/DVB/apps/scan/dump-vdr.c,v retrieving revision 1.11 diff -u -p -r1.11 dump-vdr.c --- DVB/apps/scan/dump-vdr.c 26 Jun 2003 13:23:30 -0000 1.11 +++ DVB/apps/scan/dump-vdr.c 26 Jun 2003 18:50:12 -0000 @@ -124,11 +124,14 @@ void vdr_dump_service_parameter_set (FIL int orbital_pos, int we_flag, int dump_provider, - int ca_select) + int ca_select, + int radio_select) { int i; - if ((video_pid || audio_pid[0]) && ((ca_select > 0) || ((ca_select == 0) && (scrambled == 0)))) { + if ((video_pid || audio_pid[0]) && + ((ca_select > 0) || ((ca_select == 0) && (scrambled == 0))) && + ((radio_select > 0) || ((radio_select == 0) && (video_pid > 0)))) { if (dump_provider == 1) fprintf (f, "%s:", provider_name); fprintf (f, "%s:", service_name); Index: DVB/apps/scan/dump-vdr.h =================================================================== RCS file: /cvs/linuxtv/DVB/apps/scan/dump-vdr.h,v retrieving revision 1.5 diff -u -p -r1.5 dump-vdr.h --- DVB/apps/scan/dump-vdr.h 26 Jun 2003 13:23:30 -0000 1.5 +++ DVB/apps/scan/dump-vdr.h 26 Jun 2003 18:50:12 -0000 @@ -27,7 +27,8 @@ void vdr_dump_service_parameter_set (FIL int orbital_pos, int we_flag, int dump_provider, - int ca_select); + int ca_select, + int radio_select); #endif Index: DVB/apps/scan/initial.h =================================================================== RCS file: /cvs/linuxtv/DVB/apps/scan/initial.h,v retrieving revision 1.15 diff -u -p -r1.15 initial.h --- DVB/apps/scan/initial.h 26 Jun 2003 16:59:04 -0000 1.15 +++ DVB/apps/scan/initial.h 26 Jun 2003 18:50:12 -0000 @@ -539,7 +539,7 @@ struct transponder ofdm_probes [] = { .type = FE_OFDM, .param = { .frequency = 562000000, - .inversion = INVERSION_AUTO, + .inversion = INVERSION_OFF, { ofdm: { .bandwidth = BANDWIDTH_8_MHZ, Index: DVB/apps/scan/scan.c =================================================================== RCS file: /cvs/linuxtv/DVB/apps/scan/scan.c,v retrieving revision 1.38 diff -u -p -r1.38 scan.c --- DVB/apps/scan/scan.c 26 Jun 2003 13:23:30 -0000 1.38 +++ DVB/apps/scan/scan.c 26 Jun 2003 18:50:13 -0000 @@ -39,6 +39,7 @@ static int current_tp_only; static int get_other_nits; static int vdr_dump_provider; static int ca_select; +static int radio_select; enum table_type { PAT, @@ -1465,7 +1466,8 @@ void dump_lists (void) t->orbital_pos, t->we_flag, vdr_dump_provider, - ca_select); + ca_select, + radio_select); break; case OUTPUT_ZAP: zap_dump_service_parameter_set (stdout, @@ -1502,6 +1504,7 @@ static const char *usage = "\n" " -x N Conditional Axcess, (default 1)\n" " N=0 gets only FTA channels\n" " N=xxx sets ca field in vdr output to :xxx:\n" + " -r N N=0, no Radio Channels (default 1)\n" " -p for vdr output format: dump provider name\n"; @@ -1512,8 +1515,9 @@ int main (int argc, char **argv) int opt, i; vdr_dump_provider = 0; ca_select = 1; + radio_select = 1; - while ((opt = getopt(argc, argv, "5cnpa:f:d:s:o:x:")) != -1) { + while ((opt = getopt(argc, argv, "5cnpa:f:d:s:o:x:r:")) != -1) { switch (opt) { case 'a': adapter = strtoul(optarg, NULL, 0); @@ -1551,6 +1555,9 @@ int main (int argc, char **argv) break; case 'x': ca_select = strtoul(optarg, NULL, 0); + break; + case 'r': + radio_select = strtoul(optarg, NULL, 0); break; default: fprintf (stderr, usage, argv[0]);
--- End Message ---
