summaryrefslogtreecommitdiff
path: root/noncore
Side-by-side diff
Diffstat (limited to 'noncore') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sound/soundsettings.cpp17
-rw-r--r--noncore/settings/sound/soundsettings.h1
-rw-r--r--noncore/settings/sound/soundsettingsbase.cpp8
-rw-r--r--noncore/settings/sound/soundsettingsbase.h2
4 files changed, 24 insertions, 4 deletions
diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp
index 09d2e92..4bc86fa 100644
--- a/noncore/settings/sound/soundsettings.cpp
+++ b/noncore/settings/sound/soundsettings.cpp
@@ -103,21 +103,29 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl )
sixteenBitCheckBox->setChecked(cfg.readNumEntry("SixteenBit", 1));
cfg.setGroup("Defaults");
keyComboBox->setCurrentItem(cfg.readNumEntry("toggleKey") );
updateStorageCombo();
+
+ Config vmCfg("Vmemo");
+ vmCfg.setGroup("Defaults");
+ adpcmCheckBox->setChecked( vmCfg.readBoolEntry("use_ADPCM", 0));
+
connect( LocationComboBox,SIGNAL(activated(const QString &)), this,
SLOT( setLocation(const QString &)));
connect( keyComboBox,SIGNAL(activated( int)), this,
SLOT( setKeyButton( int)));
connect( timeLimitComboBox,SIGNAL(activated( const QString &)), this,
SLOT( setSizeLimitButton(const QString &)));
connect( restartCheckBox,SIGNAL( toggled( bool)), this,
SLOT( restartOpie( bool)));
-// connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
+ connect( adpcmCheckBox,SIGNAL( toggled( bool)), this,
+ SLOT( slotAdpcm( bool)));
+
+ // connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
}
void SoundSettings::updateStorageCombo() {
Config config( "Vmemo" );
config.setGroup( "System" );
@@ -161,13 +169,12 @@ void SoundSettings::cleanUp() {
cfg.writeEntry("Alert",AlertCheckBox->isChecked());
cfg.setGroup("Record");
cfg.writeEntry("SampleRate",sampleRate->currentText());
cfg.writeEntry("Stereo",stereoCheckBox->isChecked());
cfg.writeEntry("SixteenBit",sixteenBitCheckBox->isChecked());
-
if(keyReset && noWarning) {
QCopEnvelope ("QPE/System", "restart()");
}
}
void SoundSettings::setKeyButton( int index) {
@@ -202,6 +209,12 @@ void SoundSettings::setSizeLimitButton(const QString &index) {
}
void SoundSettings::restartOpie(bool b) {
noWarning=b;
}
+void SoundSettings::slotAdpcm(bool b) {
+ Config vmCfg("Vmemo");
+ vmCfg.setGroup("Defaults");
+ vmCfg.writeEntry("use_ADPCM", b);
+ vmCfg.write();
+}
diff --git a/noncore/settings/sound/soundsettings.h b/noncore/settings/sound/soundsettings.h
index 0f3605e..71ce6f5 100644
--- a/noncore/settings/sound/soundsettings.h
+++ b/noncore/settings/sound/soundsettings.h
@@ -41,11 +41,12 @@ protected:
private slots:
void setKeyButton( int);
void setSizeLimitButton(const QString &);
void setLocation(const QString &);
void cleanUp();
void restartOpie(bool);
+ void slotAdpcm(bool);
};
#endif // SOUNDSETTINGS_H
diff --git a/noncore/settings/sound/soundsettingsbase.cpp b/noncore/settings/sound/soundsettingsbase.cpp
index af794ba..f283119 100644
--- a/noncore/settings/sound/soundsettingsbase.cpp
+++ b/noncore/settings/sound/soundsettingsbase.cpp
@@ -158,16 +158,20 @@ SoundSettingsBase::SoundSettingsBase( QWidget* parent, const char* name, bool m
restartCheckBox= new QCheckBox( this, "restartCheck" );
restartCheckBox->setText( tr( "Restart Opie if needed" ) );
SoundSettingsBaseLayout->addMultiCellWidget( restartCheckBox , 9, 9, 0, 0, 1);
-
+
+ adpcmCheckBox = new QCheckBox( this, "adpcmCheck" );
+ adpcmCheckBox->setText( tr( "Use ADPCM compression" ) );
+
+ SoundSettingsBaseLayout->addMultiCellWidget( adpcmCheckBox , 10, 10, 0, 0, 1);
QSpacerItem* spacer4 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding );
- SoundSettingsBaseLayout->addItem( spacer4, 9, 0 );
+ SoundSettingsBaseLayout->addItem( spacer4, 10, 0 );
}
/*
* Destroys the object and frees any allocated resources
*/
SoundSettingsBase::~SoundSettingsBase()
diff --git a/noncore/settings/sound/soundsettingsbase.h b/noncore/settings/sound/soundsettingsbase.h
index e6bc186..48c31e8 100644
--- a/noncore/settings/sound/soundsettingsbase.h
+++ b/noncore/settings/sound/soundsettingsbase.h
@@ -47,12 +47,14 @@ public:
QCheckBox* AlertCheckBox;
QLabel* TextLabel1;
QComboBox* LocationComboBox;
QComboBox* keyComboBox;
QComboBox* timeLimitComboBox;
QCheckBox *restartCheckBox;
+ QCheckBox *adpcmCheckBox;
+
bool keyReset;
protected:
QGridLayout* SoundSettingsBaseLayout;
protected slots:
};