summaryrefslogtreecommitdiff
path: root/noncore/multimedia/opierec/qtrec.cpp
Side-by-side diff
Diffstat (limited to 'noncore/multimedia/opierec/qtrec.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opierec/qtrec.cpp35
1 files changed, 11 insertions, 24 deletions
diff --git a/noncore/multimedia/opierec/qtrec.cpp b/noncore/multimedia/opierec/qtrec.cpp
index 9b761aa..9d3d5cf 100644
--- a/noncore/multimedia/opierec/qtrec.cpp
+++ b/noncore/multimedia/opierec/qtrec.cpp
@@ -721,6 +721,11 @@ void QtRec::initConnections() {
connect(toEndButton,SIGNAL(pressed()),this,SLOT(FastforwardPressed()));
connect(toEndButton,SIGNAL(released()),this,SLOT(FastforwardReleased()));
+
connect(deleteSoundButton,SIGNAL(released()),this,SLOT(deleteSound()));
+
connect(Stop_PushButton,SIGNAL(released()),this,SLOT(doPlayBtn()));
+// connect(Stop_PushButton,SIGNAL(released()),this,SLOT(doPlayBtn()));
+
+// connect(Rec_PushButton,SIGNAL(released()),this,SIGNAL(startRecording()));
connect(Rec_PushButton,SIGNAL(released()),this,SLOT(newSound()));
@@ -812,8 +817,11 @@ void QtRec::stop() {
setRecordButton(false);
- if( !recording)
+ if( !recording) {
+ emit stopPlaying();
endPlaying();
- else
+ } else {
+ emit stopRecording();
endRecording();
+ }
timeSlider->setValue(0);
}
@@ -865,13 +873,5 @@ bool QtRec::rec() { //record
Config cfg("OpieRec");
cfg.setGroup("Settings");
-// odebug << "<<<<<<<Device bits " << soundDevice->getDeviceBits()
-// << ", device rate " << soundDevice->getDeviceRate()
-// << ", device channels " << soundDevice->getDeviceChannels() << oendl;
-
- //filePara.sampleRate = cfg.readNumEntry("samplerate", 22050);
-// odebug << "sample rate is " << filePara.sampleRate << "" << oendl;
filePara.SecondsToRecord = getCurrentSizeLimit();
-
-// odebug << "size limit " << filePara.SecondsToRecord << " sec" << oendl;
int diskSize = checkDiskSpace( (const QString &) wavFile->trackName());
@@ -1049,6 +1049,5 @@ bool QtRec::setupAudio( bool b) {
recording = true;
}
-
- // if(soundDevice) delete soundDevice;
+
owarn << "<<<<<<<<<<<<<<<<<<<open dsp " << filePara.sampleRate << " " << filePara.channels << " " << sampleformat << "" << oendl;
// owarn << "change waveform settings" << oendl;
@@ -1090,6 +1089,4 @@ bool QtRec::setupAudio( bool b) {
bool QtRec::setUpFile() { //setup file for recording
-// odebug << "Setting up wavfile" << oendl;
-// if(wavFile) delete wavFile;
wavFile = new WavFile( this, (const QString &)"",
true,
@@ -1103,5 +1100,4 @@ bool QtRec::setUpFile() { //setup file for recording
return false;
} else {
-// filePara.channels=1;
}
return true;
@@ -1226,11 +1222,4 @@ void QtRec::deleteSound() {
if( ListView1->currentItem() == NULL)
return;
-// #ifndef DEV_VERSION
-// switch ( QMessageBox::warning(this,tr("Delete"),
-// tr("Do you really want to <font size=+2><B>DELETE</B></font>\nthe selected file?"),
-// tr("Yes"),tr("No"),0,1,1) ) {
-// case 0:
-// #endif
- // {
QString file = ListView1->currentItem()->text(0);
QString fileName;
@@ -1402,7 +1391,5 @@ void QtRec::endRecording() {
if( wavFile->track.isOpen()) {
wavFile->adjustHeaders( filePara.fd, filePara.numberSamples);
- // soundDevice->sd=-1;
filePara.numberSamples = 0;
- // filePara.sd=-1;
wavFile->closeFile();
filePara.fd=0;