imported 0.2 fixes

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@524 90c681e8-e032-0410-971d-27865f9a5e38

1 files changed, 0 insertions, 38 deletions

diff --git a/src/plugins/Output/oss/outputoss.cpp b/src/plugins/Output/oss/outputoss.cpp
index 2f8bf6bc4..9dfcadbbd 100644
--- a/src/plugins/Output/oss/outputoss.cpp
+++ b/src/plugins/Output/oss/outputoss.cpp
@@ -465,41 +465,3 @@ void OutputOSS::volume(int *ll,int *rr)
     *ll = (*ll < 0) ? 0 : *ll;
     *rr = (*rr < 0) ? 0 : *rr;
 }
-
-
-void OutputOSS::checkVolume()
-{
-    long ll = 0, lr = 0, cmd;
-    int v, devs;
-
-    /*
-     * We dont show any errors if this fails, as this is called
-     * rather often
-     */
-//    if (!open_mixer_device()) {
-    ioctl(m_mixer_fd, SOUND_MIXER_READ_DEVMASK, &devs);
-    if ((devs & SOUND_MASK_PCM) && (m_master == 0))
-        cmd = SOUND_MIXER_READ_PCM;
-    else if ((devs & SOUND_MASK_VOLUME) && (m_master == 1))
-        cmd = SOUND_MIXER_READ_VOLUME;
-    else
-        return;
-
-    ioctl(m_mixer_fd, cmd, &v);
-    ll = (v & 0xFF00) >> 8;
-    lr = (v & 0x00FF);
-
-    ll = (ll > 100) ? 100 : ll;
-    lr = (lr > 100) ? 100 : lr;
-    ll = (ll < 0) ? 0 : ll;
-    lr = (lr < 0) ? 0 : lr;
-    if (bl!=ll || br!=lr)
-    {
-        bl = ll;
-        br = lr;
-        dispatchVolume(ll,lr);
-    }
-//    }
-}
-
-