This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/xawtv3.git tree:
Subject: xawtv: Don't skip parsing non channel sections of the config on non tuners Author: Hans de Goede <[email protected]> Date: Mon Mar 25 15:11:38 2013 +0100 This fixes: https://bugzilla.novell.com/show_bug.cgi?id=735032 Signed-off-by: Hans de Goede <[email protected]> common/channel.c | 5 ++++- common/channel.h | 2 +- console/fbtv.c | 2 +- console/ttv.c | 2 +- x11/motv.c | 2 +- x11/mtt.c | 2 +- x11/v4lctl.c | 2 +- x11/xawtv.c | 6 +++--- 8 files changed, 13 insertions(+), 10 deletions(-) --- http://git.linuxtv.org/xawtv3.git?a=commitdiff;h=295d8682bda59f3125aa586cbd733fa9b24ada8a diff --git a/common/channel.c b/common/channel.c index 0f9d365..aa977b5 100644 --- a/common/channel.c +++ b/common/channel.c @@ -498,7 +498,7 @@ read_config(char *conffile, int *argc, char **argv) } void -parse_config(void) +parse_config(int parse_channels) { char key[16], cmdline[128]; char **list,*val; @@ -530,6 +530,9 @@ parse_config(void) /* events */ event_readconfig(); + if (!parse_channels) + return; + /* channels */ init_channel("defaults",&defaults); for (list = cfg_list_sections(); *list != NULL; list++) { diff --git a/common/channel.h b/common/channel.h index fbc44f1..dd53cd0 100644 --- a/common/channel.h +++ b/common/channel.h @@ -74,7 +74,7 @@ void del_channel(int nr); void calc_frequencies(void); void read_config(char *conffile, int *argc, char **argv); -void parse_config(void); +void parse_config(int parse_channels); void save_config(void); /* ----------------------------------------------------------------------- */ diff --git a/console/fbtv.c b/console/fbtv.c index 04f06a9..d96ab9f 100644 --- a/console/fbtv.c +++ b/console/fbtv.c @@ -709,7 +709,7 @@ main(int argc, char *argv[]) audio_init(); /* build channel list */ - parse_config(); + parse_config(1); channel_menu(); init_overlay(); diff --git a/console/ttv.c b/console/ttv.c index 283c5f4..b5a7712 100644 --- a/console/ttv.c +++ b/console/ttv.c @@ -236,7 +236,7 @@ main(int argc, char **argv) audio_init(); /* build channel list */ - parse_config(); + parse_config(1); do_va_cmd(2,"setfreqtab",(-1 != chantab) ? chanlist_names[chantab].str : "europe-west"); cur_capture = 0; diff --git a/x11/motv.c b/x11/motv.c index 2d82737..998d4e2 100644 --- a/x11/motv.c +++ b/x11/motv.c @@ -3427,7 +3427,7 @@ main(int argc, char *argv[]) if (args.readconfig) { if (debug) fprintf(stderr,"main: parse channels from config file ...\n"); - parse_config(); + parse_config(1); } channel_menu(); diff --git a/x11/mtt.c b/x11/mtt.c index 8a4c248..dfe548c 100644 --- a/x11/mtt.c +++ b/x11/mtt.c @@ -232,7 +232,7 @@ main(int argc, char **argv) freq_init(); read_config(NULL, &argc, argv); - parse_config(); + parse_config(1); do_va_cmd(2,"setfreqtab",(-1 != chantab) ? chanlist_names[chantab].str : "europe-west"); diff --git a/x11/v4lctl.c b/x11/v4lctl.c index d7b5660..050bf30 100644 --- a/x11/v4lctl.c +++ b/x11/v4lctl.c @@ -109,7 +109,7 @@ int main(int argc, char *argv[]) audio_init(); audio_init(); - parse_config(); + parse_config(1); do_command(argc-optind,argv+optind); drv->close(h_drv); diff --git a/x11/xawtv.c b/x11/xawtv.c index 5299351..bade35a 100644 --- a/x11/xawtv.c +++ b/x11/xawtv.c @@ -1807,10 +1807,10 @@ main(int argc, char *argv[]) audio_init(); /* build channel list */ - if (args.readconfig &&(f_drv & CAN_TUNE)) { + if (args.readconfig) { if (debug) - fprintf(stderr,"main: parse channels from config file ...\n"); - parse_config(); + fprintf(stderr,"main: parse config file ...\n"); + parse_config(f_drv & CAN_TUNE); } channel_menu(); _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
