author | llornkcor <llornkcor> | 2002-06-17 23:09:38 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-06-17 23:09:38 (UTC) |
commit | 554f88d0e8839bd6112fa42139a967712552e519 (patch) (side-by-side diff) | |
tree | d90788c9247f35ee10a1cdd8df0408b1df2a7e57 | |
parent | 28400a31238af793fe235a0c8d13131eb823037d (diff) | |
download | opie-554f88d0e8839bd6112fa42139a967712552e519.zip opie-554f88d0e8839bd6112fa42139a967712552e519.tar.gz opie-554f88d0e8839bd6112fa42139a967712552e519.tar.bz2 |
fixed volume fix
-rw-r--r-- | core/multimedia/opieplayer/audiodevice.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/multimedia/opieplayer/audiodevice.cpp b/core/multimedia/opieplayer/audiodevice.cpp index 4c5f12d..faadd72 100644 --- a/core/multimedia/opieplayer/audiodevice.cpp +++ b/core/multimedia/opieplayer/audiodevice.cpp @@ -149,51 +149,51 @@ void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume, // formatData.wBitsPerSample = 16; // waveOutOpen(&handle, WAVE_MAPPER, &formatData, 0L, 0L, CALLBACK_NULL); // unsigned int volume = (rightVolume << 16) | leftVolume; // if ( waveOutSetVolume( handle, volume ) ) // // qDebug( "set volume of audio device failed" ); // waveOutClose( handle ); // #else // Volume can be from 0 to 100 which is 101 distinct values unsigned int rV = (rightVolume * 101) >> 16; # if 0 unsigned int lV = (leftVolume * 101) >> 16; unsigned int volume = ((rV << 8) & 0xFF00) | (lV & 0x00FF); int mixerHandle = 0; if ( ( mixerHandle = open( "/dev/mixer", O_RDWR ) ) >= 0 ) { if(ioctl( mixerHandle, MIXER_WRITE(0), &volume ) ==-1) perror("ioctl(\"MIXER_WRITE\")"); close( mixerHandle ); } else perror("open(\"/dev/mixer\")"); # else // This is the way this has to be done now I guess, doesn't allow for // independant right and left channel setting, or setting for different outputs - Config cfg("Sound"); - cfg.setGroup("System"); - cfg.writeEntry("Volume",(int)rV); + Config cfg("qpe"); // qtopia is "Sound" + cfg.setGroup("Volume"); // qtopia is "Settings" + cfg.writeEntry("VolumePercent",(int)rV); //qtopia is Volume # endif //#endif // qDebug( "setting volume to: 0x%x", volume ); #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) // Send notification that the volume has changed QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << muted; #endif } AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { qDebug("creating new audio device"); QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; d = new AudioDevicePrivate; d->frequency = f; d->channels = chs; d->bytesPerSample = bps; qDebug("%d",bps); int format=0; if( bps == 8) format = AFMT_U8; else if( bps <= 0) format = AFMT_S16_LE; |