summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-04-24 23:47:05 (UTC)
committer llornkcor <llornkcor>2002-04-24 23:47:05 (UTC)
commitb6958ff0363b194e129584a0a0a597bd643718a3 (patch) (side-by-side diff)
treee5b68b3bd300e029685a58152f23d690895b9070
parent26d2eaa54161d16521cfc7b2866dd8f14fe54b42 (diff)
downloadopie-b6958ff0363b194e129584a0a0a597bd643718a3.zip
opie-b6958ff0363b194e129584a0a0a597bd643718a3.tar.gz
opie-b6958ff0363b194e129584a0a0a597bd643718a3.tar.bz2
bug fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/vmemo/vmemo.cpp26
1 files changed, 15 insertions, 11 deletions
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index 4c55dc7..22cb276 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -245,71 +245,74 @@ void VMemo::paintEvent( QPaintEvent* )
void VMemo::mousePressEvent( QMouseEvent *me )
{
// just to be safe
if (recording) {
recording = FALSE;
return;
}
/*
No mousePress/mouseRelease recording on the iPAQ. The REC button on the iPAQ calls these functions
mousePressEvent and mouseReleaseEvent with a NULL parameter.
*/
- if (!systemZaurus && me != NULL)
- return;
-
+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX)
+ if (!systemZaurus )
+ return;
+#endif
+
Config config( "Sound" );
config.setGroup( "System" );
useAlerts = config.readBoolEntry("Alert");
// if(useAlerts)
// QMessageBox::message("VMemo","Really Record?");//) ==1)
// return;
// } else {
+ if (!systemZaurus )
QSound::play(Resource::findSound("vmemob"));
// }
qDebug("Start recording");
recording = TRUE;
if (openDSP() == -1) {
QMessageBox::critical(0, "VMemo", "Could not open dsp device.\n"+errorMsg, "Abort");
recording = FALSE;
return;
}
Config vmCfg("VMemo");
vmCfg.setGroup("Defaults");
QDateTime dt = QDateTime::currentDateTime();
QString fName;
Config cfg( "Sound" );
cfg.setGroup( "System" );
- fileName = cfg.readEntry("RecLocation",QPEApplication::documentDir() );
+ fName = QPEApplication::documentDir() ;
+ fileName = cfg.readEntry("RecLocation", fName);
int s;
s=fileName.find(':');
if(s)
- fileName=fileName.right(fileName.length()-s-2)+"/";
-
-// if( !fileName.right(1).find('/') == -1)
-// fileName+="/audio/";
-// else
-// fileName+="audio/";
+ fileName=fileName.right(fileName.length()-s-2);
+ qDebug("filename will be "+fileName);
+ if( !fileName.right(1).find('/') == -1)
+ fileName+="/";
// if(systemZaurus)
// fileName=vmCfg.readEntry("Dir", "/mnt/cf/"); // zaurus does not have /mnt/ramfs
// else
// fileName=vmCfg.readEntry("Dir", "/mnt/ramfs/");
fName = "vm_"+ dt.toString()+ ".wav";
+
fileName+=fName;
qDebug("filename is "+fileName);
// No spaces in the filename
fileName.replace(QRegExp("'"),"");
fileName.replace(QRegExp(" "),"_");
fileName.replace(QRegExp(":"),".");
fileName.replace(QRegExp(","),"");
if(openWAV(fileName.latin1()) == -1) {
QString err("Could not open the output file\n");
err += fileName;
QMessageBox::critical(0, "VMemo", err, "Abort");
@@ -354,25 +357,24 @@ int VMemo::openDSP()
qDebug("samplerate: %d, channels %d, resolution %d", speed, channels, resolution);
if(systemZaurus) {
dsp = open("/dev/dsp1", O_RDWR); //Zaurus needs /dev/dsp1
channels=1; //zaurus has one input channel
} else {
dsp = open("/dev/dsp", O_RDWR);
}
if(dsp == -1) {
perror("open(\"/dev/dsp\")");
-
errorMsg="open(\"/dev/dsp\")\n "+(QString)strerror(errno);
return -1;
}
if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1) {
perror("ioctl(\"SNDCTL_DSP_SETFMT\")");
errorMsg="ioctl(\"SNDCTL_DSP_SETFMT\")\n%d\n"+(QString)strerror(errno),format;
return -1;
}
if(ioctl(dsp, SNDCTL_DSP_CHANNELS , &channels)==-1) {
perror("ioctl(\"SNDCTL_DSP_CHANNELS\")");
errorMsg="ioctl(\"SNDCTL_DSP_CHANNELS\")\n%d\n"+(QString)strerror(errno),channels;
@@ -505,16 +507,18 @@ void VMemo::record(void)
}
value = length+36;
lseek(wav, 4, SEEK_SET);
write(wav, &value, 4);
lseek(wav, 40, SEEK_SET);
write(wav, &length, 4);
track.close();
if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1)
perror("ioctl(\"SNDCTL_DSP_RESET\")");
::close(dsp);
+ fileName = fileName.left(fileName.length()-4);
if(useAlerts)
QMessageBox::message("Vmemo"," Done recording\n"+ fileName);
+ qDebug("done recording "+fileName);
QSound::play(Resource::findSound("vmemoe"));
}