summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore 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
@@ -104,17 +104,12 @@ int sd;
#endif
// threaded recording
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;
count_info info;
bytesWritten=0;
@@ -124,128 +119,95 @@ void quickRec() {
int threshold=0;
// if(limit != 0)
// t->start( ( limit +.3) , true);
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;
timeString.sprintf("%.2f", filePara.numberOfRecordedSeconds);
timeLabel->setText( timeString+ " seconds");
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];
short sbuf2[BUFSIZE];
memset( abuf,0,BUFSIZE/2);
memset( sbuf,0,BUFSIZE);
memset( sbuf2,0,BUFSIZE);
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;
}
//if(stereo == 2) {
// 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++)
{ //since Z is mono do normally
peak = findPeak((long)sbuf[i]);
printf("peak %ld\r",peak);
fflush(stdout);
}
-
-
//------------->>>> out to file
// if(filePara.channels==1)
// total += bytesWritten/2; //mono
// else
total += bytesWritten;
filePara.numberSamples = total;
// if( total >= filePara.samplesToRecord)
// timeSlider->setValue(0);
// else if( filePara.SecondsToRecord !=0)
timeSlider->setValue( total);
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");
qApp->processEvents();
if( total >= filePara.samplesToRecord)
break;
}
} 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);
memset( outbuffer,0,BUFSIZE);
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
}*/
bytesWritten = ::write( filePara.fd , inbuffer, number);
//------------->>>> out to file
if(bytesWritten < 0) {
// errorStop();
@@ -261,28 +223,24 @@ outbuffer[i]=inbuffer[i]>>1; // no clippy, please
for (int i = 0; i < number; i++)
{ //since Z is mono do normally
peak = findPeak((long)inbuffer[i]);
printf("peak %ld\r",peak);
fflush(stdout);
}
-
-
filePara.numberSamples = total;
if(filePara.SecondsToRecord !=0)
timeSlider->setValue( total);
// printf("Writing number %d, bytes %d,total %d\r",number, bytesWritten , total);
// fflush(stdout);
ioctl( filePara.sd, SNDCTL_DSP_GETIPTR, &info);
// qDebug("%d, %d", info.bytes, ( info.bytes / filePara.sampleRate) / 2);
filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate / (float)2;
-
timeString.sprintf("%.2f", filePara.numberOfRecordedSeconds);
timeLabel->setText( timeString + " seconds");
-
qApp->processEvents();
if( total >= filePara.samplesToRecord)
break;
}
} //end main loop
@@ -290,13 +248,13 @@ outbuffer[i]=inbuffer[i]>>1; // no clippy, please
unsigned char unsigned_inbuffer[BUFSIZE], unsigned_outbuffer[BUFSIZE];
memset( unsigned_inbuffer, 0, BUFSIZE);
memset( unsigned_outbuffer, 0, BUFSIZE);
for(;;) {
if (stopped) {
- qDebug("quickRec:: stopped");
+ // qDebug("quickRec:: stopped");
break; // stop if playing was set to false
}
number=::read( filePara.sd, unsigned_inbuffer, BUFSIZE);
//-------------<<<< in from device
// val = (data ^ 0x80) << 8;
@@ -345,25 +303,19 @@ outbuffer[i]=inbuffer[i]>>1; // no clippy, please
// threaded play
void playIt() {
}
-
-
/////////////////<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>
-/////////////////<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>
-
QtRec::QtRec( QWidget* parent, const char* name, WFlags fl )
: QWidget( parent, name, fl ) {
// QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << true; // mute device
// autoMute=TRUE;
// QPEApplication::grabKeyboard();
-// signal(SIGPIPE, SIG_IGN);
-
if ( !name )
setName( "OpieRec" );
init();
initConfig();
initConnections();
renameBox = 0;
@@ -408,13 +360,12 @@ void QtRec::cleanUp() {
if(autoMute)
doMute(false);
if(wavFile) delete wavFile;
// if(soundDevice) delete soundDevice;
-
// QPEApplication::grabKeyboard();
// QPEApplication::ungrabKeyboard();
}
void QtRec::init() {
@@ -751,15 +702,16 @@ void QtRec::initIconView() {
int nFiles = cfg.readNumEntry("NumberofFiles",0);
for(int i=1;i<= nFiles;i++) {
QListViewItem * item;
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);
fileDate = info.lastModified().toString();
fileS = cfg.readEntry( filePath, "0" );// file length in seconds
mediaLocation=getStorage( filePath);
@@ -856,13 +808,13 @@ void QtRec::initConfig() {
inMuteCheckBox->setChecked( cofg.readBoolEntry( "MicMute",0));
}
//================
void QtRec::stop() {
- qDebug("<<<<<<<<<stop()");
+ // qDebug("<<<<<<<<<stop()");
setRecordButton(false);
monitoring=false;
stopped=true;
if( !recording)
endPlaying();
@@ -884,13 +836,12 @@ void QtRec::doPlayBtn() {
start();
}
}
void QtRec::start() { //play
if(stopped) {
- qDebug("start::");
QPixmap image3( ( const char** ) image3_data );
Stop_PushButton->setPixmap( image3 );
Stop_PushButton->setDown(true);
stopped=false;
paused=false;
secCount=1;
@@ -899,66 +850,48 @@ void QtRec::start() { //play
if( setupAudio( false)) //recording is false
doPlay();
}
}
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"));
monitoring=false;
setRecordButton(true);
stopped=false;
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());
if( filePara.SecondsToRecord == 0) {
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;
}
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) {
QMessageBox::warning(this,
tr("Low Disk Space"),
tr("You are running low of\nrecording space\n"
"or a card isn't being recognized"));
@@ -968,17 +901,15 @@ bool QtRec::rec() { //record
QString msg;
msg.sprintf("%d, %d, %d", filePara.sampleRate, filePara.channels, filePara.resolution);
#ifdef DEV_VERSION
setCaption( msg);
#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);
startTimer(1000);
}
} //end setUpFile
@@ -1007,37 +938,35 @@ bool QtRec::rec() { //record
/*
This happens when a tab is selected*/
void QtRec::thisTab(QWidget* widg) {
if(widg != NULL) {
int index=TabWidget->currentPageIndex();
- if(index==0) { //file page
- }
+// if(index==0) { //file page
+// }
if(index ==1) { //control page
fillDirectoryCombo();
// soundDevice->getOutVol();
// soundDevice->getInVol();
}
- if(index==2) { //help page
- }
+// if(index==2) { //help page
+// }
qApp->processEvents();
update();
}
}
void QtRec::getOutVol( ) {
filePara.outVol = soundDevice->getOutVolume();
- qDebug("out vol %d", filePara.outVol);
OutputSlider->setValue( -filePara.outVol);
}
void QtRec::getInVol() {
filePara.inVol = soundDevice->getInVolume();
- qDebug("in vol %d", filePara.inVol);
InputSlider->setValue( -filePara.inVol);
}
void QtRec::changedOutVolume() {
soundDevice->changedOutVolume(-OutputSlider->value());
}
@@ -1052,13 +981,12 @@ bool QtRec::setupAudio( bool b) {
int sampleformat, stereo, flags;
char * dspString, *mixerString;
filePara.resolution = bitRateComboBox->currentText().toInt( &ok,10); //16
if( !b){ // we want to play
- qDebug("setting up DSP for playing");
if( filePara.resolution == 16 || compressionCheckBox->isChecked() ) {
sampleformat = AFMT_S16_LE;
filePara.resolution = 16;
} else {
sampleformat = AFMT_U8;
filePara.resolution=8;
@@ -1066,75 +994,65 @@ bool QtRec::setupAudio( bool b) {
stereo = filePara.channels = 1;
flags= O_WRONLY;
dspString = DSPSTROUT;
mixerString = DSPSTRMIXEROUT;
} else { // we want to record
- qDebug("setting up DSP for recording");
if( !bitRateComboBox->isEnabled() || bitRateComboBox->currentText() == "16")
sampleformat = AFMT_S16_LE;
else
sampleformat = AFMT_U8;
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;
}
// 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);
soundDevice->setDeviceRate( filePara.sampleRate);
soundDevice->getDeviceFragSize();
#ifdef QT_QWS_EBX
int frag = FRAGSIZE;
soundDevice->setFragSize( frag);
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;
}
if(autoMute)
doMute(false);
return true;
}
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 &)"",
true,
filePara.sampleRate,
filePara.channels,
filePara.resolution,
@@ -1157,42 +1075,41 @@ bool QtRec::doPlay() {
// qDebug("doPlay file %d", filePara.fd);
int bytesWritten, number;
recording = false;
// int number=0;
if( !paused) {
- qDebug("new");
+ // qDebug("new");
total=0;
bytesWritten=0;
filePara.numberOfRecordedSeconds = 0;
} else {
paused = false;
secCount = (int)filePara.numberOfRecordedSeconds;
}
playing=true;
number=0;
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);
#ifdef DEV_VERSION
setCaption( msg);
#endif
if( filePara.resolution == 16 ) { //AFMT_S16_LE) {
- qDebug("16 bit");
+ // qDebug("16 bit");
startTimer(1000);
if( filePara.format==WAVE_FORMAT_DVI_ADPCM) {
char abuf[BUFSIZE/2];
short sbuf[BUFSIZE];
@@ -1274,13 +1191,13 @@ bool QtRec::doPlay() {
}
}
// printf("\nplaying number %d, bytes %d, total %d\r",number, bytesWritten, total);
// fflush(stdout);
} //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
if (stopped)
break; // stop if playing was set to false
number=::read( filePara.fd, unsigned_inbuffer, BUFSIZE);
//data = (val >> 8) ^ 0x80;
@@ -1340,13 +1257,13 @@ void QtRec::changesamplerateCombo(int i) {
// soundDevice->setDeviceChannels(filePara.channels);
// soundDevice->setDeviceRate(filePara.sampleRate);
//
// soundDevice->closeDevice( true);
// soundDevice=0;
// delete soundDevice;
- qDebug("Change sample rate %d", rate);
+ // qDebug("Change sample rate %d", rate);
cfg.write();
}
void QtRec::changeDirCombo(int index) {
@@ -1361,13 +1278,13 @@ void QtRec::changeDirCombo(int index) {
for( ; it.current(); ++it ){
if( sName == (*it)->name()+" "+ (*it)->path() ||
(*it)->name() == sName ) {
const QString path = (*it)->path();
recDir = path;
cfg.writeEntry("directory", recDir);
- qDebug("new rec dir "+recDir);
+ // qDebug("new rec dir "+recDir);
}
}
cfg.write();
}
@@ -1376,16 +1293,16 @@ void QtRec::changeSizeLimitCombo(int) {
cfg.setGroup("Settings");
cfg.writeEntry("sizeLimit", getCurrentSizeLimit() );
cfg.write();
}
void QtRec::newSound() {
- qDebug("<<<<<<<<<new sound");
+ // qDebug("<<<<<<<<<new sound");
if( !rec()) {
- qDebug("rec() failed");
+ // qDebug("rec() failed");
endRecording();
deleteSound();
}
}
@@ -1445,13 +1362,13 @@ void QtRec::deleteSound() {
initIconView();
update();
}
#ifndef DEV_VERSION
};
#endif
- setCaption( tr( "OpieRecord " ) + QString::number(VERSION) );
+ setCaption( tr( "OpieRecord " ) /*+ QString::number(VERSION)*/ );
}
void QtRec::keyPressEvent( QKeyEvent *e) {
switch ( e->key() ) {
@@ -1510,13 +1427,13 @@ void QtRec::keyPressEvent( QKeyEvent *e) {
// stop();
break;
case Key_Down:
// newSound();
break;
case Key_Left: {
- qDebug("rewinding");
+ // qDebug("rewinding");
if( !e->isAutoRepeat())
rewindPressed();
}
break;
case Key_Right: {
if( !e->isAutoRepeat())
@@ -1564,32 +1481,32 @@ void QtRec::keyReleaseEvent( QKeyEvent *e) {
break;
case Key_Delete:
deleteSound();
break;
case Key_Up:
// stop();
- qDebug("Up");
+ // qDebug("Up");
break;
case Key_Down:
// start();
// qDebug("Down");
// newSound();
break;
case Key_Left:
- qDebug("Left");
+ // qDebug("Left");
rewindReleased();
break;
case Key_Right:
- qDebug("Right");
+ // qDebug("Right");
FastforwardReleased();
break;
}
}
void QtRec::endRecording() {
- qDebug("endRecording");
+ // qDebug("endRecording");
setRecordButton(false);
timeSlider->setValue(0);
toBeginningButton->setEnabled(true);
toEndButton->setEnabled(true);
monitoring=false;
@@ -1614,17 +1531,17 @@ void QtRec::endRecording() {
filePara.fd=0;
if(wavFile->isTempFile()) {
// move tmp file to regular file
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");
int nFiles = cfg.readNumEntry( "NumberofFiles",0);
currentFile = QFileInfo(wavFile->currentFileName).fileName();
@@ -1634,53 +1551,53 @@ void QtRec::endRecording() {
cfg.writeEntry( QString::number( nFiles+1), currentFile);
cfg.writeEntry( currentFile, wavFile->currentFileName);
QString time;
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("");
}
if(soundDevice) delete soundDevice;
initIconView();
selectItemByName(currentFile);
}
void QtRec::endPlaying() {
- qDebug("end playing");
+ // qDebug("end playing");
setRecordButton(false);
toBeginningButton->setEnabled(true);
toEndButton->setEnabled(true);
if(autoMute)
doMute(true);
soundDevice->closeDevice( false);
soundDevice->sd=-1;
// if(soundDevice) delete soundDevice;
- qDebug("file and sound device closed");
+ // qDebug("file and sound device closed");
stopped=true;
recording=false;
playing=false;
timeLabel->setText("");
monitoring=false;
total = 0;
filePara.numberSamples=0;
filePara.sd=-1;
wavFile->closeFile();
filePara.fd=0;
// if(wavFile) delete wavFile; //this crashes
- qDebug("track closed");
+ // qDebug("track closed");
timeSlider->setValue(0);
if(soundDevice) delete soundDevice;
}
@@ -1696,24 +1613,24 @@ bool QtRec::openPlayFile() {
Config cfg("OpieRec");
cfg.setGroup("Sounds");
int nFiles = cfg.readNumEntry("NumberofFiles",0);
for(int i=0;i<nFiles+1;i++) { //look for file
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);
}
}
wavFile = new WavFile(this,
currentFileName,
false);
filePara.fd = wavFile->wavHandle();
if(filePara.fd == -1) {
// if(!track.open(IO_ReadOnly)) {
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);
return false;
} else {
filePara.numberSamples=wavFile->getNumberSamples();
filePara.format = wavFile->getFormat();
@@ -1818,26 +1735,26 @@ void QtRec::doRename() {
renameBox->setFocus();
renameBox->show();
}
void QtRec::okRename() {
- qDebug("okRename");
- qDebug(renameBox->text());
+ // qDebug("okRename");
+ // qDebug(renameBox->text());
QString filename = renameBox->text();
cancelRename();
if( ListView1->currentItem() == NULL)
return;
Config cfg("OpieRec");
cfg.setGroup("Sounds");
QString file = ListView1->currentItem()->text(0);
- qDebug("filename is " + filename);
+ // qDebug("filename is " + filename);
int nFiles = cfg.readNumEntry("NumberofFiles",0);
for(int i=0;i<nFiles+1;i++) { //look for file
if( cfg.readEntry( QString::number(i),"").find(file,0,true) != -1) {
@@ -1855,13 +1772,13 @@ void QtRec::okRename() {
ListView1->clear();
initIconView();
update();
}
void QtRec::cancelRename() {
- qDebug("cancel rename");
+ // qDebug("cancel rename");
bool resetFocus = ListView1->viewport()->focusProxy() == renameBox;
delete renameBox;
renameBox = 0;
if ( resetFocus ) {
ListView1->viewport()->setFocusProxy( ListView1 );
ListView1->setFocus();
@@ -1891,13 +1808,13 @@ bool QtRec::eventFilter( QObject * o, QEvent * e ) {
int QtRec::getCurrentSizeLimit() {
return sizeLimitCombo->currentItem() * 5;
}
void QtRec::timerBreak() {
- qDebug("timer break");
+ // qDebug("timer break");
stop();
}
void QtRec::doVolMuting(bool b) {
Config cfg( "qpe" );
cfg. setGroup( "Volume" );
@@ -1958,14 +1875,14 @@ long QtRec::checkDiskSpace(const QString &path) {
// long f_bfree; /* Count of free blocks */
// long f_files; /* Total number of file nodes */
// long f_ffree; /* Count of free file nodes */
// char f_fname[6]; /* Volumename */
// 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);
}
///////////////////////////// timerEvent
void QtRec::timerEvent( QTimerEvent *e ) {
@@ -2224,31 +2141,28 @@ void QtRec::selectItemByName(const QString & name) {
}
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;
//
// When current gets close to 0.0, set current to 0.0 to prevent FP underflow
// which can cause a severe performance degradation due to a flood
// of interrupts.
//
if( output < vsf ) output = 0.0;
}
- 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
@@ -1,13 +1,13 @@
/****************************************************************************
** Created: Thu Jan 17 11:19:45 2002
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>
#include <iostream.h>
#include <qfile.h>
#include <qimage.h>