author | llornkcor <llornkcor> | 2003-11-13 08:33:15 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2003-11-13 08:33:15 (UTC) |
commit | 3451f19533b2dd342a57bceda4aec20edd4048b7 (patch) (unidiff) | |
tree | 9065ee04704e4f095a093696be94b1776b873c1e /noncore/multimedia/opierec | |
parent | 452f0cc3d9fdd792d2050ceaffd33b3d1611fcc3 (diff) | |
download | opie-3451f19533b2dd342a57bceda4aec20edd4048b7.zip opie-3451f19533b2dd342a57bceda4aec20edd4048b7.tar.gz opie-3451f19533b2dd342a57bceda4aec20edd4048b7.tar.bz2 |
update wavfile
-rw-r--r-- | noncore/multimedia/opierec/wavFile.cpp | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/noncore/multimedia/opierec/wavFile.cpp b/noncore/multimedia/opierec/wavFile.cpp index 7bfffb6..b177c91 100644 --- a/noncore/multimedia/opierec/wavFile.cpp +++ b/noncore/multimedia/opierec/wavFile.cpp | |||
@@ -26,5 +26,5 @@ WavFile::WavFile( QObject * parent,const QString &fileName, bool makeNwFile, int | |||
26 | : QObject( parent) | 26 | : QObject( parent) |
27 | { | 27 | { |
28 | qDebug("new wave file"); | 28 | //qDebug("new wave file"); |
29 | bool b = makeNwFile; | 29 | bool b = makeNwFile; |
30 | wavSampleRate=sampleRate; | 30 | wavSampleRate=sampleRate; |
@@ -42,5 +42,5 @@ qDebug("new wave file"); | |||
42 | bool WavFile::newFile() { | 42 | bool WavFile::newFile() { |
43 | 43 | ||
44 | qDebug("Set up new file"); | 44 | // qDebug("Set up new file"); |
45 | Config cfg("OpieRec"); | 45 | Config cfg("OpieRec"); |
46 | cfg.setGroup("Settings"); | 46 | cfg.setGroup("Settings"); |
@@ -61,6 +61,7 @@ bool WavFile::newFile() { | |||
61 | currentFileName+=".wav"; | 61 | currentFileName+=".wav"; |
62 | 62 | ||
63 | qDebug("set up file for recording: "+currentFileName); | 63 | // qDebug("set up file for recording: "+currentFileName); |
64 | char *pointer; | 64 | char pointer[] = "/tmp/opierec-XXXXXX"; |
65 | int fd = 0; | ||
65 | 66 | ||
66 | if( currentFileName.find("/mnt",0,true) == -1 | 67 | if( currentFileName.find("/mnt",0,true) == -1 |
@@ -70,6 +71,10 @@ bool WavFile::newFile() { | |||
70 | 71 | ||
71 | useTmpFile = true; | 72 | useTmpFile = true; |
72 | pointer=tmpnam(NULL); | 73 | if(( fd = mkstemp( pointer)) < 0 ) { |
73 | qDebug("Opening tmp file %s",pointer); | 74 | perror("mkstemp failed"); |
75 | return false; | ||
76 | } | ||
77 | |||
78 | // qDebug("Opening tmp file %s",pointer); | ||
74 | track.setName( pointer); | 79 | track.setName( pointer); |
75 | 80 | ||
@@ -102,5 +107,5 @@ void WavFile::closeFile() { | |||
102 | 107 | ||
103 | int WavFile::openFile(const QString ¤tFileName) { | 108 | int WavFile::openFile(const QString ¤tFileName) { |
104 | qDebug("open play file "+currentFileName); | 109 | // qDebug("open play file "+currentFileName); |
105 | closeFile(); | 110 | closeFile(); |
106 | 111 | ||
@@ -127,9 +132,9 @@ bool WavFile::setWavHeader(int fd, wavhdr *hdr) { | |||
127 | if( wavFormat == WAVE_FORMAT_PCM) { | 132 | if( wavFormat == WAVE_FORMAT_PCM) { |
128 | (*hdr).fmtTag = 1; // PCM | 133 | (*hdr).fmtTag = 1; // PCM |
129 | qDebug("set header WAVE_FORMAT_PCM"); | 134 | // qDebug("set header WAVE_FORMAT_PCM"); |
130 | } | 135 | } |
131 | else { | 136 | else { |
132 | (*hdr).fmtTag = WAVE_FORMAT_DVI_ADPCM; //intel ADPCM | 137 | (*hdr).fmtTag = WAVE_FORMAT_DVI_ADPCM; //intel ADPCM |
133 | qDebug("set header WAVE_FORMAT_DVI_ADPCM"); | 138 | // qDebug("set header WAVE_FORMAT_DVI_ADPCM"); |
134 | } | 139 | } |
135 | 140 | ||
@@ -145,6 +150,6 @@ bool WavFile::setWavHeader(int fd, wavhdr *hdr) { | |||
145 | 150 | ||
146 | write( fd,hdr, sizeof(*hdr)); | 151 | write( fd,hdr, sizeof(*hdr)); |
147 | qDebug("writing header: bitrate%d, samplerate %d, channels %d", | 152 | // qDebug("writing header: bitrate%d, samplerate %d, channels %d", |
148 | wavResolution, wavSampleRate, wavChannels); | 153 | // wavResolution, wavSampleRate, wavChannels); |
149 | return true; | 154 | return true; |
150 | } | 155 | } |
@@ -156,10 +161,10 @@ bool WavFile::adjustHeaders(int fd, int total) { | |||
156 | lseek( fd, 40, SEEK_SET); | 161 | lseek( fd, 40, SEEK_SET); |
157 | write( fd, &total, sizeof(total)); | 162 | write( fd, &total, sizeof(total)); |
158 | qDebug("adjusting header %d", total); | 163 | // qDebug("adjusting header %d", total); |
159 | return true; | 164 | return true; |
160 | } | 165 | } |
161 | 166 | ||
162 | int WavFile::parseWavHeader(int fd) { | 167 | int WavFile::parseWavHeader(int fd) { |
163 | qDebug("Parsing wav header"); | 168 | // qDebug("Parsing wav header"); |
164 | char string[4]; | 169 | char string[4]; |
165 | int found; | 170 | int found; |
@@ -259,6 +264,6 @@ int WavFile::parseWavHeader(int fd) { | |||
259 | } else { | 264 | } else { |
260 | wavNumberSamples = longdata; | 265 | wavNumberSamples = longdata; |
261 | qDebug("file has length of %d \nlasting %d seconds", longdata, | 266 | qDebug("file has length of %d \nlasting %d seconds", (int)longdata, |
262 | (( longdata / wavSampleRate) / wavChannels) / ( wavChannels*( wavResolution/8)) ); | 267 | (int)(( longdata / wavSampleRate) / wavChannels) / ( wavChannels*( wavResolution/8)) ); |
263 | // wavSeconds = (( longdata / wavSampleRate) / wavChannels) / ( wavChannels*( wavResolution/8)); | 268 | // wavSeconds = (( longdata / wavSampleRate) / wavChannels) / ( wavChannels*( wavResolution/8)); |
264 | 269 | ||