author | llornkcor <llornkcor> | 2002-05-19 17:13:43 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-05-19 17:13:43 (UTC) |
commit | 396ca2a131b398b1562fee1cdc8cbe9bc629b37f (patch) (unidiff) | |
tree | 77a2bc6bb9a9887acb37ce887ef7bf9ed739002e | |
parent | 61a917bec9006516115d94be8c49acadf4eba222 (diff) | |
download | opie-396ca2a131b398b1562fee1cdc8cbe9bc629b37f.zip opie-396ca2a131b398b1562fee1cdc8cbe9bc629b37f.tar.gz opie-396ca2a131b398b1562fee1cdc8cbe9bc629b37f.tar.bz2 |
can hide the icon by adding in VMemo.conf [Defaults] hideIcon = 1
-rw-r--r-- | core/applets/vmemo/vmemo.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp index 7e91ef0..c27050d 100644 --- a/core/applets/vmemo/vmemo.cpp +++ b/core/applets/vmemo/vmemo.cpp | |||
@@ -186,70 +186,69 @@ static char * vmemo_xpm[] = { | |||
186 | " d e f g h i j 3 k l m n ", | 186 | " d e f g h i j 3 k l m n ", |
187 | " o p q r s t u v w n ", | 187 | " o p q r s t u v w n ", |
188 | " o x y z A B C D E n ", | 188 | " o x y z A B C D E n ", |
189 | " F G H I J K L M N O ", | 189 | " F G H I J K L M N O ", |
190 | " P Q R S T U V W X ", | 190 | " P Q R S T U V W X ", |
191 | " Y Z ` b ...+. ", | 191 | " Y Z ` b ...+. ", |
192 | " @.#.$.%.&. ", | 192 | " @.#.$.%.&. ", |
193 | " *.B =. ", | 193 | " *.B =. ", |
194 | " n n n n n n n n n "}; | 194 | " n n n n n n n n n "}; |
195 | 195 | ||
196 | 196 | ||
197 | VMemo::VMemo( QWidget *parent, const char *_name ) | 197 | VMemo::VMemo( QWidget *parent, const char *_name ) |
198 | : QWidget( parent, _name ) | 198 | : QWidget( parent, _name ) |
199 | { | 199 | { |
200 | setFixedHeight( 18 ); | 200 | setFixedHeight( 18 ); |
201 | setFixedWidth( 14 ); | 201 | setFixedWidth( 14 ); |
202 | 202 | ||
203 | recording = FALSE; | 203 | recording = FALSE; |
204 | 204 | ||
205 | struct utsname name; /* check for embedix kernel running on the zaurus*/ | 205 | struct utsname name; /* check for embedix kernel running on the zaurus*/ |
206 | if (uname(&name) != -1) { | 206 | if (uname(&name) != -1) { |
207 | QString release=name.release; | 207 | QString release=name.release; |
208 | Config vmCfg("VMemo"); | 208 | Config vmCfg("VMemo"); |
209 | vmCfg.setGroup("Defaults"); | 209 | vmCfg.setGroup("Defaults"); |
210 | int toggleKey = vmCfg.readNumEntry("toggleKey", -1); | ||
210 | 211 | ||
211 | if(release.find("embedix",0,TRUE) !=-1) { | 212 | if(release.find("embedix",0,TRUE) !=-1) |
212 | int toggleKey = vmCfg.readNumEntry("toggleKey", -1); | ||
213 | systemZaurus=TRUE; | 213 | systemZaurus=TRUE; |
214 | } else { | 214 | else |
215 | int toggleKey = vmCfg.readNumEntry("toggleKey", 4096); | ||
216 | //default key for ipaq record button is Key_Escape = 4096 | ||
217 | systemZaurus=FALSE; | 215 | systemZaurus=FALSE; |
218 | } | ||
219 | 216 | ||
220 | myChannel = new QCopChannel( "QPE/VMemo", this ); | 217 | myChannel = new QCopChannel( "QPE/VMemo", this ); |
221 | connect( myChannel, SIGNAL(received(const QCString&, const QByteArray&)), | 218 | connect( myChannel, SIGNAL(received(const QCString&, const QByteArray&)), |
222 | this, SLOT(receive(const QCString&, const QByteArray&)) ); | 219 | this, SLOT(receive(const QCString&, const QByteArray&)) ); |
223 | 220 | ||
224 | if( toggleKey != -1 ) { | 221 | if( toggleKey != -1 ) { |
225 | QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)"); | 222 | QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)"); |
226 | // e << 4096; // Key_Escape | 223 | // e << 4096; // Key_Escape |
227 | // e << Key_F5; //4148 | 224 | // e << Key_F5; //4148 |
228 | e << toggleKey; | 225 | e << toggleKey; |
229 | e << QString("QPE/VMemo"); | 226 | e << QString("QPE/VMemo"); |
230 | e << QString("toggleRecord()"); | 227 | e << QString("toggleRecord()"); |
231 | } | 228 | } |
229 | if( vmCfg.readNumEntry("hideIcon",0) == 1) | ||
230 | hide(); | ||
232 | } | 231 | } |
233 | } | 232 | } |
234 | 233 | ||
235 | VMemo::~VMemo() | 234 | VMemo::~VMemo() |
236 | { | 235 | { |
237 | } | 236 | } |
238 | 237 | ||
239 | void VMemo::receive( const QCString &msg, const QByteArray &data ) | 238 | void VMemo::receive( const QCString &msg, const QByteArray &data ) |
240 | { | 239 | { |
241 | QDataStream stream( data, IO_ReadOnly ); | 240 | QDataStream stream( data, IO_ReadOnly ); |
242 | if (msg == "toggleRecord()") { | 241 | if (msg == "toggleRecord()") { |
243 | if (recording) { | 242 | if (recording) { |
244 | fromToggle = TRUE; | 243 | fromToggle = TRUE; |
245 | stopRecording(); | 244 | stopRecording(); |
246 | } else { | 245 | } else { |
247 | fromToggle = TRUE; | 246 | fromToggle = TRUE; |
248 | startRecording(); | 247 | startRecording(); |
249 | } | 248 | } |
250 | } | 249 | } |
251 | } | 250 | } |
252 | 251 | ||
253 | void VMemo::paintEvent( QPaintEvent* ) | 252 | void VMemo::paintEvent( QPaintEvent* ) |
254 | { | 253 | { |
255 | QPainter p(this); | 254 | QPainter p(this); |
@@ -356,64 +355,60 @@ int VMemo::openDSP() | |||
356 | format = AFMT_S16_LE; | 355 | format = AFMT_S16_LE; |
357 | resolution = 16; | 356 | resolution = 16; |
358 | } else { | 357 | } else { |
359 | format = AFMT_U8; | 358 | format = AFMT_U8; |
360 | resolution = 8; | 359 | resolution = 8; |
361 | } | 360 | } |
362 | 361 | ||
363 | qDebug("samplerate: %d, channels %d, resolution %d", speed, channels, resolution); | 362 | qDebug("samplerate: %d, channels %d, resolution %d", speed, channels, resolution); |
364 | 363 | ||
365 | if(systemZaurus) { | 364 | if(systemZaurus) { |
366 | dsp = open("/dev/dsp1", O_RDWR); //Zaurus needs /dev/dsp1 | 365 | dsp = open("/dev/dsp1", O_RDWR); //Zaurus needs /dev/dsp1 |
367 | channels=1; //zaurus has one input channel | 366 | channels=1; //zaurus has one input channel |
368 | } else { | 367 | } else { |
369 | dsp = open("/dev/dsp", O_RDWR); | 368 | dsp = open("/dev/dsp", O_RDWR); |
370 | } | 369 | } |
371 | 370 | ||
372 | if(dsp == -1) { | 371 | if(dsp == -1) { |
373 | perror("open(\"/dev/dsp\")"); | 372 | perror("open(\"/dev/dsp\")"); |
374 | errorMsg="open(\"/dev/dsp\")\n "+(QString)strerror(errno); | 373 | errorMsg="open(\"/dev/dsp\")\n "+(QString)strerror(errno); |
375 | return -1; | 374 | return -1; |
376 | } | 375 | } |
377 | 376 | ||
378 | if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1) { | 377 | if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1) { |
379 | perror("ioctl(\"SNDCTL_DSP_SETFMT\")"); | 378 | perror("ioctl(\"SNDCTL_DSP_SETFMT\")"); |
380 | errorMsg="ioctl(\"SNDCTL_DSP_SETFMT\")\n%d\n"+(QString)strerror(errno),format; | ||
381 | return -1; | 379 | return -1; |
382 | } | 380 | } |
383 | if(ioctl(dsp, SNDCTL_DSP_CHANNELS , &channels)==-1) { | 381 | if(ioctl(dsp, SNDCTL_DSP_CHANNELS , &channels)==-1) { |
384 | perror("ioctl(\"SNDCTL_DSP_CHANNELS\")"); | 382 | perror("ioctl(\"SNDCTL_DSP_CHANNELS\")"); |
385 | errorMsg="ioctl(\"SNDCTL_DSP_CHANNELS\")\n%d\n"+(QString)strerror(errno),channels; | ||
386 | return -1; | 383 | return -1; |
387 | } | 384 | } |
388 | if(ioctl(dsp, SNDCTL_DSP_SPEED , &speed)==-1) { | 385 | if(ioctl(dsp, SNDCTL_DSP_SPEED , &speed)==-1) { |
389 | perror("ioctl(\"SNDCTL_DSP_SPEED\")"); | 386 | perror("ioctl(\"SNDCTL_DSP_SPEED\")"); |
390 | errorMsg="ioctl(\"SNDCTL_DSP_SPEED\")\n%d\n"+(QString)strerror(errno),speed; | ||
391 | return -1; | 387 | return -1; |
392 | } | 388 | } |
393 | if(ioctl(dsp, SOUND_PCM_READ_RATE , &rate)==-1) { | 389 | if(ioctl(dsp, SOUND_PCM_READ_RATE , &rate)==-1) { |
394 | perror("ioctl(\"SOUND_PCM_READ_RATE\")"); | 390 | perror("ioctl(\"SOUND_PCM_READ_RATE\")"); |
395 | errorMsg="ioctl(\"SOUND_PCM_READ_RATE\")\n%d\n"+(QString)strerror(errno),rate; | ||
396 | return -1; | 391 | return -1; |
397 | } | 392 | } |
398 | 393 | ||
399 | return 1; | 394 | return 1; |
400 | } | 395 | } |
401 | 396 | ||
402 | int VMemo::openWAV(const char *filename) | 397 | int VMemo::openWAV(const char *filename) |
403 | { | 398 | { |
404 | track.setName(filename); | 399 | track.setName(filename); |
405 | if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw)) { | 400 | if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw)) { |
406 | errorMsg=filename; | 401 | errorMsg=filename; |
407 | return -1; | 402 | return -1; |
408 | } | 403 | } |
409 | 404 | ||
410 | wav=track.handle(); | 405 | wav=track.handle(); |
411 | 406 | ||
412 | WaveHeader wh; | 407 | WaveHeader wh; |
413 | 408 | ||
414 | wh.main_chunk = RIFF; | 409 | wh.main_chunk = RIFF; |
415 | wh.length=0; | 410 | wh.length=0; |
416 | wh.chunk_type = WAVE; | 411 | wh.chunk_type = WAVE; |
417 | wh.sub_chunk = FMT; | 412 | wh.sub_chunk = FMT; |
418 | wh.sc_len = 16; | 413 | wh.sc_len = 16; |
419 | wh.format = PCM_CODE; | 414 | wh.format = PCM_CODE; |