summaryrefslogtreecommitdiff
authorzecke <zecke>2004-04-07 18:01:16 (UTC)
committer zecke <zecke>2004-04-07 18:01:16 (UTC)
commit7c4c7920dd7c38db7a0bd49529ce0cd20a54a78a (patch) (side-by-side diff)
tree20598f8c9085180a4a41e011fb5707a71142ec91
parent51218a62632aa83a84d4ef23a0044c7f8cf5aa9c (diff)
downloadopie-7c4c7920dd7c38db7a0bd49529ce0cd20a54a78a.zip
opie-7c4c7920dd7c38db7a0bd49529ce0cd20a54a78a.tar.gz
opie-7c4c7920dd7c38db7a0bd49529ce0cd20a54a78a.tar.bz2
Using the right mixer helps.. lets see if h5xxx breaks again
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/qpeapplication.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 3370264..755fb19 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -336,49 +336,49 @@ static int& hack(int& i)
// These should be created, but aren't in Qt 2.3.0
(void)new QUtf8Codec;
(void)new QUtf16Codec;
#endif
return i;
}
static int muted = 0;
static int micMuted = 0;
static void setVolume( int t = 0, int percent = -1 )
{
switch ( t ) {
case 0: {
Config cfg( "qpe" );
cfg.setGroup( "Volume" );
if ( percent < 0 )
percent = cfg.readNumEntry( "VolumePercent", 50 );
#ifndef QT_NO_SOUND
int fd = 0;
if ( ( fd = open( "/dev/mixer", O_RDWR ) ) >= 0 ) {
int vol = muted ? 0 : percent;
// set both channels to same volume
vol |= vol << 8;
- ioctl( fd, MIXER_WRITE( SOUND_MIXER_PCM ), &vol );
+ ioctl( fd, MIXER_WRITE( SOUND_MIXER_VOLUME ), &vol );
::close( fd );
}
#endif
}
break;
}
}
static void setMic( int t = 0, int percent = -1 )
{
switch ( t ) {
case 0: {
Config cfg( "qpe" );
cfg.setGroup( "Volume" );
if ( percent < 0 )
percent = cfg.readNumEntry( "Mic", 50 );
#ifndef QT_NO_SOUND
int fd = 0;
int mic = micMuted ? 0 : percent;
if ( ( fd = open( "/dev/mixer", O_RDWR ) ) >= 0 ) {
ioctl( fd, MIXER_WRITE( SOUND_MIXER_MIC ), &mic );
::close( fd );
}