diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-11 06:00:15 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-11 06:00:15 +0000 |
| commit | b1057f437bf65300831a0ccb45b920787c6b318d (patch) | |
| tree | f8a73db06ca1180d0da0ba6dfbe786197b4f4bc3 /kmix/mixer_oss.cpp | |
| parent | 4ddfca384ced9ad654213aef9dc2c3973720b980 (diff) | |
| download | tdemultimedia-b1057f437bf65300831a0ccb45b920787c6b318d.tar.gz tdemultimedia-b1057f437bf65300831a0ccb45b920787c6b318d.zip | |
TQt4 port kdemultimedia
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmix/mixer_oss.cpp')
| -rw-r--r-- | kmix/mixer_oss.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kmix/mixer_oss.cpp b/kmix/mixer_oss.cpp index 7fcfb38e..5b51db16 100644 --- a/kmix/mixer_oss.cpp +++ b/kmix/mixer_oss.cpp @@ -108,31 +108,31 @@ int Mixer_OSS::open() } } - int devmask, recmask, i_recsrc, stereodevs; + int devtqmask, rectqmask, i_recsrc, stereodevs; // Mixer is open. Now define properties - if (ioctl(m_fd, SOUND_MIXER_READ_DEVMASK, &devmask) == -1) + if (ioctl(m_fd, SOUND_MIXER_READ_DEVMASK, &devtqmask) == -1) return Mixer::ERR_READ; - if (ioctl(m_fd, SOUND_MIXER_READ_RECMASK, &recmask) == -1) + if (ioctl(m_fd, SOUND_MIXER_READ_RECMASK, &rectqmask) == -1) return Mixer::ERR_READ; if (ioctl(m_fd, SOUND_MIXER_READ_RECSRC, &i_recsrc) == -1) return Mixer::ERR_READ; if (ioctl(m_fd, SOUND_MIXER_READ_STEREODEVS, &stereodevs) == -1) return Mixer::ERR_READ; - if (!devmask) + if (!devtqmask) return Mixer::ERR_NODEV; int maxVolume =100; if( m_mixDevices.isEmpty() ) { int idx = 0; - while( devmask && idx < MAX_MIXDEVS ) + while( devtqmask && idx < MAX_MIXDEVS ) { - if( devmask & ( 1 << idx ) ) // device active? + if( devtqmask & ( 1 << idx ) ) // device active? { Volume vol( stereodevs & ( 1 << idx ) ? 2 : 1, maxVolume); readVolumeFromHW( idx, vol ); MixDevice* md = - new MixDevice( idx, vol, recmask & ( 1 << idx ), true, + new MixDevice( idx, vol, rectqmask & ( 1 << idx ), true, MixerDevNames[idx], MixerChannelTypes[idx]); md->setRecSource( isRecsrcHW( idx ) ); @@ -268,7 +268,7 @@ bool Mixer_OSS::setRecsrcHW( int devnum, bool on ) } // PORTING: Hint: Do not forget to set i_recsrc to the new valid - // record source mask. + // record source tqmask. return i_recsrc == oldrecsrc; } @@ -280,7 +280,7 @@ bool Mixer_OSS::isRecsrcHW( int devnum ) if (ioctl(m_fd, SOUND_MIXER_READ_RECSRC, &recsrcMask) == -1) errormsg(Mixer::ERR_READ); else { - // test if device bit is set in record bit mask + // test if device bit is set in record bit tqmask isRecsrc = ( (recsrcMask & ( 1<<devnum)) != 0 ); } return isRecsrc; |