summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--v4l/ChangeLog10
-rw-r--r--v4l_experimental/pvrusb2/pvrusb2-audio.c9
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");
}