diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2016-04-09 16:50:06 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2016-04-09 16:50:06 +0000 |
| commit | b45d86f28414aa755ae5d723c2d6620927d03b6f (patch) | |
| tree | ba54bb7544176575b42c9b1474bb8aa6a4f01f0a /src | |
| parent | e2ea8990c3dc6b3c7f69b3be59ad54b4537df5ba (diff) | |
| download | qmmp-b45d86f28414aa755ae5d723c2d6620927d03b6f.tar.gz qmmp-b45d86f28414aa755ae5d723c2d6620927d03b6f.tar.bz2 qmmp-b45d86f28414aa755ae5d723c2d6620927d03b6f.zip | |
optimization
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@6235 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src')
| -rw-r--r-- | src/qmmp/volumecontrol.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/qmmp/volumecontrol.cpp b/src/qmmp/volumecontrol.cpp index aa5a59238..467581196 100644 --- a/src/qmmp/volumecontrol.cpp +++ b/src/qmmp/volumecontrol.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2015 by Ilya Kotov * + * Copyright (C) 2008-2016 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -54,10 +54,7 @@ void VolumeControl::setVolume(int left, int right) void VolumeControl::changeVolume(int delta) { - int v = qMax(m_left, m_right); - int balance = v > 0 ? (m_right - m_left)*100/v : 0; - v = delta > 0 ? qMin(100, v + 5) : qMax(0, v - 5); - setVolume(v-qMax(balance,0)*v/100, v+qMin(balance,0)*v/100); + setVolume(qBound(0, volume() + delta, 100)); } void VolumeControl::setVolume(int volume) |