author | llornkcor <llornkcor> | 2002-03-19 00:58:28 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-03-19 00:58:28 (UTC) |
commit | d9bbf6f090bd5e35bf2ec7782cf77de049634149 (patch) (side-by-side diff) | |
tree | 9e3bd25584c24d1850d90fd474ebaf517e946d9a | |
parent | 7ac89ca47c72729aad8a5a91c8be6ce9c223ab9c (diff) | |
download | opie-d9bbf6f090bd5e35bf2ec7782cf77de049634149.zip opie-d9bbf6f090bd5e35bf2ec7782cf77de049634149.tar.gz opie-d9bbf6f090bd5e35bf2ec7782cf77de049634149.tar.bz2 |
added 3200 samplerate to combo
-rw-r--r-- | noncore/settings/sound/sound.pro | 2 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettings.cpp | 6 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettingsbase.ui | 6 |
3 files changed, 12 insertions, 2 deletions
diff --git a/noncore/settings/sound/sound.pro b/noncore/settings/sound/sound.pro index 8b33ff2..fa87b86 100644 --- a/noncore/settings/sound/sound.pro +++ b/noncore/settings/sound/sound.pro @@ -1,12 +1,12 @@ TEMPLATE = app CONFIG += qt warn_on release DESTDIR = ../../bin HEADERS = soundsettings.h SOURCES = soundsettings.cpp main.cpp INTERFACES = soundsettingsbase.ui INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe TARGET = sound -TRANSLATIONS = ../../i18n/pt_BR/sound.ts +TRANSLATIONS += ../../i18n/pt_BR/sound.ts diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp index 55f6c99..467f23e 100644 --- a/noncore/settings/sound/soundsettings.cpp +++ b/noncore/settings/sound/soundsettings.cpp @@ -15,91 +15,95 @@ ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #include "soundsettings.h" #include <qpe/config.h> #include <qpe/qcopenvelope_qws.h> #include <qapplication.h> #include <qslider.h> #include <qcheckbox.h> #include <qlineedit.h> #include <qcombobox.h> SoundSettings::SoundSettings( QWidget* parent, const char* name, WFlags fl ) : SoundSettingsBase( parent, name, TRUE, fl ) { Config config( "Sound" ); config.setGroup( "System" ); volume->setValue(100-config.readNumEntry("Volume")); mic->setValue(100-config.readNumEntry("Mic")); touchsound->setChecked(config.readBoolEntry("Touch")); keysound->setChecked(config.readBoolEntry("Key")); config.setGroup("Record"); int rate=config.readNumEntry("SampleRate", 11025); if(rate == 11025) sampleRate->setCurrentItem(0); else if(rate == 22050) sampleRate->setCurrentItem(1); + else if(rate == 32000) + sampleRate->setCurrentItem(2); else if(rate==44100) sampleRate->setCurrentItem(2); stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0)); sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 1)); connect(volume, SIGNAL(valueChanged(int)), this, SLOT(setVolume(int))); connect(mic, SIGNAL(valueChanged(int)), this, SLOT(setMic(int))); connect(qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) ); connect(qApp, SIGNAL( micChanged(bool) ), this, SLOT ( micChanged(bool) ) ); } void SoundSettings::reject() { Config config( "Sound" ); config.setGroup( "System" ); setVolume(100-config.readNumEntry("Volume")); setMic(100-config.readNumEntry("Mic")); config.setGroup("Record"); int rate=config.readNumEntry("SampleRate", 11025); if(rate == 11025) sampleRate->setCurrentItem(0); else if(rate == 22050) sampleRate->setCurrentItem(1); - else if(rate==44100) + else if(rate == 32000) sampleRate->setCurrentItem(2); + else if(rate==44100) + sampleRate->setCurrentItem(3); stereoCheckBox->setChecked(config.readNumEntry("Stereo", 0)); sixteenBitCheckBox->setChecked(config.readNumEntry("SixteenBit", 0)); QDialog::reject(); } void SoundSettings::accept() { Config config( "Sound" ); config.setGroup( "System" ); config.writeEntry("Volume",100-volume->value()); config.writeEntry("Mic",100-mic->value()); config.writeEntry("Touch",touchsound->isChecked()); config.writeEntry("Key",keysound->isChecked()); setVolume(volume->value()); setMic(mic->value()); config.setGroup("Record"); config.writeEntry("SampleRate",sampleRate->currentText()); config.writeEntry("Stereo",stereoCheckBox->isChecked()); config.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked()); QDialog::accept(); } void SoundSettings::setVolume(int v) { Config config( "Sound" ); config.setGroup( "System" ); config.writeEntry("Volume",100-v); #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) diff --git a/noncore/settings/sound/soundsettingsbase.ui b/noncore/settings/sound/soundsettingsbase.ui index 0351fd8..97bea2d 100644 --- a/noncore/settings/sound/soundsettingsbase.ui +++ b/noncore/settings/sound/soundsettingsbase.ui @@ -97,64 +97,70 @@ <property stdset="1"> <name>spacing</name> <number>6</number> </property> <widget> <class>QLabel</class> <property stdset="1"> <name>name</name> <cstring>sampleRateLabel</cstring> </property> <property stdset="1"> <name>text</name> <string>Sample Rate</string> </property> </widget> <widget> <class>QComboBox</class> <item> <property> <name>text</name> <string>11025</string> </property> </item> <item> <property> <name>text</name> <string>22050</string> </property> </item> <item> <property> <name>text</name> + <string>32000</string> + </property> + </item> + <item> + <property> + <name>text</name> <string>44100</string> </property> </item> <property stdset="1"> <name>name</name> <cstring>sampleRate</cstring> </property> </widget> <widget> <class>QCheckBox</class> <property stdset="1"> <name>name</name> <cstring>stereoCheckBox</cstring> </property> <property stdset="1"> <name>text</name> <string>Stereo</string> </property> </widget> <widget> <class>QCheckBox</class> <property stdset="1"> <name>name</name> <cstring>sixteenBitCheckBox</cstring> </property> <property stdset="1"> <name>text</name> <string>16 bit</string> </property> </widget> </vbox> </widget> |