From faf6dbc127abbb18e699e38d6912ca9eec8bb2a3 Mon Sep 17 00:00:00 2001 From: John Poet Date: Sun, 3 Jun 2012 12:00:46 -0600 Subject: [PATCH] Apply David's modifications from #10765 to AnalogSignalMonitor::VerifyHDPVRaudio. --- mythtv/libs/libmythtv/analogsignalmonitor.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mythtv/libs/libmythtv/analogsignalmonitor.cpp b/mythtv/libs/libmythtv/analogsignalmonitor.cpp index 4f92fa65c01..82387e4df0a 100644 --- a/mythtv/libs/libmythtv/analogsignalmonitor.cpp +++ b/mythtv/libs/libmythtv/analogsignalmonitor.cpp @@ -51,7 +51,7 @@ bool AnalogSignalMonitor::VerifyHDPVRaudio(int videofd) } int current_audio; - uint audio_enc = max(min(audtype - 1, qctrl.maximum), qctrl.minimum); + uint audio_enc = max(min(audtype, qctrl.maximum), qctrl.minimum); struct v4l2_ext_control ext_ctrl; struct v4l2_ext_controls ext_ctrls; @@ -73,24 +73,24 @@ bool AnalogSignalMonitor::VerifyHDPVRaudio(int videofd) current_audio = ext_ctrls.controls->value; - if (audtype - 1 != current_audio) + if (audtype != current_audio) { LOG(VB_GENERAL, LOG_ERR, LOC + QString("Audio desired %1, current %2 " "min %3 max %4") - .arg(audtype - 1) + .arg(audtype) .arg(current_audio) .arg(qctrl.minimum) .arg(qctrl.maximum) ); ext_ctrl.id = V4L2_CID_MPEG_AUDIO_ENCODING; - ext_ctrl.value = audtype - 1; + ext_ctrl.value = audtype; if (ioctl(videofd, VIDIOC_S_EXT_CTRLS, &ext_ctrls) == 0) { LOG(VB_GENERAL, LOG_ERR, LOC + QString("Changed audio encoding " "from %1 to %2.") .arg(current_audio) - .arg(audtype - 1) + .arg(audtype) ); } else @@ -99,7 +99,7 @@ bool AnalogSignalMonitor::VerifyHDPVRaudio(int videofd) "encoding from %1 to %2." + ENO) .arg(current_audio) - .arg(audtype - 1) + .arg(audtype) ); }