-rw-r--r-- | core/applets/vmemo/vmemo.cpp | 41 | ||||
-rw-r--r-- | noncore/apps/opie-console/TEHistory.cpp | 27 |
2 files changed, 56 insertions, 12 deletions
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp index 8ba1eb7..1a8f154 100644 --- a/core/applets/vmemo/vmemo.cpp +++ b/core/applets/vmemo/vmemo.cpp | |||
@@ -285,118 +285,141 @@ bool VMemo::startRecording() { | |||
285 | Config config( "Vmemo" ); | 285 | Config config( "Vmemo" ); |
286 | config.setGroup( "System" ); | 286 | config.setGroup( "System" ); |
287 | 287 | ||
288 | 288 | ||
289 | odebug << "Start recording engines" << oendl; | 289 | odebug << "Start recording engines" << oendl; |
290 | recording = true; | 290 | recording = true; |
291 | 291 | ||
292 | if (openDSP() == -1) { | 292 | if (openDSP() == -1) { |
293 | recording = false; | 293 | recording = false; |
294 | return false; | 294 | return false; |
295 | } | 295 | } |
296 | 296 | ||
297 | config.setGroup("Defaults"); | 297 | config.setGroup("Defaults"); |
298 | 298 | ||
299 | date = TimeString::dateString( QDateTime::currentDateTime(),false,true); | 299 | date = TimeString::dateString( QDateTime::currentDateTime(),false,true); |
300 | date.replace(QRegExp("'"),""); | 300 | date.replace(QRegExp("'"),""); |
301 | date.replace(QRegExp(" "),"_"); | 301 | date.replace(QRegExp(" "),"_"); |
302 | date.replace(QRegExp(":"),"-"); | 302 | date.replace(QRegExp(":"),"-"); |
303 | date.replace(QRegExp(","),""); | 303 | date.replace(QRegExp(","),""); |
304 | 304 | ||
305 | QString fName; | 305 | QString fName; |
306 | config.setGroup( "System" ); | 306 | config.setGroup( "System" ); |
307 | fName = QPEApplication::documentDir() ; | 307 | fName = QPEApplication::documentDir() ; |
308 | fileName = config.readEntry("RecLocation", fName); | 308 | fileName = config.readEntry("RecLocation", fName); |
309 | 309 | ||
310 | int s; | 310 | int s; |
311 | s=fileName.find(':'); | 311 | s=fileName.find(':'); |
312 | if(s) | 312 | if(s) |
313 | fileName=fileName.right(fileName.length()-s-2); | 313 | fileName=fileName.right(fileName.length()-s-2); |
314 | odebug << "pathname will be "+fileName << oendl; | 314 | odebug << "pathname will be "+fileName << oendl; |
315 | 315 | ||
316 | if( fileName.left(1).find('/') == -1) | 316 | if( fileName.left(1).find('/') == -1) |
317 | fileName="/"+fileName; | 317 | fileName="/"+fileName; |
318 | if( fileName.right(1).find('/') == -1) | 318 | if( fileName.right(1).find('/') == -1) |
319 | fileName+="/"; | 319 | fileName+="/"; |
320 | fName = "vm_"+ date + ".wav"; | 320 | fName = "vm_"+ date + ".wav"; |
321 | 321 | ||
322 | fileName += fName; | 322 | fileName += fName; |
323 | odebug << "filename is " + fileName << oendl; | 323 | odebug << "filename is " + fileName << oendl; |
324 | 324 | ||
325 | useAlerts = config.readBoolEntry("Alert",1); | 325 | useAlerts = config.readBoolEntry("Alert",1); |
326 | if(useAlerts) { | 326 | if(useAlerts) { |
327 | msgLabel = new QLabel( 0, "alertLabel" ); | 327 | msgLabel = new QLabel( 0, "alertLabel" ); |
328 | msgLabel->setText( tr("<B><P><font size=+2>VMemo-Recording</font></B><p>%1</p>").arg("vm_"+ date)); | 328 | msgLabel->setText( tr("<B><P><font size=+2>VMemo-Recording</font></B><p>%1</p>").arg("vm_"+ date)); |
329 | msgLabel->show(); | 329 | msgLabel->show(); |
330 | } | 330 | } |
331 | 331 | ||
332 | // open tmp file here | 332 | // open tmp file here |
333 | char *pointer; | 333 | char *tmpFilePath = 0; |
334 | pointer=tmpnam(NULL); | 334 | char *tmpDir = getenv("TMPDIR"); |
335 | odebug << "Opening tmp file " << pointer << "" << oendl; | 335 | if (tmpDir && *tmpDir != '\0') { |
336 | tmpFilePath = new char[strlen(tmpDir) + strlen("/vmemo-wav-XXXXXX") + 1]; | ||
337 | strcpy(tmpFilePath, tmpDir); | ||
338 | free(tmpDir); | ||
339 | } else { | ||
340 | tmpFilePath = new char[strlen("/tmp/vmemo-wav-XXXXXX") + 1]; | ||
341 | strcpy(tmpFilePath, "/tmp"); | ||
342 | } | ||
343 | strcat(tmpFilePath, "/vmemo-wav-XXXXXX"); | ||
344 | mode_t currUmask = umask(S_IRWXO | S_IRWXG); | ||
345 | int tmpFd = mkstemp(tmpFilePath); | ||
346 | umask(currUmask); | ||
347 | if (tmpFd == -1) { | ||
348 | owarn << "Could not open temp file with template " << tmpFilePath | ||
349 | << oendl; | ||
350 | delete [] tmpFilePath; | ||
351 | return false; | ||
352 | } else | ||
353 | odebug << "Opened temp file " << tmpFilePath << "" << oendl; | ||
354 | |||
355 | close(tmpFd); | ||
336 | 356 | ||
337 | if(openWAV(pointer ) == -1) { | 357 | if(openWAV(tmpFilePath ) == -1) { |
338 | 358 | ||
339 | QString err("Could not open the temp file\n"); | 359 | QString err("Could not open the temp file\n"); |
340 | err += fileName; | 360 | err += fileName; |
341 | QMessageBox::critical(0, "vmemo", err, "Abort"); | 361 | QMessageBox::critical(0, "vmemo", err, "Abort"); |
342 | ::close(dsp); | 362 | ::close(dsp); |
343 | return false; | 363 | return false; |
344 | } | 364 | } |
345 | if( record() ) { | 365 | if( record() ) { |
346 | 366 | ||
347 | QString cmd; | ||
348 | if( fileName.find(".wav",0,true) == -1) | 367 | if( fileName.find(".wav",0,true) == -1) |
349 | fileName += ".wav"; | 368 | fileName += ".wav"; |
350 | 369 | ||
351 | cmd.sprintf("mv %s "+fileName, pointer); | 370 | int retVal = rename(tmpFilePath, fileName.local8Bit()); |
352 | // move tmp file to regular file here | 371 | if (retVal == -1) { |
353 | 372 | owarn << "Could not move " << tmpFilePath << " to " << fileName | |
354 | system(cmd.latin1()); | 373 | << oendl; |
374 | delete [] tmpFilePath; | ||
375 | return false; | ||
376 | } | ||
377 | delete [] tmpFilePath; | ||
355 | 378 | ||
356 | QArray<int> cats(1); | 379 | QArray<int> cats(1); |
357 | cats[0] = config.readNumEntry("Category", 0); | 380 | cats[0] = config.readNumEntry("Category", 0); |
358 | 381 | ||
359 | QString dlName("vm_"); | 382 | QString dlName("vm_"); |
360 | dlName += date; | 383 | dlName += date; |
361 | DocLnk l; | 384 | DocLnk l; |
362 | l.setFile(fileName); | 385 | l.setFile(fileName); |
363 | l.setName(dlName); | 386 | l.setName(dlName); |
364 | l.setType("audio/x-wav"); | 387 | l.setType("audio/x-wav"); |
365 | l.setCategories(cats); | 388 | l.setCategories(cats); |
366 | l.writeLink(); | 389 | l.writeLink(); |
367 | return true; | 390 | return true; |
368 | } else | 391 | } else |
369 | return false; | 392 | return false; |
370 | 393 | ||
371 | } | 394 | } |
372 | 395 | ||
373 | void VMemo::stopRecording() { | 396 | void VMemo::stopRecording() { |
374 | // show(); | 397 | // show(); |
375 | odebug << "Stopped recording" << oendl; | 398 | odebug << "Stopped recording" << oendl; |
376 | recording = false; | 399 | recording = false; |
377 | if(useAlerts) { | 400 | if(useAlerts) { |
378 | msgLabel->close(); | 401 | msgLabel->close(); |
379 | msgLabel=0; | 402 | msgLabel=0; |
380 | delete msgLabel; | 403 | delete msgLabel; |
381 | } | 404 | } |
382 | t_timer->stop(); | 405 | t_timer->stop(); |
383 | Config cfg("Vmemo"); | 406 | Config cfg("Vmemo"); |
384 | cfg.setGroup("Defaults"); | 407 | cfg.setGroup("Defaults"); |
385 | // if( cfg.readNumEntry("hideIcon",0) == 1 ) | 408 | // if( cfg.readNumEntry("hideIcon",0) == 1 ) |
386 | // hide(); | 409 | // hide(); |
387 | } | 410 | } |
388 | 411 | ||
389 | int VMemo::openDSP() { | 412 | int VMemo::openDSP() { |
390 | Config cfg("Vmemo"); | 413 | Config cfg("Vmemo"); |
391 | cfg.setGroup("Record"); | 414 | cfg.setGroup("Record"); |
392 | 415 | ||
393 | speed = cfg.readNumEntry("SampleRate", 22050); | 416 | speed = cfg.readNumEntry("SampleRate", 22050); |
394 | channels = cfg.readNumEntry("Stereo", 1) ? 2 : 1; // 1 = stereo(2), 0 = mono(1) | 417 | channels = cfg.readNumEntry("Stereo", 1) ? 2 : 1; // 1 = stereo(2), 0 = mono(1) |
395 | if (cfg.readNumEntry("SixteenBit", 1)==1) { | 418 | if (cfg.readNumEntry("SixteenBit", 1)==1) { |
396 | format = AFMT_S16_LE; | 419 | format = AFMT_S16_LE; |
397 | resolution = 16; | 420 | resolution = 16; |
398 | } else { | 421 | } else { |
399 | format = AFMT_U8; | 422 | format = AFMT_U8; |
400 | resolution = 8; | 423 | resolution = 8; |
401 | } | 424 | } |
402 | 425 | ||
diff --git a/noncore/apps/opie-console/TEHistory.cpp b/noncore/apps/opie-console/TEHistory.cpp index 317ce57..e2be42a 100644 --- a/noncore/apps/opie-console/TEHistory.cpp +++ b/noncore/apps/opie-console/TEHistory.cpp | |||
@@ -1,149 +1,170 @@ | |||
1 | /* -------------------------------------------------------------------------- */ | 1 | /* -------------------------------------------------------------------------- */ |
2 | /* */ | 2 | /* */ |
3 | /* [TEHistory.C] History Buffer */ | 3 | /* [TEHistory.C] History Buffer */ |
4 | /* */ | 4 | /* */ |
5 | /* -------------------------------------------------------------------------- */ | 5 | /* -------------------------------------------------------------------------- */ |
6 | /* */ | 6 | /* */ |
7 | /* Copyright (c) 1997,1998 by Lars Doelle <lars.doelle@on-line.de> */ | 7 | /* Copyright (c) 1997,1998 by Lars Doelle <lars.doelle@on-line.de> */ |
8 | /* */ | 8 | /* */ |
9 | /* This file is part of Konsole - an X terminal for KDE */ | 9 | /* This file is part of Konsole - an X terminal for KDE */ |
10 | /* */ | 10 | /* */ |
11 | /* -------------------------------------------------------------------------- */ | 11 | /* -------------------------------------------------------------------------- */ |
12 | /* */ | 12 | /* */ |
13 | /* Ported Konsole to Qt/Embedded */ | 13 | /* Ported Konsole to Qt/Embedded */ |
14 | /* */ | 14 | /* */ |
15 | /* Copyright (C) 2000 by John Ryland <jryland@trolltech.com> */ | 15 | /* Copyright (C) 2000 by John Ryland <jryland@trolltech.com> */ |
16 | /* */ | 16 | /* */ |
17 | /* -------------------------------------------------------------------------- */ | 17 | /* -------------------------------------------------------------------------- */ |
18 | 18 | ||
19 | #include "TEHistory.h" | 19 | #include "TEHistory.h" |
20 | #include <stdlib.h> | 20 | #include <stdlib.h> |
21 | #include <assert.h> | 21 | #include <assert.h> |
22 | #include <stdio.h> | 22 | #include <stdio.h> |
23 | #include <sys/types.h> | 23 | #include <sys/types.h> |
24 | #include <sys/stat.h> | ||
24 | #include <unistd.h> | 25 | #include <unistd.h> |
25 | #include <errno.h> | 26 | #include <errno.h> |
26 | 27 | ||
27 | #define HERE printf("%s(%d): here\n",__FILE__,__LINE__) | 28 | #define HERE printf("%s(%d): here\n",__FILE__,__LINE__) |
28 | 29 | ||
29 | /* | 30 | /* |
30 | An arbitrary long scroll. | 31 | An arbitrary long scroll. |
31 | 32 | ||
32 | One can modify the scroll only by adding either cells | 33 | One can modify the scroll only by adding either cells |
33 | or newlines, but access it randomly. | 34 | or newlines, but access it randomly. |
34 | 35 | ||
35 | The model is that of an arbitrary wide typewriter scroll | 36 | The model is that of an arbitrary wide typewriter scroll |
36 | in that the scroll is a serie of lines and each line is | 37 | in that the scroll is a serie of lines and each line is |
37 | a serie of cells with no overwriting permitted. | 38 | a serie of cells with no overwriting permitted. |
38 | 39 | ||
39 | The implementation provides arbitrary length and numbers | 40 | The implementation provides arbitrary length and numbers |
40 | of cells and line/column indexed read access to the scroll | 41 | of cells and line/column indexed read access to the scroll |
41 | at constant costs. | 42 | at constant costs. |
42 | 43 | ||
43 | FIXME: some complain about the history buffer comsuming the | 44 | FIXME: some complain about the history buffer comsuming the |
44 | memory of their machines. This problem is critical | 45 | memory of their machines. This problem is critical |
45 | since the history does not behave gracefully in cases | 46 | since the history does not behave gracefully in cases |
46 | where the memory is used up completely. | 47 | where the memory is used up completely. |
47 | 48 | ||
48 | I put in a workaround that should handle it problem | 49 | I put in a workaround that should handle it problem |
49 | now gracefully. I'm not satisfied with the solution. | 50 | now gracefully. I'm not satisfied with the solution. |
50 | 51 | ||
51 | FIXME: Terminating the history is not properly indicated | 52 | FIXME: Terminating the history is not properly indicated |
52 | in the menu. We should throw a signal. | 53 | in the menu. We should throw a signal. |
53 | 54 | ||
54 | FIXME: There is noticable decrease in speed, also. Perhaps, | 55 | FIXME: There is noticable decrease in speed, also. Perhaps, |
55 | there whole feature needs to be revisited therefore. | 56 | there whole feature needs to be revisited therefore. |
56 | Disadvantage of a more elaborated, say block-oriented | 57 | Disadvantage of a more elaborated, say block-oriented |
57 | scheme with wrap around would be it's complexity. | 58 | scheme with wrap around would be it's complexity. |
58 | */ | 59 | */ |
59 | 60 | ||
60 | //FIXME: tempory replacement for tmpfile | 61 | //FIXME: tempory replacement for tmpfile |
61 | // this is here one for debugging purpose. | 62 | // this is here one for debugging purpose. |
62 | 63 | ||
63 | //#define tmpfile xTmpFile | 64 | //#define tmpfile xTmpFile |
64 | 65 | ||
65 | FILE* xTmpFile() | 66 | FILE* xTmpFile() |
66 | { | 67 | { |
67 | static int fid = 0; | 68 | static int fid = 0; |
68 | char fname[80]; | 69 | char fname[80]; |
69 | sprintf(fname,"TmpFile.%d",fid++); | 70 | sprintf(fname,"TmpFile.%d",fid++); |
70 | return fopen(fname,"w"); | 71 | return fopen(fname,"w"); |
71 | } | 72 | } |
72 | 73 | ||
73 | 74 | ||
74 | // History Buffer /////////////////////////////////////////// | 75 | // History Buffer /////////////////////////////////////////// |
75 | 76 | ||
76 | /* | 77 | /* |
77 | A Row(X) data type which allows adding elements to the end. | 78 | A Row(X) data type which allows adding elements to the end. |
78 | */ | 79 | */ |
79 | 80 | ||
80 | HistoryBuffer::HistoryBuffer() | 81 | HistoryBuffer::HistoryBuffer() |
81 | { | 82 | { |
82 | ion = -1; | 83 | ion = -1; |
83 | length = 0; | 84 | length = 0; |
84 | } | 85 | } |
85 | 86 | ||
86 | HistoryBuffer::~HistoryBuffer() | 87 | HistoryBuffer::~HistoryBuffer() |
87 | { | 88 | { |
88 | setScroll(FALSE); | 89 | setScroll(FALSE); |
89 | } | 90 | } |
90 | 91 | ||
91 | void HistoryBuffer::setScroll(bool on) | 92 | void HistoryBuffer::setScroll(bool on) |
92 | { | 93 | { |
93 | if (on == hasScroll()) return; | 94 | if (on == hasScroll()) return; |
94 | 95 | ||
95 | if (on) | 96 | if (on) |
96 | { | 97 | { |
97 | assert( ion < 0 ); | 98 | assert( ion < 0 ); |
98 | assert( length == 0); | 99 | assert( length == 0); |
99 | FILE* tmp = tmpfile(); if (!tmp) { perror("konsole: cannot open temp file.\n"); return; } | 100 | char* tmpDir = getenv("TMPDIR"); |
100 | ion = dup(fileno(tmp)); if (ion<0) perror("konsole: cannot dup temp file.\n"); | 101 | char* tmpFilePath = 0; |
101 | fclose(tmp); | 102 | if (tmpDir && *tmpDir != '\0') { |
103 | tmpFilePath = new char[strlen(tmpDir) + strlen("/opie-console-HistoryBuffer-XXXXXX") + 1]; | ||
104 | strcpy(tmpFilePath, tmpDir); | ||
105 | free(tmpDir); | ||
106 | } else { | ||
107 | tmpFilePath = new char[strlen("/tmp/opie-console-HistoryBuffer-XXXXXX") + 1]; | ||
108 | strcpy(tmpFilePath, "/tmp"); | ||
109 | } | ||
110 | strcat(tmpFilePath, "/opie-console-HistoryBuffer-XXXXXX"); | ||
111 | mode_t currUmask = umask(S_IRWXO | S_IRWXG); | ||
112 | int tmpfd = mkstemp(tmpFilePath); | ||
113 | delete [] tmpFilePath; | ||
114 | umask(currUmask); | ||
115 | if (tmpfd == -1) { | ||
116 | perror("konsole: cannot open temp file.\n"); | ||
117 | return; | ||
118 | } | ||
119 | ion = dup(tmpfd); | ||
120 | if (ion<0) | ||
121 | perror("konsole: cannot dup temp file.\n"); | ||
122 | close(tmpfd); | ||
102 | } | 123 | } |
103 | else | 124 | else |
104 | { | 125 | { |
105 | assert( ion >= 0 ); | 126 | assert( ion >= 0 ); |
106 | close(ion); | 127 | close(ion); |
107 | ion = -1; | 128 | ion = -1; |
108 | length = 0; | 129 | length = 0; |
109 | } | 130 | } |
110 | } | 131 | } |
111 | 132 | ||
112 | bool HistoryBuffer::hasScroll() | 133 | bool HistoryBuffer::hasScroll() |
113 | { | 134 | { |
114 | return ion >= 0; | 135 | return ion >= 0; |
115 | } | 136 | } |
116 | 137 | ||
117 | void HistoryBuffer::add(const unsigned char* bytes, int len) | 138 | void HistoryBuffer::add(const unsigned char* bytes, int len) |
118 | { int rc; | 139 | { int rc; |
119 | assert(hasScroll()); | 140 | assert(hasScroll()); |
120 | rc = lseek(ion,length,SEEK_SET); if (rc < 0) { perror("HistoryBuffer::add.seek"); setScroll(FALSE); return; } | 141 | rc = lseek(ion,length,SEEK_SET); if (rc < 0) { perror("HistoryBuffer::add.seek"); setScroll(FALSE); return; } |
121 | rc = write(ion,bytes,len); if (rc < 0) { perror("HistoryBuffer::add.write"); setScroll(FALSE); return; } | 142 | rc = write(ion,bytes,len); if (rc < 0) { perror("HistoryBuffer::add.write"); setScroll(FALSE); return; } |
122 | length += rc; | 143 | length += rc; |
123 | } | 144 | } |
124 | 145 | ||
125 | void HistoryBuffer::get(unsigned char* bytes, int len, int loc) | 146 | void HistoryBuffer::get(unsigned char* bytes, int len, int loc) |
126 | { int rc; | 147 | { int rc; |
127 | assert(hasScroll()); | 148 | assert(hasScroll()); |
128 | if (loc < 0 || len < 0 || loc + len > length) | 149 | if (loc < 0 || len < 0 || loc + len > length) |
129 | fprintf(stderr,"getHist(...,%d,%d): invalid args.\n",len,loc); | 150 | fprintf(stderr,"getHist(...,%d,%d): invalid args.\n",len,loc); |
130 | rc = lseek(ion,loc,SEEK_SET); if (rc < 0) { perror("HistoryBuffer::get.seek"); setScroll(FALSE); return; } | 151 | rc = lseek(ion,loc,SEEK_SET); if (rc < 0) { perror("HistoryBuffer::get.seek"); setScroll(FALSE); return; } |
131 | rc = read(ion,bytes,len); if (rc < 0) { perror("HistoryBuffer::get.read"); setScroll(FALSE); return; } | 152 | rc = read(ion,bytes,len); if (rc < 0) { perror("HistoryBuffer::get.read"); setScroll(FALSE); return; } |
132 | } | 153 | } |
133 | 154 | ||
134 | int HistoryBuffer::len() | 155 | int HistoryBuffer::len() |
135 | { | 156 | { |
136 | return length; | 157 | return length; |
137 | } | 158 | } |
138 | 159 | ||
139 | // History Scroll ////////////////////////////////////// | 160 | // History Scroll ////////////////////////////////////// |
140 | 161 | ||
141 | /* | 162 | /* |
142 | The history scroll makes a Row(Row(Cell)) from | 163 | The history scroll makes a Row(Row(Cell)) from |
143 | two history buffers. The index buffer contains | 164 | two history buffers. The index buffer contains |
144 | start of line positions which refere to the cells | 165 | start of line positions which refere to the cells |
145 | buffer. | 166 | buffer. |
146 | 167 | ||
147 | Note that index[0] addresses the second line | 168 | Note that index[0] addresses the second line |
148 | (line #1), while the first line (line #0) starts | 169 | (line #1), while the first line (line #0) starts |
149 | at 0 in cells. | 170 | at 0 in cells. |