Using the right mixer helps.. lets see if h5xxx breaks again

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
@@ -312,97 +312,97 @@ public:
 			do {
 				sl = abs_name.findRev( '/', sl - 1 );
 				QString name = sl >= 0 ? abs_name.mid( sl + 1 ) : abs_name;
 				int dot = name.findRev( '.' );
 				if ( dot >= 0 )
 					name = name.left( dot );
 				QImage img = Resource::loadImage( name );
 				if ( !img.isNull() ) {
                                     delete resImage;
                                     resImage = new QImageDrag( img );
                                     r = resImage;
                                 }
 			}
 			while ( !r && sl > 0 );
 		}
 		return r;
 	}
 private:
     mutable QImageDrag *resImage;
 };
 
 static int& hack(int& i)
 {
 #if QT_VERSION <= 230 && defined(QT_NO_CODECS)
     // 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 );
 				}
 #endif
 			}
 			break;
 	}
 }
 
 
 static void setBass( int t = 0, int percent = -1 )
 {
 	switch ( t ) {
 		case 0: {
 				Config cfg( "qpe" );
 				cfg.setGroup( "Volume" );
 				if ( percent < 0 )
 					percent = cfg.readNumEntry( "BassPercent", 50 );
 
 #ifndef QT_NO_SOUND
 				int fd = 0;
 				int bass = percent;
                                 if ( ( fd = open( "/dev/mixer", O_RDWR ) ) >= 0 ) {
 					ioctl( fd, MIXER_WRITE( SOUND_MIXER_BASS ), &bass );
 					::close( fd );
 				}
 #endif