diff options
author | Mike Isely <devnull@localhost> | 2006-01-23 07:00:31 +0000 |
---|---|---|
committer | Mike Isely <devnull@localhost> | 2006-01-23 07:00:31 +0000 |
commit | 79c67aeaeb1fb1d54c353dec996c405871fd1fdb (patch) | |
tree | b1aae903c1c96ccef93593c4ba809009804a1c36 | |
parent | 02770b94ef98488e5f3a2f255ab32bcf6829710d (diff) | |
download | mediapointer-dvb-s2-79c67aeaeb1fb1d54c353dec996c405871fd1fdb.tar.gz mediapointer-dvb-s2-79c67aeaeb1fb1d54c353dec996c405871fd1fdb.tar.bz2 |
Fix minor bug in pvrusb2 where audio mode wasn't updating correctly
From: Mike Isely <isely@pobox.com>
Signed-off-by: Mike Isely <isely@pobox.com>
-rw-r--r-- | v4l/ChangeLog | 10 | ||||
-rw-r--r-- | v4l_experimental/pvrusb2/pvrusb2-audio.c | 9 |
2 files changed, 15 insertions, 4 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 54b0d4d58..b089c0964 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,13 @@ +2006-01-23 06:59 mcisely + + * v4l_experimental/pvrusb2/pvrusb2-audio.c: (check_stereo), + (pvr2_msp3400_describe): + + - Fix minor problem in pvrusb2 involving changing audio mode; the + driver wasn't noticing when the mode needed to be updated. + + Signed-off-by: Mike Isely <isely@pobox.com> + 2006-01-23 06:54 mcisely * v4l_experimental/pvrusb2/pvrusb2-context.c: diff --git a/v4l_experimental/pvrusb2/pvrusb2-audio.c b/v4l_experimental/pvrusb2/pvrusb2-audio.c index 215635f93..067a686e0 100644 --- a/v4l_experimental/pvrusb2/pvrusb2-audio.c +++ b/v4l_experimental/pvrusb2/pvrusb2-audio.c @@ -1,6 +1,6 @@ /* * - * $Id: pvrusb2-audio.c,v 1.8 2006/01/22 03:48:34 mcisely Exp $ + * $Id: pvrusb2-audio.c,v 1.9 2006/01/23 07:00:31 mcisely Exp $ * * Copyright (C) 2005 Mike Isely <isely@pobox.com> * Copyright (C) 2004 Aurelien Alleaume <slts@free.fr> @@ -134,7 +134,8 @@ static void set_stereo(struct pvr2_msp3400_handler *ctxt) static int check_stereo(struct pvr2_msp3400_handler *ctxt) { struct pvr2_hdw *hdw = ctxt->hdw; - return hdw->controls[PVR2_CID_INPUT].dirty != 0; + return ((hdw->controls[PVR2_CID_INPUT].dirty != 0)|| + (hdw->controls[PVR2_CID_AUDIOMODE].dirty != 0)); } @@ -206,8 +207,8 @@ static void pvr2_msp3400_detach(struct pvr2_msp3400_handler *ctxt) } -static unsigned int pvr2_msp3400_describe(struct pvr2_msp3400_handler *ctxt,char *buf, - unsigned int cnt) +static unsigned int pvr2_msp3400_describe(struct pvr2_msp3400_handler *ctxt, + char *buf,unsigned int cnt) { return scnprintf(buf,cnt,"handler: pvrusb2-audio"); } |