-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 | |||
@@ -375,13 +375,13 @@ QtRec::QtRec( QWidget* parent, const char* name, WFlags fl ) | |||
375 | // autoMute=TRUE; | 375 | // autoMute=TRUE; |
376 | // QPEApplication::grabKeyboard(); | 376 | // QPEApplication::grabKeyboard(); |
377 | 377 | ||
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(); |
385 | renameBox = 0; | 385 | renameBox = 0; |
386 | 386 | ||
387 | // open sound device to get volumes | 387 | // open sound device to get volumes |
@@ -437,13 +437,13 @@ void QtRec::init() { | |||
437 | needsStereoOut=false; | 437 | needsStereoOut=false; |
438 | QPixmap image3( ( const char** ) image3_data ); | 438 | QPixmap image3( ( const char** ) image3_data ); |
439 | QPixmap image4( ( const char** ) image4_data ); | 439 | QPixmap image4( ( const char** ) image4_data ); |
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); |
447 | 447 | ||
448 | TabWidget = new QTabWidget( this, "TabWidget" ); | 448 | TabWidget = new QTabWidget( this, "TabWidget" ); |
449 | layout->addMultiCellWidget(TabWidget, 0, 7, 0, 7); | 449 | layout->addMultiCellWidget(TabWidget, 0, 7, 0, 7); |
@@ -732,36 +732,36 @@ void QtRec::init() { | |||
732 | layout4->setSpacing( 2); | 732 | layout4->setSpacing( 2); |
733 | layout4->setMargin( 2); | 733 | layout4->setMargin( 2); |
734 | TabWidget->insertTab( tab_4, tr( "Help")); | 734 | TabWidget->insertTab( tab_4, tr( "Help")); |
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(); |
742 | //help->showMaximized(); | 742 | //help->showMaximized(); |
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 | } |
754 | ///**********<<<<<<<<<<<<>>>>>>>>>>>>*************** | 754 | ///**********<<<<<<<<<<<<>>>>>>>>>>>>*************** |
755 | 755 | ||
756 | } | 756 | } |
757 | 757 | ||
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 ); |
765 | 765 | ||
766 | 766 | ||
767 | int nFiles = cfg.readNumEntry("NumberofFiles",0); | 767 | int nFiles = cfg.readNumEntry("NumberofFiles",0); |
@@ -820,13 +820,13 @@ void QtRec::initConnections() { | |||
820 | connect( compressionCheckBox, SIGNAL( toggled(bool)),this, SLOT( compressionSelected(bool))); | 820 | connect( compressionCheckBox, SIGNAL( toggled(bool)),this, SLOT( compressionSelected(bool))); |
821 | connect( autoMuteCheckBox, SIGNAL( toggled(bool)),this, SLOT( slotAutoMute(bool))); | 821 | connect( autoMuteCheckBox, SIGNAL( toggled(bool)),this, SLOT( slotAutoMute(bool))); |
822 | } | 822 | } |
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); |
830 | bool ok; | 830 | bool ok; |
831 | 831 | ||
832 | for(int ws=0;ws<sampleRateComboBox->count();ws++) { | 832 | for(int ws=0;ws<sampleRateComboBox->count();ws++) { |
@@ -932,13 +932,13 @@ bool QtRec::rec() { //record | |||
932 | stopped=false; | 932 | stopped=false; |
933 | 933 | ||
934 | if( setupAudio( true)) | 934 | if( setupAudio( true)) |
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(), |
942 | soundDevice->getDeviceRate(), | 942 | soundDevice->getDeviceRate(), |
943 | soundDevice->getDeviceChannels()); | 943 | soundDevice->getDeviceChannels()); |
944 | 944 | ||
@@ -1132,13 +1132,13 @@ bool QtRec::setupAudio( bool b) { | |||
1132 | 1132 | ||
1133 | if ( filePara.sd == -1) { | 1133 | if ( filePara.sd == -1) { |
1134 | 1134 | ||
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 | } |
1142 | if(autoMute) | 1142 | if(autoMute) |
1143 | doMute(false); | 1143 | doMute(false); |
1144 | 1144 | ||
@@ -1328,24 +1328,24 @@ bool QtRec::doPlay() { | |||
1328 | } | 1328 | } |
1329 | return true; | 1329 | return true; |
1330 | } | 1330 | } |
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; } |
1338 | else { bits=8; } | 1338 | else { bits=8; } |
1339 | cfg.writeEntry("bitrate", bits); | 1339 | cfg.writeEntry("bitrate", bits); |
1340 | filePara.resolution=bits; | 1340 | filePara.resolution=bits; |
1341 | cfg.write(); | 1341 | cfg.write(); |
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; |
1349 | rate = sampleRateComboBox->text(i).toInt(&ok, 10); | 1349 | rate = sampleRateComboBox->text(i).toInt(&ok, 10); |
1350 | cfg.writeEntry("samplerate",rate); | 1350 | cfg.writeEntry("samplerate",rate); |
1351 | filePara.sampleRate=rate; | 1351 | filePara.sampleRate=rate; |
@@ -1363,13 +1363,13 @@ void QtRec::changesamplerateCombo(int i) { | |||
1363 | cfg.write(); | 1363 | cfg.write(); |
1364 | 1364 | ||
1365 | } | 1365 | } |
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 | ||
1373 | StorageInfo storageInfo; | 1373 | StorageInfo storageInfo; |
1374 | const QList<FileSystem> &fs = storageInfo.fileSystems(); | 1374 | const QList<FileSystem> &fs = storageInfo.fileSystems(); |
1375 | QListIterator<FileSystem> it ( fs ); | 1375 | QListIterator<FileSystem> it ( fs ); |
@@ -1385,13 +1385,13 @@ void QtRec::changeDirCombo(int index) { | |||
1385 | } | 1385 | } |
1386 | cfg.write(); | 1386 | cfg.write(); |
1387 | } | 1387 | } |
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(); |
1395 | } | 1395 | } |
1396 | 1396 | ||
1397 | void QtRec::newSound() { | 1397 | void QtRec::newSound() { |
@@ -1404,17 +1404,17 @@ void QtRec::newSound() { | |||
1404 | } | 1404 | } |
1405 | 1405 | ||
1406 | } | 1406 | } |
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; |
1418 | #ifndef DEV_VERSION | 1418 | #ifndef DEV_VERSION |
1419 | switch ( QMessageBox::warning(this,tr("Delete"), | 1419 | switch ( QMessageBox::warning(this,tr("Delete"), |
1420 | tr("Do you really want to <font size=+2><B>DELETE</B></font>\nthe selected file?"), | 1420 | tr("Do you really want to <font size=+2><B>DELETE</B></font>\nthe selected file?"), |
@@ -1461,13 +1461,13 @@ void QtRec::deleteSound() { | |||
1461 | initIconView(); | 1461 | initIconView(); |
1462 | update(); | 1462 | update(); |
1463 | } | 1463 | } |
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 | ||
1471 | void QtRec::keyPressEvent( QKeyEvent *e) { | 1471 | void QtRec::keyPressEvent( QKeyEvent *e) { |
1472 | 1472 | ||
1473 | switch ( e->key() ) { | 1473 | switch ( e->key() ) { |
@@ -1635,13 +1635,13 @@ void QtRec::endRecording() { | |||
1635 | cmd.sprintf("mv "+ wavFile->trackName() + " " + wavFile->currentFileName); | 1635 | cmd.sprintf("mv "+ wavFile->trackName() + " " + wavFile->currentFileName); |
1636 | qDebug("moving tmp file to "+currentFileName); | 1636 | qDebug("moving tmp file to "+currentFileName); |
1637 | system(cmd.latin1()); | 1637 | system(cmd.latin1()); |
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); |
1645 | 1645 | ||
1646 | currentFile = QFileInfo(wavFile->currentFileName).fileName(); | 1646 | currentFile = QFileInfo(wavFile->currentFileName).fileName(); |
1647 | currentFile=currentFile.left(currentFile.length()-4); | 1647 | currentFile=currentFile.left(currentFile.length()-4); |
@@ -1701,18 +1701,18 @@ void QtRec::endPlaying() { | |||
1701 | } | 1701 | } |
1702 | 1702 | ||
1703 | bool QtRec::openPlayFile() { | 1703 | 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 |
1716 | if( cfg.readEntry( QString::number(i),"").find( currentFile,0,true) != -1) { | 1716 | if( cfg.readEntry( QString::number(i),"").find( currentFile,0,true) != -1) { |
1717 | currentFileName=cfg.readEntry( currentFile, "" ); | 1717 | currentFileName=cfg.readEntry( currentFile, "" ); |
1718 | qDebug("opening for play: "+currentFileName); | 1718 | qDebug("opening for play: "+currentFileName); |
@@ -1723,13 +1723,13 @@ bool QtRec::openPlayFile() { | |||
1723 | false); | 1723 | false); |
1724 | filePara.fd = wavFile->wavHandle(); | 1724 | filePara.fd = wavFile->wavHandle(); |
1725 | if(filePara.fd == -1) { | 1725 | if(filePara.fd == -1) { |
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; |
1733 | } else { | 1733 | } else { |
1734 | filePara.numberSamples=wavFile->getNumberSamples(); | 1734 | filePara.numberSamples=wavFile->getNumberSamples(); |
1735 | filePara.format = wavFile->getFormat(); | 1735 | filePara.format = wavFile->getFormat(); |
@@ -1751,13 +1751,13 @@ void QtRec::listPressed( int mouse, QListViewItem *item, const QPoint &, int ) { | |||
1751 | switch (mouse) { | 1751 | switch (mouse) { |
1752 | case 1: { | 1752 | case 1: { |
1753 | if( renameBox !=0 ) //tricky | 1753 | if( renameBox !=0 ) //tricky |
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: |
1761 | showListMenu(item); | 1761 | showListMenu(item); |
1762 | ListView1->clearSelection(); | 1762 | ListView1->clearSelection(); |
1763 | break; | 1763 | break; |
@@ -1790,23 +1790,23 @@ void QtRec::doBeam() { | |||
1790 | qApp->processEvents(); | 1790 | qApp->processEvents(); |
1791 | if( ListView1->currentItem() == NULL) | 1791 | if( ListView1->currentItem() == NULL) |
1792 | return; | 1792 | return; |
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); |
1800 | 1800 | ||
1801 | for(int i=0;i<nFiles+1;i++) { | 1801 | for(int i=0;i<nFiles+1;i++) { |
1802 | if( cfg.readEntry( QString::number(i),"").find(file,0,true) != -1) { | 1802 | if( cfg.readEntry( QString::number(i),"").find(file,0,true) != -1) { |
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 | } |
1810 | } | 1810 | } |
1811 | 1811 | ||
1812 | void QtRec::doMenuPlay() { | 1812 | void QtRec::doMenuPlay() { |
@@ -1842,13 +1842,13 @@ void QtRec::okRename() { | |||
1842 | QString filename = renameBox->text(); | 1842 | QString filename = renameBox->text(); |
1843 | cancelRename(); | 1843 | cancelRename(); |
1844 | 1844 | ||
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); |
1852 | 1852 | ||
1853 | qDebug("filename is " + filename); | 1853 | qDebug("filename is " + filename); |
1854 | 1854 | ||
@@ -1929,13 +1929,13 @@ void QtRec::doMicMuting(bool b) { | |||
1929 | cfg.writeEntry( "MicMute",b); | 1929 | cfg.writeEntry( "MicMute",b); |
1930 | cfg.write(); | 1930 | cfg.write(); |
1931 | QCopEnvelope( "QPE/System", "micChange(bool)" ) << b; | 1931 | QCopEnvelope( "QPE/System", "micChange(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; |
1939 | cfg.write(); | 1939 | cfg.write(); |
1940 | 1940 | ||
1941 | if(b) { | 1941 | if(b) { |
@@ -2190,13 +2190,13 @@ void QtRec::setRecordButton(bool b) { | |||
2190 | } | 2190 | } |
2191 | 2191 | ||
2192 | void QtRec::fillDirectoryCombo() { | 2192 | 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; |
2200 | const QList<FileSystem> &fs = storageInfo.fileSystems(); | 2200 | const QList<FileSystem> &fs = storageInfo.fileSystems(); |
2201 | QListIterator<FileSystem> it ( fs ); | 2201 | QListIterator<FileSystem> it ( fs ); |
2202 | QString storage; | 2202 | QString storage; |
@@ -2221,13 +2221,13 @@ void QtRec::doMute(bool b) { | |||
2221 | doVolMuting( b); | 2221 | doVolMuting( b); |
2222 | doMicMuting( b); | 2222 | doMicMuting( b); |
2223 | } | 2223 | } |
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); |
2231 | outMuteCheckBox->setChecked( b); | 2231 | outMuteCheckBox->setChecked( b); |
2232 | inMuteCheckBox->setChecked( b); | 2232 | inMuteCheckBox->setChecked( b); |
2233 | } | 2233 | } |
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 | |||
@@ -41,13 +41,13 @@ qDebug("new wave file"); | |||
41 | } | 41 | } |
42 | } | 42 | } |
43 | 43 | ||
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()); |
51 | QString date; | 51 | QString date; |
52 | date = TimeString::dateString( QDateTime::currentDateTime(),false,true); | 52 | date = TimeString::dateString( QDateTime::currentDateTime(),false,true); |
53 | date.replace(QRegExp("'"),""); | 53 | date.replace(QRegExp("'"),""); |