summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2005-02-18 07:36:37 (UTC)
committer llornkcor <llornkcor>2005-02-18 07:36:37 (UTC)
commit436a26541402c85a24eaf9ffb3ab2e866631000c (patch) (side-by-side diff)
treec78780fa2a6a461e58646b71edb09fdd717f35ad
parentfc9d9892b0798f2f0b27f2a9c60e72ff27178b8a (diff)
downloadopie-436a26541402c85a24eaf9ffb3ab2e866631000c.zip
opie-436a26541402c85a24eaf9ffb3ab2e866631000c.tar.gz
opie-436a26541402c85a24eaf9ffb3ab2e866631000c.tar.bz2
fix icon showing. add filename to visual.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/vmemo/vmemo.cpp317
1 files changed, 154 insertions, 163 deletions
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index d5808b7..8ba1eb7 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -210,59 +210,54 @@ VMemo::VMemo( QWidget *parent, const char *_name )
vmCfg.setGroup("Defaults");
int toggleKey = setToggleButton(vmCfg.readNumEntry("toggleKey", -1));
useADPCM = vmCfg.readBoolEntry("use_ADPCM", 0);
- odebug << "toggleKey " << toggleKey << "" << oendl;
+ owarn <<"VMemo toggleKey" << toggleKey << oendl;
-// if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" ))
-// systemZaurus=TRUE;
-// else
- systemZaurus = FALSE;
+ systemZaurus = false;
-// myChannel = new QCopChannel( "QPE/VMemo", this );
myChannel = new QCopChannel( "QPE/VMemo", this );
connect( myChannel, SIGNAL(received(const QCString&,const QByteArray&)),
this, SLOT(receive(const QCString&,const QByteArray&)) );
if( toggleKey != -1 ) {
- odebug << "Register key " << toggleKey << "" << oendl;
- QCopEnvelope e("QPE/Launcher", "keyRegister(int,QCString,QCString)");
+ owarn << "Register key " << toggleKey << "" << oendl;
+
+ QCopEnvelope e("QPE/Launcher", "keyRegister(int,QCString,QCString)");
// e << 4096; // Key_Escape
// e << Key_F5; //4148
e << toggleKey;
e << QCString("QPE/VMemo");
e << QCString("toggleRecord()");
}
- if(toggleKey == 1)
- usingIcon = TRUE;
+ if(toggleKey == 0)
+ usingIcon = true;
else
- usingIcon = FALSE;
-// if( vmCfg.readNumEntry("hideIcon",0) == 1)
+ usingIcon = false;
if (!usingIcon)
hide();
- recording = FALSE;
- // }
+ recording = false;
}
VMemo::~VMemo() {
}
int VMemo::position()
{
- return 6;
+ return 1;
}
void VMemo::receive( const QCString &msg, const QByteArray &data ) {
QDataStream stream( data, IO_ReadOnly );
if (msg == "toggleRecord()") {
if (recording) {
- fromToggle = TRUE;
+ fromToggle = true;
stopRecording();
} else {
- fromToggle = TRUE;
+ fromToggle = true;
startRecording();
}
}
}
@@ -272,19 +267,16 @@ void VMemo::paintEvent( QPaintEvent* ) {
p.drawPixmap( 0, 1,( const char** ) vmemo_xpm );
}
void VMemo::mousePressEvent( QMouseEvent * /*me*/) {
- /* 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(!recording)
- startRecording();
- else
- stopRecording();
+ if(!recording) {
+ if(!startRecording() ){
+ QMessageBox::critical(0, "vmemo", "Abort Recording", "Abort Recording");
+ }
+ } else {
+ stopRecording();
+ }
}
void VMemo::mouseReleaseEvent( QMouseEvent * ) {
}
@@ -292,22 +284,15 @@ void VMemo::mouseReleaseEvent( QMouseEvent * ) {
bool VMemo::startRecording() {
Config config( "Vmemo" );
config.setGroup( "System" );
- useAlerts = config.readBoolEntry("Alert",1);
- if(useAlerts) {
-
- msgLabel = new QLabel( 0, "alertLabel" );
- msgLabel->setText("<B><P><font size=+2>VMemo-Recording</font></B>");
- msgLabel->show();
- }
odebug << "Start recording engines" << oendl;
- recording = TRUE;
+ recording = true;
if (openDSP() == -1) {
- recording = FALSE;
- return FALSE;
+ recording = false;
+ return false;
}
config.setGroup("Defaults");
@@ -333,10 +318,18 @@ bool VMemo::startRecording() {
if( fileName.right(1).find('/') == -1)
fileName+="/";
fName = "vm_"+ date + ".wav";
- fileName+=fName;
+ fileName += fName;
odebug << "filename is " + fileName << oendl;
+
+ useAlerts = config.readBoolEntry("Alert",1);
+ if(useAlerts) {
+ msgLabel = new QLabel( 0, "alertLabel" );
+ msgLabel->setText( tr("<B><P><font size=+2>VMemo-Recording</font></B><p>%1</p>").arg("vm_"+ date));
+ msgLabel->show();
+ }
+
// open tmp file here
char *pointer;
pointer=tmpnam(NULL);
odebug << "Opening tmp file " << pointer << "" << oendl;
@@ -346,14 +339,14 @@ bool VMemo::startRecording() {
QString err("Could not open the temp file\n");
err += fileName;
QMessageBox::critical(0, "vmemo", err, "Abort");
::close(dsp);
- return FALSE;
+ return false;
}
if( record() ) {
QString cmd;
- if( fileName.find(".wav",0,TRUE) == -1)
+ if( fileName.find(".wav",0,true) == -1)
fileName += ".wav";
cmd.sprintf("mv %s "+fileName, pointer);
// move tmp file to regular file here
@@ -370,18 +363,18 @@ bool VMemo::startRecording() {
l.setName(dlName);
l.setType("audio/x-wav");
l.setCategories(cats);
l.writeLink();
- return TRUE;
+ return true;
} else
- return FALSE;
+ return false;
}
void VMemo::stopRecording() {
// show();
odebug << "Stopped recording" << oendl;
- recording = FALSE;
+ recording = false;
if(useAlerts) {
msgLabel->close();
msgLabel=0;
delete msgLabel;
@@ -432,24 +425,24 @@ int VMemo::openDSP() {
}
if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1) {
perror("ioctl(\"SNDCTL_DSP_SETFMT\")");
- return -1;
+// return -1;
}
if(ioctl(dsp, SNDCTL_DSP_CHANNELS , &channels)==-1) {
perror("ioctl(\"SNDCTL_DSP_CHANNELS\")");
- return -1;
+// return -1;
}
if(ioctl(dsp, SNDCTL_DSP_SPEED , &speed)==-1) {
perror("ioctl(\"SNDCTL_DSP_SPEED\")");
- return -1;
+// return -1;
}
if(ioctl(dsp, SOUND_PCM_READ_RATE , &rate)==-1) {
perror("ioctl(\"SOUND_PCM_READ_RATE\")");
- return -1;
+// return -1;
}
- QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; //mute
+ QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << false; //mute
return 1;
}
@@ -490,28 +483,28 @@ int VMemo::openWAV(const char *filename) {
return 1;
}
bool VMemo::record() {
- length = 0;
- int bytesWritten = 0;
- int result = 0;
- int value = 0;
+ length = 0;
+ int bytesWritten = 0;
+ int result = 0;
+ int value = 0;
- QString msg;
- msg.sprintf("Recording format %d", format);
- odebug << msg << oendl;
+ QString msg;
+ msg.sprintf("Recording format %d", format);
+ odebug << msg << oendl;
- Config config("Vmemo");
- config.setGroup("Record");
- int sRate = config.readNumEntry("SizeLimit", 30);
- odebug << "VMEMO rate" << sRate << oendl;
+ Config config("Vmemo");
+ config.setGroup("Record");
+ int sRate = config.readNumEntry("SizeLimit", 30);
+ odebug << "VMEMO rate" << sRate << oendl;
- if(sRate > 0) {
- t_timer->start( sRate * 1000+1000, TRUE);
- }
+ if(sRate > 0) {
+ t_timer->start( sRate * 1000+1000, true);
+ }
- msg.sprintf("Recording format other");
- odebug << msg << oendl;
+ msg.sprintf("Recording format other");
+ odebug << msg << oendl;
config.setGroup("Defaults");
useADPCM = config.readBoolEntry("use_ADPCM", 0);
@@ -519,110 +512,108 @@ bool VMemo::record() {
unsigned short sound[bufsize]; //, monoBuffer[bufsize];
char abuf[bufsize / 2];
short sbuf[bufsize];
odebug << "ready to record"<< oendl;
- if(useADPCM) {
- odebug << "usr ADPCM" << oendl;
-
- while(recording) {
- result = ::read(dsp, sbuf, bufsize); // adpcm read
- if( result <= 0) {
- perror("recording error ");
- QMessageBox::message(tr("Note"),tr("error recording"));
- recording = FALSE;
- break;
- return FALSE;
- }
- adpcm_coder( sbuf, abuf, result/2, &encoder_state);
- bytesWritten = ::write(wav, abuf, result/4); // adpcm write
- length += bytesWritten;
-
- if(length < 0) {
- recording = false;
- perror("dev/dsp's is a lookin' messy");
- QMessageBox::message("Vmemo","Error writing to file\n"+ fileName);
- break;
- return FALSE;
- }
- printf("%d\r", length);
- fflush(stdout);
- qApp->processEvents();
- }
- } else {
- odebug << "use regular wav" << oendl;
- while(recording) {
- result = ::read(dsp, sound, bufsize); // read
- if( result <= 0) {
- perror("recording error ");
- QMessageBox::message(tr("Note"),tr("error recording"));
- recording = FALSE;
- break;
- return FALSE;
- }
-
- bytesWritten = ::write(wav, sound, result); // write
- length += bytesWritten;
-
- if(length < 0) {
- recording = false;
- perror("dev/dsp's is a lookin' messy");
- QMessageBox::message("Vmemo","Error writing to file\n"+ fileName);
- break;
- return FALSE;
- }
-// printf("%d\r", length);
-// fflush(stdout);
- qApp->processEvents();
- }
-// odebug << "result is " << result << oendl;
- }
- odebug << "file has length of " << length << " lasting " << (( length / speed) / channels) / 2 << " seconds" << oendl;
-
- value = length + 36;
-
- lseek(wav, 4, SEEK_SET);
- write(wav, &value, 4);
- lseek(wav, 40, SEEK_SET);
-
- write(wav, &length, 4);
-
- track.close();
- odebug << "Track closed" << oendl;
-
- if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1)
- perror("ioctl(\"SNDCTL_DSP_RESET\")");
-
- ::close(dsp);
-
- Config cfgO("OpieRec");
- cfgO.setGroup("Sounds");
-
- int nFiles = cfgO.readNumEntry( "NumberofFiles",0);
-
- QString currentFileName = fileName;
- QString currentFile = "vm_"+ date;
-
- float numberOfRecordedSeconds = (float) length / (float)speed * (float)2;
-
- cfgO.writeEntry( "NumberofFiles", nFiles + 1);
- cfgO.writeEntry( QString::number( nFiles + 1), currentFile);
- cfgO.writeEntry( currentFile, currentFileName);
-
- QString time;
- time.sprintf("%.2f", numberOfRecordedSeconds);
- cfgO.writeEntry( currentFileName, time );
+ if(useADPCM) {
+ odebug << "usr ADPCM" << oendl;
+
+ while(recording) {
+ result = ::read(dsp, sbuf, bufsize); // adpcm read
+ if( result <= 0) {
+ perror("recording error ");
+ QMessageBox::message(tr("Note"),tr("error recording"));
+ recording = false;
+ break;
+ return false;
+ }
+ adpcm_coder( sbuf, abuf, result/2, &encoder_state);
+ bytesWritten = ::write(wav, abuf, result/4); // adpcm write
+ length += bytesWritten;
+
+ if(length < 0) {
+ recording = false;
+ perror("dev/dsp's is a lookin' messy");
+ QMessageBox::message("Vmemo","Error writing to file\n"+ fileName);
+ break;
+ return false;
+ }
+ printf("%d\r", length);
+ fflush(stdout);
+ qApp->processEvents();
+ }
+ } else {
+ odebug << "use regular wav" << oendl;
+ while(recording) {
+ result = ::read(dsp, sound, bufsize); // read
+ if( result <= 0) {
+ perror("recording error ");
+ QMessageBox::message(tr("Note"),tr("error recording"));
+ recording = false;
+ break;
+ return false;
+ }
+
+ bytesWritten = ::write(wav, sound, result); // write
+ length += bytesWritten;
+
+ if(length < 0) {
+ recording = false;
+ perror("dev/dsp's is a lookin' messy");
+ QMessageBox::message("Vmemo","Error writing to file\n"+ fileName);
+ break;
+ return false;
+ }
+// printf("%d\r", length);
+// fflush(stdout);
+ qApp->processEvents();
+ }
+ }
+ owarn << "file has length of " << length << " lasting " << (( length / speed) / channels) / 2 << " seconds" << oendl;
+
+ 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);
+
+ Config cfgO("OpieRec");
+ cfgO.setGroup("Sounds");
+
+ int nFiles = cfgO.readNumEntry( "NumberofFiles",0);
+
+ QString currentFileName = fileName;
+ QString currentFile = "vm_"+ date;
+
+ float numberOfRecordedSeconds = (float) length / (float)speed * (float)2;
+
+ cfgO.writeEntry( "NumberofFiles", nFiles + 1);
+ cfgO.writeEntry( QString::number( nFiles + 1), currentFile);
+ cfgO.writeEntry( currentFile, currentFileName);
+
+ QString time;
+ time.sprintf("%.2f", numberOfRecordedSeconds);
+ cfgO.writeEntry( currentFileName, time );
// odebug << "writing config numberOfRecordedSeconds "+time << oendl;
- cfgO.write();
+ cfgO.write();
- odebug << "done recording "+fileName << oendl;
+ odebug << "done recording "+fileName << oendl;
- Config cfg("qpe");
- cfg.setGroup("Volume");
- QString foo = cfg.readEntry("Mute","TRUE");
- if(foo.find("TRUE",0,TRUE) != -1)
- QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; //mute
- return TRUE;
+ Config cfg("qpe");
+ cfg.setGroup("Volume");
+ QString foo = cfg.readEntry("Mute","true");
+ if(foo.find("true",0,true) != -1)
+ QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << true; //mute
+ return true;
}
int VMemo::setToggleButton(int tog) {
@@ -666,6 +657,6 @@ void VMemo::timerBreak() {
QMessageBox::message("Vmemo","Vmemo recording has ended");
}
-//EXPORT_OPIE_APPLET_v1( VMemo )
+EXPORT_OPIE_APPLET_v1( VMemo )