summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/sound/soundsettings.cpp18
1 files changed, 17 insertions, 1 deletions
diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp
index f417b79..75a707b 100644
--- a/noncore/settings/sound/soundsettings.cpp
+++ b/noncore/settings/sound/soundsettings.cpp
@@ -22,24 +22,30 @@
22 22
23#include <qpe/qpeapplication.h> 23#include <qpe/qpeapplication.h>
24#include <qpe/config.h> 24#include <qpe/config.h>
25#include <qpe/qcopenvelope_qws.h> 25#include <qpe/qcopenvelope_qws.h>
26#include <qpe/storage.h> 26#include <qpe/storage.h>
27 27
28#include <qapplication.h> 28#include <qapplication.h>
29#include <qslider.h> 29#include <qslider.h>
30#include <qcheckbox.h> 30#include <qcheckbox.h>
31#include <qlineedit.h> 31#include <qlineedit.h>
32#include <qcombobox.h> 32#include <qcombobox.h>
33 33
34#include <sys/utsname.h>
35#include <sys/time.h>
36#include <sys/types.h>
37#include <unistd.h>
38#include <stdio.h>
39#include <sys/stat.h>
34 40
35SoundSettings::SoundSettings( QWidget* parent, const char* name, WFlags fl ) 41SoundSettings::SoundSettings( QWidget* parent, const char* name, WFlags fl )
36 : SoundSettingsBase( parent, name, TRUE, fl ) 42 : SoundSettingsBase( parent, name, TRUE, fl )
37{ 43{
38 keyReset=FALSE; 44 keyReset=FALSE;
39 45
40 Config config( "qpe"); 46 Config config( "qpe");
41 config.setGroup( "Volume" ); 47 config.setGroup( "Volume" );
42 volume->setValue(100-config.readNumEntry("VolumePercent")); 48 volume->setValue(100-config.readNumEntry("VolumePercent"));
43 mic->setValue(100-config.readNumEntry("Mic")); 49 mic->setValue(100-config.readNumEntry("Mic"));
44// touchsound->setChecked(config.readBoolEntry("TouchSound")); 50// touchsound->setChecked(config.readBoolEntry("TouchSound"));
45// keysound->setChecked(config.readBoolEntry("KeySound")); 51// keysound->setChecked(config.readBoolEntry("KeySound"));
@@ -51,25 +57,35 @@ SoundSettings::SoundSettings( QWidget* parent, const char* name, WFlags fl )
51 int rate=config.readNumEntry("SampleRate", 22050); 57 int rate=config.readNumEntry("SampleRate", 22050);
52 if(rate == 8000) 58 if(rate == 8000)
53 sampleRate->setCurrentItem(0); 59 sampleRate->setCurrentItem(0);
54 else if(rate == 11025) 60 else if(rate == 11025)
55 sampleRate->setCurrentItem(1); 61 sampleRate->setCurrentItem(1);
56 else if(rate == 22050) 62 else if(rate == 22050)
57 sampleRate->setCurrentItem(2); 63 sampleRate->setCurrentItem(2);
58 else if(rate == 33075) 64 else if(rate == 33075)
59 sampleRate->setCurrentItem(3); 65 sampleRate->setCurrentItem(3);
60 else if(rate==44100) 66 else if(rate==44100)
61 sampleRate->setCurrentItem(4); 67 sampleRate->setCurrentItem(4);
62 68
63 stereoCheckBox->setChecked(cfg.readNumEntry("Stereo", 0)); 69 stereoCheckBox->setChecked(cfg.readNumEntry("Stereo", 0)); //TODO hide if zaurus- mono only
70 struct utsname name; /* check for embedix kernel running on the zaurus*/
71 if (uname(&name) != -1) {
72 QString release=name.release;
73
74 if( release.find("embedix",0,TRUE) !=-1)
75 stereoCheckBox->hide();
76// else
77// stereoCheckBox->hide();
78
79
64 sixteenBitCheckBox->setChecked(cfg.readNumEntry("SixteenBit", 1)); 80 sixteenBitCheckBox->setChecked(cfg.readNumEntry("SixteenBit", 1));
65 81
66 cfg.setGroup("Defaults"); 82 cfg.setGroup("Defaults");
67 keyComboBox->setCurrentItem(cfg.readNumEntry("toggleKey") ); 83 keyComboBox->setCurrentItem(cfg.readNumEntry("toggleKey") );
68 84
69 updateStorageCombo(); 85 updateStorageCombo();
70 86
71 connect(volume, SIGNAL(valueChanged(int)), this, SLOT(setVolume(int))); 87 connect(volume, SIGNAL(valueChanged(int)), this, SLOT(setVolume(int)));
72 connect(mic, SIGNAL(valueChanged(int)), this, SLOT(setMic(int))); 88 connect(mic, SIGNAL(valueChanged(int)), this, SLOT(setMic(int)));
73 connect(qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) ); 89 connect(qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) );
74 connect(qApp, SIGNAL( micChanged(bool) ), this, SLOT ( micChanged(bool) ) ); 90 connect(qApp, SIGNAL( micChanged(bool) ), this, SLOT ( micChanged(bool) ) );
75 connect( LocationComboBox,SIGNAL(activated(const QString &)),this,SLOT( setLocation(const QString &))); 91 connect( LocationComboBox,SIGNAL(activated(const QString &)),this,SLOT( setLocation(const QString &)));