summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opierec/qtrec.cpp54
-rw-r--r--noncore/multimedia/opierec/wavFile.cpp2
2 files changed, 28 insertions, 28 deletions
diff --git a/noncore/multimedia/opierec/qtrec.cpp b/noncore/multimedia/opierec/qtrec.cpp
index 4223d93..8a0f8db 100644
--- a/noncore/multimedia/opierec/qtrec.cpp
+++ b/noncore/multimedia/opierec/qtrec.cpp
@@ -369,25 +369,25 @@ 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( "QpeRec" );
+ setName( "OpieRec" );
init();
initConfig();
initConnections();
renameBox = 0;
// open sound device to get volumes
soundDevice = new Device( this, DSPSTROUT, DSPSTRMIXEROUT, false);
// soundDevice->setDeviceFormat(AFMT_S16_LE);
// soundDevice->setDeviceChannels(1);
// soundDevice->setDeviceRate( 22050);
@@ -431,25 +431,25 @@ void QtRec::cleanUp() {
// QPEApplication::grabKeyboard();
// QPEApplication::ungrabKeyboard();
}
void QtRec::init() {
needsStereoOut=false;
QPixmap image3( ( const char** ) image3_data );
QPixmap image4( ( const char** ) image4_data );
QPixmap image6( ( const char** ) image6_data );
stopped=true;
- setCaption( tr( "QpeRecord " ) + QString::number(VERSION) );
+ setCaption( tr( "OpieRecord " ) + QString::number(VERSION) );
QGridLayout *layout = new QGridLayout( this );
layout->setSpacing( 2);
layout->setMargin( 2);
TabWidget = new QTabWidget( this, "TabWidget" );
layout->addMultiCellWidget(TabWidget, 0, 7, 0, 7);
// TabWidget->setTabShape(QTabWidget::Triangular);
///**********<<<<<<<<<<<<>>>>>>>>>>>>***************
tab = new QWidget( TabWidget, "tab" );
QGridLayout *layout1 = new QGridLayout( tab);
@@ -726,48 +726,48 @@ void QtRec::init() {
///**********<<<<<<<<<<<<>>>>>>>>>>>>***************
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, "qperec_help");
+ 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>QpeRec</B><br>"
+ 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>QpeRec</B> is copyright&copy; 2002 by"
+ "<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("QpeRec");
+ Config cfg("OpieRec");
cfg.setGroup("Sounds");
QString temp;
QPixmap image0( ( const char** ) image0_data );
int nFiles = cfg.readNumEntry("NumberofFiles",0);
for(int i=1;i<= nFiles;i++) {
QListViewItem * item;
QString fileS, mediaLocation, fileDate, filePath;
// temp.sprintf("%d",i);
@@ -814,25 +814,25 @@ void QtRec::initConnections() {
connect( ListView1,SIGNAL(doubleClicked( QListViewItem*)),this,SLOT( itClick(QListViewItem*)));
connect( ListView1, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
this,SLOT( listPressed(int, QListViewItem *, const QPoint&, int)) );
connect( timeSlider, SIGNAL( sliderMoved( int)), this, SLOT( changeTimeSlider(int) ));
connect( timeSlider, SIGNAL( sliderPressed( )), this, SLOT( timeSliderPressed() ));
connect( timeSlider, SIGNAL( sliderReleased( )), this, SLOT( timeSliderReleased() ));
connect( compressionCheckBox, SIGNAL( toggled(bool)),this, SLOT( compressionSelected(bool)));
connect( autoMuteCheckBox, SIGNAL( toggled(bool)),this, SLOT( slotAutoMute(bool)));
}
void QtRec::initConfig() {
int index, fred, i;
- Config cfg("QpeRec");
+ Config cfg("OpieRec");
cfg.setGroup("Settings");
index = cfg.readNumEntry("samplerate",22050);
bool ok;
for(int ws=0;ws<sampleRateComboBox->count();ws++) {
fred = sampleRateComboBox->text(ws).toInt(&ok, 10);
if(index == fred) {
filePara.sampleRate = fred;
sampleRateComboBox->setCurrentItem(ws);
}
}
@@ -926,25 +926,25 @@ bool QtRec::rec() { //record
} else {
qDebug("go ahead and record");
secCount=1;
playLabel2->setText("Stop");
monitoring=false;
setRecordButton(true);
stopped=false;
if( setupAudio( true))
if(setUpFile()) {
qDebug("Ok to start recording");
int fileSize=0;
- Config cfg("QpeRec");
+ 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);
filePara.SecondsToRecord = getCurrentSizeLimit();
qDebug("size limit %d sec", filePara.SecondsToRecord);
int diskSize = checkDiskSpace( (const QString &) wavFile->trackName());
@@ -1126,25 +1126,25 @@ bool QtRec::setupAudio( bool b) {
int frag = FRAGSIZE;
soundDevice->setFragSize( frag);
soundDevice->getDeviceFragSize();
#endif
/////////////////
filePara.sd = soundDevice->sd;
if ( filePara.sd == -1) {
monitoring=false;
stopped=true;
update();
- setCaption( tr( "QpeRecord " ) + 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");
@@ -1322,105 +1322,105 @@ bool QtRec::doPlay() {
// qDebug("\nstopped or paused %d", total/4);
if(!paused && !stopped) {
stopped = true;
// endPlaying();
endPlaying();
}
return true;
}
void QtRec::changebitrateCombo(int i) {
- Config cfg("QpeRec");
+ Config cfg("OpieRec");
cfg.setGroup("Settings");
int bits=0;
if(i==0) { bits=16; }
else { bits=8; }
cfg.writeEntry("bitrate", bits);
filePara.resolution=bits;
cfg.write();
}
void QtRec::changesamplerateCombo(int i) {
- Config cfg("QpeRec");
+ 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("QpeRec");
+ Config cfg("OpieRec");
cfg.setGroup("Settings");
QString sName = directoryComboBox->text(index);
StorageInfo storageInfo;
const QList<FileSystem> &fs = storageInfo.fileSystems();
QListIterator<FileSystem> it ( fs );
QString storage;
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);
}
}
cfg.write();
}
void QtRec::changeSizeLimitCombo(int) {
- Config cfg("QpeRec");
+ Config cfg("OpieRec");
cfg.setGroup("Settings");
cfg.writeEntry("sizeLimit", getCurrentSizeLimit() );
cfg.write();
}
void QtRec::newSound() {
qDebug("<<<<<<<<<new sound");
if( !rec()) {
qDebug("rec() failed");
endRecording();
deleteSound();
}
}
void QtRec::itClick(QListViewItem *item) {
currentFile=item->text(0);
- setCaption("QpeRecord "+currentFile);
+ setCaption("OpieRecord "+currentFile);
}
void QtRec::deleteSound() {
- Config cfg("QpeRec");
+ Config cfg("OpieRec");
cfg.setGroup("Sounds");
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);
// qDebug("Filename to find is "+file);
@@ -1455,25 +1455,25 @@ void QtRec::deleteSound() {
ListView1->takeItem( ListView1->currentItem() );
// ListView1->takeItem( ListView1->itemAt(nFiles) );
delete ListView1->currentItem();
ListView1->clear();
ListView1->setSelected(ListView1->firstChild(), true);
initIconView();
update();
}
#ifndef DEV_VERSION
};
#endif
- setCaption( tr( "QpeRecord " ) + QString::number(VERSION) );
+ setCaption( tr( "OpieRecord " ) + QString::number(VERSION) );
}
void QtRec::keyPressEvent( QKeyEvent *e) {
switch ( e->key() ) {
/*
vercel keys->
right side
0
1 0x1030 Key_F1
2 0x1031 Key_F2
@@ -1629,25 +1629,25 @@ void QtRec::endRecording() {
wavFile->closeFile();
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);
system(cmd.latin1());
}
qDebug("Just moved "+wavFile->currentFileName);
- Config cfg("QpeRec");
+ Config cfg("OpieRec");
cfg.setGroup("Sounds");
int nFiles = cfg.readNumEntry( "NumberofFiles",0);
currentFile = QFileInfo(wavFile->currentFileName).fileName();
currentFile=currentFile.left(currentFile.length()-4);
cfg.writeEntry( "NumberofFiles",nFiles+1);
cfg.writeEntry( QString::number( nFiles+1), currentFile);
cfg.writeEntry( currentFile, wavFile->currentFileName);
QString time;
@@ -1695,47 +1695,47 @@ void QtRec::endPlaying() {
qDebug("track closed");
timeSlider->setValue(0);
if(soundDevice) delete soundDevice;
}
bool QtRec::openPlayFile() {
qApp->processEvents();
if( currentFile.isEmpty()) {
- QMessageBox::message(tr("Qperec"),tr("Please select file to play"));
+ QMessageBox::message(tr("Opierec"),tr("Please select file to play"));
endPlaying();
return false;
}
QString currentFileName;
- Config cfg("QpeRec");
+ 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);
}
}
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( "QpeRecord " ) + 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();
// qDebug("file %d, samples %f", filePara.fd, filePara.numberSamples);
filePara.sampleRate= wavFile->getSampleRate();
filePara.resolution=wavFile->getResolution();
timeSlider->setPageStep(1);
monitoring=true;
timeSlider->setRange(0, filePara.numberSamples );
@@ -1745,25 +1745,25 @@ bool QtRec::openPlayFile() {
return true;
}
void QtRec::listPressed( int mouse, QListViewItem *item, const QPoint &, int ) {
if(item == NULL )
return;
switch (mouse) {
case 1: {
if( renameBox !=0 ) //tricky
cancelRename();
currentFile=item->text(0);
- setCaption( "QpeRecord "+currentFile);
+ setCaption( "OpieRecord "+currentFile);
}
break;
case 2:
showListMenu(item);
ListView1->clearSelection();
break;
};
}
void QtRec::showListMenu(QListViewItem * item) {
if(item == NULL)
return;
@@ -1784,35 +1784,35 @@ void QtRec::fileBeamFinished( Ir *ir) {
if(ir)
QMessageBox::message( tr("Ir Beam out"), tr("Ir sent.") ,tr("Ok") );
}
void QtRec::doBeam() {
qApp->processEvents();
if( ListView1->currentItem() == NULL)
return;
Ir ir;
if( ir.supported()) {
QString file = ListView1->currentItem()->text(0);
- Config cfg("QpeRec");
+ Config cfg("OpieRec");
cfg.setGroup("Sounds");
int nFiles = cfg.readNumEntry("NumberofFiles",0);
for(int i=0;i<nFiles+1;i++) {
if( cfg.readEntry( QString::number(i),"").find(file,0,true) != -1) {
QString filePath = cfg.readEntry(file,"");
Ir *file = new Ir(this, "IR");
connect(file, SIGNAL(done(Ir*)), this, SLOT( fileBeamFinished( Ir * )));
- file->send( filePath, "QpeRec audio file\n"+filePath );
+ file->send( filePath, "OPieRec audio file\n"+filePath );
}
}
}
}
void QtRec::doMenuPlay() {
qApp->processEvents();
currentFile = ListView1->currentItem()->text(0);
}
void QtRec::doRename() {
QRect r = ListView1->itemRect( ListView1->currentItem( ));
@@ -1836,25 +1836,25 @@ void QtRec::doRename() {
}
void QtRec::okRename() {
qDebug("okRename");
qDebug(renameBox->text());
QString filename = renameBox->text();
cancelRename();
if( ListView1->currentItem() == NULL)
return;
- Config cfg("QpeRec");
+ Config cfg("OpieRec");
cfg.setGroup("Sounds");
QString file = ListView1->currentItem()->text(0);
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) {
QString filePath = cfg.readEntry(file,"");
@@ -1923,25 +1923,25 @@ void QtRec::doVolMuting(bool b) {
}
void QtRec::doMicMuting(bool b) {
// qDebug("mic mute");
Config cfg( "qpe" );
cfg. setGroup( "Volume" );
cfg.writeEntry( "MicMute",b);
cfg.write();
QCopEnvelope( "QPE/System", "micChange(bool)" ) << b;
}
void QtRec::compressionSelected(bool b) {
- Config cfg("QpeRec");
+ Config cfg("OpieRec");
cfg.setGroup("Settings");
cfg.writeEntry("wavCompression", b);
cfg.writeEntry("bitrate",16); filePara.resolution=16;
cfg.write();
if(b) {
bitRateComboBox->setEnabled(false);
bitRateComboBox->setCurrentItem(0);
filePara.resolution=16;
} else{
bitRateComboBox->setEnabled(true);
}
@@ -2184,25 +2184,25 @@ void QtRec::setRecordButton(bool b) {
if(Stop_PushButton->isDown())
Stop_PushButton->setDown(false);
playLabel2->setText("Play");
if(Rec_PushButton->isDown())
Rec_PushButton->setDown( false);
}
}
void QtRec::fillDirectoryCombo() {
if( directoryComboBox->count() > 0)
directoryComboBox->clear();
int index=0;
- Config cfg("QpeRec");
+ Config cfg("OpieRec");
cfg.setGroup("Settings");
QString dir= cfg.readEntry("directory", "/");
StorageInfo storageInfo;
const QList<FileSystem> &fs = storageInfo.fileSystems();
QListIterator<FileSystem> it ( fs );
QString storage;
for( ; it.current(); ++it ){
const QString name = (*it)->name();
const QString path = (*it)->path();
// directoryComboBox->insertItem(name+" "+path);
directoryComboBox->insertItem(name);
if(path==dir)
@@ -2215,25 +2215,25 @@ void QtRec::errorStop() {
stopped = true;
wavFile->closeFile();
killTimers();
}
void QtRec::doMute(bool b) {
doVolMuting( b);
doMicMuting( b);
}
void QtRec::slotAutoMute(bool b) {
autoMute=b;
- Config cfg("QpeRec");
+ Config cfg("OpieRec");
cfg.setGroup("Settings");
cfg.writeEntry("useAutoMute",b);
doMute(b);
outMuteCheckBox->setChecked( b);
inMuteCheckBox->setChecked( b);
}
void QtRec::selectItemByName(const QString & name) {
QListViewItemIterator it( ListView1 );
for ( ; it.current(); ++it )
if(name == it.current()->text(0))
ListView1->setCurrentItem(it.current());
diff --git a/noncore/multimedia/opierec/wavFile.cpp b/noncore/multimedia/opierec/wavFile.cpp
index 09695aa..0bb5736 100644
--- a/noncore/multimedia/opierec/wavFile.cpp
+++ b/noncore/multimedia/opierec/wavFile.cpp
@@ -35,25 +35,25 @@ qDebug("new wave file");
wavResolution=resolution;
useTmpFile=false;
if( b) {
newFile();
} else {
openFile(fileName);
}
}
bool WavFile::newFile() {
qDebug("Set up new file");
- Config cfg("QpeRec");
+ Config cfg("OpieRec");
cfg.setGroup("Settings");
currentFileName=cfg.readEntry("directory",QDir::homeDirPath());
QString date;
date = TimeString::dateString( QDateTime::currentDateTime(),false,true);
date.replace(QRegExp("'"),"");
date.replace(QRegExp(" "),"_");
date.replace(QRegExp(":"),".");
date.replace(QRegExp(","),"");
QString currentFile=date;
if(currentFileName.right(1).find("/",0,true) == -1)