author | zecke <zecke> | 2004-03-06 12:47:33 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-06 12:47:33 (UTC) |
commit | e605df00284707a6dc4dd2ba51962531d43a5bea (patch) (unidiff) | |
tree | e18e8234e406ccf528672cad35a8fa349cabbf97 | |
parent | a66fd5afde517e9a61e74fc17df617297f134c96 (diff) | |
download | opie-e605df00284707a6dc4dd2ba51962531d43a5bea.zip opie-e605df00284707a6dc4dd2ba51962531d43a5bea.tar.gz opie-e605df00284707a6dc4dd2ba51962531d43a5bea.tar.bz2 |
-ioctl( fd, MIXER_WRITE( 0 ), &vol );
+ioctl( fd, MIXER_WRITE( SOUND_MIXER_PCM ), &vol );
don't hardcode the mixer
-rw-r--r-- | library/qpeapplication.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index c339a78..5d05ed5 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -328,65 +328,65 @@ public: | |||
328 | } | 328 | } |
329 | private: | 329 | private: |
330 | mutable QImageDrag *resImage; | 330 | mutable QImageDrag *resImage; |
331 | }; | 331 | }; |
332 | 332 | ||
333 | static int& hack(int& i) | 333 | static int& hack(int& i) |
334 | { | 334 | { |
335 | #if QT_VERSION <= 230 && defined(QT_NO_CODECS) | 335 | #if QT_VERSION <= 230 && defined(QT_NO_CODECS) |
336 | // These should be created, but aren't in Qt 2.3.0 | 336 | // These should be created, but aren't in Qt 2.3.0 |
337 | (void)new QUtf8Codec; | 337 | (void)new QUtf8Codec; |
338 | (void)new QUtf16Codec; | 338 | (void)new QUtf16Codec; |
339 | #endif | 339 | #endif |
340 | return i; | 340 | return i; |
341 | } | 341 | } |
342 | 342 | ||
343 | static int muted = 0; | 343 | static int muted = 0; |
344 | static int micMuted = 0; | 344 | static int micMuted = 0; |
345 | 345 | ||
346 | static void setVolume( int t = 0, int percent = -1 ) | 346 | static void setVolume( int t = 0, int percent = -1 ) |
347 | { | 347 | { |
348 | switch ( t ) { | 348 | switch ( t ) { |
349 | case 0: { | 349 | case 0: { |
350 | Config cfg( "qpe" ); | 350 | Config cfg( "qpe" ); |
351 | cfg.setGroup( "Volume" ); | 351 | cfg.setGroup( "Volume" ); |
352 | if ( percent < 0 ) | 352 | if ( percent < 0 ) |
353 | percent = cfg.readNumEntry( "VolumePercent", 50 ); | 353 | percent = cfg.readNumEntry( "VolumePercent", 50 ); |
354 | #ifndef QT_NO_SOUND | 354 | #ifndef QT_NO_SOUND |
355 | int fd = 0; | 355 | int fd = 0; |
356 | if ( ( fd = open( "/dev/mixer", O_RDWR ) ) >= 0 ) { | 356 | if ( ( fd = open( "/dev/mixer", O_RDWR ) ) >= 0 ) { |
357 | int vol = muted ? 0 : percent; | 357 | int vol = muted ? 0 : percent; |
358 | // set both channels to same volume | 358 | // set both channels to same volume |
359 | vol |= vol << 8; | 359 | vol |= vol << 8; |
360 | ioctl( fd, MIXER_WRITE( 0 ), &vol ); | 360 | ioctl( fd, MIXER_WRITE( SOUND_MIXER_PCM ), &vol ); |
361 | ::close( fd ); | 361 | ::close( fd ); |
362 | } | 362 | } |
363 | #endif | 363 | #endif |
364 | } | 364 | } |
365 | break; | 365 | break; |
366 | } | 366 | } |
367 | } | 367 | } |
368 | 368 | ||
369 | static void setMic( int t = 0, int percent = -1 ) | 369 | static void setMic( int t = 0, int percent = -1 ) |
370 | { | 370 | { |
371 | switch ( t ) { | 371 | switch ( t ) { |
372 | case 0: { | 372 | case 0: { |
373 | Config cfg( "qpe" ); | 373 | Config cfg( "qpe" ); |
374 | cfg.setGroup( "Volume" ); | 374 | cfg.setGroup( "Volume" ); |
375 | if ( percent < 0 ) | 375 | if ( percent < 0 ) |
376 | percent = cfg.readNumEntry( "Mic", 50 ); | 376 | percent = cfg.readNumEntry( "Mic", 50 ); |
377 | 377 | ||
378 | #ifndef QT_NO_SOUND | 378 | #ifndef QT_NO_SOUND |
379 | int fd = 0; | 379 | int fd = 0; |
380 | int mic = micMuted ? 0 : percent; | 380 | int mic = micMuted ? 0 : percent; |
381 | if ( ( fd = open( "/dev/mixer", O_RDWR ) ) >= 0 ) { | 381 | if ( ( fd = open( "/dev/mixer", O_RDWR ) ) >= 0 ) { |
382 | ioctl( fd, MIXER_WRITE( SOUND_MIXER_MIC ), &mic ); | 382 | ioctl( fd, MIXER_WRITE( SOUND_MIXER_MIC ), &mic ); |
383 | ::close( fd ); | 383 | ::close( fd ); |
384 | } | 384 | } |
385 | #endif | 385 | #endif |
386 | } | 386 | } |
387 | break; | 387 | break; |
388 | } | 388 | } |
389 | } | 389 | } |
390 | 390 | ||
391 | 391 | ||
392 | static void setBass( int t = 0, int percent = -1 ) | 392 | static void setBass( int t = 0, int percent = -1 ) |