summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2003-04-27 13:28:37 (UTC)
committer llornkcor <llornkcor>2003-04-27 13:28:37 (UTC)
commit1d7eb1dd34ce10b01dddc65b3bfd34363969b987 (patch) (side-by-side diff)
treef00b7e2c8f14e0ceb0a7862955683f83aa22f5cc
parent6d032a24be12c13e10723dc27cbedc1a30628428 (diff)
downloadopie-1d7eb1dd34ce10b01dddc65b3bfd34363969b987.zip
opie-1d7eb1dd34ce10b01dddc65b3bfd34363969b987.tar.gz
opie-1d7eb1dd34ce10b01dddc65b3bfd34363969b987.tar.bz2
remove help tab
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opierec/qtrec.cpp78
1 files changed, 39 insertions, 39 deletions
diff --git a/noncore/multimedia/opierec/qtrec.cpp b/noncore/multimedia/opierec/qtrec.cpp
index 8a0f8db..28f6546 100644
--- a/noncore/multimedia/opierec/qtrec.cpp
+++ b/noncore/multimedia/opierec/qtrec.cpp
@@ -193,25 +193,25 @@ 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++)
{ //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);
@@ -271,35 +271,35 @@ outbuffer[i]=inbuffer[i]>>1; // no clippy, please
// if(filePara.channels==1)
// total += bytesWritten/2; //mono
// else
total += bytesWritten;
long peak;
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
} else { // <<<<<<<<<<<<<<<<<<<<<<< format = AFMT_U8;
@@ -549,25 +549,25 @@ void QtRec::init() {
sampleGroup = new QGroupBox( tab_3, "samplegroup" );
sampleGroup->setTitle( tr( "Sample Rate" ) );
sampleGroup->setFixedSize( 95,50);
sampleRateComboBox = new QComboBox( false, sampleGroup, "SampleRateComboBox" );
sampleRateComboBox->setGeometry( QRect( 10, 20, 80, 25 ) );
//#ifndef QT_QWS_EBX
sampleRateComboBox->insertItem( tr( "44100"));
sampleRateComboBox->insertItem( tr( "32000"));
//#endif
sampleRateComboBox->insertItem( tr( "22050"));
//#ifndef QT_QWS_VERCEL_IDR
- sampleRateComboBox->insertItem( tr( "16000"));
+ sampleRateComboBox->insertItem( tr( "16000"));
sampleRateComboBox->insertItem( tr( "11025"));
sampleRateComboBox->insertItem( tr( "8000"));
//#endif
Layout17->addWidget( sampleGroup );
sizeGroup= new QGroupBox( tab_3, "sizeGroup" );
sizeGroup->setTitle( tr( "Limit Size" ) );
sizeGroup->setFixedSize(80,50);
sizeLimitCombo = new QComboBox( false, sizeGroup, "sizeLimitCombo" );
sizeLimitCombo ->setGeometry( QRect( 5, 20, 70, 25 ) );
@@ -718,48 +718,48 @@ void QtRec::init() {
Layout19->addLayout( Layout15 );
Layout19->addLayout( Layout15b );
fillDirectoryCombo();
TabWidget->insertTab( tab_3, tr( "Options" ) );
}
///**********<<<<<<<<<<<<>>>>>>>>>>>>***************
- tab_4 = new QWidget( TabWidget, "tab_4" );
- QGridLayout *layout4 = new QGridLayout( tab_4);
- layout4->setSpacing( 2);
- layout4->setMargin( 2);
- TabWidget->insertTab( tab_4, tr( "Help"));
-
- ///////////////////////////////////////////// FIXME change to a real helpfile path
- QString url="/index.html";
- HelpWindow *help = new HelpWindow( url, ".", tab_4, "opierec_help");
- layout4->addMultiCellWidget( help, 0, 1, 0, 1);
- if( !QFile(url).exists()) {
- help->hide();
- //help->showMaximized();
- QLabel *helpLabel;
- helpLabel = new QLabel( tab_4, "TimeLabel" );
- layout4->addMultiCellWidget( helpLabel, 0, 3, 0, 4 );
- helpLabel->setText( "<B>OpieRec</B><br>"
- "Records files in standard wav format<br>"
- "or a compressed version<br>"
- "For help, please email the author<br>"
- "<B>OpieRec</B> is copyright&copy; 2002 by"
- " L.J. Potter<br>llornkcor@handhelds.org<BR>"
- "and is licensed under the <B>QPL</B>");
- }
+// tab_4 = new QWidget( TabWidget, "tab_4" );
+// QGridLayout *layout4 = new QGridLayout( tab_4);
+// layout4->setSpacing( 2);
+// layout4->setMargin( 2);
+// TabWidget->insertTab( tab_4, tr( "Help"));
+
+// ///////////////////////////////////////////// FIXME change to a real helpfile path
+// QString url="/index.html";
+// HelpWindow *help = new HelpWindow( url, ".", tab_4, "opierec_help");
+// layout4->addMultiCellWidget( help, 0, 1, 0, 1);
+// if( !QFile(url).exists()) {
+// help->hide();
+// //help->showMaximized();
+// QLabel *helpLabel;
+// helpLabel = new QLabel( tab_4, "TimeLabel" );
+// layout4->addMultiCellWidget( helpLabel, 0, 3, 0, 4 );
+// helpLabel->setText( "<B>OpieRec</B><br>"
+// "Records files in standard wav format<br>"
+// "or a compressed version<br>"
+// "For help, please email the author<br>"
+// "<B>OpieRec</B> is copyright&copy; 2002 by"
+// " L.J. Potter<br>llornkcor@handhelds.org<BR>"
+// "and is licensed under the <B>QPL</B>");
+// }
///**********<<<<<<<<<<<<>>>>>>>>>>>>***************
}
void QtRec::initIconView() {
ListView1->clear();
Config cfg("OpieRec");
cfg.setGroup("Sounds");
QString temp;
QPixmap image0( ( const char** ) image0_data );
@@ -839,25 +839,25 @@ void QtRec::initConfig() {
i=cfg.readNumEntry("bitrate",16);
if(i == 16)
bitRateComboBox->setCurrentItem( 0);
else
bitRateComboBox->setCurrentItem( 1);
filePara.resolution = i;
i=cfg.readNumEntry("sizeLimit", 5 );
QString temp;
// for(int i=1;i<13; i++) {
// temp = sizeLimitCombo->text(i);
-
+
// sizeLimitCombo->insertItem( QString::number(i*5)+tr(" secs"));
// }
sizeLimitCombo->setCurrentItem((i/5));
compressionCheckBox->setChecked( cfg.readBoolEntry("wavCompression",1));
if( compressionCheckBox->isChecked()) {
bitRateComboBox->setEnabled(false);
bitRateComboBox->setCurrentItem(0);
filePara.resolution=16;
}
autoMuteCheckBox->setChecked( cfg.readBoolEntry("useAutoMute",0));
@@ -921,26 +921,26 @@ 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("Stop");
monitoring=false;
setRecordButton(true);
stopped=false;
-
- if( setupAudio( true))
+
+ 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);
@@ -991,25 +991,25 @@ bool QtRec::rec() { //record
pthread_t thread1;
pthread_create( &thread1, NULL, (void * (*)(void *))quickRec, NULL/* &*/);
// quickRec();
toBeginningButton->setEnabled(false);
toEndButton->setEnabled(false);
startTimer(1000);
}
} //end setUpFile
} //end setupAudio
// _exit( 0);
-
+
// ///* default:
// // /* pid greater than zero is parent getting the child's pid */
// /* printf("Child's pid is %d\n",pid);
// waitpid( pid, &status, 0);
// printf("Child[%d] exited with status %d\n", pid, status);*/
// while (wait(NULL) != pid)
// ;
// printf("child %ld terminated normally, return status is zero\n", (long) pid);
// endRecording();
/* else { //device was not opened
qDebug("Audio device open failed");
return false;
@@ -1107,35 +1107,35 @@ bool QtRec::setupAudio( bool b) {
// 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
+#ifdef QT_QWS_EBX
int frag = FRAGSIZE;
soundDevice->setFragSize( frag);
soundDevice->getDeviceFragSize();
-#endif
+#endif
/////////////////
filePara.sd = soundDevice->sd;
if ( filePara.sd == -1) {
monitoring=false;
stopped=true;
update();
setCaption( tr( "OpieRecord " ) + QString::number(VERSION) );
stopped=true;
return false;
}
@@ -1342,29 +1342,29 @@ void QtRec::changebitrateCombo(int i) {
}
void QtRec::changesamplerateCombo(int i) {
Config cfg("OpieRec");
cfg.setGroup("Settings");
int rate=0;
bool ok;
rate = sampleRateComboBox->text(i).toInt(&ok, 10);
cfg.writeEntry("samplerate",rate);
filePara.sampleRate=rate;
/* soundDevice = new Device( this, DSPSTROUT, DSPSTRMIXER, false);
soundDevice->openDsp();*/
-//
+//
// soundDevice->setDeviceFormat(AFMT_S16_LE);
// soundDevice->setDeviceChannels(filePara.channels);
// soundDevice->setDeviceRate(filePara.sampleRate);
-//
+//
// soundDevice->closeDevice( true);
// soundDevice=0;
// delete soundDevice;
qDebug("Change sample rate %d", rate);
cfg.write();
}
void QtRec::changeDirCombo(int index) {
Config cfg("OpieRec");
cfg.setGroup("Settings");
@@ -1980,25 +1980,25 @@ long QtRec::checkDiskSpace(const QString &path) {
void QtRec::receive( const QCString &msg, const QByteArray & ) {
qDebug("Voicerecord received message "+msg);
}
///////////////////////////// timerEvent
void QtRec::timerEvent( QTimerEvent *e ) {
// qDebug( "%d", secCount );
#ifdef DEV_VERSION
QString msg;
msg.sprintf("%d, %d, %d", filePara.sampleRate, filePara.channels, filePara.resolution);
- setCaption( msg +" :: "+QString::number(secCount));
+ setCaption( msg +" :: "+QString::number(secCount));
#endif
if( !playing ) {
if(!recording ){
killTimer(e->timerId());
///* stopped=true;
// recording=false;
///*/
// _exit( 0);
}
if(filePara.SecondsToRecord < secCount && filePara.SecondsToRecord !=0) {
killTimer(e->timerId());
@@ -2249,22 +2249,22 @@ long findPeak(long input ) {
float scalar = pow( 0.5, 1.0/(halfLife * filePara.sampleRate ));
if( input < 0.0 )
input = -input; // Absolute value.
if ( input >= output )
{
// When we hit a peak, ride the peak to the top.
output = input;
}
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;
}