summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opierec/qtrec.cpp200
-rw-r--r--noncore/multimedia/opierec/qtrec.h2
2 files changed, 58 insertions, 144 deletions
diff --git a/noncore/multimedia/opierec/qtrec.cpp b/noncore/multimedia/opierec/qtrec.cpp
index 147f63d..2bf795f 100644
--- a/noncore/multimedia/opierec/qtrec.cpp
+++ b/noncore/multimedia/opierec/qtrec.cpp
@@ -108,9 +108,4 @@ void quickRec() {
//void QtRec::quickRec() {
- qDebug("%d",
- filePara.numberSamples/filePara.sampleRate * filePara.channels);
- qDebug("samples %d, rate %d, channels %d",
- filePara.numberSamples, filePara.sampleRate, filePara.channels);
-
int total = 0; // Total number of bytes read in so far.
int bytesWritten, number;
@@ -128,16 +123,10 @@ void quickRec() {
recording = true;
//rate=filePara.sampleRate;
- int bits = filePara.resolution;
- qDebug("bits %d", bits);
-// if( filePara.format==WAVE_FORMAT_DVI_ADPCM)
-// else
+ // int bits = filePara.resolution;
audio_buf_info inInfo;
ioctl( filePara.fd, SNDCTL_DSP_GETISPACE, &inInfo);
- qDebug("ispace is frags %d, total %d", inInfo.fragments, inInfo.fragstotal);
+ // qDebug("ispace is frags %d, total %d", inInfo.fragments, inInfo.fragstotal);
if( filePara.resolution == 16 ) { //AFMT_S16_LE)
- qDebug("AFMT_S16_LE size %d", filePara.SecondsToRecord);
- qDebug("samples to record %d", filePara.samplesToRecord);
- qDebug("%d", filePara.sd);
level=7;
threshold=0;
@@ -146,6 +135,5 @@ void quickRec() {
if( filePara.format==WAVE_FORMAT_DVI_ADPCM) {
- qDebug("start recording WAVE_FORMAT_DVI_ADPCM");
- // <<<<<<<<<<<<<<<<<<<<<<<<<<< WAVE_FORMAT_DVI_ADPCM >>>>>>>>>>>>>>>>>>>>>>
+ // qDebug("start recording WAVE_FORMAT_DVI_ADPCM");
char abuf[BUFSIZE/2];
short sbuf[BUFSIZE];
@@ -157,19 +145,14 @@ void quickRec() {
for(;;) {
if (stopped) {
- qDebug("quickRec:: stopped");
break; // stop if playing was set to false
-// return;
}
number=::read( filePara.sd, sbuf, BUFSIZE);
-
if(number <= 0) {
perror("recording error ");
- qDebug( "%s %d", filePara.fileName, number);
+ // qDebug( "%s %d", filePara.fileName, number);
// errorStop();
recording=stopped=false;
-// QMessageBox::message("Note",
-// "Error recording to file\n%s",
-// filePara.fileName);
+// QMessageBox::message("Note", "Error recording to file\n%s",filePara.fileName);
return;
}
@@ -177,7 +160,5 @@ void quickRec() {
// adpcm_coder( sbuf2, abuf, number/2, &encoder_state);
adpcm_coder( sbuf, abuf, number/2, &encoder_state);
-
bytesWritten = ::write( filePara.fd , abuf, number/4);
-
long peak;
for (int i = 0; i < number; i++)
@@ -187,6 +168,4 @@ void quickRec() {
fflush(stdout);
}
-
-
//------------->>>> out to file
// if(filePara.channels==1)
@@ -201,15 +180,5 @@ void quickRec() {
filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate * (float)2;
-
-// printf("Writing number %d, bytes %d,total %d, sample rate %d, secs %.2f \n",
-// number,
-// bytesWritten ,
-// total,
-// filePara.sampleRate,
-// filePara.numberOfRecordedSeconds);
-// fflush(stdout);
ioctl( filePara.sd, SNDCTL_DSP_GETIPTR, &info);
-// qDebug("%d, %d", info.bytes, (info.bytes / filePara.sampleRate) / 2);
-
timeString.sprintf("%.2f", filePara.numberOfRecordedSeconds);
timeLabel->setText( timeString + " seconds");
@@ -220,6 +189,5 @@ void quickRec() {
}
} else {
- // <<<<<<<<<<<<<<<<<<<<<<<<<<< WAVE_FORMAT_PCM >>>>>>>>>>>>>>>>>>>>>>
- qDebug("start recording WAVE_FORMAT_PCM");
+ // qDebug("start recording WAVE_FORMAT_PCM");
short inbuffer[BUFSIZE], outbuffer[BUFSIZE];
memset( inbuffer,0,BUFSIZE);
@@ -227,21 +195,15 @@ void quickRec() {
for(;;) {
if (stopped) {
- qDebug("quickRec:: stopped");
break; // stop if playing was set to false
- return;
}
number=::read( filePara.sd, inbuffer, BUFSIZE);
-
if(number <= 0) {
perror("recording error ");
- qDebug( filePara.fileName);
recording=stopped=false;
// errorStop();
-// QMessageBox::message("Note","error recording to file\n%s",filePara.fileName);
return;// false;
}
/* for (int i=0;i< number;i++) { //2*i is left channel
-
outbuffer[i]=inbuffer[i]>>1; // no clippy, please
}*/
@@ -265,6 +227,4 @@ outbuffer[i]=inbuffer[i]>>1; // no clippy, please
fflush(stdout);
}
-
-
filePara.numberSamples = total;
if(filePara.SecondsToRecord !=0)
@@ -277,8 +237,6 @@ outbuffer[i]=inbuffer[i]>>1; // no clippy, please
filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate / (float)2;
-
timeString.sprintf("%.2f", filePara.numberOfRecordedSeconds);
timeLabel->setText( timeString + " seconds");
-
qApp->processEvents();
if( total >= filePara.samplesToRecord)
@@ -294,5 +252,5 @@ outbuffer[i]=inbuffer[i]>>1; // no clippy, please
for(;;) {
if (stopped) {
- qDebug("quickRec:: stopped");
+ // qDebug("quickRec:: stopped");
break; // stop if playing was set to false
}
@@ -349,9 +307,5 @@ void playIt() {
}
-
-
-/////////////////<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>
/////////////////<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>
-
QtRec::QtRec( QWidget* parent, const char* name, WFlags fl )
: QWidget( parent, name, fl ) {
@@ -360,6 +314,4 @@ QtRec::QtRec( QWidget* parent, const char* name, WFlags fl )
// QPEApplication::grabKeyboard();
-// signal(SIGPIPE, SIG_IGN);
-
if ( !name )
setName( "OpieRec" );
@@ -412,5 +364,4 @@ void QtRec::cleanUp() {
if(wavFile) delete wavFile;
// if(soundDevice) delete soundDevice;
-
// QPEApplication::grabKeyboard();
// QPEApplication::ungrabKeyboard();
@@ -755,7 +706,8 @@ void QtRec::initIconView() {
QString fileS, mediaLocation, fileDate, filePath;
-// temp.sprintf("%d",i);
+ temp.sprintf("%d",i);
temp=cfg.readEntry(temp,""); //reads currentFile
filePath = cfg.readEntry(temp,""); //currentFileName
+ // qDebug(filePath);
QFileInfo info(filePath);
@@ -860,5 +812,5 @@ void QtRec::initConfig() {
void QtRec::stop() {
- qDebug("<<<<<<<<<stop()");
+ // qDebug("<<<<<<<<<stop()");
setRecordButton(false);
monitoring=false;
@@ -888,5 +840,4 @@ void QtRec::doPlayBtn() {
void QtRec::start() { //play
if(stopped) {
- qDebug("start::");
QPixmap image3( ( const char** ) image3_data );
Stop_PushButton->setPixmap( image3 );
@@ -903,11 +854,8 @@ void QtRec::start() { //play
bool QtRec::rec() { //record
- qDebug("rec()");
if(!stopped) {
- qDebug("rec:: !stopped");
monitoring=true;
return false;
} else {
- qDebug("go ahead and record");
secCount=1;
playLabel2->setText(tr("Stop"));
@@ -918,18 +866,11 @@ bool QtRec::rec() { //record
if( setupAudio( true))
if(setUpFile()) {
- qDebug("Ok to start recording");
int fileSize=0;
Config cfg("OpieRec");
cfg.setGroup("Settings");
- qDebug( "<<<<<<<Device bits %d, device rate %d, device channels %d",
- soundDevice->getDeviceBits(),
- soundDevice->getDeviceRate(),
- soundDevice->getDeviceChannels());
-
//filePara.sampleRate = cfg.readNumEntry("samplerate", 22050);
- qDebug("sample rate is %d", filePara.sampleRate);
+ // qDebug("sample rate is %d", filePara.sampleRate);
filePara.SecondsToRecord = getCurrentSizeLimit();
- qDebug("size limit %d sec", filePara.SecondsToRecord);
int diskSize = checkDiskSpace( (const QString &) wavFile->trackName());
@@ -937,9 +878,7 @@ bool QtRec::rec() { //record
fileSize = diskSize;
} else if( filePara.format==WAVE_FORMAT_PCM) {
- qDebug("WAVE_FORMAT_PCM");
fileSize = (filePara.SecondsToRecord ) * filePara.channels
* filePara.sampleRate *(filePara.resolution/8)+1000;
} else {
- qDebug("WAVE_FORMAT_DVI_ADPCM");
fileSize = ((filePara.SecondsToRecord) * filePara.channels
* filePara.sampleRate *(filePara.resolution/8) )/4+250;
@@ -947,14 +886,8 @@ bool QtRec::rec() { //record
filePara.samplesToRecord = fileSize;
- qDebug("filesize should be %d, bits %d, rate %d",
- filePara.samplesToRecord, filePara.resolution, filePara.sampleRate);
if(paused) {
paused = false;
}
- // else {
- qDebug("Setting timeslider %d", filePara.samplesToRecord);
- // if(fileSize != 0)
timeSlider->setRange(0, filePara.samplesToRecord);
- // }
if( diskSize < fileSize/1024) {
@@ -972,9 +905,7 @@ bool QtRec::rec() { //record
#endif
filePara.fileName=currentFile.latin1();
- qDebug("Start recording thread");
pthread_t thread1;
pthread_create( &thread1, NULL, (void * (*)(void *))quickRec, NULL/* &*/);
-// quickRec();
toBeginningButton->setEnabled(false);
toEndButton->setEnabled(false);
@@ -1011,6 +942,6 @@ void QtRec::thisTab(QWidget* widg) {
int index=TabWidget->currentPageIndex();
- if(index==0) { //file page
- }
+// if(index==0) { //file page
+// }
if(index ==1) { //control page
@@ -1020,6 +951,6 @@ void QtRec::thisTab(QWidget* widg) {
}
- if(index==2) { //help page
- }
+// if(index==2) { //help page
+// }
qApp->processEvents();
update();
@@ -1029,5 +960,4 @@ void QtRec::thisTab(QWidget* widg) {
void QtRec::getOutVol( ) {
filePara.outVol = soundDevice->getOutVolume();
- qDebug("out vol %d", filePara.outVol);
OutputSlider->setValue( -filePara.outVol);
}
@@ -1035,5 +965,4 @@ void QtRec::getOutVol( ) {
void QtRec::getInVol() {
filePara.inVol = soundDevice->getInVolume();
- qDebug("in vol %d", filePara.inVol);
InputSlider->setValue( -filePara.inVol);
}
@@ -1056,5 +985,4 @@ bool QtRec::setupAudio( bool b) {
if( !b){ // we want to play
- qDebug("setting up DSP for playing");
if( filePara.resolution == 16 || compressionCheckBox->isChecked() ) {
sampleformat = AFMT_S16_LE;
@@ -1070,5 +998,4 @@ bool QtRec::setupAudio( bool b) {
mixerString = DSPSTRMIXEROUT;
} else { // we want to record
- qDebug("setting up DSP for recording");
if( !bitRateComboBox->isEnabled() || bitRateComboBox->currentText() == "16")
@@ -1079,15 +1006,11 @@ bool QtRec::setupAudio( bool b) {
if( !compressionCheckBox->isChecked()) {
filePara.format=WAVE_FORMAT_PCM;
- qDebug("WAVE_FORMAT_PCM");
} else {
filePara.format=WAVE_FORMAT_DVI_ADPCM;
sampleformat=AFMT_S16_LE;
- qDebug("WAVE_FORMAT_DVI_ADPCM");
}
stereo = filePara.channels = 1;
-// filePara.sampleRate = sampleRateComboBox->currentText().toInt( &ok,10);//44100;
flags= O_RDWR;
-// flags= O_RDONLY;
dspString = DSPSTRIN;
mixerString = DSPSTRMIXEROUT;
@@ -1095,12 +1018,8 @@ bool QtRec::setupAudio( bool b) {
// if(soundDevice) delete soundDevice;
- qDebug("<<<<<<<<<<<<<<<<<<<open dsp %d %d %d", filePara.sampleRate, filePara.channels, sampleformat);
soundDevice = new Device( this, dspString, mixerString, b);
// soundDevice->openDsp();
soundDevice->reset();
- qDebug("device has been made %d", soundDevice->sd);
-
- ////////////////// <<<<<<<<<<<<>>>>>>>>>>>>
soundDevice->setDeviceFormat( sampleformat);
soundDevice->setDeviceChannels( filePara.channels);
@@ -1112,13 +1031,12 @@ bool QtRec::setupAudio( bool b) {
soundDevice->getDeviceFragSize();
#endif
- /////////////////
+
filePara.sd = soundDevice->sd;
if ( filePara.sd == -1) {
-
monitoring=false;
stopped=true;
update();
- setCaption( tr( "OpieRecord " ) + QString::number(VERSION) );
+ setCaption( tr( "OpieRecord " ) /*+ QString::number(VERSION)*/ );
stopped=true;
return false;
@@ -1132,5 +1050,5 @@ bool QtRec::setupAudio( bool b) {
bool QtRec::setUpFile() { //setup file for recording
- qDebug("Setting up wavfile");
+ // qDebug("Setting up wavfile");
// if(wavFile) delete wavFile;
wavFile = new WavFile( this, (const QString &)"",
@@ -1161,5 +1079,5 @@ bool QtRec::doPlay() {
// int number=0;
if( !paused) {
- qDebug("new");
+ // qDebug("new");
total=0;
bytesWritten=0;
@@ -1174,14 +1092,13 @@ bool QtRec::doPlay() {
QString num;
// block=BUFSIZE;
- qDebug("Play number of samples %d", filePara.numberSamples);
timeSlider->setRange(0, filePara.numberSamples);
timeString.sprintf("%.2f", filePara.numberOfRecordedSeconds);
timeLabel->setText( timeString+ tr(" seconds"));
- if( filePara.format==WAVE_FORMAT_DVI_ADPCM) {
- qDebug("WAVE_FORMAT_DVI_ADPCM");
- } else {
- qDebug("WAVE_FORMAT_PCM");
- }
+// if( filePara.format==WAVE_FORMAT_DVI_ADPCM) {
+// // qDebug("WAVE_FORMAT_DVI_ADPCM");
+// } else {
+// // qDebug("WAVE_FORMAT_PCM");
+// }
QString msg;
msg.sprintf("%d, %d, %d", filePara.sampleRate, filePara.channels, filePara.resolution);
@@ -1190,5 +1107,5 @@ bool QtRec::doPlay() {
#endif
if( filePara.resolution == 16 ) { //AFMT_S16_LE) {
- qDebug("16 bit");
+ // qDebug("16 bit");
startTimer(1000);
@@ -1278,5 +1195,5 @@ bool QtRec::doPlay() {
} //end loop
} else { /////////////////////////////// format = AFMT_U8;
- unsigned char unsigned_inbuffer[BUFSIZE], unsigned_outbuffer[BUFSIZE];
+ unsigned char unsigned_inbuffer[BUFSIZE];//, unsigned_outbuffer[BUFSIZE];
memset( unsigned_inbuffer,0,BUFSIZE);
for(;;) { // main loop
@@ -1344,5 +1261,5 @@ void QtRec::changesamplerateCombo(int i) {
// soundDevice=0;
// delete soundDevice;
- qDebug("Change sample rate %d", rate);
+ // qDebug("Change sample rate %d", rate);
cfg.write();
@@ -1365,5 +1282,5 @@ void QtRec::changeDirCombo(int index) {
recDir = path;
cfg.writeEntry("directory", recDir);
- qDebug("new rec dir "+recDir);
+ // qDebug("new rec dir "+recDir);
}
}
@@ -1380,8 +1297,8 @@ void QtRec::changeSizeLimitCombo(int) {
void QtRec::newSound() {
- qDebug("<<<<<<<<<new sound");
+ // qDebug("<<<<<<<<<new sound");
if( !rec()) {
- qDebug("rec() failed");
+ // qDebug("rec() failed");
endRecording();
deleteSound();
@@ -1449,5 +1366,5 @@ void QtRec::deleteSound() {
};
#endif
- setCaption( tr( "OpieRecord " ) + QString::number(VERSION) );
+ setCaption( tr( "OpieRecord " ) /*+ QString::number(VERSION)*/ );
}
@@ -1514,5 +1431,5 @@ void QtRec::keyPressEvent( QKeyEvent *e) {
break;
case Key_Left: {
- qDebug("rewinding");
+ // qDebug("rewinding");
if( !e->isAutoRepeat())
rewindPressed();
@@ -1568,5 +1485,5 @@ void QtRec::keyReleaseEvent( QKeyEvent *e) {
case Key_Up:
// stop();
- qDebug("Up");
+ // qDebug("Up");
break;
case Key_Down:
@@ -1576,9 +1493,9 @@ void QtRec::keyReleaseEvent( QKeyEvent *e) {
break;
case Key_Left:
- qDebug("Left");
+ // qDebug("Left");
rewindReleased();
break;
case Key_Right:
- qDebug("Right");
+ // qDebug("Right");
FastforwardReleased();
break;
@@ -1587,5 +1504,5 @@ void QtRec::keyReleaseEvent( QKeyEvent *e) {
void QtRec::endRecording() {
- qDebug("endRecording");
+ // qDebug("endRecording");
setRecordButton(false);
timeSlider->setValue(0);
@@ -1618,9 +1535,9 @@ void QtRec::endRecording() {
QString cmd;
cmd.sprintf("mv "+ wavFile->trackName() + " " + wavFile->currentFileName);
- qDebug("moving tmp file to "+currentFileName);
+ // qDebug("moving tmp file to "+currentFileName);
system(cmd.latin1());
}
- qDebug("Just moved "+wavFile->currentFileName);
+ // qDebug("Just moved "+wavFile->currentFileName);
Config cfg("OpieRec");
cfg.setGroup("Sounds");
@@ -1638,8 +1555,8 @@ void QtRec::endRecording() {
time.sprintf("%.2f", filePara.numberOfRecordedSeconds);
cfg.writeEntry( wavFile->currentFileName, time );
- qDebug("writing config numberOfRecordedSeconds "+time);
+ // qDebug("writing config numberOfRecordedSeconds "+time);
cfg.write();
- qDebug("finished recording");
+ // qDebug("finished recording");
timeLabel->setText("");
}
@@ -1653,5 +1570,5 @@ void QtRec::endRecording() {
void QtRec::endPlaying() {
- qDebug("end playing");
+ // qDebug("end playing");
setRecordButton(false);
@@ -1665,5 +1582,5 @@ void QtRec::endPlaying() {
soundDevice->sd=-1;
// if(soundDevice) delete soundDevice;
- qDebug("file and sound device closed");
+ // qDebug("file and sound device closed");
stopped=true;
recording=false;
@@ -1678,5 +1595,5 @@ void QtRec::endPlaying() {
// if(wavFile) delete wavFile; //this crashes
- qDebug("track closed");
+ // qDebug("track closed");
timeSlider->setValue(0);
@@ -1700,5 +1617,5 @@ bool QtRec::openPlayFile() {
if( cfg.readEntry( QString::number(i),"").find( currentFile,0,true) != -1) {
currentFileName=cfg.readEntry( currentFile, "" );
- qDebug("opening for play: "+currentFileName);
+ // qDebug("opening for play: "+currentFileName);
}
}
@@ -1711,5 +1628,5 @@ bool QtRec::openPlayFile() {
QString errorMsg=(QString)strerror(errno);
monitoring=false;
- setCaption( tr( "OpieRecord " ) + QString::number(VERSION) );
+ setCaption( tr( "OpieRecord " )/* + QString::number(VERSION)*/ );
QMessageBox::message(tr("Note"),tr("Could not open audio file.\n")
+errorMsg+"\n"+currentFile);
@@ -1822,6 +1739,6 @@ void QtRec::doRename() {
void QtRec::okRename() {
- qDebug("okRename");
- qDebug(renameBox->text());
+ // qDebug("okRename");
+ // qDebug(renameBox->text());
QString filename = renameBox->text();
cancelRename();
@@ -1835,5 +1752,5 @@ void QtRec::okRename() {
QString file = ListView1->currentItem()->text(0);
- qDebug("filename is " + filename);
+ // qDebug("filename is " + filename);
int nFiles = cfg.readNumEntry("NumberofFiles",0);
@@ -1859,5 +1776,5 @@ void QtRec::okRename() {
void QtRec::cancelRename() {
- qDebug("cancel rename");
+ // qDebug("cancel rename");
bool resetFocus = ListView1->viewport()->focusProxy() == renameBox;
delete renameBox;
@@ -1895,5 +1812,5 @@ int QtRec::getCurrentSizeLimit() {
void QtRec::timerBreak() {
- qDebug("timer break");
+ // qDebug("timer break");
stop();
}
@@ -1962,6 +1879,6 @@ long QtRec::checkDiskSpace(const QString &path) {
// char f_fpack[6]; /* Pack name */
-void QtRec::receive( const QCString &msg, const QByteArray & ) {
- qDebug("Voicerecord received message "+msg);
+void QtRec::receive( const QCString &/* msg*/, const QByteArray & ) {
+ // qDebug("Voicerecord received message "+msg);
}
@@ -2228,17 +2145,14 @@ long findPeak(long input ) {
// halfLife = time in seconds for output to decay to half value after an impulse
- static float output = 0.0;
- int halfLife = .25;
+ float output = 0.0;
+ float halfLife = .25;
float vsf = .0025;
float scalar = pow( 0.5, 1.0/(halfLife * filePara.sampleRate ));
if( input < 0.0 )
input = -input; // Absolute value.
- if ( input >= output )
- {
+ if ( input >= output) {
// When we hit a peak, ride the peak to the top.
output = input;
- }
- else
- {
+ } else {
// Exponential decay of output when signal is low.
output = output * scalar;
@@ -2251,4 +2165,4 @@ long findPeak(long input ) {
}
- return output;
+ return (long)output;
}
diff --git a/noncore/multimedia/opierec/qtrec.h b/noncore/multimedia/opierec/qtrec.h
index bcf5504..7965c74 100644
--- a/noncore/multimedia/opierec/qtrec.h
+++ b/noncore/multimedia/opierec/qtrec.h
@@ -5,5 +5,5 @@ copyright 2002 by L.J. Potter ljp@llornkcor.com
#ifndef QTREC_H
#define QTREC_H
-#define VERSION 20021202
+#define VERSION 1.0
#include <qpe/ir.h>