From e1a3a0cb8fab212eb7463ad71d909bfdd4c83585 Mon Sep 17 00:00:00 2001 From: "Dr.Best" Date: Fri, 6 Aug 2010 09:18:06 +0000 Subject: [PATCH] Allow adjust-value = 0 for individual channel-setting --- automaticvolumeadjustment/src/AutomaticVolumeAdjustment.py | 5 +++-- automaticvolumeadjustment/src/AutomaticVolumeAdjustmentConfig.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/automaticvolumeadjustment/src/AutomaticVolumeAdjustment.py b/automaticvolumeadjustment/src/AutomaticVolumeAdjustment.py index fc197f4..7066d1c 100644 --- a/automaticvolumeadjustment/src/AutomaticVolumeAdjustment.py +++ b/automaticvolumeadjustment/src/AutomaticVolumeAdjustment.py @@ -101,7 +101,7 @@ class AutomaticVolumeAdjustment(Screen): if vol >= 100 - ajvol: # check if delta + vol < 100 ajvol = 100 - vol # correct delta value self.lastAdjustedValue = ajvol # save delta value - if (ajvol !=0 or self.defaultValue == 0) and (vol+ajvol != currentvol): # only adjust volume when delta != 0 and current vol != new volume + if (vol + ajvol != currentvol): # only when current vol != new volume if ajvol == 0: ajvol = vol+self.lastAdjustedValue - currentvol # correction for debug -print only self.volctrl.setVolume(vol+self.lastAdjustedValue, vol+self.lastAdjustedValue) @@ -182,4 +182,5 @@ def AVA_setVolume(self, direction): self.volumeDialog.show() self.hideVolTimer.start(3000, True) if ok: - baseVolumeControl_setVolume(self, direction) \ No newline at end of file + baseVolumeControl_setVolume(self, direction) + diff --git a/automaticvolumeadjustment/src/AutomaticVolumeAdjustmentConfig.py b/automaticvolumeadjustment/src/AutomaticVolumeAdjustmentConfig.py index 51e4ec3..1b7be5a 100644 --- a/automaticvolumeadjustment/src/AutomaticVolumeAdjustmentConfig.py +++ b/automaticvolumeadjustment/src/AutomaticVolumeAdjustmentConfig.py @@ -60,7 +60,7 @@ class AutomaticVolumeAdjustmentConfig(): i = len(self.config.Entries) - 1 self.config.Entries[i].servicereference = ConfigText(default = "") self.config.Entries[i].name = NoSave(ConfigDirectory(default = _("Press OK to select a service"))) - self.config.Entries[i].adjustvalue = ConfigInteger(default=25, limits=(5,50)) + self.config.Entries[i].adjustvalue = ConfigInteger(default=25, limits=(0,50)) return self.config.Entries[i] def remove(self, configItem): -- 2.7.4