-rw-r--r-- | core/applets/vmemo/vmemo.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp index 7cc4062..f5d2b20 100644 --- a/core/applets/vmemo/vmemo.cpp +++ b/core/applets/vmemo/vmemo.cpp | |||
@@ -177,258 +177,260 @@ static char * vmemo_xpm[] = { | |||
177 | "*. c #000713", | 177 | "*. c #000713", |
178 | "=. c #1F1F21", | 178 | "=. c #1F1F21", |
179 | " ", | 179 | " ", |
180 | " . + @ # ", | 180 | " . + @ # ", |
181 | " $ % & * = - ", | 181 | " $ % & * = - ", |
182 | " ; > , ' ) ! ~ ", | 182 | " ; > , ' ) ! ~ ", |
183 | " { ] ^ / ( _ : ", | 183 | " { ] ^ / ( _ : ", |
184 | " < [ } | 1 2 3 ", | 184 | " < [ } | 1 2 3 ", |
185 | " 4 5 6 7 8 9 0 a b c ", | 185 | " 4 5 6 7 8 9 0 a b c ", |
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 | int toggleKey = vmCfg.readNumEntry("toggleKey", -1); |
211 | 211 | ||
212 | if(release.find("embedix",0,TRUE) !=-1) | 212 | if(release.find("embedix",0,TRUE) !=-1) |
213 | systemZaurus=TRUE; | 213 | systemZaurus=TRUE; |
214 | else | 214 | else |
215 | systemZaurus=FALSE; | 215 | systemZaurus=FALSE; |
216 | 216 | ||
217 | myChannel = new QCopChannel( "QPE/VMemo", this ); | 217 | myChannel = new QCopChannel( "QPE/VMemo", this ); |
218 | connect( myChannel, SIGNAL(received(const QCString&, const QByteArray&)), | 218 | connect( myChannel, SIGNAL(received(const QCString&, const QByteArray&)), |
219 | this, SLOT(receive(const QCString&, const QByteArray&)) ); | 219 | this, SLOT(receive(const QCString&, const QByteArray&)) ); |
220 | 220 | ||
221 | if( toggleKey != -1 ) { | 221 | if( toggleKey != -1 ) { |
222 | QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)"); | 222 | QCopEnvelope e("QPE/Desktop", "keyRegister(int key, QString channel, QString message)"); |
223 | // e << 4096; // Key_Escape | 223 | // e << 4096; // Key_Escape |
224 | // e << Key_F5; //4148 | 224 | // e << Key_F5; //4148 |
225 | e << toggleKey; | 225 | e << toggleKey; |
226 | e << QString("QPE/VMemo"); | 226 | e << QString("QPE/VMemo"); |
227 | e << QString("toggleRecord()"); | 227 | e << QString("toggleRecord()"); |
228 | } | 228 | } |
229 | if( vmCfg.readNumEntry("hideIcon",0) == 1) | 229 | if( vmCfg.readNumEntry("hideIcon",0) == 1) |
230 | hide(); | 230 | hide(); |
231 | } | 231 | } |
232 | } | 232 | } |
233 | 233 | ||
234 | VMemo::~VMemo() | 234 | VMemo::~VMemo() |
235 | { | 235 | { |
236 | } | 236 | } |
237 | 237 | ||
238 | void VMemo::receive( const QCString &msg, const QByteArray &data ) | 238 | void VMemo::receive( const QCString &msg, const QByteArray &data ) |
239 | { | 239 | { |
240 | QDataStream stream( data, IO_ReadOnly ); | 240 | QDataStream stream( data, IO_ReadOnly ); |
241 | if (msg == "toggleRecord()") { | 241 | if (msg == "toggleRecord()") { |
242 | if (recording) { | 242 | if (recording) { |
243 | fromToggle = TRUE; | 243 | fromToggle = TRUE; |
244 | stopRecording(); | 244 | stopRecording(); |
245 | } else { | 245 | } else { |
246 | fromToggle = TRUE; | 246 | fromToggle = TRUE; |
247 | startRecording(); | 247 | startRecording(); |
248 | } | 248 | } |
249 | } | 249 | } |
250 | } | 250 | } |
251 | 251 | ||
252 | void VMemo::paintEvent( QPaintEvent* ) | 252 | void VMemo::paintEvent( QPaintEvent* ) |
253 | { | 253 | { |
254 | QPainter p(this); | 254 | QPainter p(this); |
255 | p.drawPixmap( 0, 1,( const char** ) vmemo_xpm ); | 255 | p.drawPixmap( 0, 1,( const char** ) vmemo_xpm ); |
256 | } | 256 | } |
257 | 257 | ||
258 | void VMemo::mousePressEvent( QMouseEvent * ) | 258 | void VMemo::mousePressEvent( QMouseEvent * ) |
259 | { | 259 | { |
260 | startRecording(); | 260 | startRecording(); |
261 | } | 261 | } |
262 | 262 | ||
263 | void VMemo::mouseReleaseEvent( QMouseEvent * ) | 263 | void VMemo::mouseReleaseEvent( QMouseEvent * ) |
264 | { | 264 | { |
265 | stopRecording(); | 265 | stopRecording(); |
266 | } | 266 | } |
267 | 267 | ||
268 | bool VMemo::startRecording() { | 268 | bool VMemo::startRecording() { |
269 | 269 | ||
270 | if ( recording) | 270 | if ( recording) |
271 | return FALSE;; | 271 | return FALSE;; |
272 | Config config( "Vmemo" ); | 272 | Config config( "Vmemo" ); |
273 | config.setGroup( "System" ); | 273 | config.setGroup( "System" ); |
274 | useAlerts = config.readBoolEntry("Alert"); | 274 | useAlerts = config.readBoolEntry("Alert"); |
275 | 275 | ||
276 | // if(useAlerts) | 276 | // if(useAlerts) |
277 | // QMessageBox::message("VMemo","Really Record?");//) ==1) | 277 | // QMessageBox::message("VMemo","Really Record?");//) ==1) |
278 | // return; | 278 | // return; |
279 | // } else { | 279 | // } else { |
280 | if (!systemZaurus ) | 280 | if (!systemZaurus ) |
281 | QSound::play(Resource::findSound("vmemob")); | 281 | QSound::play(Resource::findSound("vmemob")); |
282 | // } | 282 | // } |
283 | qDebug("Start recording"); | 283 | qDebug("Start recording"); |
284 | recording = TRUE; | 284 | recording = TRUE; |
285 | if (openDSP() == -1) { | 285 | if (openDSP() == -1) { |
286 | QMessageBox::critical(0, "VMemo", "Could not open dsp device.\n"+errorMsg, "Abort"); | 286 | QMessageBox::critical(0, "VMemo", "Could not open dsp device.\n"+errorMsg, "Abort"); |
287 | recording = FALSE; | 287 | recording = FALSE; |
288 | return FALSE; | 288 | return FALSE; |
289 | } | 289 | } |
290 | 290 | ||
291 | config.setGroup("Defaults"); | 291 | config.setGroup("Defaults"); |
292 | 292 | ||
293 | QDateTime dt = QDateTime::currentDateTime(); | 293 | QDateTime dt = QDateTime::currentDateTime(); |
294 | 294 | ||
295 | QString fName; | 295 | QString fName; |
296 | config.setGroup( "System" ); | 296 | config.setGroup( "System" ); |
297 | fName = QPEApplication::documentDir() ; | 297 | fName = QPEApplication::documentDir() ; |
298 | fileName = config.readEntry("RecLocation", fName); | 298 | fileName = config.readEntry("RecLocation", fName); |
299 | 299 | ||
300 | int s; | 300 | int s; |
301 | s=fileName.find(':'); | 301 | s=fileName.find(':'); |
302 | if(s) | 302 | if(s) |
303 | fileName=fileName.right(fileName.length()-s-2); | 303 | fileName=fileName.right(fileName.length()-s-2); |
304 | qDebug("filename will be "+fileName); | 304 | qDebug("filename will be "+fileName); |
305 | if( fileName.right(1).find('/') == -1) | 305 | if( fileName.left(1).find('/') == -1) |
306 | fileName+="/"; | 306 | fileName="/"+fileName; |
307 | if( fileName.right(1).find('/') == -1) | ||
308 | fileName+="/"; | ||
307 | fName = "vm_"+ dt.toString()+ ".wav"; | 309 | fName = "vm_"+ dt.toString()+ ".wav"; |
308 | 310 | ||
309 | fileName+=fName; | 311 | fileName+=fName; |
310 | qDebug("filename is "+fileName); | 312 | qDebug("filename is "+fileName); |
311 | // No spaces in the filename | 313 | // No spaces in the filename |
312 | fileName.replace(QRegExp("'"),""); | 314 | fileName.replace(QRegExp("'"),""); |
313 | fileName.replace(QRegExp(" "),"_"); | 315 | fileName.replace(QRegExp(" "),"_"); |
314 | fileName.replace(QRegExp(":"),"."); | 316 | fileName.replace(QRegExp(":"),"."); |
315 | fileName.replace(QRegExp(","),""); | 317 | fileName.replace(QRegExp(","),""); |
316 | 318 | ||
317 | if(openWAV(fileName.latin1()) == -1) { | 319 | if(openWAV(fileName.latin1()) == -1) { |
318 | QString err("Could not open the output file\n"); | 320 | QString err("Could not open the output file\n"); |
319 | err += fileName; | 321 | err += fileName; |
320 | QMessageBox::critical(0, "VMemo", err, "Abort"); | 322 | QMessageBox::critical(0, "VMemo", err, "Abort"); |
321 | close(dsp); | 323 | close(dsp); |
322 | return FALSE; | 324 | return FALSE; |
323 | } | 325 | } |
324 | 326 | ||
325 | QArray<int> cats(1); | 327 | QArray<int> cats(1); |
326 | cats[0] = config.readNumEntry("Category", 0); | 328 | cats[0] = config.readNumEntry("Category", 0); |
327 | 329 | ||
328 | QString dlName("vm_"); | 330 | QString dlName("vm_"); |
329 | dlName += dt.toString(); | 331 | dlName += dt.toString(); |
330 | DocLnk l; | 332 | DocLnk l; |
331 | l.setFile(fileName); | 333 | l.setFile(fileName); |
332 | l.setName(dlName); | 334 | l.setName(dlName); |
333 | l.setType("audio/x-wav"); | 335 | l.setType("audio/x-wav"); |
334 | l.setCategories(cats); | 336 | l.setCategories(cats); |
335 | l.writeLink(); | 337 | l.writeLink(); |
336 | 338 | ||
337 | record(); | 339 | record(); |
338 | return TRUE; | 340 | return TRUE; |
339 | } | 341 | } |
340 | 342 | ||
341 | void VMemo::stopRecording() { | 343 | void VMemo::stopRecording() { |
342 | recording = FALSE; | 344 | recording = FALSE; |
343 | } | 345 | } |
344 | 346 | ||
345 | int VMemo::openDSP() | 347 | int VMemo::openDSP() |
346 | { | 348 | { |
347 | Config cfg("Vmemo"); | 349 | Config cfg("Vmemo"); |
348 | cfg.setGroup("Record"); | 350 | cfg.setGroup("Record"); |
349 | 351 | ||
350 | speed = cfg.readNumEntry("SampleRate", 22050); | 352 | speed = cfg.readNumEntry("SampleRate", 22050); |
351 | channels = cfg.readNumEntry("Stereo", 1) ? 2 : 1; // 1 = stereo(2), 0 = mono(1) | 353 | channels = cfg.readNumEntry("Stereo", 1) ? 2 : 1; // 1 = stereo(2), 0 = mono(1) |
352 | if (cfg.readNumEntry("SixteenBit", 1)==1) { | 354 | if (cfg.readNumEntry("SixteenBit", 1)==1) { |
353 | format = AFMT_S16_LE; | 355 | format = AFMT_S16_LE; |
354 | resolution = 16; | 356 | resolution = 16; |
355 | } else { | 357 | } else { |
356 | format = AFMT_U8; | 358 | format = AFMT_U8; |
357 | resolution = 8; | 359 | resolution = 8; |
358 | } | 360 | } |
359 | 361 | ||
360 | qDebug("samplerate: %d, channels %d, resolution %d", speed, channels, resolution); | 362 | qDebug("samplerate: %d, channels %d, resolution %d", speed, channels, resolution); |
361 | 363 | ||
362 | if(systemZaurus) { | 364 | if(systemZaurus) { |
363 | dsp = open("/dev/dsp1", O_RDWR); //Zaurus needs /dev/dsp1 | 365 | dsp = open("/dev/dsp1", O_RDWR); //Zaurus needs /dev/dsp1 |
364 | channels=1; //zaurus has one input channel | 366 | channels=1; //zaurus has one input channel |
365 | } else { | 367 | } else { |
366 | dsp = open("/dev/dsp", O_RDWR); | 368 | dsp = open("/dev/dsp", O_RDWR); |
367 | } | 369 | } |
368 | 370 | ||
369 | if(dsp == -1) { | 371 | if(dsp == -1) { |
370 | perror("open(\"/dev/dsp\")"); | 372 | perror("open(\"/dev/dsp\")"); |
371 | errorMsg="open(\"/dev/dsp\")\n "+(QString)strerror(errno); | 373 | errorMsg="open(\"/dev/dsp\")\n "+(QString)strerror(errno); |
372 | return -1; | 374 | return -1; |
373 | } | 375 | } |
374 | 376 | ||
375 | if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1) { | 377 | if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1) { |
376 | perror("ioctl(\"SNDCTL_DSP_SETFMT\")"); | 378 | perror("ioctl(\"SNDCTL_DSP_SETFMT\")"); |
377 | return -1; | 379 | return -1; |
378 | } | 380 | } |
379 | if(ioctl(dsp, SNDCTL_DSP_CHANNELS , &channels)==-1) { | 381 | if(ioctl(dsp, SNDCTL_DSP_CHANNELS , &channels)==-1) { |
380 | perror("ioctl(\"SNDCTL_DSP_CHANNELS\")"); | 382 | perror("ioctl(\"SNDCTL_DSP_CHANNELS\")"); |
381 | return -1; | 383 | return -1; |
382 | } | 384 | } |
383 | if(ioctl(dsp, SNDCTL_DSP_SPEED , &speed)==-1) { | 385 | if(ioctl(dsp, SNDCTL_DSP_SPEED , &speed)==-1) { |
384 | perror("ioctl(\"SNDCTL_DSP_SPEED\")"); | 386 | perror("ioctl(\"SNDCTL_DSP_SPEED\")"); |
385 | return -1; | 387 | return -1; |
386 | } | 388 | } |
387 | if(ioctl(dsp, SOUND_PCM_READ_RATE , &rate)==-1) { | 389 | if(ioctl(dsp, SOUND_PCM_READ_RATE , &rate)==-1) { |
388 | perror("ioctl(\"SOUND_PCM_READ_RATE\")"); | 390 | perror("ioctl(\"SOUND_PCM_READ_RATE\")"); |
389 | return -1; | 391 | return -1; |
390 | } | 392 | } |
391 | 393 | ||
392 | return 1; | 394 | return 1; |
393 | } | 395 | } |
394 | 396 | ||
395 | int VMemo::openWAV(const char *filename) | 397 | int VMemo::openWAV(const char *filename) |
396 | { | 398 | { |
397 | track.setName(filename); | 399 | track.setName(filename); |
398 | if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw)) { | 400 | if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw)) { |
399 | errorMsg=filename; | 401 | errorMsg=filename; |
400 | return -1; | 402 | return -1; |
401 | } | 403 | } |
402 | 404 | ||
403 | wav=track.handle(); | 405 | wav=track.handle(); |
404 | 406 | ||
405 | WaveHeader wh; | 407 | WaveHeader wh; |
406 | 408 | ||
407 | wh.main_chunk = RIFF; | 409 | wh.main_chunk = RIFF; |
408 | wh.length=0; | 410 | wh.length=0; |
409 | wh.chunk_type = WAVE; | 411 | wh.chunk_type = WAVE; |
410 | wh.sub_chunk = FMT; | 412 | wh.sub_chunk = FMT; |
411 | wh.sc_len = 16; | 413 | wh.sc_len = 16; |
412 | wh.format = PCM_CODE; | 414 | wh.format = PCM_CODE; |
413 | wh.modus = channels; | 415 | wh.modus = channels; |
414 | wh.sample_fq = speed; | 416 | wh.sample_fq = speed; |
415 | wh.byte_p_sec = speed * channels * resolution/8; | 417 | wh.byte_p_sec = speed * channels * resolution/8; |
416 | wh.byte_p_spl = channels * (resolution / 8); | 418 | wh.byte_p_spl = channels * (resolution / 8); |
417 | wh.bit_p_spl = resolution; | 419 | wh.bit_p_spl = resolution; |
418 | wh.data_chunk = DATA; | 420 | wh.data_chunk = DATA; |
419 | wh.data_length= 0; | 421 | wh.data_length= 0; |
420 | // qDebug("Write header channels %d, speed %d, b/s %d, blockalign %d, bitrate %d" | 422 | // qDebug("Write header channels %d, speed %d, b/s %d, blockalign %d, bitrate %d" |
421 | // , wh.modus, wh.sample_fq, wh.byte_p_sec, wh.byte_p_spl, wh.bit_p_spl ); | 423 | // , wh.modus, wh.sample_fq, wh.byte_p_sec, wh.byte_p_spl, wh.bit_p_spl ); |
422 | write (wav, &wh, sizeof(WaveHeader)); | 424 | write (wav, &wh, sizeof(WaveHeader)); |
423 | 425 | ||
424 | return 1; | 426 | return 1; |
425 | } | 427 | } |
426 | 428 | ||
427 | void VMemo::record(void) | 429 | void VMemo::record(void) |
428 | { | 430 | { |
429 | int length=0, result, value; | 431 | int length=0, result, value; |
430 | qDebug("Recording"); | 432 | qDebug("Recording"); |
431 | 433 | ||
432 | if(systemZaurus) { | 434 | if(systemZaurus) { |
433 | signed short sound[512], monoBuffer[512]; | 435 | signed short sound[512], monoBuffer[512]; |
434 | if(format==AFMT_S16_LE) { | 436 | if(format==AFMT_S16_LE) { |