Diffstat (limited to 'noncore/multimedia/opierec/qtrec.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opierec/qtrec.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/noncore/multimedia/opierec/qtrec.cpp b/noncore/multimedia/opierec/qtrec.cpp index 6eb6524..3b8cb0d 100644 --- a/noncore/multimedia/opierec/qtrec.cpp +++ b/noncore/multimedia/opierec/qtrec.cpp | |||
@@ -112,28 +112,27 @@ int sd; | |||
112 | 112 | ||
113 | Waveform* waveform; | 113 | Waveform* waveform; |
114 | Device *soundDevice; | 114 | Device *soundDevice; |
115 | 115 | ||
116 | 116 | ||
117 | #ifdef THREADED | 117 | #ifdef THREADED |
118 | void quickRec() | 118 | void quickRec() |
119 | #else | 119 | #else |
120 | void QtRec::quickRec() | 120 | void QtRec::quickRec() |
121 | #endif | 121 | #endif |
122 | { | 122 | { |
123 | 123 | ||
124 | qDebug("%d", | 124 | odebug << ( filePara.numberSamples/filePara.sampleRate * filePara.channels ) << oendl; |
125 | filePara.numberSamples/filePara.sampleRate * filePara.channels); | 125 | odebug << "samples " << filePara.numberSamples << ", rate " << filePara.sampleRate |
126 | qDebug("samples %d, rate %d, channels %d", | 126 | << ", channels " << filePara.channels << oendl; |
127 | filePara.numberSamples, filePara.sampleRate, filePara.channels); | ||
128 | 127 | ||
129 | int total = 0; // Total number of bytes read in so far. | 128 | int total = 0; // Total number of bytes read in so far. |
130 | int bytesWritten, number; | 129 | int bytesWritten, number; |
131 | 130 | ||
132 | bytesWritten = 0; | 131 | bytesWritten = 0; |
133 | number = 0; | 132 | number = 0; |
134 | QString num; | 133 | QString num; |
135 | int level = 0; | 134 | int level = 0; |
136 | int threshold = 0; | 135 | int threshold = 0; |
137 | // int bits = filePara.resolution; | 136 | // int bits = filePara.resolution; |
138 | // odebug << "bits " << bits << "" << oendl; | 137 | // odebug << "bits " << bits << "" << oendl; |
139 | 138 | ||
@@ -910,51 +909,50 @@ bool QtRec::rec() { //record | |||
910 | return false; | 909 | return false; |
911 | } else { | 910 | } else { |
912 | secCount = 1; | 911 | secCount = 1; |
913 | playLabel2->setText(tr("Stop")); | 912 | playLabel2->setText(tr("Stop")); |
914 | monitoring = false; | 913 | monitoring = false; |
915 | setRecordButton( true); | 914 | setRecordButton( true); |
916 | 915 | ||
917 | if( setupAudio( true)) | 916 | if( setupAudio( true)) |
918 | if(setUpFile()) { | 917 | if(setUpFile()) { |
919 | int fileSize = 0; | 918 | int fileSize = 0; |
920 | Config cfg("OpieRec"); | 919 | Config cfg("OpieRec"); |
921 | cfg.setGroup("Settings"); | 920 | cfg.setGroup("Settings"); |
922 | // qDebug( "<<<<<<<Device bits %d, device rate %d, device channels %d", | 921 | // odebug << "<<<<<<<Device bits " << soundDevice->getDeviceBits() |
923 | // soundDevice->getDeviceBits(), | 922 | // << ", device rate " << soundDevice->getDeviceRate() |
924 | // soundDevice->getDeviceRate(), | 923 | // << ", device channels " << soundDevice->getDeviceChannels() << oendl; |
925 | // soundDevice->getDeviceChannels()); | ||
926 | 924 | ||
927 | //filePara.sampleRate = cfg.readNumEntry("samplerate", 22050); | 925 | //filePara.sampleRate = cfg.readNumEntry("samplerate", 22050); |
928 | // odebug << "sample rate is " << filePara.sampleRate << "" << oendl; | 926 | // odebug << "sample rate is " << filePara.sampleRate << "" << oendl; |
929 | filePara.SecondsToRecord = getCurrentSizeLimit(); | 927 | filePara.SecondsToRecord = getCurrentSizeLimit(); |
930 | 928 | ||
931 | // odebug << "size limit " << filePara.SecondsToRecord << " sec" << oendl; | 929 | // odebug << "size limit " << filePara.SecondsToRecord << " sec" << oendl; |
932 | int diskSize = checkDiskSpace( (const QString &) wavFile->trackName()); | 930 | int diskSize = checkDiskSpace( (const QString &) wavFile->trackName()); |
933 | 931 | ||
934 | if( filePara.SecondsToRecord == 0) { | 932 | if( filePara.SecondsToRecord == 0) { |
935 | fileSize = diskSize; | 933 | fileSize = diskSize; |
936 | } else if( filePara.format == WAVE_FORMAT_PCM) { | 934 | } else if( filePara.format == WAVE_FORMAT_PCM) { |
937 | // odebug << "WAVE_FORMAT_PCM" << oendl; | 935 | // odebug << "WAVE_FORMAT_PCM" << oendl; |
938 | fileSize = (filePara.SecondsToRecord ) * filePara.channels | 936 | fileSize = (filePara.SecondsToRecord ) * filePara.channels |
939 | * filePara.sampleRate * ( filePara.resolution / 8) + 1000; | 937 | * filePara.sampleRate * ( filePara.resolution / 8) + 1000; |
940 | } else { | 938 | } else { |
941 | // odebug << "WAVE_FORMAT_DVI_ADPCM" << oendl; | 939 | // odebug << "WAVE_FORMAT_DVI_ADPCM" << oendl; |
942 | fileSize = ((filePara.SecondsToRecord) * filePara.channels | 940 | fileSize = ((filePara.SecondsToRecord) * filePara.channels |
943 | * filePara.sampleRate * ( filePara.resolution / 8) ) / 4 + 250; | 941 | * filePara.sampleRate * ( filePara.resolution / 8) ) / 4 + 250; |
944 | } | 942 | } |
945 | 943 | ||
946 | filePara.samplesToRecord = fileSize; | 944 | filePara.samplesToRecord = fileSize; |
947 | qDebug("filesize should be %d, bits %d, rate %d", | 945 | odebug << "filesize should be " << filePara.samplesToRecord |
948 | filePara.samplesToRecord, filePara.resolution, filePara.sampleRate); | 946 | << ", bits " << filePara.resolution << ", rate " << filePara.sampleRate; |
949 | if( paused) { | 947 | if( paused) { |
950 | paused = false; | 948 | paused = false; |
951 | } | 949 | } |
952 | // else { | 950 | // else { |
953 | odebug << "Setting timeslider " << filePara.samplesToRecord << "" << oendl; | 951 | odebug << "Setting timeslider " << filePara.samplesToRecord << "" << oendl; |
954 | // if(fileSize != 0) | 952 | // if(fileSize != 0) |
955 | timeSlider->setRange(0, filePara.samplesToRecord); | 953 | timeSlider->setRange(0, filePara.samplesToRecord); |
956 | // } | 954 | // } |
957 | 955 | ||
958 | if( diskSize < fileSize/1024) { | 956 | if( diskSize < fileSize/1024) { |
959 | QMessageBox::warning(this, | 957 | QMessageBox::warning(this, |
960 | tr("Low Disk Space"), | 958 | tr("Low Disk Space"), |