summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2003-11-13 08:33:15 (UTC)
committer llornkcor <llornkcor>2003-11-13 08:33:15 (UTC)
commit3451f19533b2dd342a57bceda4aec20edd4048b7 (patch) (side-by-side diff)
tree9065ee04704e4f095a093696be94b1776b873c1e
parent452f0cc3d9fdd792d2050ceaffd33b3d1611fcc3 (diff)
downloadopie-3451f19533b2dd342a57bceda4aec20edd4048b7.zip
opie-3451f19533b2dd342a57bceda4aec20edd4048b7.tar.gz
opie-3451f19533b2dd342a57bceda4aec20edd4048b7.tar.bz2
update wavfile
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opierec/wavFile.cpp35
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
@@ -4,184 +4,189 @@
#include <qmessagebox.h>
#include <qdir.h>
#include <qpe/timestring.h>
#include <qpe/config.h>
#include <errno.h>
#include <sys/time.h>
#include <sys/types.h>
#include <sys/vfs.h>
#include <fcntl.h>
#include <math.h>
#include <mntent.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
WavFile::WavFile( QObject * parent,const QString &fileName, bool makeNwFile, int sampleRate,
int channels, int resolution, int format )
: QObject( parent)
{
-qDebug("new wave file");
+//qDebug("new wave file");
bool b = makeNwFile;
wavSampleRate=sampleRate;
wavFormat=format;
wavChannels=channels;
wavResolution=resolution;
useTmpFile=false;
if( b) {
newFile();
} else {
openFile(fileName);
}
}
bool WavFile::newFile() {
- qDebug("Set up new file");
+// qDebug("Set up new file");
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)
currentFileName += "/" + date;
else
currentFileName += date;
currentFileName+=".wav";
- qDebug("set up file for recording: "+currentFileName);
- char *pointer;
+// qDebug("set up file for recording: "+currentFileName);
+ char pointer[] = "/tmp/opierec-XXXXXX";
+ int fd = 0;
if( currentFileName.find("/mnt",0,true) == -1
&& currentFileName.find("/tmp",0,true) == -1 ) {
// if destination file is most likely in flash (assuming jffs2)
// we have to write to a different filesystem first
useTmpFile = true;
- pointer=tmpnam(NULL);
- qDebug("Opening tmp file %s",pointer);
+ if(( fd = mkstemp( pointer)) < 0 ) {
+ perror("mkstemp failed");
+ return false;
+ }
+
+// qDebug("Opening tmp file %s",pointer);
track.setName( pointer);
} else { //just use regular file.. no moving
useTmpFile = false;
track.setName( currentFileName);
}
if(!track.open( IO_ReadWrite | IO_Truncate)) {
QString errorMsg=(QString)strerror(errno);
qDebug(errorMsg);
QMessageBox::message("Note", "Error opening file.\n" +errorMsg);
return false;
} else {
setWavHeader( track.handle() , &hdr);
}
return true;
}
WavFile::~WavFile() {
closeFile();
}
void WavFile::closeFile() {
if(track.isOpen())
track.close();
}
int WavFile::openFile(const QString &currentFileName) {
- qDebug("open play file "+currentFileName);
+// qDebug("open play file "+currentFileName);
closeFile();
track.setName(currentFileName);
if(!track.open(IO_ReadOnly)) {
QString errorMsg=(QString)strerror(errno);
qDebug("<<<<<<<<<<< "+errorMsg+currentFileName);
QMessageBox::message("Note", "Error opening file.\n" +errorMsg);
return -1;
} else {
parseWavHeader( track.handle());
}
return track.handle();
}
bool WavFile::setWavHeader(int fd, wavhdr *hdr) {
strncpy((*hdr).riffID, "RIFF", 4); // RIFF
strncpy((*hdr).wavID, "WAVE", 4); //WAVE
strncpy((*hdr).fmtID, "fmt ", 4); // fmt
(*hdr).fmtLen = 16; // format length = 16
if( wavFormat == WAVE_FORMAT_PCM) {
(*hdr).fmtTag = 1; // PCM
- qDebug("set header WAVE_FORMAT_PCM");
+// qDebug("set header WAVE_FORMAT_PCM");
}
else {
(*hdr).fmtTag = WAVE_FORMAT_DVI_ADPCM; //intel ADPCM
- qDebug("set header WAVE_FORMAT_DVI_ADPCM");
+ // qDebug("set header WAVE_FORMAT_DVI_ADPCM");
}
// (*hdr).nChannels = 1;//filePara.channels;// ? 2 : 1*/; // channels
(*hdr).nChannels = wavChannels;// ? 2 : 1*/; // channels
(*hdr).sampleRate = wavSampleRate; //samples per second
(*hdr).avgBytesPerSec = (wavSampleRate)*( wavChannels*(wavResolution/8)); // bytes per second
(*hdr).nBlockAlign = wavChannels*( wavResolution/8); //block align
(*hdr).bitsPerSample = wavResolution; //bits per sample 8, or 16
strncpy((*hdr).dataID, "data", 4);
write( fd,hdr, sizeof(*hdr));
- qDebug("writing header: bitrate%d, samplerate %d, channels %d",
- wavResolution, wavSampleRate, wavChannels);
+// qDebug("writing header: bitrate%d, samplerate %d, channels %d",
+// wavResolution, wavSampleRate, wavChannels);
return true;
}
bool WavFile::adjustHeaders(int fd, int total) {
lseek(fd, 4, SEEK_SET);
int i = total + 36;
write( fd, &i, sizeof(i));
lseek( fd, 40, SEEK_SET);
write( fd, &total, sizeof(total));
- qDebug("adjusting header %d", total);
+// qDebug("adjusting header %d", total);
return true;
}
int WavFile::parseWavHeader(int fd) {
- qDebug("Parsing wav header");
+// qDebug("Parsing wav header");
char string[4];
int found;
short fmt;
unsigned short ch, bitrate;
unsigned long samplerrate, longdata;
if (read(fd, string, 4) < 4) {
qDebug(" Could not read from sound file.\n");
return -1;
}
if (strncmp(string, "RIFF", 4)) {
qDebug(" not a valid WAV file.\n");
return -1;
}
lseek(fd, 4, SEEK_CUR);
if (read(fd, string, 4) < 4) {
qDebug("Could not read from sound file.\n");
return -1;
}
if (strncmp(string, "WAVE", 4)) {
qDebug("not a valid WAV file.\n");
return -1;
}
found = 0;
@@ -237,50 +242,50 @@ int WavFile::parseWavHeader(int fd) {
}
found++;
}
}
found = 0;
while (!found) {
if (read(fd, string, 4) < 4) {
qDebug("Could not read from sound file.\n");
return -1;
}
if (strncmp(string, "data", 4)) {
if (read(fd, &longdata, 4)<4) {
qDebug("Could not read from sound file.\n");
return -1;
}
lseek(fd, longdata, SEEK_CUR);
} else {
if (read(fd, &longdata, 4) < 4) {
qDebug("Could not read from sound file.\n");
return -1;
} else {
wavNumberSamples = longdata;
- qDebug("file has length of %d \nlasting %d seconds", longdata,
- (( longdata / wavSampleRate) / wavChannels) / ( wavChannels*( wavResolution/8)) );
+ qDebug("file has length of %d \nlasting %d seconds", (int)longdata,
+ (int)(( longdata / wavSampleRate) / wavChannels) / ( wavChannels*( wavResolution/8)) );
// wavSeconds = (( longdata / wavSampleRate) / wavChannels) / ( wavChannels*( wavResolution/8));
return longdata;
}
}
}
lseek(fd, 0, SEEK_SET);
return 0;
}
QString WavFile::trackName() {
return track.name();
}
int WavFile::wavHandle(){
return track.handle();
}
int WavFile::getFormat() {
return wavFormat;
}