diff options
Diffstat (limited to 'kradio3/plugins/oss-sound/oss-sound.cpp')
| -rw-r--r-- | kradio3/plugins/oss-sound/oss-sound.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kradio3/plugins/oss-sound/oss-sound.cpp b/kradio3/plugins/oss-sound/oss-sound.cpp index 37d3c3e..2ac0f6e 100644 --- a/kradio3/plugins/oss-sound/oss-sound.cpp +++ b/kradio3/plugins/oss-sound/oss-sound.cpp @@ -654,10 +654,10 @@ bool OSSSoundDevice::openDSPDevice(const SoundFormat &format, bool reopen) // setup buffer, ask for 40ms latency int tmp = (400 * m_DSPFormat.frameSize() * m_DSPFormat.m_SampleRate) / 1000; - int tqmask = -1; for (; tmp; tmp >>= 1) ++tqmask; - if (tqmask < 8) tqmask = 12; // default 4kB - tqmask |= 0x7FFF0000; - err |= ioctl (m_DSP_fd, SNDCTL_DSP_SETFRAGMENT, &tqmask); + int mask = -1; for (; tmp; tmp >>= 1) ++mask; + if (mask < 8) mask = 12; // default 4kB + mask |= 0x7FFF0000; + err |= ioctl (m_DSP_fd, SNDCTL_DSP_SETFRAGMENT, &mask); if (err) logError(i18n("Cannot set buffers for %1").tqarg(m_DSPDeviceName)); @@ -758,17 +758,17 @@ void OSSSoundDevice::getMixerChannels(int query, TQStringList &retval, TQMap<TQS } if (fd >= 0) { - int tqmask = 0; - if ( ioctl(fd, MIXER_READ(query), &tqmask) == 0 ) { + int mask = 0; + if ( ioctl(fd, MIXER_READ(query), &mask) == 0 ) { for (int i = 0; i < SOUND_MIXER_NRDEVICES; ++i) { - if (tqmask & (1 << i)) { + if (mask & (1 << i)) { static const char *labels[] = SOUND_DEVICE_LABELS; retval.append(i18n(labels[i])); revmap.insert(i18n(labels[i]), i); } } } else { - logError(i18n("OSSSoundDevice::getMixerChannels: Cannot read mixer device tqmask on device %1").tqarg(m_MixerDeviceName)); + logError(i18n("OSSSoundDevice::getMixerChannels: Cannot read mixer device mask on device %1").tqarg(m_MixerDeviceName)); } } if (fd != m_Mixer_fd) |