diff options
Diffstat (limited to 'src/plugins/Output/oss')
| -rw-r--r-- | src/plugins/Output/oss/outputoss.cpp | 38 | ||||
| -rw-r--r-- | src/plugins/Output/oss/outputoss.h | 1 |
2 files changed, 0 insertions, 39 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); - } -// } -} - - diff --git a/src/plugins/Output/oss/outputoss.h b/src/plugins/Output/oss/outputoss.h index 90a443ea6..c38bbc68b 100644 --- a/src/plugins/Output/oss/outputoss.h +++ b/src/plugins/Output/oss/outputoss.h @@ -46,7 +46,6 @@ public: void seek(long); void setVolume(int l, int r); void volume(int* l,int* r); - void checkVolume(); private: // thread run function |
