-rw-r--r-- | noncore/multimedia/opierec/qtrec.cpp | 54 | ||||
-rw-r--r-- | noncore/multimedia/opierec/wavFile.cpp | 2 |
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 | |||
@@ -378,7 +378,7 @@ QtRec::QtRec( QWidget* parent, const char* name, WFlags fl ) | |||
378 | // signal(SIGPIPE, SIG_IGN); | 378 | // signal(SIGPIPE, SIG_IGN); |
379 | 379 | ||
380 | if ( !name ) | 380 | if ( !name ) |
381 | setName( "QpeRec" ); | 381 | setName( "OpieRec" ); |
382 | init(); | 382 | init(); |
383 | initConfig(); | 383 | initConfig(); |
384 | initConnections(); | 384 | initConnections(); |
@@ -440,7 +440,7 @@ void QtRec::init() { | |||
440 | QPixmap image6( ( const char** ) image6_data ); | 440 | QPixmap image6( ( const char** ) image6_data ); |
441 | 441 | ||
442 | stopped=true; | 442 | stopped=true; |
443 | setCaption( tr( "QpeRecord " ) + QString::number(VERSION) ); | 443 | setCaption( tr( "OpieRecord " ) + QString::number(VERSION) ); |
444 | QGridLayout *layout = new QGridLayout( this ); | 444 | QGridLayout *layout = new QGridLayout( this ); |
445 | layout->setSpacing( 2); | 445 | layout->setSpacing( 2); |
446 | layout->setMargin( 2); | 446 | layout->setMargin( 2); |
@@ -735,7 +735,7 @@ void QtRec::init() { | |||
735 | 735 | ||
736 | ///////////////////////////////////////////// FIXME change to a real helpfile path | 736 | ///////////////////////////////////////////// FIXME change to a real helpfile path |
737 | QString url="/index.html"; | 737 | QString url="/index.html"; |
738 | HelpWindow *help = new HelpWindow( url, ".", tab_4, "qperec_help"); | 738 | HelpWindow *help = new HelpWindow( url, ".", tab_4, "opierec_help"); |
739 | layout4->addMultiCellWidget( help, 0, 1, 0, 1); | 739 | layout4->addMultiCellWidget( help, 0, 1, 0, 1); |
740 | if( !QFile(url).exists()) { | 740 | if( !QFile(url).exists()) { |
741 | help->hide(); | 741 | help->hide(); |
@@ -743,11 +743,11 @@ void QtRec::init() { | |||
743 | QLabel *helpLabel; | 743 | QLabel *helpLabel; |
744 | helpLabel = new QLabel( tab_4, "TimeLabel" ); | 744 | helpLabel = new QLabel( tab_4, "TimeLabel" ); |
745 | layout4->addMultiCellWidget( helpLabel, 0, 3, 0, 4 ); | 745 | layout4->addMultiCellWidget( helpLabel, 0, 3, 0, 4 ); |
746 | helpLabel->setText( "<B>QpeRec</B><br>" | 746 | helpLabel->setText( "<B>OpieRec</B><br>" |
747 | "Records files in standard wav format<br>" | 747 | "Records files in standard wav format<br>" |
748 | "or a compressed version<br>" | 748 | "or a compressed version<br>" |
749 | "For help, please email the author<br>" | 749 | "For help, please email the author<br>" |
750 | "<B>QpeRec</B> is copyright© 2002 by" | 750 | "<B>OpieRec</B> is copyright© 2002 by" |
751 | " L.J. Potter<br>llornkcor@handhelds.org<BR>" | 751 | " L.J. Potter<br>llornkcor@handhelds.org<BR>" |
752 | "and is licensed under the <B>QPL</B>"); | 752 | "and is licensed under the <B>QPL</B>"); |
753 | } | 753 | } |
@@ -758,7 +758,7 @@ void QtRec::init() { | |||
758 | void QtRec::initIconView() { | 758 | void QtRec::initIconView() { |
759 | 759 | ||
760 | ListView1->clear(); | 760 | ListView1->clear(); |
761 | Config cfg("QpeRec"); | 761 | Config cfg("OpieRec"); |
762 | cfg.setGroup("Sounds"); | 762 | cfg.setGroup("Sounds"); |
763 | QString temp; | 763 | QString temp; |
764 | QPixmap image0( ( const char** ) image0_data ); | 764 | QPixmap image0( ( const char** ) image0_data ); |
@@ -823,7 +823,7 @@ void QtRec::initConnections() { | |||
823 | 823 | ||
824 | void QtRec::initConfig() { | 824 | void QtRec::initConfig() { |
825 | int index, fred, i; | 825 | int index, fred, i; |
826 | Config cfg("QpeRec"); | 826 | Config cfg("OpieRec"); |
827 | cfg.setGroup("Settings"); | 827 | cfg.setGroup("Settings"); |
828 | 828 | ||
829 | index = cfg.readNumEntry("samplerate",22050); | 829 | index = cfg.readNumEntry("samplerate",22050); |
@@ -935,7 +935,7 @@ bool QtRec::rec() { //record | |||
935 | if(setUpFile()) { | 935 | if(setUpFile()) { |
936 | qDebug("Ok to start recording"); | 936 | qDebug("Ok to start recording"); |
937 | int fileSize=0; | 937 | int fileSize=0; |
938 | Config cfg("QpeRec"); | 938 | Config cfg("OpieRec"); |
939 | cfg.setGroup("Settings"); | 939 | cfg.setGroup("Settings"); |
940 | qDebug( "<<<<<<<Device bits %d, device rate %d, device channels %d", | 940 | qDebug( "<<<<<<<Device bits %d, device rate %d, device channels %d", |
941 | soundDevice->getDeviceBits(), | 941 | soundDevice->getDeviceBits(), |
@@ -1135,7 +1135,7 @@ bool QtRec::setupAudio( bool b) { | |||
1135 | monitoring=false; | 1135 | monitoring=false; |
1136 | stopped=true; | 1136 | stopped=true; |
1137 | update(); | 1137 | update(); |
1138 | setCaption( tr( "QpeRecord " ) + QString::number(VERSION) ); | 1138 | setCaption( tr( "OpieRecord " ) + QString::number(VERSION) ); |
1139 | stopped=true; | 1139 | stopped=true; |
1140 | return false; | 1140 | return false; |
1141 | } | 1141 | } |
@@ -1331,7 +1331,7 @@ bool QtRec::doPlay() { | |||
1331 | 1331 | ||
1332 | 1332 | ||
1333 | void QtRec::changebitrateCombo(int i) { | 1333 | void QtRec::changebitrateCombo(int i) { |
1334 | Config cfg("QpeRec"); | 1334 | Config cfg("OpieRec"); |
1335 | cfg.setGroup("Settings"); | 1335 | cfg.setGroup("Settings"); |
1336 | int bits=0; | 1336 | int bits=0; |
1337 | if(i==0) { bits=16; } | 1337 | if(i==0) { bits=16; } |
@@ -1342,7 +1342,7 @@ void QtRec::changebitrateCombo(int i) { | |||
1342 | } | 1342 | } |
1343 | 1343 | ||
1344 | void QtRec::changesamplerateCombo(int i) { | 1344 | void QtRec::changesamplerateCombo(int i) { |
1345 | Config cfg("QpeRec"); | 1345 | Config cfg("OpieRec"); |
1346 | cfg.setGroup("Settings"); | 1346 | cfg.setGroup("Settings"); |
1347 | int rate=0; | 1347 | int rate=0; |
1348 | bool ok; | 1348 | bool ok; |
@@ -1366,7 +1366,7 @@ void QtRec::changesamplerateCombo(int i) { | |||
1366 | 1366 | ||
1367 | 1367 | ||
1368 | void QtRec::changeDirCombo(int index) { | 1368 | void QtRec::changeDirCombo(int index) { |
1369 | Config cfg("QpeRec"); | 1369 | Config cfg("OpieRec"); |
1370 | cfg.setGroup("Settings"); | 1370 | cfg.setGroup("Settings"); |
1371 | QString sName = directoryComboBox->text(index); | 1371 | QString sName = directoryComboBox->text(index); |
1372 | 1372 | ||
@@ -1388,7 +1388,7 @@ void QtRec::changeDirCombo(int index) { | |||
1388 | 1388 | ||
1389 | 1389 | ||
1390 | void QtRec::changeSizeLimitCombo(int) { | 1390 | void QtRec::changeSizeLimitCombo(int) { |
1391 | Config cfg("QpeRec"); | 1391 | Config cfg("OpieRec"); |
1392 | cfg.setGroup("Settings"); | 1392 | cfg.setGroup("Settings"); |
1393 | cfg.writeEntry("sizeLimit", getCurrentSizeLimit() ); | 1393 | cfg.writeEntry("sizeLimit", getCurrentSizeLimit() ); |
1394 | cfg.write(); | 1394 | cfg.write(); |
@@ -1407,11 +1407,11 @@ void QtRec::newSound() { | |||
1407 | 1407 | ||
1408 | void QtRec::itClick(QListViewItem *item) { | 1408 | void QtRec::itClick(QListViewItem *item) { |
1409 | currentFile=item->text(0); | 1409 | currentFile=item->text(0); |
1410 | setCaption("QpeRecord "+currentFile); | 1410 | setCaption("OpieRecord "+currentFile); |
1411 | } | 1411 | } |
1412 | 1412 | ||
1413 | void QtRec::deleteSound() { | 1413 | void QtRec::deleteSound() { |
1414 | Config cfg("QpeRec"); | 1414 | Config cfg("OpieRec"); |
1415 | cfg.setGroup("Sounds"); | 1415 | cfg.setGroup("Sounds"); |
1416 | if( ListView1->currentItem() == NULL) | 1416 | if( ListView1->currentItem() == NULL) |
1417 | return; | 1417 | return; |
@@ -1464,7 +1464,7 @@ void QtRec::deleteSound() { | |||
1464 | #ifndef DEV_VERSION | 1464 | #ifndef DEV_VERSION |
1465 | }; | 1465 | }; |
1466 | #endif | 1466 | #endif |
1467 | setCaption( tr( "QpeRecord " ) + QString::number(VERSION) ); | 1467 | setCaption( tr( "OpieRecord " ) + QString::number(VERSION) ); |
1468 | 1468 | ||
1469 | } | 1469 | } |
1470 | 1470 | ||
@@ -1638,7 +1638,7 @@ void QtRec::endRecording() { | |||
1638 | } | 1638 | } |
1639 | 1639 | ||
1640 | qDebug("Just moved "+wavFile->currentFileName); | 1640 | qDebug("Just moved "+wavFile->currentFileName); |
1641 | Config cfg("QpeRec"); | 1641 | Config cfg("OpieRec"); |
1642 | cfg.setGroup("Sounds"); | 1642 | cfg.setGroup("Sounds"); |
1643 | 1643 | ||
1644 | int nFiles = cfg.readNumEntry( "NumberofFiles",0); | 1644 | int nFiles = cfg.readNumEntry( "NumberofFiles",0); |
@@ -1704,12 +1704,12 @@ bool QtRec::openPlayFile() { | |||
1704 | 1704 | ||
1705 | qApp->processEvents(); | 1705 | qApp->processEvents(); |
1706 | if( currentFile.isEmpty()) { | 1706 | if( currentFile.isEmpty()) { |
1707 | QMessageBox::message(tr("Qperec"),tr("Please select file to play")); | 1707 | QMessageBox::message(tr("Opierec"),tr("Please select file to play")); |
1708 | endPlaying(); | 1708 | endPlaying(); |
1709 | return false; | 1709 | return false; |
1710 | } | 1710 | } |
1711 | QString currentFileName; | 1711 | QString currentFileName; |
1712 | Config cfg("QpeRec"); | 1712 | Config cfg("OpieRec"); |
1713 | cfg.setGroup("Sounds"); | 1713 | cfg.setGroup("Sounds"); |
1714 | int nFiles = cfg.readNumEntry("NumberofFiles",0); | 1714 | int nFiles = cfg.readNumEntry("NumberofFiles",0); |
1715 | for(int i=0;i<nFiles+1;i++) { //look for file | 1715 | for(int i=0;i<nFiles+1;i++) { //look for file |
@@ -1726,7 +1726,7 @@ bool QtRec::openPlayFile() { | |||
1726 | // if(!track.open(IO_ReadOnly)) { | 1726 | // if(!track.open(IO_ReadOnly)) { |
1727 | QString errorMsg=(QString)strerror(errno); | 1727 | QString errorMsg=(QString)strerror(errno); |
1728 | monitoring=false; | 1728 | monitoring=false; |
1729 | setCaption( tr( "QpeRecord " ) + QString::number(VERSION) ); | 1729 | setCaption( tr( "OpieRecord " ) + QString::number(VERSION) ); |
1730 | QMessageBox::message(tr("Note"),tr("Could not open audio file.\n") | 1730 | QMessageBox::message(tr("Note"),tr("Could not open audio file.\n") |
1731 | +errorMsg+"\n"+currentFile); | 1731 | +errorMsg+"\n"+currentFile); |
1732 | return false; | 1732 | return false; |
@@ -1754,7 +1754,7 @@ void QtRec::listPressed( int mouse, QListViewItem *item, const QPoint &, int ) { | |||
1754 | cancelRename(); | 1754 | cancelRename(); |
1755 | 1755 | ||
1756 | currentFile=item->text(0); | 1756 | currentFile=item->text(0); |
1757 | setCaption( "QpeRecord "+currentFile); | 1757 | setCaption( "OpieRecord "+currentFile); |
1758 | } | 1758 | } |
1759 | break; | 1759 | break; |
1760 | case 2: | 1760 | case 2: |
@@ -1793,7 +1793,7 @@ void QtRec::doBeam() { | |||
1793 | Ir ir; | 1793 | Ir ir; |
1794 | if( ir.supported()) { | 1794 | if( ir.supported()) { |
1795 | QString file = ListView1->currentItem()->text(0); | 1795 | QString file = ListView1->currentItem()->text(0); |
1796 | Config cfg("QpeRec"); | 1796 | Config cfg("OpieRec"); |
1797 | cfg.setGroup("Sounds"); | 1797 | cfg.setGroup("Sounds"); |
1798 | 1798 | ||
1799 | int nFiles = cfg.readNumEntry("NumberofFiles",0); | 1799 | int nFiles = cfg.readNumEntry("NumberofFiles",0); |
@@ -1803,7 +1803,7 @@ void QtRec::doBeam() { | |||
1803 | QString filePath = cfg.readEntry(file,""); | 1803 | QString filePath = cfg.readEntry(file,""); |
1804 | Ir *file = new Ir(this, "IR"); | 1804 | Ir *file = new Ir(this, "IR"); |
1805 | connect(file, SIGNAL(done(Ir*)), this, SLOT( fileBeamFinished( Ir * ))); | 1805 | connect(file, SIGNAL(done(Ir*)), this, SLOT( fileBeamFinished( Ir * ))); |
1806 | file->send( filePath, "QpeRec audio file\n"+filePath ); | 1806 | file->send( filePath, "OPieRec audio file\n"+filePath ); |
1807 | } | 1807 | } |
1808 | } | 1808 | } |
1809 | } | 1809 | } |
@@ -1845,7 +1845,7 @@ void QtRec::okRename() { | |||
1845 | if( ListView1->currentItem() == NULL) | 1845 | if( ListView1->currentItem() == NULL) |
1846 | return; | 1846 | return; |
1847 | 1847 | ||
1848 | Config cfg("QpeRec"); | 1848 | Config cfg("OpieRec"); |
1849 | cfg.setGroup("Sounds"); | 1849 | cfg.setGroup("Sounds"); |
1850 | 1850 | ||
1851 | QString file = ListView1->currentItem()->text(0); | 1851 | QString file = ListView1->currentItem()->text(0); |
@@ -1932,7 +1932,7 @@ void QtRec::doMicMuting(bool b) { | |||
1932 | } | 1932 | } |
1933 | 1933 | ||
1934 | void QtRec::compressionSelected(bool b) { | 1934 | void QtRec::compressionSelected(bool b) { |
1935 | Config cfg("QpeRec"); | 1935 | Config cfg("OpieRec"); |
1936 | cfg.setGroup("Settings"); | 1936 | cfg.setGroup("Settings"); |
1937 | cfg.writeEntry("wavCompression", b); | 1937 | cfg.writeEntry("wavCompression", b); |
1938 | cfg.writeEntry("bitrate",16); filePara.resolution=16; | 1938 | cfg.writeEntry("bitrate",16); filePara.resolution=16; |
@@ -2193,7 +2193,7 @@ void QtRec::fillDirectoryCombo() { | |||
2193 | if( directoryComboBox->count() > 0) | 2193 | if( directoryComboBox->count() > 0) |
2194 | directoryComboBox->clear(); | 2194 | directoryComboBox->clear(); |
2195 | int index=0; | 2195 | int index=0; |
2196 | Config cfg("QpeRec"); | 2196 | Config cfg("OpieRec"); |
2197 | cfg.setGroup("Settings"); | 2197 | cfg.setGroup("Settings"); |
2198 | QString dir= cfg.readEntry("directory", "/"); | 2198 | QString dir= cfg.readEntry("directory", "/"); |
2199 | StorageInfo storageInfo; | 2199 | StorageInfo storageInfo; |
@@ -2224,7 +2224,7 @@ void QtRec::doMute(bool b) { | |||
2224 | 2224 | ||
2225 | void QtRec::slotAutoMute(bool b) { | 2225 | void QtRec::slotAutoMute(bool b) { |
2226 | autoMute=b; | 2226 | autoMute=b; |
2227 | Config cfg("QpeRec"); | 2227 | Config cfg("OpieRec"); |
2228 | cfg.setGroup("Settings"); | 2228 | cfg.setGroup("Settings"); |
2229 | cfg.writeEntry("useAutoMute",b); | 2229 | cfg.writeEntry("useAutoMute",b); |
2230 | doMute(b); | 2230 | doMute(b); |
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 | |||
@@ -44,7 +44,7 @@ qDebug("new wave file"); | |||
44 | bool WavFile::newFile() { | 44 | bool WavFile::newFile() { |
45 | 45 | ||
46 | qDebug("Set up new file"); | 46 | qDebug("Set up new file"); |
47 | Config cfg("QpeRec"); | 47 | Config cfg("OpieRec"); |
48 | cfg.setGroup("Settings"); | 48 | cfg.setGroup("Settings"); |
49 | 49 | ||
50 | currentFileName=cfg.readEntry("directory",QDir::homeDirPath()); | 50 | currentFileName=cfg.readEntry("directory",QDir::homeDirPath()); |