summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2003-05-26 03:13:01 (UTC)
committer llornkcor <llornkcor>2003-05-26 03:13:01 (UTC)
commit830bab619ea396c018ccd29b20ce81cb47e113e1 (patch) (unidiff)
tree41acd0f61f309992e5cd8faa4995cafff099fea1
parenteaa924af86511fd43fc9eac5438e73972f82158b (diff)
downloadopie-830bab619ea396c018ccd29b20ce81cb47e113e1.zip
opie-830bab619ea396c018ccd29b20ce81cb47e113e1.tar.gz
opie-830bab619ea396c018ccd29b20ce81cb47e113e1.tar.bz2
remove extra includes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opierec/device.cpp6
-rw-r--r--noncore/multimedia/opierec/helpwindow.cpp23
-rw-r--r--noncore/multimedia/opierec/opierec.control2
-rw-r--r--noncore/multimedia/opierec/qtrec.cpp16
-rw-r--r--noncore/multimedia/opierec/wavFile.cpp2
5 files changed, 1 insertions, 48 deletions
diff --git a/noncore/multimedia/opierec/device.cpp b/noncore/multimedia/opierec/device.cpp
index c2029b7..f9a80c5 100644
--- a/noncore/multimedia/opierec/device.cpp
+++ b/noncore/multimedia/opierec/device.cpp
@@ -1,341 +1,335 @@
1// device.cpp 1// device.cpp
2 2
3#include "device.h" 3#include "device.h"
4#include "qtrec.h"
5 4
6#include <qpe/qpeapplication.h>
7#include <qpe/config.h> 5#include <qpe/config.h>
8#include <qpe/qcopenvelope_qws.h> 6#include <qpe/qcopenvelope_qws.h>
9 7
10#include <qslider.h>
11#include <qmessagebox.h>
12 8
13#include <qfile.h>
14#include <qtextstream.h>
15#include <fcntl.h> 9#include <fcntl.h>
16#include <stdio.h> 10#include <stdio.h>
17#include <stdlib.h> 11#include <stdlib.h>
18#include <sys/ioctl.h> 12#include <sys/ioctl.h>
19#include <sys/soundcard.h> 13#include <sys/soundcard.h>
20#include <unistd.h> 14#include <unistd.h>
21#include<sys/wait.h> 15#include<sys/wait.h>
22// #include <sys/stat.h> 16// #include <sys/stat.h>
23// #include <sys/time.h> 17// #include <sys/time.h>
24// #include <sys/types.h> 18// #include <sys/types.h>
25#include <unistd.h> 19#include <unistd.h>
26#include <errno.h> 20#include <errno.h>
27 21
28//extern QtRec *qperec; 22//extern QtRec *qperec;
29 23
30Device::Device( QObject * parent, const char * dsp, const char * mixr, bool record ) 24Device::Device( QObject * parent, const char * dsp, const char * mixr, bool record )
31 : QObject( parent) 25 : QObject( parent)
32{ 26{
33 dspstr = (char *)dsp; 27 dspstr = (char *)dsp;
34 mixstr = (char *)mixr; 28 mixstr = (char *)mixr;
35 29
36 devForm=-1; 30 devForm=-1;
37 devCh=-1; 31 devCh=-1;
38 devRate=-1; 32 devRate=-1;
39 33
40 if( !record){ //playing 34 if( !record){ //playing
41 qDebug("setting up DSP for playing"); 35 qDebug("setting up DSP for playing");
42 flags = O_WRONLY; 36 flags = O_WRONLY;
43 } else { //recording 37 } else { //recording
44 qDebug("setting up DSP for recording"); 38 qDebug("setting up DSP for recording");
45 flags = O_RDWR; 39 flags = O_RDWR;
46// flags = O_RDONLY; 40// flags = O_RDONLY;
47 selectMicInput(); 41 selectMicInput();
48 } 42 }
49} 43}
50 44
51bool Device::openDsp() { 45bool Device::openDsp() {
52 if( openDevice( flags) == -1) { 46 if( openDevice( flags) == -1) {
53 perror("<<<<<<<<<<<<<<ioctl(\"Open device\")"); 47 perror("<<<<<<<<<<<<<<ioctl(\"Open device\")");
54 return false; 48 return false;
55 } 49 }
56 return true; 50 return true;
57} 51}
58 52
59int Device::getOutVolume( ) { 53int Device::getOutVolume( ) {
60 unsigned int volume; 54 unsigned int volume;
61 int mixerHandle = open( mixstr, O_RDWR ); 55 int mixerHandle = open( mixstr, O_RDWR );
62 if ( mixerHandle >= 0 ) { 56 if ( mixerHandle >= 0 ) {
63 if(ioctl( mixerHandle, MIXER_READ(SOUND_MIXER_VOLUME), &volume )==-1) 57 if(ioctl( mixerHandle, MIXER_READ(SOUND_MIXER_VOLUME), &volume )==-1)
64 perror("<<<<<<<<<<<<<<ioctl(\"MIXER_READ\")"); 58 perror("<<<<<<<<<<<<<<ioctl(\"MIXER_READ\")");
65 ::close( mixerHandle ); 59 ::close( mixerHandle );
66 } else 60 } else
67 perror("open(\"/dev/mixer\")"); 61 perror("open(\"/dev/mixer\")");
68 printf("<<<<<<<<<<<<<<<<<<<<output volume %d\n",volume); 62 printf("<<<<<<<<<<<<<<<<<<<<output volume %d\n",volume);
69 63
70 Config cfg("qpe"); 64 Config cfg("qpe");
71 cfg.setGroup("Volume"); 65 cfg.setGroup("Volume");
72 66
73 return cfg.readNumEntry("VolumePercent"); 67 return cfg.readNumEntry("VolumePercent");
74} 68}
75 69
76int Device::getInVolume() { 70int Device::getInVolume() {
77 unsigned int volume=0; 71 unsigned int volume=0;
78 int mixerHandle = ::open( mixstr, O_RDWR ); 72 int mixerHandle = ::open( mixstr, O_RDWR );
79 if ( mixerHandle >= 0 ) { 73 if ( mixerHandle >= 0 ) {
80 if(ioctl( mixerHandle, MIXER_READ(SOUND_MIXER_MIC), &volume )==-1) 74 if(ioctl( mixerHandle, MIXER_READ(SOUND_MIXER_MIC), &volume )==-1)
81 perror("<<<<<<<<<<<<<<<ioctl(\"MIXER_READ\")"); 75 perror("<<<<<<<<<<<<<<<ioctl(\"MIXER_READ\")");
82 ::close( mixerHandle ); 76 ::close( mixerHandle );
83 } else 77 } else
84 perror("open(\"/dev/mixer\")"); 78 perror("open(\"/dev/mixer\")");
85 printf("<<<<<<<<<<<<<<input volume %d\n", volume ); 79 printf("<<<<<<<<<<<<<<input volume %d\n", volume );
86 Config cfg("qpe"); 80 Config cfg("qpe");
87 cfg.setGroup("Volume"); 81 cfg.setGroup("Volume");
88 82
89 return cfg.readNumEntry("Mic"); 83 return cfg.readNumEntry("Mic");
90} 84}
91 85
92void Device::changedOutVolume(int vol) { 86void Device::changedOutVolume(int vol) {
93 int level = (vol << 8) + vol; 87 int level = (vol << 8) + vol;
94 int fd = 0; 88 int fd = 0;
95 if ((fd = open("/dev/mixer", O_RDWR))>=0) { 89 if ((fd = open("/dev/mixer", O_RDWR))>=0) {
96 if(ioctl(fd, MIXER_WRITE(SOUND_MIXER_VOLUME), &level) == -1) 90 if(ioctl(fd, MIXER_WRITE(SOUND_MIXER_VOLUME), &level) == -1)
97 perror("ioctl(\"MIXER_IN_WRITE\")"); 91 perror("ioctl(\"MIXER_IN_WRITE\")");
98 92
99 Config cfg("qpe"); 93 Config cfg("qpe");
100 cfg.setGroup("Volume"); 94 cfg.setGroup("Volume");
101 cfg.writeEntry("VolumePercent", QString::number( vol )); 95 cfg.writeEntry("VolumePercent", QString::number( vol ));
102 QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << false; 96 QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << false;
103 } 97 }
104 ::close(fd); 98 ::close(fd);
105} 99}
106 100
107void Device::changedInVolume(int vol ) { 101void Device::changedInVolume(int vol ) {
108 int level = (vol << 8) + vol; 102 int level = (vol << 8) + vol;
109 int fd = 0; 103 int fd = 0;
110 if ((fd = open("/dev/mixer", O_RDWR))>=0) { 104 if ((fd = open("/dev/mixer", O_RDWR))>=0) {
111 if(ioctl(fd, MIXER_WRITE(SOUND_MIXER_MIC), &level) == -1) 105 if(ioctl(fd, MIXER_WRITE(SOUND_MIXER_MIC), &level) == -1)
112 perror("ioctl(\"MIXER_IN_WRITE\")"); 106 perror("ioctl(\"MIXER_IN_WRITE\")");
113 Config cfg("qpe"); 107 Config cfg("qpe");
114 cfg.setGroup("Volume"); 108 cfg.setGroup("Volume");
115 cfg.writeEntry("Mic", QString::number(vol )); 109 cfg.writeEntry("Mic", QString::number(vol ));
116 QCopEnvelope( "QPE/System", "micChange(bool)" ) << false; 110 QCopEnvelope( "QPE/System", "micChange(bool)" ) << false;
117 } 111 }
118 ::close(fd); 112 ::close(fd);
119} 113}
120 114
121bool Device::selectMicInput() { 115bool Device::selectMicInput() {
122/* 116/*
123 int md=0; 117 int md=0;
124 int info=MIXER_WRITE(SOUND_MIXER_MIC); 118 int info=MIXER_WRITE(SOUND_MIXER_MIC);
125 md = ::open( "/dev/mixer", O_RDWR ); 119 md = ::open( "/dev/mixer", O_RDWR );
126 if ( md == -1) 120 if ( md == -1)
127 perror("open(\"/dev/mixer\")"); 121 perror("open(\"/dev/mixer\")");
128 else { 122 else {
129 if( ioctl( md, SOUND_MIXER_WRITE_RECSRC, &info) == -1) 123 if( ioctl( md, SOUND_MIXER_WRITE_RECSRC, &info) == -1)
130 perror("ioctl(\"SOUND_MIXER_WRITE_RECSRC\")"); 124 perror("ioctl(\"SOUND_MIXER_WRITE_RECSRC\")");
131 ::close(md); 125 ::close(md);
132 return false; 126 return false;
133 } 127 }
134 ::close(md); 128 ::close(md);
135*/ 129*/
136 return true; 130 return true;
137} 131}
138 132
139int Device::openDevice( int flags) { 133int Device::openDevice( int flags) {
140/* pid_t pid; 134/* pid_t pid;
141 int status; 135 int status;
142 int pipefd[2]; 136 int pipefd[2];
143 char message[20]; 137 char message[20];
144 if (pipe(pipefd) == -1){ 138 if (pipe(pipefd) == -1){
145 perror ("Error creating pipe"); 139 perror ("Error creating pipe");
146exit(1); 140exit(1);
147 } 141 }
148 switch (pid = fork()) { 142 switch (pid = fork()) {
149 case -1: 143 case -1:
150 perror("The fork failed!"); 144 perror("The fork failed!");
151 break; 145 break;
152 case 0: { 146 case 0: {
153 */ 147 */
154 if (( sd = ::open( dspstr, flags)) == -1) { 148 if (( sd = ::open( dspstr, flags)) == -1) {
155 perror("open(\"/dev/dsp\")"); 149 perror("open(\"/dev/dsp\")");
156 QString errorMsg="Could not open audio device\n /dev/dsp\n" 150 QString errorMsg="Could not open audio device\n /dev/dsp\n"
157 +(QString)strerror(errno); 151 +(QString)strerror(errno);
158 qDebug(errorMsg); 152 qDebug(errorMsg);
159 return -1; 153 return -1;
160 } 154 }
161 155
162 int mixerHandle=0; 156 int mixerHandle=0;
163 /* Set the input dsp device and its input gain the weird Zaurus way */ 157 /* Set the input dsp device and its input gain the weird Zaurus way */
164 if (( mixerHandle = open("/dev/mixer1",O_RDWR))<0) { 158 if (( mixerHandle = open("/dev/mixer1",O_RDWR))<0) {
165 perror("open(\"/dev/mixer1\")"); 159 perror("open(\"/dev/mixer1\")");
166 } 160 }
167 161
168 if(ioctl(sd,SNDCTL_DSP_RESET,0)<0){ 162 if(ioctl(sd,SNDCTL_DSP_RESET,0)<0){
169 perror("ioctl RESET"); 163 perror("ioctl RESET");
170 } 164 }
171// sprintf(message, "%d", sd); 165// sprintf(message, "%d", sd);
172 166
173/* QFile f1("/pid"); 167/* QFile f1("/pid");
174 f1.open(IO_WriteOnly ); 168 f1.open(IO_WriteOnly );
175 f1.writeBlock(message, strlen(message)); 169 f1.writeBlock(message, strlen(message));
176 f1.close(); 170 f1.close();
177 */ 171 */
178 /* close(pipefd[0]); 172 /* close(pipefd[0]);
179 write(pipefd[1], message, sizeof(message)); 173 write(pipefd[1], message, sizeof(message));
180 close(pipefd[1]); 174 close(pipefd[1]);
181 // qDebug("%d",soundDevice->sd ); 175 // qDebug("%d",soundDevice->sd );
182 _exit(0); 176 _exit(0);
183 } 177 }
184 default: 178 default:
185 // pid greater than zero is parent getting the child's pid 179 // pid greater than zero is parent getting the child's pid
186 printf("Child's pid is %d\n",pid); 180 printf("Child's pid is %d\n",pid);
187 QString s; 181 QString s;
188 close(pipefd[1]); 182 close(pipefd[1]);
189 read(pipefd[0], message, sizeof(message)); 183 read(pipefd[0], message, sizeof(message));
190 s = message; 184 s = message;
191 close(pipefd[0]); 185 close(pipefd[0]);
192 186
193// while(wait(NULL)!=pid) 187// while(wait(NULL)!=pid)
194 // ; 188 // ;
195 printf("child %ld terminated normally, return status is zero\n", (long) pid); 189 printf("child %ld terminated normally, return status is zero\n", (long) pid);
196 */ 190 */
197 // filePara.sd=(long) pid; 191 // filePara.sd=(long) pid;
198 /* QFile f2("/pid"); 192 /* QFile f2("/pid");
199 f2.open(IO_ReadOnly); 193 f2.open(IO_ReadOnly);
200 QTextStream t(&f2); 194 QTextStream t(&f2);
201 // for(int f=0; f < t.atEnd() ;f++) { 195 // for(int f=0; f < t.atEnd() ;f++) {
202 s = t.readLine(); 196 s = t.readLine();
203 // } 197 // }
204 */ 198 */
205// bool ok; 199// bool ok;
206// sd = s.toInt(&ok, 10); 200// sd = s.toInt(&ok, 10);
207// qDebug("<<<<<<<<<<<<<>>>>>>>>>>>>"+s); 201// qDebug("<<<<<<<<<<<<<>>>>>>>>>>>>"+s);
208 202
209// f2.close(); 203// f2.close();
210// } 204// }
211::close(mixerHandle ); 205::close(mixerHandle );
212 qDebug("open device %s", dspstr); 206 qDebug("open device %s", dspstr);
213 qDebug("success! %d",sd); 207 qDebug("success! %d",sd);
214 return sd; 208 return sd;
215} 209}
216 210
217bool Device::closeDevice( bool b) { 211bool Device::closeDevice( bool b) {
218// if(b) {//close now 212// if(b) {//close now
219// if (ioctl( sd, SNDCTL_DSP_RESET, 0) == -1) { 213// if (ioctl( sd, SNDCTL_DSP_RESET, 0) == -1) {
220// perror("ioctl(\"SNDCTL_DSP_RESET\")"); 214// perror("ioctl(\"SNDCTL_DSP_RESET\")");
221// } 215// }
222// } else { //let play 216// } else { //let play
223// if (ioctl( sd, SNDCTL_DSP_SYNC, 0) == -1) { 217// if (ioctl( sd, SNDCTL_DSP_SYNC, 0) == -1) {
224// perror("ioctl(\"SNDCTL_DSP_SYNC\")"); 218// perror("ioctl(\"SNDCTL_DSP_SYNC\")");
225// } 219// }
226// } 220// }
227 221
228 ::close( sd); //close sound device 222 ::close( sd); //close sound device
229// sdfd=0; 223// sdfd=0;
230 // sd=0; 224 // sd=0;
231 qDebug("closed dsp"); 225 qDebug("closed dsp");
232 return true; 226 return true;
233} 227}
234 228
235bool Device::setDeviceFormat( int form) { 229bool Device::setDeviceFormat( int form) {
236 qDebug("set device res %d %d", form, sd); 230 qDebug("set device res %d %d", form, sd);
237 if (ioctl( sd, SNDCTL_DSP_SETFMT, &form)==-1) { //set format 231 if (ioctl( sd, SNDCTL_DSP_SETFMT, &form)==-1) { //set format
238 perror("ioctl(\"SNDCTL_DSP_SETFMT\")"); 232 perror("ioctl(\"SNDCTL_DSP_SETFMT\")");
239 return false; 233 return false;
240 } 234 }
241 devRes=form; 235 devRes=form;
242 return true; 236 return true;
243} 237}
244 238
245bool Device::setDeviceChannels( int ch) { 239bool Device::setDeviceChannels( int ch) {
246 qDebug("set channels %d %d", ch, sd); 240 qDebug("set channels %d %d", ch, sd);
247 if (ioctl( sd, SNDCTL_DSP_CHANNELS, &ch)==-1) { 241 if (ioctl( sd, SNDCTL_DSP_CHANNELS, &ch)==-1) {
248 perror("ioctl(\"SNDCTL_DSP_CHANNELS\")"); 242 perror("ioctl(\"SNDCTL_DSP_CHANNELS\")");
249 return false; 243 return false;
250 } 244 }
251 devCh=ch; 245 devCh=ch;
252 return true; 246 return true;
253} 247}
254 248
255bool Device::setDeviceRate( int rate) { 249bool Device::setDeviceRate( int rate) {
256 qDebug("set rate %d %d", rate, sd); 250 qDebug("set rate %d %d", rate, sd);
257 if (ioctl( sd, SNDCTL_DSP_SPEED, &rate) == -1) { 251 if (ioctl( sd, SNDCTL_DSP_SPEED, &rate) == -1) {
258 perror("ioctl(\"SNDCTL_DSP_SPEED\")"); 252 perror("ioctl(\"SNDCTL_DSP_SPEED\")");
259 return false; 253 return false;
260 } 254 }
261 255
262 devRate=rate; 256 devRate=rate;
263 257
264 return true; 258 return true;
265} 259}
266 260
267int Device::getRes() { 261int Device::getRes() {
268 return devRes; 262 return devRes;
269} 263}
270 264
271int Device::getFormat() { 265int Device::getFormat() {
272 return devForm; 266 return devForm;
273} 267}
274 268
275int Device::getRate() { 269int Device::getRate() {
276 return devRate; 270 return devRate;
277} 271}
278 272
279int Device::getChannels() { 273int Device::getChannels() {
280 return devCh; 274 return devCh;
281} 275}
282 276
283int Device::getDeviceFormat() { 277int Device::getDeviceFormat() {
284 return 0; 278 return 0;
285} 279}
286 280
287 281
288int Device::getDeviceRate() { 282int Device::getDeviceRate() {
289 int dRate=0; 283 int dRate=0;
290 if (ioctl( sd, SOUND_PCM_READ_RATE, &dRate) == -1) { 284 if (ioctl( sd, SOUND_PCM_READ_RATE, &dRate) == -1) {
291 perror("ioctl(\"SNDCTL_PCM_READ_RATE\")"); 285 perror("ioctl(\"SNDCTL_PCM_READ_RATE\")");
292 } 286 }
293 return dRate; 287 return dRate;
294 288
295} 289}
296 290
297int Device::getDeviceBits() { 291int Device::getDeviceBits() {
298 int dBits=0; 292 int dBits=0;
299#ifndef QT_QWS_EBX // zaurus doesnt have this 293#ifndef QT_QWS_EBX // zaurus doesnt have this
300 if (ioctl( sd, SOUND_PCM_READ_BITS, &dBits) == -1) { 294 if (ioctl( sd, SOUND_PCM_READ_BITS, &dBits) == -1) {
301 perror("ioctl(\"SNDCTL_PCM_READ_BITS\")"); 295 perror("ioctl(\"SNDCTL_PCM_READ_BITS\")");
302 } 296 }
303#endif 297#endif
304 return dBits; 298 return dBits;
305} 299}
306 300
307int Device::getDeviceChannels() { 301int Device::getDeviceChannels() {
308 int dCh=0; 302 int dCh=0;
309 if (ioctl( sd, SOUND_PCM_READ_CHANNELS, &dCh) == -1) { 303 if (ioctl( sd, SOUND_PCM_READ_CHANNELS, &dCh) == -1) {
310 perror("ioctl(\"SNDCTL_PCM_READ_CHANNELS\")"); 304 perror("ioctl(\"SNDCTL_PCM_READ_CHANNELS\")");
311 } 305 }
312 return dCh; 306 return dCh;
313} 307}
314 308
315int Device::getDeviceFragSize() { 309int Device::getDeviceFragSize() {
316 int frag_size; 310 int frag_size;
317 311
318 if (ioctl( sd, SNDCTL_DSP_GETBLKSIZE, &frag_size) == -1) { 312 if (ioctl( sd, SNDCTL_DSP_GETBLKSIZE, &frag_size) == -1) {
319 qDebug("no fragsize"); 313 qDebug("no fragsize");
320 } else 314 } else
321 qDebug("driver says frag size is %d", frag_size); 315 qDebug("driver says frag size is %d", frag_size);
322 return frag_size; 316 return frag_size;
323} 317}
324 318
325bool Device::setFragSize(int frag) { 319bool Device::setFragSize(int frag) {
326 if (ioctl(sd, SNDCTL_DSP_SETFRAGMENT, &frag)) { 320 if (ioctl(sd, SNDCTL_DSP_SETFRAGMENT, &frag)) {
327 perror("ioctl(\"SNDCTL_DSP_SETFRAGMENT\")"); 321 perror("ioctl(\"SNDCTL_DSP_SETFRAGMENT\")");
328 return false; 322 return false;
329 } 323 }
330 return true; 324 return true;
331} 325}
332 326
333bool Device::reset() { 327bool Device::reset() {
334 closeDevice(true); 328 closeDevice(true);
335 openDsp(); 329 openDsp();
336 if (ioctl( sd, SNDCTL_DSP_RESET, 0) == -1) { 330 if (ioctl( sd, SNDCTL_DSP_RESET, 0) == -1) {
337 perror("ioctl(\"SNDCTL_DSP_RESET\")"); 331 perror("ioctl(\"SNDCTL_DSP_RESET\")");
338 return false; 332 return false;
339 } 333 }
340 return true; 334 return true;
341} 335}
diff --git a/noncore/multimedia/opierec/helpwindow.cpp b/noncore/multimedia/opierec/helpwindow.cpp
index 0c4ac78..1ab6510 100644
--- a/noncore/multimedia/opierec/helpwindow.cpp
+++ b/noncore/multimedia/opierec/helpwindow.cpp
@@ -1,219 +1,196 @@
1/**************************************************************************** 1/****************************************************************************
2** $Id$ 2** $Id$
3** 3**
4** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. 4** Copyright (C) 1992-2000 Trolltech AS. All rights reserved.
5** 5**
6** This file is part of an example program for Qt. This example 6** This file is part of an example program for Qt. This example
7** program may be used, distributed and modified without limitation. 7** program may be used, distributed and modified without limitation.
8** 8**
9*****************************************************************************/ 9*****************************************************************************/
10 10
11#include "helpwindow.h" 11#include "helpwindow.h"
12#include <qstatusbar.h>
13#include <qstringlist.h>
14#include <qlayout.h> 12#include <qlayout.h>
15 13
16#include <qpe/qpemenubar.h>
17#include <qpe/qpetoolbar.h> 14#include <qpe/qpetoolbar.h>
18#include <qpe/resource.h> 15#include <qpe/resource.h>
19 16
20#include <qaction.h> 17#include <qaction.h>
21#include <qpixmap.h>
22#include <qpopupmenu.h>
23#include <qmenubar.h> 18#include <qmenubar.h>
24#include <qtoolbutton.h>
25#include <qiconset.h>
26#include <qfile.h>
27#include <qtextstream.h>
28#include <qstylesheet.h>
29#include <qmessagebox.h>
30#include <qfiledialog.h>
31#include <qapplication.h>
32#include <qcombobox.h>
33#include <qevent.h>
34#include <qlineedit.h>
35#include <qobjectlist.h>
36#include <qfileinfo.h>
37#include <qfile.h>
38#include <qdatastream.h>
39#include <qprinter.h>
40#include <qsimplerichtext.h>
41#include <qpaintdevicemetrics.h>
42 19
43#include <ctype.h> 20#include <ctype.h>
44 21
45HelpWindow::HelpWindow( const QString& home_, const QString& _path, QWidget* parent, const char *name ) 22HelpWindow::HelpWindow( const QString& home_, const QString& _path, QWidget* parent, const char *name )
46 : QMainWindow( parent, name, WDestructiveClose ), pathCombo( 0 ), selectedURL() 23 : QMainWindow( parent, name, WDestructiveClose ), pathCombo( 0 ), selectedURL()
47{ 24{
48 QGridLayout *layout = new QGridLayout( this ); 25 QGridLayout *layout = new QGridLayout( this );
49 layout->setSpacing( 2); 26 layout->setSpacing( 2);
50 layout->setMargin( 2); 27 layout->setMargin( 2);
51 qDebug(_path); 28 qDebug(_path);
52 browser = new QTextBrowser( this ); 29 browser = new QTextBrowser( this );
53 QStringList Strlist; 30 QStringList Strlist;
54 Strlist.append( home_); 31 Strlist.append( home_);
55 browser->mimeSourceFactory()->setFilePath( Strlist ); 32 browser->mimeSourceFactory()->setFilePath( Strlist );
56 browser->setFrameStyle( QFrame::Panel | QFrame::Sunken ); 33 browser->setFrameStyle( QFrame::Panel | QFrame::Sunken );
57 34
58 connect( browser, SIGNAL( textChanged() ), this, SLOT( textChanged() ) ); 35 connect( browser, SIGNAL( textChanged() ), this, SLOT( textChanged() ) );
59 36
60 if ( !home_.isEmpty() ) 37 if ( !home_.isEmpty() )
61 browser->setSource( home_ ); 38 browser->setSource( home_ );
62 QPEToolBar *toolbar = new QPEToolBar( this ); 39 QPEToolBar *toolbar = new QPEToolBar( this );
63 40
64 QAction *a = new QAction( tr( "Backward" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 ); 41 QAction *a = new QAction( tr( "Backward" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 );
65 connect( a, SIGNAL( activated() ), browser, SLOT( backward() ) ); 42 connect( a, SIGNAL( activated() ), browser, SLOT( backward() ) );
66 a->addTo( toolbar ); 43 a->addTo( toolbar );
67 44
68 a = new QAction( tr( "Forward" ), Resource::loadPixmap( "forward" ), QString::null, 0, this, 0 ); 45 a = new QAction( tr( "Forward" ), Resource::loadPixmap( "forward" ), QString::null, 0, this, 0 );
69 connect( a, SIGNAL( activated() ), browser, SLOT( forward() ) ); 46 connect( a, SIGNAL( activated() ), browser, SLOT( forward() ) );
70 a->addTo( toolbar ); 47 a->addTo( toolbar );
71 48
72 49
73 layout->addMultiCellWidget( toolbar, 0, 0, 0, 0); 50 layout->addMultiCellWidget( toolbar, 0, 0, 0, 0);
74 51
75 layout->addMultiCellWidget( browser, 1, 2, 0, 2); 52 layout->addMultiCellWidget( browser, 1, 2, 0, 2);
76 53
77 browser->setFocus(); 54 browser->setFocus();
78} 55}
79 56
80 57
81void HelpWindow::setBackwardAvailable( bool b) 58void HelpWindow::setBackwardAvailable( bool b)
82{ 59{
83 menuBar()->setItemEnabled( backwardId, b); 60 menuBar()->setItemEnabled( backwardId, b);
84} 61}
85 62
86void HelpWindow::setForwardAvailable( bool b) 63void HelpWindow::setForwardAvailable( bool b)
87{ 64{
88 menuBar()->setItemEnabled( forwardId, b); 65 menuBar()->setItemEnabled( forwardId, b);
89} 66}
90 67
91 68
92void HelpWindow::textChanged() 69void HelpWindow::textChanged()
93{ 70{
94 if ( browser->documentTitle().isNull() ) { 71 if ( browser->documentTitle().isNull() ) {
95 setCaption( "QpeRec - Helpviewer - " + browser->context() ); 72 setCaption( "QpeRec - Helpviewer - " + browser->context() );
96 selectedURL = browser->context(); 73 selectedURL = browser->context();
97 } 74 }
98 else { 75 else {
99 setCaption( "QpeRec - Helpviewer - " + browser->documentTitle() ) ; 76 setCaption( "QpeRec - Helpviewer - " + browser->documentTitle() ) ;
100 selectedURL = browser->documentTitle(); 77 selectedURL = browser->documentTitle();
101 } 78 }
102 79
103// if ( !selectedURL.isEmpty() && pathCombo ) { 80// if ( !selectedURL.isEmpty() && pathCombo ) {
104// bool exists = FALSE; 81// bool exists = FALSE;
105// int i; 82// int i;
106// for ( i = 0; i < pathCombo->count(); ++i ) { 83// for ( i = 0; i < pathCombo->count(); ++i ) {
107// if ( pathCombo->text( i ) == selectedURL ) { 84// if ( pathCombo->text( i ) == selectedURL ) {
108// exists = TRUE; 85// exists = TRUE;
109// break; 86// break;
110// } 87// }
111// } 88// }
112// if ( !exists ) { 89// if ( !exists ) {
113// pathCombo->insertItem( selectedURL, 0 ); 90// pathCombo->insertItem( selectedURL, 0 );
114// pathCombo->setCurrentItem( 0 ); 91// pathCombo->setCurrentItem( 0 );
115// mHistory[ hist->insertItem( selectedURL ) ] = selectedURL; 92// mHistory[ hist->insertItem( selectedURL ) ] = selectedURL;
116// } else 93// } else
117// pathCombo->setCurrentItem( i ); 94// pathCombo->setCurrentItem( i );
118// selectedURL = QString::null; 95// selectedURL = QString::null;
119// } 96// }
120} 97}
121 98
122HelpWindow::~HelpWindow() 99HelpWindow::~HelpWindow()
123{ 100{
124 history.clear(); 101 history.clear();
125 QMap<int, QString>::Iterator it = mHistory.begin(); 102 QMap<int, QString>::Iterator it = mHistory.begin();
126 for ( ; it != mHistory.end(); ++it ) 103 for ( ; it != mHistory.end(); ++it )
127 history.append( *it ); 104 history.append( *it );
128 105
129 QFile f( QDir::currentDirPath() + "/.history" ); 106 QFile f( QDir::currentDirPath() + "/.history" );
130 f.open( IO_WriteOnly ); 107 f.open( IO_WriteOnly );
131 QDataStream s( &f ); 108 QDataStream s( &f );
132 s << history; 109 s << history;
133 f.close(); 110 f.close();
134 111
135 bookmarks.clear(); 112 bookmarks.clear();
136 QMap<int, QString>::Iterator it2 = mBookmarks.begin(); 113 QMap<int, QString>::Iterator it2 = mBookmarks.begin();
137 for ( ; it2 != mBookmarks.end(); ++it2 ) 114 for ( ; it2 != mBookmarks.end(); ++it2 )
138 bookmarks.append( *it2 ); 115 bookmarks.append( *it2 );
139 116
140 QFile f2( QDir::currentDirPath() + "/.bookmarks" ); 117 QFile f2( QDir::currentDirPath() + "/.bookmarks" );
141 f2.open( IO_WriteOnly ); 118 f2.open( IO_WriteOnly );
142 QDataStream s2( &f2 ); 119 QDataStream s2( &f2 );
143 s2 << bookmarks; 120 s2 << bookmarks;
144 f2.close(); 121 f2.close();
145} 122}
146 123
147void HelpWindow::openFile() 124void HelpWindow::openFile()
148{ 125{
149#ifndef QT_NO_FILEDIALOG 126#ifndef QT_NO_FILEDIALOG
150#endif 127#endif
151} 128}
152 129
153void HelpWindow::newWindow() 130void HelpWindow::newWindow()
154{ 131{
155 ( new HelpWindow(browser->source(), "qbrowser") )->show(); 132 ( new HelpWindow(browser->source(), "qbrowser") )->show();
156} 133}
157 134
158void HelpWindow::print() 135void HelpWindow::print()
159{ 136{
160#ifndef QT_NO_PRINTER 137#ifndef QT_NO_PRINTER
161#endif 138#endif
162} 139}
163 140
164void HelpWindow::pathSelected( const QString &_path ) 141void HelpWindow::pathSelected( const QString &_path )
165{ 142{
166 browser->setSource( _path ); 143 browser->setSource( _path );
167 QMap<int, QString>::Iterator it = mHistory.begin(); 144 QMap<int, QString>::Iterator it = mHistory.begin();
168 bool exists = FALSE; 145 bool exists = FALSE;
169 for ( ; it != mHistory.end(); ++it ) { 146 for ( ; it != mHistory.end(); ++it ) {
170 if ( *it == _path ) { 147 if ( *it == _path ) {
171 exists = TRUE; 148 exists = TRUE;
172 break; 149 break;
173 } 150 }
174 } 151 }
175 if ( !exists ) 152 if ( !exists )
176 mHistory[ hist->insertItem( _path ) ] = _path; 153 mHistory[ hist->insertItem( _path ) ] = _path;
177} 154}
178 155
179void HelpWindow::readHistory() 156void HelpWindow::readHistory()
180{ 157{
181 if ( QFile::exists( QDir::currentDirPath() + "/.history" ) ) { 158 if ( QFile::exists( QDir::currentDirPath() + "/.history" ) ) {
182 QFile f( QDir::currentDirPath() + "/.history" ); 159 QFile f( QDir::currentDirPath() + "/.history" );
183 f.open( IO_ReadOnly ); 160 f.open( IO_ReadOnly );
184 QDataStream s( &f ); 161 QDataStream s( &f );
185 s >> history; 162 s >> history;
186 f.close(); 163 f.close();
187 while ( history.count() > 20 ) 164 while ( history.count() > 20 )
188 history.remove( history.begin() ); 165 history.remove( history.begin() );
189 } 166 }
190} 167}
191 168
192void HelpWindow::readBookmarks() 169void HelpWindow::readBookmarks()
193{ 170{
194 if ( QFile::exists( QDir::currentDirPath() + "/.bookmarks" ) ) { 171 if ( QFile::exists( QDir::currentDirPath() + "/.bookmarks" ) ) {
195 QFile f( QDir::currentDirPath() + "/.bookmarks" ); 172 QFile f( QDir::currentDirPath() + "/.bookmarks" );
196 f.open( IO_ReadOnly ); 173 f.open( IO_ReadOnly );
197 QDataStream s( &f ); 174 QDataStream s( &f );
198 s >> bookmarks; 175 s >> bookmarks;
199 f.close(); 176 f.close();
200 } 177 }
201} 178}
202 179
203void HelpWindow::histChosen( int i ) 180void HelpWindow::histChosen( int i )
204{ 181{
205 if ( mHistory.contains( i ) ) 182 if ( mHistory.contains( i ) )
206 browser->setSource( mHistory[ i ] ); 183 browser->setSource( mHistory[ i ] );
207} 184}
208 185
209void HelpWindow::bookmChosen( int i ) 186void HelpWindow::bookmChosen( int i )
210{ 187{
211 if ( mBookmarks.contains( i ) ) 188 if ( mBookmarks.contains( i ) )
212 browser->setSource( mBookmarks[ i ] ); 189 browser->setSource( mBookmarks[ i ] );
213} 190}
214 191
215void HelpWindow::addBookmark() 192void HelpWindow::addBookmark()
216{ 193{
217 mBookmarks[ bookm->insertItem( caption() ) ] = caption(); 194 mBookmarks[ bookm->insertItem( caption() ) ] = caption();
218} 195}
219 196
diff --git a/noncore/multimedia/opierec/opierec.control b/noncore/multimedia/opierec/opierec.control
index e8396ae..455691f 100644
--- a/noncore/multimedia/opierec/opierec.control
+++ b/noncore/multimedia/opierec/opierec.control
@@ -1,10 +1,10 @@
1Package: opierec 1Package: opie-rec
2Files: bin/opierec pics/opierec apps/Applications/opierec.desktop 2Files: bin/opierec pics/opierec apps/Applications/opierec.desktop
3Priority: optional 3Priority: optional
4Section: multimedia/applications 4Section: multimedia/applications
5Maintainer: L.J. Potter <ljp@llornkcor.com> 5Maintainer: L.J. Potter <ljp@llornkcor.com>
6Architecture: arm 6Architecture: arm
7Version: 1.5-2 7Version: 1.5-2
8Depends: opie ($QPE_VERSION) 8Depends: opie ($QPE_VERSION)
9Description: audio sampling recorder 9Description: audio sampling recorder
10 A simple audio recording/playing application. 10 A simple audio recording/playing application.
diff --git a/noncore/multimedia/opierec/qtrec.cpp b/noncore/multimedia/opierec/qtrec.cpp
index 28f6546..0307d99 100644
--- a/noncore/multimedia/opierec/qtrec.cpp
+++ b/noncore/multimedia/opierec/qtrec.cpp
@@ -1,827 +1,811 @@
1/**************************************************************************** 1/****************************************************************************
2 // qtrec.cpp 2 // qtrec.cpp
3 Created: Thu Jan 17 11:19:58 2002 3 Created: Thu Jan 17 11:19:58 2002
4 copyright 2002 by L.J. Potter <ljp@llornkcor.com> 4 copyright 2002 by L.J. Potter <ljp@llornkcor.com>
5****************************************************************************/ 5****************************************************************************/
6 6
7#define DEV_VERSION 7#define DEV_VERSION
8 8
9#include "pixmaps.h" 9#include "pixmaps.h"
10#include "qtrec.h" 10#include "qtrec.h"
11#include "helpwindow.h"
12#include "device.h"
13#include "wavFile.h"
14 11
15#include <pthread.h> 12#include <pthread.h>
16 13
17extern "C" { 14extern "C" {
18#include "adpcm.h" 15#include "adpcm.h"
19} 16}
20 17
21#include <sys/soundcard.h> 18#include <sys/soundcard.h>
22 19
23// #if defined (QTOPIA_INTERNAL_FSLP) 20// #if defined (QTOPIA_INTERNAL_FSLP)
24// #include <qpe/lnkproperties.h> 21// #include <qpe/lnkproperties.h>
25// #endif 22// #endif
26 23
27#include <qpe/applnk.h>
28#include <qpe/config.h> 24#include <qpe/config.h>
29#include <qpe/ir.h>
30#include <qpe/qcopenvelope_qws.h> 25#include <qpe/qcopenvelope_qws.h>
31#include <qpe/qpeapplication.h> 26#include <qpe/qpeapplication.h>
32#include <qpe/resource.h> 27#include <qpe/resource.h>
33#include <qpe/storage.h> 28#include <qpe/storage.h>
34 29
35#include <qlineedit.h>
36#include <qbuttongroup.h>
37#include <qcheckbox.h> 30#include <qcheckbox.h>
38#include <qcombobox.h> 31#include <qcombobox.h>
39#include <qcursor.h>
40//#include <qdatetime.h> 32//#include <qdatetime.h>
41#include <qdir.h> 33#include <qdir.h>
42#include <qfile.h>
43#include <qtextstream.h>
44#include <qgroupbox.h> 34#include <qgroupbox.h>
45#include <qiconview.h>
46#include <qimage.h>
47#include <qlabel.h> 35#include <qlabel.h>
48#include <qlayout.h> 36#include <qlayout.h>
49#include <qlineedit.h>
50#include <qlistview.h> 37#include <qlistview.h>
51#include <qmessagebox.h> 38#include <qmessagebox.h>
52#include <qpixmap.h>
53#include <qpopupmenu.h> 39#include <qpopupmenu.h>
54#include <qpushbutton.h> 40#include <qpushbutton.h>
55#include <qregexp.h>
56#include <qslider.h> 41#include <qslider.h>
57#include <qtabwidget.h> 42#include <qtabwidget.h>
58#include <qtimer.h> 43#include <qtimer.h>
59#include <qvariant.h>
60 44
61#include <errno.h> 45#include <errno.h>
62#include <fcntl.h> 46#include <fcntl.h>
63#include <math.h> 47#include <math.h>
64#include <mntent.h> 48#include <mntent.h>
65#include <stdio.h> 49#include <stdio.h>
66#include <stdlib.h> 50#include <stdlib.h>
67#include <sys/ioctl.h> 51#include <sys/ioctl.h>
68#include <sys/soundcard.h> 52#include <sys/soundcard.h>
69#include <sys/stat.h> 53#include <sys/stat.h>
70#include <sys/time.h> 54#include <sys/time.h>
71#include <sys/types.h> 55#include <sys/types.h>
72#include <sys/vfs.h> 56#include <sys/vfs.h>
73#include <unistd.h> 57#include <unistd.h>
74#include<sys/wait.h> 58#include<sys/wait.h>
75#include <sys/signal.h> 59#include <sys/signal.h>
76 60
77//#define ZAURUS 0 61//#define ZAURUS 0
78struct adpcm_state encoder_state; 62struct adpcm_state encoder_state;
79struct adpcm_state decoder_state; 63struct adpcm_state decoder_state;
80 64
81long findPeak(long input ); 65long findPeak(long input );
82//char deviceRates[]; 66//char deviceRates[];
83 67
84typedef struct { 68typedef struct {
85 int sampleRate; 69 int sampleRate;
86 /* int fragSize; */ 70 /* int fragSize; */
87 /* int blockSize; */ 71 /* int blockSize; */
88 int resolution; //bitrate 72 int resolution; //bitrate
89 int channels; //number of channels 73 int channels; //number of channels
90 int fd; //file descriptor 74 int fd; //file descriptor
91 int sd; //sound device descriptor 75 int sd; //sound device descriptor
92 int numberSamples; //total number of samples 76 int numberSamples; //total number of samples
93 int SecondsToRecord; // number of seconds that should be recorded 77 int SecondsToRecord; // number of seconds that should be recorded
94 float numberOfRecordedSeconds; //total number of samples recorded 78 float numberOfRecordedSeconds; //total number of samples recorded
95 int samplesToRecord; //number of samples to be recorded 79 int samplesToRecord; //number of samples to be recorded
96 int inVol; //input volume 80 int inVol; //input volume
97 int outVol; //output volume 81 int outVol; //output volume
98 int format; //wavfile format PCM.. ADPCM 82 int format; //wavfile format PCM.. ADPCM
99 const char *fileName; //name of fiel to be played/recorded 83 const char *fileName; //name of fiel to be played/recorded
100} fileParameters; 84} fileParameters;
101 85
102fileParameters filePara; 86fileParameters filePara;
103 87
104bool monitoring, recording; 88bool monitoring, recording;
105bool stopped; 89bool stopped;
106QLabel *timeLabel; 90QLabel *timeLabel;
107QSlider *timeSlider; 91QSlider *timeSlider;
108int sd; 92int sd;
109 93
110#if defined(QT_QWS_EBX) 94#if defined(QT_QWS_EBX)
111#define DSPSTROUT "/dev/dsp" 95#define DSPSTROUT "/dev/dsp"
112#define DSPSTRIN "/dev/dsp1" 96#define DSPSTRIN "/dev/dsp1"
113#define DSPSTRMIXEROUT "/dev/mixer" 97#define DSPSTRMIXEROUT "/dev/mixer"
114#define DSPSTRMIXERIN "/dev/mixer1" 98#define DSPSTRMIXERIN "/dev/mixer1"
115#else 99#else
116#define DSPSTROUT "/dev/dsp" 100#define DSPSTROUT "/dev/dsp"
117#define DSPSTRIN "/dev/dsp" 101#define DSPSTRIN "/dev/dsp"
118#define DSPSTRMIXERIN "/dev/mixer" 102#define DSPSTRMIXERIN "/dev/mixer"
119#define DSPSTRMIXEROUT "/dev/mixer" 103#define DSPSTRMIXEROUT "/dev/mixer"
120#endif 104#endif
121 105
122// threaded recording 106// threaded recording
123void quickRec() { 107void quickRec() {
124//void QtRec::quickRec() { 108//void QtRec::quickRec() {
125 109
126 qDebug("%d", 110 qDebug("%d",
127 filePara.numberSamples/filePara.sampleRate * filePara.channels); 111 filePara.numberSamples/filePara.sampleRate * filePara.channels);
128 qDebug("samples %d, rate %d, channels %d", 112 qDebug("samples %d, rate %d, channels %d",
129 filePara.numberSamples, filePara.sampleRate, filePara.channels); 113 filePara.numberSamples, filePara.sampleRate, filePara.channels);
130 114
131 int total = 0; // Total number of bytes read in so far. 115 int total = 0; // Total number of bytes read in so far.
132 int bytesWritten, number; 116 int bytesWritten, number;
133 117
134 count_info info; 118 count_info info;
135 119
136 bytesWritten=0; 120 bytesWritten=0;
137 number=0; 121 number=0;
138 QString num, timeString; 122 QString num, timeString;
139 int level=0; 123 int level=0;
140 int threshold=0; 124 int threshold=0;
141 // if(limit != 0) 125 // if(limit != 0)
142 // t->start( ( limit +.3) , true); 126 // t->start( ( limit +.3) , true);
143 127
144 recording = true; 128 recording = true;
145 //rate=filePara.sampleRate; 129 //rate=filePara.sampleRate;
146 int bits = filePara.resolution; 130 int bits = filePara.resolution;
147 qDebug("bits %d", bits); 131 qDebug("bits %d", bits);
148// if( filePara.format==WAVE_FORMAT_DVI_ADPCM) 132// if( filePara.format==WAVE_FORMAT_DVI_ADPCM)
149// else 133// else
150 audio_buf_info inInfo; 134 audio_buf_info inInfo;
151 ioctl( filePara.fd, SNDCTL_DSP_GETISPACE, &inInfo); 135 ioctl( filePara.fd, SNDCTL_DSP_GETISPACE, &inInfo);
152 qDebug("ispace is frags %d, total %d", inInfo.fragments, inInfo.fragstotal); 136 qDebug("ispace is frags %d, total %d", inInfo.fragments, inInfo.fragstotal);
153 137
154 if( filePara.resolution == 16 ) { //AFMT_S16_LE) 138 if( filePara.resolution == 16 ) { //AFMT_S16_LE)
155 qDebug("AFMT_S16_LE size %d", filePara.SecondsToRecord); 139 qDebug("AFMT_S16_LE size %d", filePara.SecondsToRecord);
156 qDebug("samples to record %d", filePara.samplesToRecord); 140 qDebug("samples to record %d", filePara.samplesToRecord);
157 qDebug("%d", filePara.sd); 141 qDebug("%d", filePara.sd);
158 level=7; 142 level=7;
159 threshold=0; 143 threshold=0;
160 timeString.sprintf("%.2f", filePara.numberOfRecordedSeconds); 144 timeString.sprintf("%.2f", filePara.numberOfRecordedSeconds);
161 timeLabel->setText( timeString+ " seconds"); 145 timeLabel->setText( timeString+ " seconds");
162 146
163 if( filePara.format==WAVE_FORMAT_DVI_ADPCM) { 147 if( filePara.format==WAVE_FORMAT_DVI_ADPCM) {
164 qDebug("start recording WAVE_FORMAT_DVI_ADPCM"); 148 qDebug("start recording WAVE_FORMAT_DVI_ADPCM");
165 // <<<<<<<<<<<<<<<<<<<<<<<<<<< WAVE_FORMAT_DVI_ADPCM >>>>>>>>>>>>>>>>>>>>>> 149 // <<<<<<<<<<<<<<<<<<<<<<<<<<< WAVE_FORMAT_DVI_ADPCM >>>>>>>>>>>>>>>>>>>>>>
166 char abuf[BUFSIZE/2]; 150 char abuf[BUFSIZE/2];
167 short sbuf[BUFSIZE]; 151 short sbuf[BUFSIZE];
168 short sbuf2[BUFSIZE]; 152 short sbuf2[BUFSIZE];
169 memset( abuf,0,BUFSIZE/2); 153 memset( abuf,0,BUFSIZE/2);
170 memset( sbuf,0,BUFSIZE); 154 memset( sbuf,0,BUFSIZE);
171 memset( sbuf2,0,BUFSIZE); 155 memset( sbuf2,0,BUFSIZE);
172 156
173 for(;;) { 157 for(;;) {
174 if (stopped) { 158 if (stopped) {
175 qDebug("quickRec:: stopped"); 159 qDebug("quickRec:: stopped");
176 break; // stop if playing was set to false 160 break; // stop if playing was set to false
177// return; 161// return;
178 } 162 }
179 163
180 number=::read( filePara.sd, sbuf, BUFSIZE); 164 number=::read( filePara.sd, sbuf, BUFSIZE);
181 165
182 if(number <= 0) { 166 if(number <= 0) {
183 perror("recording error "); 167 perror("recording error ");
184 qDebug( "%s %d", filePara.fileName, number); 168 qDebug( "%s %d", filePara.fileName, number);
185 // errorStop(); 169 // errorStop();
186 recording=stopped=false; 170 recording=stopped=false;
187// QMessageBox::message("Note", 171// QMessageBox::message("Note",
188// "Error recording to file\n%s", 172// "Error recording to file\n%s",
189// filePara.fileName); 173// filePara.fileName);
190 return; 174 return;
191 } 175 }
192 //if(stereo == 2) { 176 //if(stereo == 2) {
193// adpcm_coder( sbuf2, abuf, number/2, &encoder_state); 177// adpcm_coder( sbuf2, abuf, number/2, &encoder_state);
194 adpcm_coder( sbuf, abuf, number/2, &encoder_state); 178 adpcm_coder( sbuf, abuf, number/2, &encoder_state);
195 179
196 bytesWritten = ::write( filePara.fd , abuf, number/4); 180 bytesWritten = ::write( filePara.fd , abuf, number/4);
197 181
198 long peak; 182 long peak;
199 for (int i = 0; i < number; i++) 183 for (int i = 0; i < number; i++)
200 { //since Z is mono do normally 184 { //since Z is mono do normally
201 peak = findPeak((long)sbuf[i]); 185 peak = findPeak((long)sbuf[i]);
202 printf("peak %ld\r",peak); 186 printf("peak %ld\r",peak);
203 fflush(stdout); 187 fflush(stdout);
204 } 188 }
205 189
206 190
207 //------------->>>> out to file 191 //------------->>>> out to file
208 // if(filePara.channels==1) 192 // if(filePara.channels==1)
209 // total += bytesWritten/2; //mono 193 // total += bytesWritten/2; //mono
210 // else 194 // else
211 total += bytesWritten; 195 total += bytesWritten;
212 filePara.numberSamples = total; 196 filePara.numberSamples = total;
213// if( total >= filePara.samplesToRecord) 197// if( total >= filePara.samplesToRecord)
214// timeSlider->setValue(0); 198// timeSlider->setValue(0);
215// else if( filePara.SecondsToRecord !=0) 199// else if( filePara.SecondsToRecord !=0)
216 timeSlider->setValue( total); 200 timeSlider->setValue( total);
217 201
218 filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate * (float)2; 202 filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate * (float)2;
219 203
220// printf("Writing number %d, bytes %d,total %d, sample rate %d, secs %.2f \n", 204// printf("Writing number %d, bytes %d,total %d, sample rate %d, secs %.2f \n",
221// number, 205// number,
222// bytesWritten , 206// bytesWritten ,
223// total, 207// total,
224// filePara.sampleRate, 208// filePara.sampleRate,
225// filePara.numberOfRecordedSeconds); 209// filePara.numberOfRecordedSeconds);
226// fflush(stdout); 210// fflush(stdout);
227 ioctl( filePara.sd, SNDCTL_DSP_GETIPTR, &info); 211 ioctl( filePara.sd, SNDCTL_DSP_GETIPTR, &info);
228// qDebug("%d, %d", info.bytes, (info.bytes / filePara.sampleRate) / 2); 212// qDebug("%d, %d", info.bytes, (info.bytes / filePara.sampleRate) / 2);
229 213
230 timeString.sprintf("%.2f", filePara.numberOfRecordedSeconds); 214 timeString.sprintf("%.2f", filePara.numberOfRecordedSeconds);
231 timeLabel->setText( timeString + " seconds"); 215 timeLabel->setText( timeString + " seconds");
232 216
233 qApp->processEvents(); 217 qApp->processEvents();
234 if( total >= filePara.samplesToRecord) 218 if( total >= filePara.samplesToRecord)
235 break; 219 break;
236 } 220 }
237 } else { 221 } else {
238 // <<<<<<<<<<<<<<<<<<<<<<<<<<< WAVE_FORMAT_PCM >>>>>>>>>>>>>>>>>>>>>> 222 // <<<<<<<<<<<<<<<<<<<<<<<<<<< WAVE_FORMAT_PCM >>>>>>>>>>>>>>>>>>>>>>
239 qDebug("start recording WAVE_FORMAT_PCM"); 223 qDebug("start recording WAVE_FORMAT_PCM");
240 short inbuffer[BUFSIZE], outbuffer[BUFSIZE]; 224 short inbuffer[BUFSIZE], outbuffer[BUFSIZE];
241 memset( inbuffer,0,BUFSIZE); 225 memset( inbuffer,0,BUFSIZE);
242 memset( outbuffer,0,BUFSIZE); 226 memset( outbuffer,0,BUFSIZE);
243 for(;;) { 227 for(;;) {
244 if (stopped) { 228 if (stopped) {
245 qDebug("quickRec:: stopped"); 229 qDebug("quickRec:: stopped");
246 break; // stop if playing was set to false 230 break; // stop if playing was set to false
247 return; 231 return;
248 } 232 }
249 233
250 number=::read( filePara.sd, inbuffer, BUFSIZE); 234 number=::read( filePara.sd, inbuffer, BUFSIZE);
251 235
252 if(number <= 0) { 236 if(number <= 0) {
253 perror("recording error "); 237 perror("recording error ");
254 qDebug( filePara.fileName); 238 qDebug( filePara.fileName);
255 recording=stopped=false; 239 recording=stopped=false;
256 // errorStop(); 240 // errorStop();
257// QMessageBox::message("Note","error recording to file\n%s",filePara.fileName); 241// QMessageBox::message("Note","error recording to file\n%s",filePara.fileName);
258 return;// false; 242 return;// false;
259 } 243 }
260/* for (int i=0;i< number;i++) { //2*i is left channel 244/* for (int i=0;i< number;i++) { //2*i is left channel
261 245
262outbuffer[i]=inbuffer[i]>>1; // no clippy, please 246outbuffer[i]=inbuffer[i]>>1; // no clippy, please
263}*/ 247}*/
264 bytesWritten = ::write( filePara.fd , inbuffer, number); 248 bytesWritten = ::write( filePara.fd , inbuffer, number);
265//------------->>>> out to file 249//------------->>>> out to file
266 if(bytesWritten < 0) { 250 if(bytesWritten < 0) {
267 // errorStop(); 251 // errorStop();
268 perror("File writing error "); 252 perror("File writing error ");
269 return;// false; 253 return;// false;
270 } 254 }
271 255
272 // if(filePara.channels==1) 256 // if(filePara.channels==1)
273 // total += bytesWritten/2; //mono 257 // total += bytesWritten/2; //mono
274 // else 258 // else
275 total += bytesWritten; 259 total += bytesWritten;
276 long peak; 260 long peak;
277 for (int i = 0; i < number; i++) 261 for (int i = 0; i < number; i++)
278 { //since Z is mono do normally 262 { //since Z is mono do normally
279 peak = findPeak((long)inbuffer[i]); 263 peak = findPeak((long)inbuffer[i]);
280 printf("peak %ld\r",peak); 264 printf("peak %ld\r",peak);
281 fflush(stdout); 265 fflush(stdout);
282 } 266 }
283 267
284 268
285 filePara.numberSamples = total; 269 filePara.numberSamples = total;
286 if(filePara.SecondsToRecord !=0) 270 if(filePara.SecondsToRecord !=0)
287 timeSlider->setValue( total); 271 timeSlider->setValue( total);
288// printf("Writing number %d, bytes %d,total %d\r",number, bytesWritten , total); 272// printf("Writing number %d, bytes %d,total %d\r",number, bytesWritten , total);
289// fflush(stdout); 273// fflush(stdout);
290 274
291 ioctl( filePara.sd, SNDCTL_DSP_GETIPTR, &info); 275 ioctl( filePara.sd, SNDCTL_DSP_GETIPTR, &info);
292// qDebug("%d, %d", info.bytes, ( info.bytes / filePara.sampleRate) / 2); 276// qDebug("%d, %d", info.bytes, ( info.bytes / filePara.sampleRate) / 2);
293 277
294 filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate / (float)2; 278 filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate / (float)2;
295 279
296 timeString.sprintf("%.2f", filePara.numberOfRecordedSeconds); 280 timeString.sprintf("%.2f", filePara.numberOfRecordedSeconds);
297 timeLabel->setText( timeString + " seconds"); 281 timeLabel->setText( timeString + " seconds");
298 282
299 qApp->processEvents(); 283 qApp->processEvents();
300 if( total >= filePara.samplesToRecord) 284 if( total >= filePara.samplesToRecord)
301 break; 285 break;
302 } 286 }
303 } //end main loop 287 } //end main loop
304 288
305 } else { // <<<<<<<<<<<<<<<<<<<<<<< format = AFMT_U8; 289 } else { // <<<<<<<<<<<<<<<<<<<<<<< format = AFMT_U8;
306 unsigned char unsigned_inbuffer[BUFSIZE], unsigned_outbuffer[BUFSIZE]; 290 unsigned char unsigned_inbuffer[BUFSIZE], unsigned_outbuffer[BUFSIZE];
307 memset( unsigned_inbuffer, 0, BUFSIZE); 291 memset( unsigned_inbuffer, 0, BUFSIZE);
308 memset( unsigned_outbuffer, 0, BUFSIZE); 292 memset( unsigned_outbuffer, 0, BUFSIZE);
309 293
310 for(;;) { 294 for(;;) {
311 if (stopped) { 295 if (stopped) {
312 qDebug("quickRec:: stopped"); 296 qDebug("quickRec:: stopped");
313 break; // stop if playing was set to false 297 break; // stop if playing was set to false
314 } 298 }
315 number=::read( filePara.sd, unsigned_inbuffer, BUFSIZE); 299 number=::read( filePara.sd, unsigned_inbuffer, BUFSIZE);
316//-------------<<<< in from device 300//-------------<<<< in from device
317// val = (data ^ 0x80) << 8; 301// val = (data ^ 0x80) << 8;
318 302
319//unsigned_outbuffer = (unsigned_inbuffer ^ 0x80) << 8; 303//unsigned_outbuffer = (unsigned_inbuffer ^ 0x80) << 8;
320 304
321// if(number <= 0) { 305// if(number <= 0) {
322// perror("recording error "); 306// perror("recording error ");
323// qDebug(filePara.fileName); 307// qDebug(filePara.fileName);
324// // errorStop(); 308// // errorStop();
325// QMessageBox::message("Note","error recording"); 309// QMessageBox::message("Note","error recording");
326// return;// false; 310// return;// false;
327// } 311// }
328// for (int i=0;i< number;i++) { //2*i is left channel 312// for (int i=0;i< number;i++) { //2*i is left channel
329// unsigned_outbuffer[i]=unsigned_inbuffer[i]>>1; // no clippy, please 313// unsigned_outbuffer[i]=unsigned_inbuffer[i]>>1; // no clippy, please
330// } 314// }
331 315
332 bytesWritten = ::write( filePara.fd , unsigned_inbuffer, number); 316 bytesWritten = ::write( filePara.fd , unsigned_inbuffer, number);
333 317
334//------------->>>> out to file 318//------------->>>> out to file
335 if(bytesWritten < 0) { 319 if(bytesWritten < 0) {
336 recording=stopped=false; 320 recording=stopped=false;
337 // errorStop(); 321 // errorStop();
338 QMessageBox::message("Note","There was a problem\nwriting to the file"); 322 QMessageBox::message("Note","There was a problem\nwriting to the file");
339 perror("File writing error "); 323 perror("File writing error ");
340 return;// false; 324 return;// false;
341 } 325 }
342 total += bytesWritten; 326 total += bytesWritten;
343 filePara.numberSamples = total; 327 filePara.numberSamples = total;
344 // printf("\nWriting number %d, bytes %d,total %d \r",number, bytesWritten , total); 328 // printf("\nWriting number %d, bytes %d,total %d \r",number, bytesWritten , total);
345 // fflush(stdout); 329 // fflush(stdout);
346 if(filePara.SecondsToRecord !=0) 330 if(filePara.SecondsToRecord !=0)
347 timeSlider->setValue( total); 331 timeSlider->setValue( total);
348 332
349 filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate; 333 filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate;
350 334
351 timeString.sprintf("%.2f",filePara.numberOfRecordedSeconds); 335 timeString.sprintf("%.2f",filePara.numberOfRecordedSeconds);
352 timeLabel->setText( timeString + " seconds"); 336 timeLabel->setText( timeString + " seconds");
353 337
354 qApp->processEvents(); 338 qApp->processEvents();
355 if( total >= filePara.samplesToRecord) 339 if( total >= filePara.samplesToRecord)
356 break; 340 break;
357 } //end main loop 341 } //end main loop
358 } 342 }
359// qDebug("Final %d, %d", filePara.samplesToRecord , filePara.numberOfRecordedSeconds); 343// qDebug("Final %d, %d", filePara.samplesToRecord , filePara.numberOfRecordedSeconds);
360} /// END quickRec() 344} /// END quickRec()
361 345
362// threaded play 346// threaded play
363void playIt() { 347void playIt() {
364 348
365} 349}
366 350
367 351
368 352
369/////////////////<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>> 353/////////////////<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>
370/////////////////<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>> 354/////////////////<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>
371 355
372QtRec::QtRec( QWidget* parent, const char* name, WFlags fl ) 356QtRec::QtRec( QWidget* parent, const char* name, WFlags fl )
373 : QWidget( parent, name, fl ) { 357 : QWidget( parent, name, fl ) {
374 // QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << true; // mute device 358 // QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << true; // mute device
375 // autoMute=TRUE; 359 // autoMute=TRUE;
376// QPEApplication::grabKeyboard(); 360// QPEApplication::grabKeyboard();
377 361
378// signal(SIGPIPE, SIG_IGN); 362// signal(SIGPIPE, SIG_IGN);
379 363
380 if ( !name ) 364 if ( !name )
381 setName( "OpieRec" ); 365 setName( "OpieRec" );
382 init(); 366 init();
383 initConfig(); 367 initConfig();
384 initConnections(); 368 initConnections();
385 renameBox = 0; 369 renameBox = 0;
386 370
387// open sound device to get volumes 371// open sound device to get volumes
388 soundDevice = new Device( this, DSPSTROUT, DSPSTRMIXEROUT, false); 372 soundDevice = new Device( this, DSPSTROUT, DSPSTRMIXEROUT, false);
389 373
390// soundDevice->setDeviceFormat(AFMT_S16_LE); 374// soundDevice->setDeviceFormat(AFMT_S16_LE);
391// soundDevice->setDeviceChannels(1); 375// soundDevice->setDeviceChannels(1);
392// soundDevice->setDeviceRate( 22050); 376// soundDevice->setDeviceRate( 22050);
393 377
394 getInVol(); 378 getInVol();
395 getOutVol(); 379 getOutVol();
396 380
397 soundDevice->closeDevice( true); 381 soundDevice->closeDevice( true);
398 soundDevice->sd=-1; 382 soundDevice->sd=-1;
399 soundDevice=0; 383 soundDevice=0;
400 wavFile=0; 384 wavFile=0;
401 385
402 if(soundDevice) delete soundDevice; 386 if(soundDevice) delete soundDevice;
403 387
404 initIconView(); 388 initIconView();
405 389
406 if(autoMute) 390 if(autoMute)
407 doMute(true); 391 doMute(true);
408 ListView1->setFocus(); 392 ListView1->setFocus();
409 playing=false; 393 playing=false;
410} 394}
411 395
412QtRec::~QtRec() { 396QtRec::~QtRec() {
413 397
414} 398}
415 399
416void QtRec::cleanUp() { 400void QtRec::cleanUp() {
417 401
418 if(!stopped) { 402 if(!stopped) {
419 stopped=true; 403 stopped=true;
420 endRecording(); 404 endRecording();
421 } 405 }
422 406
423 ListView1->clear(); 407 ListView1->clear();
424 408
425 if(autoMute) 409 if(autoMute)
426 doMute(false); 410 doMute(false);
427 411
428 if(wavFile) delete wavFile; 412 if(wavFile) delete wavFile;
429// if(soundDevice) delete soundDevice; 413// if(soundDevice) delete soundDevice;
430 414
431// QPEApplication::grabKeyboard(); 415// QPEApplication::grabKeyboard();
432// QPEApplication::ungrabKeyboard(); 416// QPEApplication::ungrabKeyboard();
433} 417}
434 418
435void QtRec::init() { 419void QtRec::init() {
436 420
437 needsStereoOut=false; 421 needsStereoOut=false;
438 QPixmap image3( ( const char** ) image3_data ); 422 QPixmap image3( ( const char** ) image3_data );
439 QPixmap image4( ( const char** ) image4_data ); 423 QPixmap image4( ( const char** ) image4_data );
440 QPixmap image6( ( const char** ) image6_data ); 424 QPixmap image6( ( const char** ) image6_data );
441 425
442 stopped=true; 426 stopped=true;
443 setCaption( tr( "OpieRecord " ) + QString::number(VERSION) ); 427 setCaption( tr( "OpieRecord " ) + QString::number(VERSION) );
444 QGridLayout *layout = new QGridLayout( this ); 428 QGridLayout *layout = new QGridLayout( this );
445 layout->setSpacing( 2); 429 layout->setSpacing( 2);
446 layout->setMargin( 2); 430 layout->setMargin( 2);
447 431
448 TabWidget = new QTabWidget( this, "TabWidget" ); 432 TabWidget = new QTabWidget( this, "TabWidget" );
449 layout->addMultiCellWidget(TabWidget, 0, 7, 0, 7); 433 layout->addMultiCellWidget(TabWidget, 0, 7, 0, 7);
450 // TabWidget->setTabShape(QTabWidget::Triangular); 434 // TabWidget->setTabShape(QTabWidget::Triangular);
451 435
452 ///**********<<<<<<<<<<<<>>>>>>>>>>>>*************** 436 ///**********<<<<<<<<<<<<>>>>>>>>>>>>***************
453 tab = new QWidget( TabWidget, "tab" ); 437 tab = new QWidget( TabWidget, "tab" );
454 438
455 QGridLayout *layout1 = new QGridLayout( tab); 439 QGridLayout *layout1 = new QGridLayout( tab);
456 layout1->setSpacing( 2); 440 layout1->setSpacing( 2);
457 layout1->setMargin( 2); 441 layout1->setMargin( 2);
458 442
459 timeSlider = new QSlider( 0,100,10,0, QSlider::Horizontal, tab, (const char *) "timeSlider" ); 443 timeSlider = new QSlider( 0,100,10,0, QSlider::Horizontal, tab, (const char *) "timeSlider" );
460 // timeSlider->setFixedWidth(150); 444 // timeSlider->setFixedWidth(150);
461 layout1->addMultiCellWidget( timeSlider, 1, 1, 0, 3); 445 layout1->addMultiCellWidget( timeSlider, 1, 1, 0, 3);
462// timeSlider->setTickmarks(QSlider::Above); 446// timeSlider->setTickmarks(QSlider::Above);
463 447
464 timeLabel = new QLabel( tab, "TimeLabel" ); 448 timeLabel = new QLabel( tab, "TimeLabel" );
465 layout1->addMultiCellWidget( timeLabel, 0, 0, 0, 3); 449 layout1->addMultiCellWidget( timeLabel, 0, 0, 0, 3);
466 450
467 playLabel2 = new QLabel(tab, "PlayLabel2" ); 451 playLabel2 = new QLabel(tab, "PlayLabel2" );
468 playLabel2->setText("Play"); 452 playLabel2->setText("Play");
469 playLabel2->setFixedHeight(18); 453 playLabel2->setFixedHeight(18);
470 layout1->addMultiCellWidget( playLabel2, 0, 0, 4, 4); 454 layout1->addMultiCellWidget( playLabel2, 0, 0, 4, 4);
471 455
472 Stop_PushButton = new QPushButton( tab, "Stop_PushButton" ); 456 Stop_PushButton = new QPushButton( tab, "Stop_PushButton" );
473 layout1->addMultiCellWidget( Stop_PushButton, 1, 1, 4, 4); 457 layout1->addMultiCellWidget( Stop_PushButton, 1, 1, 4, 4);
474 Stop_PushButton->setFixedSize(22,22); 458 Stop_PushButton->setFixedSize(22,22);
475 Stop_PushButton->setPixmap( image4 ); 459 Stop_PushButton->setPixmap( image4 );
476 460
477 toBeginningButton = new QPushButton( tab, "Beginning_PushButton" ); 461 toBeginningButton = new QPushButton( tab, "Beginning_PushButton" );
478 layout1->addMultiCellWidget(toBeginningButton, 1, 1, 5, 5); 462 layout1->addMultiCellWidget(toBeginningButton, 1, 1, 5, 5);
479 toBeginningButton->setFixedSize(22,22); 463 toBeginningButton->setFixedSize(22,22);
480 toBeginningButton->setPixmap( Resource::loadPixmap("fastback") ); 464 toBeginningButton->setPixmap( Resource::loadPixmap("fastback") );
481 465
482 toEndButton = new QPushButton( tab, "End_PushButton" ); 466 toEndButton = new QPushButton( tab, "End_PushButton" );
483 layout1->addMultiCellWidget( toEndButton, 1, 1, 6, 6); 467 layout1->addMultiCellWidget( toEndButton, 1, 1, 6, 6);
484 toEndButton->setFixedSize(22,22); 468 toEndButton->setFixedSize(22,22);
485 toEndButton->setPixmap( Resource::loadPixmap( "fastforward" ) ); 469 toEndButton->setPixmap( Resource::loadPixmap( "fastforward" ) );
486 470
487 QLabel *recLabel2; 471 QLabel *recLabel2;
488 recLabel2 = new QLabel( tab, "recLabel2" ); 472 recLabel2 = new QLabel( tab, "recLabel2" );
489 recLabel2->setText("Rec"); 473 recLabel2->setText("Rec");
490 recLabel2->setFixedHeight(18); 474 recLabel2->setFixedHeight(18);
491 layout1->addMultiCellWidget( recLabel2, 0, 0, 7, 7); 475 layout1->addMultiCellWidget( recLabel2, 0, 0, 7, 7);
492 476
493 Rec_PushButton = new QPushButton( tab, "Rec_PushButton" ); 477 Rec_PushButton = new QPushButton( tab, "Rec_PushButton" );
494 layout1->addMultiCellWidget( Rec_PushButton, 1, 1, 7, 7); 478 layout1->addMultiCellWidget( Rec_PushButton, 1, 1, 7, 7);
495 Rec_PushButton->setFixedSize(22,22); 479 Rec_PushButton->setFixedSize(22,22);
496 Rec_PushButton->setPixmap( image6 ); 480 Rec_PushButton->setPixmap( image6 );
497 481
498 t = new QTimer( this ); 482 t = new QTimer( this );
499 connect( t, SIGNAL( timeout() ), SLOT( timerBreak() ) ); 483 connect( t, SIGNAL( timeout() ), SLOT( timerBreak() ) );
500 484
501 rewindTimer = new QTimer( this ); 485 rewindTimer = new QTimer( this );
502 connect( rewindTimer, SIGNAL( timeout() ), SLOT( rewindTimerTimeout() ) ); 486 connect( rewindTimer, SIGNAL( timeout() ), SLOT( rewindTimerTimeout() ) );
503 487
504 forwardTimer = new QTimer( this ); 488 forwardTimer = new QTimer( this );
505 connect( forwardTimer, SIGNAL( timeout() ), SLOT( forwardTimerTimeout() ) ); 489 connect( forwardTimer, SIGNAL( timeout() ), SLOT( forwardTimerTimeout() ) );
506 490
507 deleteSoundButton = new QPushButton( tab, "deleteSoundButton" ); 491 deleteSoundButton = new QPushButton( tab, "deleteSoundButton" );
508 layout1->addMultiCellWidget( deleteSoundButton, 1, 1, 8, 8); 492 layout1->addMultiCellWidget( deleteSoundButton, 1, 1, 8, 8);
509 deleteSoundButton->setText( tr( "Delete" ) ); 493 deleteSoundButton->setText( tr( "Delete" ) );
510 494
511 ListView1 = new QListView( tab, "IconView1" ); 495 ListView1 = new QListView( tab, "IconView1" );
512 layout1->addMultiCellWidget( ListView1, 2, 2, 0, 8); 496 layout1->addMultiCellWidget( ListView1, 2, 2, 0, 8);
513 497
514 ListView1->addColumn( tr( "Name" ) ); 498 ListView1->addColumn( tr( "Name" ) );
515 ListView1->setColumnWidth(0,140); 499 ListView1->setColumnWidth(0,140);
516 ListView1->setSorting( 1, false); 500 ListView1->setSorting( 1, false);
517 ListView1->addColumn( tr( "Time" ) ); //in seconds 501 ListView1->addColumn( tr( "Time" ) ); //in seconds
518 ListView1->setColumnWidth(1,50); 502 ListView1->setColumnWidth(1,50);
519 ListView1->addColumn( "Location"); 503 ListView1->addColumn( "Location");
520 ListView1->setColumnWidth(2,50); 504 ListView1->setColumnWidth(2,50);
521 ListView1->addColumn( "Date"); 505 ListView1->addColumn( "Date");
522 ListView1->setColumnWidth(3,63); 506 ListView1->setColumnWidth(3,63);
523 507
524 ListView1->setColumnWidthMode(0,QListView::Manual); 508 ListView1->setColumnWidthMode(0,QListView::Manual);
525 ListView1->setColumnAlignment(1,QListView::AlignCenter); 509 ListView1->setColumnAlignment(1,QListView::AlignCenter);
526 ListView1->setColumnAlignment(2,QListView::AlignRight); 510 ListView1->setColumnAlignment(2,QListView::AlignRight);
527 ListView1->setColumnAlignment(3,QListView::AlignLeft); 511 ListView1->setColumnAlignment(3,QListView::AlignLeft);
528 ListView1->setAllColumnsShowFocus( true ); 512 ListView1->setAllColumnsShowFocus( true );
529 QPEApplication::setStylusOperation( ListView1->viewport(),QPEApplication::RightOnHold); 513 QPEApplication::setStylusOperation( ListView1->viewport(),QPEApplication::RightOnHold);
530 514
531 TabWidget->insertTab( tab, tr( "Files" ) ); 515 TabWidget->insertTab( tab, tr( "Files" ) );
532 516
533 ///**********<<<<<<<<<<<<>>>>>>>>>>>>*************** 517 ///**********<<<<<<<<<<<<>>>>>>>>>>>>***************
534 tab_3 = new QWidget( TabWidget, "tab_3" ); 518 tab_3 = new QWidget( TabWidget, "tab_3" );
535 //////////////////////////////////// 519 ////////////////////////////////////
536 520
537 Layout19 = new QHBoxLayout( tab_3); 521 Layout19 = new QHBoxLayout( tab_3);
538 Layout19->setSpacing( 2 ); 522 Layout19->setSpacing( 2 );
539 Layout19->setMargin( 0 ); 523 Layout19->setMargin( 0 );
540 524
541 Layout18 = new QVBoxLayout(this); 525 Layout18 = new QVBoxLayout(this);
542 Layout18->setSpacing( 2 ); 526 Layout18->setSpacing( 2 );
543 Layout18->setMargin( 0 ); 527 Layout18->setMargin( 0 );
544 528
545 Layout17 = new QHBoxLayout(this); 529 Layout17 = new QHBoxLayout(this);
546 Layout17->setSpacing( 2 ); 530 Layout17->setSpacing( 2 );
547 Layout17->setMargin( 0 ); 531 Layout17->setMargin( 0 );
548 532
549 sampleGroup = new QGroupBox( tab_3, "samplegroup" ); 533 sampleGroup = new QGroupBox( tab_3, "samplegroup" );
550 sampleGroup->setTitle( tr( "Sample Rate" ) ); 534 sampleGroup->setTitle( tr( "Sample Rate" ) );
551 sampleGroup->setFixedSize( 95,50); 535 sampleGroup->setFixedSize( 95,50);
552 536
553 sampleRateComboBox = new QComboBox( false, sampleGroup, "SampleRateComboBox" ); 537 sampleRateComboBox = new QComboBox( false, sampleGroup, "SampleRateComboBox" );
554 sampleRateComboBox->setGeometry( QRect( 10, 20, 80, 25 ) ); 538 sampleRateComboBox->setGeometry( QRect( 10, 20, 80, 25 ) );
555//#ifndef QT_QWS_EBX 539//#ifndef QT_QWS_EBX
556 sampleRateComboBox->insertItem( tr( "44100")); 540 sampleRateComboBox->insertItem( tr( "44100"));
557 sampleRateComboBox->insertItem( tr( "32000")); 541 sampleRateComboBox->insertItem( tr( "32000"));
558//#endif 542//#endif
559 sampleRateComboBox->insertItem( tr( "22050")); 543 sampleRateComboBox->insertItem( tr( "22050"));
560 //#ifndef QT_QWS_VERCEL_IDR 544 //#ifndef QT_QWS_VERCEL_IDR
561 sampleRateComboBox->insertItem( tr( "16000")); 545 sampleRateComboBox->insertItem( tr( "16000"));
562 sampleRateComboBox->insertItem( tr( "11025")); 546 sampleRateComboBox->insertItem( tr( "11025"));
563 sampleRateComboBox->insertItem( tr( "8000")); 547 sampleRateComboBox->insertItem( tr( "8000"));
564 //#endif 548 //#endif
565 549
566 Layout17->addWidget( sampleGroup ); 550 Layout17->addWidget( sampleGroup );
567 551
568 sizeGroup= new QGroupBox( tab_3, "sizeGroup" ); 552 sizeGroup= new QGroupBox( tab_3, "sizeGroup" );
569 sizeGroup->setTitle( tr( "Limit Size" ) ); 553 sizeGroup->setTitle( tr( "Limit Size" ) );
570 sizeGroup->setFixedSize(80,50); 554 sizeGroup->setFixedSize(80,50);
571 555
572 sizeLimitCombo = new QComboBox( false, sizeGroup, "sizeLimitCombo" ); 556 sizeLimitCombo = new QComboBox( false, sizeGroup, "sizeLimitCombo" );
573 sizeLimitCombo ->setGeometry( QRect( 5, 20, 70, 25 ) ); 557 sizeLimitCombo ->setGeometry( QRect( 5, 20, 70, 25 ) );
574 sizeLimitCombo->insertItem(tr("Unlimited")); 558 sizeLimitCombo->insertItem(tr("Unlimited"));
575 for(int i=1;i<13; i++) { 559 for(int i=1;i<13; i++) {
576 sizeLimitCombo->insertItem( QString::number(i*5)); 560 sizeLimitCombo->insertItem( QString::number(i*5));
577 } 561 }
578 562
579// sizeLimitCombo->insertItem(tr("5 secs")); 563// sizeLimitCombo->insertItem(tr("5 secs"));
580// sizeLimitCombo->insertItem(tr("10 secs")); 564// sizeLimitCombo->insertItem(tr("10 secs"));
581// sizeLimitCombo->insertItem(tr("15 secs")); 565// sizeLimitCombo->insertItem(tr("15 secs"));
582// sizeLimitCombo->insertItem(tr("20 secs")); 566// sizeLimitCombo->insertItem(tr("20 secs"));
583 567
584 // Layout18->addWidget( sizeGroup ); 568 // Layout18->addWidget( sizeGroup );
585 Layout17->addWidget( sizeGroup ); 569 Layout17->addWidget( sizeGroup );
586 570
587 Layout18->addLayout( Layout17 ); 571 Layout18->addLayout( Layout17 );
588 572
589 Layout16 = new QHBoxLayout(this); 573 Layout16 = new QHBoxLayout(this);
590 Layout16->setSpacing( 2 ); 574 Layout16->setSpacing( 2 );
591 Layout16->setMargin( 0 ); 575 Layout16->setMargin( 0 );
592 576
593 dirGroup = new QGroupBox( tab_3, "dirGroup" ); 577 dirGroup = new QGroupBox( tab_3, "dirGroup" );
594 dirGroup->setTitle( tr( "File Directory" ) ); 578 dirGroup->setTitle( tr( "File Directory" ) );
595 dirGroup->setFixedSize(130,50); 579 dirGroup->setFixedSize(130,50);
596 580
597 directoryComboBox = new QComboBox( false, dirGroup, "dirGroup" ); 581 directoryComboBox = new QComboBox( false, dirGroup, "dirGroup" );
598 directoryComboBox->setGeometry( QRect( 10, 15, 115, 25 ) ); 582 directoryComboBox->setGeometry( QRect( 10, 15, 115, 25 ) );
599 583
600 Layout18->addWidget( dirGroup ); 584 Layout18->addWidget( dirGroup );
601 585
602 bitGroup = new QGroupBox( tab_3, "bitGroup" ); 586 bitGroup = new QGroupBox( tab_3, "bitGroup" );
603 bitGroup->setTitle( tr( "Bit Depth" ) ); 587 bitGroup->setTitle( tr( "Bit Depth" ) );
604 bitGroup->setFixedSize(65,50); 588 bitGroup->setFixedSize(65,50);
605 589
606 bitRateComboBox = new QComboBox( false, bitGroup, "BitRateComboBox" ); 590 bitRateComboBox = new QComboBox( false, bitGroup, "BitRateComboBox" );
607 bitRateComboBox->insertItem( tr( "16" ) ); 591 bitRateComboBox->insertItem( tr( "16" ) );
608 bitRateComboBox->insertItem( tr( "8" ) ); 592 bitRateComboBox->insertItem( tr( "8" ) );
609 bitRateComboBox->setGeometry( QRect( 5, 20, 50, 25 ) ); 593 bitRateComboBox->setGeometry( QRect( 5, 20, 50, 25 ) );
610 594
611 Layout18->addWidget( bitGroup ); 595 Layout18->addWidget( bitGroup );
612 596
613 compressionCheckBox = new QCheckBox ( "Wave Compression (smaller files)", tab_3 ); 597 compressionCheckBox = new QCheckBox ( "Wave Compression (smaller files)", tab_3 );
614 Layout18->addWidget( compressionCheckBox ); 598 Layout18->addWidget( compressionCheckBox );
615 599
616 autoMuteCheckBox= new QCheckBox ( "auto Mute", tab_3 ); 600 autoMuteCheckBox= new QCheckBox ( "auto Mute", tab_3 );
617 Layout18->addWidget( autoMuteCheckBox ); 601 Layout18->addWidget( autoMuteCheckBox );
618 602
619 Layout19->addLayout( Layout18 ); 603 Layout19->addLayout( Layout18 );
620 604
621 QWidget *d = QApplication::desktop(); 605 QWidget *d = QApplication::desktop();
622 int width=d->width(); 606 int width=d->width();
623 int height=d->height(); 607 int height=d->height();
624 608
625 609
626 610
627 if( width < height) { 611 if( width < height) {
628 612
629 tab_5 = new QWidget( TabWidget, "tab_5" ); 613 tab_5 = new QWidget( TabWidget, "tab_5" );
630 614
631 QHBoxLayout *Layout19a; 615 QHBoxLayout *Layout19a;
632 Layout19a = new QHBoxLayout( tab_5); 616 Layout19a = new QHBoxLayout( tab_5);
633 Layout19a->setSpacing( 2 ); 617 Layout19a->setSpacing( 2 );
634 Layout19a->setMargin( 0 ); 618 Layout19a->setMargin( 0 );
635 619
636 620
637 Layout15 = new QVBoxLayout(this); 621 Layout15 = new QVBoxLayout(this);
638 Layout15->setSpacing( 2 ); 622 Layout15->setSpacing( 2 );
639 Layout15->setMargin( 0 ); 623 Layout15->setMargin( 0 );
640 624
641 Layout15b = new QVBoxLayout(this); 625 Layout15b = new QVBoxLayout(this);
642 Layout15b->setSpacing( 2 ); 626 Layout15b->setSpacing( 2 );
643 Layout15b->setMargin( 0 ); 627 Layout15b->setMargin( 0 );
644 628
645 TextLabel2 = new QLabel( tab_5, "InputLabel" ); 629 TextLabel2 = new QLabel( tab_5, "InputLabel" );
646 TextLabel2->setText( tr( "In")); 630 TextLabel2->setText( tr( "In"));
647 TextLabel2->setFixedWidth(35); 631 TextLabel2->setFixedWidth(35);
648 Layout15->addWidget( TextLabel2 ); 632 Layout15->addWidget( TextLabel2 );
649 633
650 TextLabel3 = new QLabel( tab_5, "OutputLabel" ); 634 TextLabel3 = new QLabel( tab_5, "OutputLabel" );
651 TextLabel3->setText( tr( "Out" ) ); 635 TextLabel3->setText( tr( "Out" ) );
652 Layout15b->addWidget( TextLabel3 ); 636 Layout15b->addWidget( TextLabel3 );
653 637
654 InputSlider = new QSlider( -100, 0, 10, 0, QSlider::Vertical, tab_5, (const char *) "InputSlider" ); 638 InputSlider = new QSlider( -100, 0, 10, 0, QSlider::Vertical, tab_5, (const char *) "InputSlider" );
655 InputSlider->setTickmarks(QSlider::Both); 639 InputSlider->setTickmarks(QSlider::Both);
656 Layout15->addWidget( InputSlider); 640 Layout15->addWidget( InputSlider);
657 641
658 OutputSlider = new QSlider( -100,0,10,0, QSlider::Vertical,tab_5,(const char *) "OutputSlider" ); 642 OutputSlider = new QSlider( -100,0,10,0, QSlider::Vertical,tab_5,(const char *) "OutputSlider" );
659 OutputSlider->setTickmarks(QSlider::Both); 643 OutputSlider->setTickmarks(QSlider::Both);
660 644
661 Layout15b->addWidget( OutputSlider ); 645 Layout15b->addWidget( OutputSlider );
662 646
663 outMuteCheckBox = new QCheckBox ( "mute", tab_5 ); 647 outMuteCheckBox = new QCheckBox ( "mute", tab_5 );
664 Layout15->addWidget( outMuteCheckBox ); 648 Layout15->addWidget( outMuteCheckBox );
665 649
666 inMuteCheckBox = new QCheckBox ( "mute", tab_5 ); 650 inMuteCheckBox = new QCheckBox ( "mute", tab_5 );
667 inMuteCheckBox-> setFocusPolicy ( QWidget::NoFocus ); 651 inMuteCheckBox-> setFocusPolicy ( QWidget::NoFocus );
668 Layout15b->addWidget( inMuteCheckBox ); 652 Layout15b->addWidget( inMuteCheckBox );
669 653
670 654
671 Layout19a->addLayout( Layout15 ); 655 Layout19a->addLayout( Layout15 );
672 Layout19a->addLayout( Layout15b ); 656 Layout19a->addLayout( Layout15b );
673 657
674 fillDirectoryCombo(); 658 fillDirectoryCombo();
675 659
676 TabWidget->insertTab( tab_3, tr( "Options" ) ); 660 TabWidget->insertTab( tab_3, tr( "Options" ) );
677 661
678 TabWidget->insertTab( tab_5, tr( "Volume" ) ); 662 TabWidget->insertTab( tab_5, tr( "Volume" ) );
679 663
680 } else {// landscape 664 } else {// landscape
681 665
682 // Layout16->addWidget( dirGroup ); 666 // Layout16->addWidget( dirGroup );
683 // Layout18->addLayout( Layout16 ); 667 // Layout18->addLayout( Layout16 );
684 Layout15 = new QVBoxLayout(this); 668 Layout15 = new QVBoxLayout(this);
685 Layout15->setSpacing( 2 ); 669 Layout15->setSpacing( 2 );
686 Layout15->setMargin( 0 ); 670 Layout15->setMargin( 0 );
687 671
688 Layout15b = new QVBoxLayout(this); 672 Layout15b = new QVBoxLayout(this);
689 Layout15b->setSpacing( 2 ); 673 Layout15b->setSpacing( 2 );
690 Layout15b->setMargin( 0 ); 674 Layout15b->setMargin( 0 );
691 675
692 TextLabel2 = new QLabel( tab_3, "InputLabel" ); 676 TextLabel2 = new QLabel( tab_3, "InputLabel" );
693 TextLabel2->setText( tr( "In")); 677 TextLabel2->setText( tr( "In"));
694 TextLabel2->setFixedWidth(35); 678 TextLabel2->setFixedWidth(35);
695 Layout15->addWidget( TextLabel2 ); 679 Layout15->addWidget( TextLabel2 );
696 680
697 TextLabel3 = new QLabel( tab_3, "OutputLabel" ); 681 TextLabel3 = new QLabel( tab_3, "OutputLabel" );
698 TextLabel3->setText( tr( "Out" ) ); 682 TextLabel3->setText( tr( "Out" ) );
699 Layout15b->addWidget( TextLabel3 ); 683 Layout15b->addWidget( TextLabel3 );
700 684
701 InputSlider = new QSlider( -100, 0, 10, 0, QSlider::Vertical, tab_3, (const char *) "InputSlider" ); 685 InputSlider = new QSlider( -100, 0, 10, 0, QSlider::Vertical, tab_3, (const char *) "InputSlider" );
702 // InputSlider->setTickmarks(QSlider::Both); 686 // InputSlider->setTickmarks(QSlider::Both);
703 Layout15->addWidget( InputSlider); 687 Layout15->addWidget( InputSlider);
704 688
705 OutputSlider = new QSlider( -100,0,10,0, QSlider::Vertical,tab_3,(const char *) "OutputSlider" ); 689 OutputSlider = new QSlider( -100,0,10,0, QSlider::Vertical,tab_3,(const char *) "OutputSlider" );
706 // OutputSlider->setTickmarks(QSlider::Both); 690 // OutputSlider->setTickmarks(QSlider::Both);
707 691
708 Layout15b->addWidget( OutputSlider ); 692 Layout15b->addWidget( OutputSlider );
709 693
710 outMuteCheckBox = new QCheckBox ( "mute", tab_3 ); 694 outMuteCheckBox = new QCheckBox ( "mute", tab_3 );
711 Layout15->addWidget( outMuteCheckBox ); 695 Layout15->addWidget( outMuteCheckBox );
712 696
713 inMuteCheckBox = new QCheckBox ( "mute", tab_3 ); 697 inMuteCheckBox = new QCheckBox ( "mute", tab_3 );
714 inMuteCheckBox-> setFocusPolicy ( QWidget::NoFocus ); 698 inMuteCheckBox-> setFocusPolicy ( QWidget::NoFocus );
715 Layout15b->addWidget( inMuteCheckBox ); 699 Layout15b->addWidget( inMuteCheckBox );
716 700
717 701
718 Layout19->addLayout( Layout15 ); 702 Layout19->addLayout( Layout15 );
719 Layout19->addLayout( Layout15b ); 703 Layout19->addLayout( Layout15b );
720 704
721 fillDirectoryCombo(); 705 fillDirectoryCombo();
722 706
723 TabWidget->insertTab( tab_3, tr( "Options" ) ); 707 TabWidget->insertTab( tab_3, tr( "Options" ) );
724 708
725 } 709 }
726 710
727 711
728 ///**********<<<<<<<<<<<<>>>>>>>>>>>>*************** 712 ///**********<<<<<<<<<<<<>>>>>>>>>>>>***************
729 713
730// tab_4 = new QWidget( TabWidget, "tab_4" ); 714// tab_4 = new QWidget( TabWidget, "tab_4" );
731// QGridLayout *layout4 = new QGridLayout( tab_4); 715// QGridLayout *layout4 = new QGridLayout( tab_4);
732// layout4->setSpacing( 2); 716// layout4->setSpacing( 2);
733// layout4->setMargin( 2); 717// layout4->setMargin( 2);
734// TabWidget->insertTab( tab_4, tr( "Help")); 718// TabWidget->insertTab( tab_4, tr( "Help"));
735 719
736// ///////////////////////////////////////////// FIXME change to a real helpfile path 720// ///////////////////////////////////////////// FIXME change to a real helpfile path
737// QString url="/index.html"; 721// QString url="/index.html";
738// HelpWindow *help = new HelpWindow( url, ".", tab_4, "opierec_help"); 722// HelpWindow *help = new HelpWindow( url, ".", tab_4, "opierec_help");
739// layout4->addMultiCellWidget( help, 0, 1, 0, 1); 723// layout4->addMultiCellWidget( help, 0, 1, 0, 1);
740// if( !QFile(url).exists()) { 724// if( !QFile(url).exists()) {
741// help->hide(); 725// help->hide();
742// //help->showMaximized(); 726// //help->showMaximized();
743// QLabel *helpLabel; 727// QLabel *helpLabel;
744// helpLabel = new QLabel( tab_4, "TimeLabel" ); 728// helpLabel = new QLabel( tab_4, "TimeLabel" );
745// layout4->addMultiCellWidget( helpLabel, 0, 3, 0, 4 ); 729// layout4->addMultiCellWidget( helpLabel, 0, 3, 0, 4 );
746// helpLabel->setText( "<B>OpieRec</B><br>" 730// helpLabel->setText( "<B>OpieRec</B><br>"
747// "Records files in standard wav format<br>" 731// "Records files in standard wav format<br>"
748// "or a compressed version<br>" 732// "or a compressed version<br>"
749// "For help, please email the author<br>" 733// "For help, please email the author<br>"
750// "<B>OpieRec</B> is copyright&copy; 2002 by" 734// "<B>OpieRec</B> is copyright&copy; 2002 by"
751// " L.J. Potter<br>llornkcor@handhelds.org<BR>" 735// " L.J. Potter<br>llornkcor@handhelds.org<BR>"
752// "and is licensed under the <B>QPL</B>"); 736// "and is licensed under the <B>QPL</B>");
753// } 737// }
754 ///**********<<<<<<<<<<<<>>>>>>>>>>>>*************** 738 ///**********<<<<<<<<<<<<>>>>>>>>>>>>***************
755 739
756} 740}
757 741
758void QtRec::initIconView() { 742void QtRec::initIconView() {
759 743
760 ListView1->clear(); 744 ListView1->clear();
761 Config cfg("OpieRec"); 745 Config cfg("OpieRec");
762 cfg.setGroup("Sounds"); 746 cfg.setGroup("Sounds");
763 QString temp; 747 QString temp;
764 QPixmap image0( ( const char** ) image0_data ); 748 QPixmap image0( ( const char** ) image0_data );
765 749
766 750
767 int nFiles = cfg.readNumEntry("NumberofFiles",0); 751 int nFiles = cfg.readNumEntry("NumberofFiles",0);
768 for(int i=1;i<= nFiles;i++) { 752 for(int i=1;i<= nFiles;i++) {
769 753
770 QListViewItem * item; 754 QListViewItem * item;
771 QString fileS, mediaLocation, fileDate, filePath; 755 QString fileS, mediaLocation, fileDate, filePath;
772 756
773// temp.sprintf("%d",i); 757// temp.sprintf("%d",i);
774 temp=cfg.readEntry(temp,""); //reads currentFile 758 temp=cfg.readEntry(temp,""); //reads currentFile
775 filePath = cfg.readEntry(temp,""); //currentFileName 759 filePath = cfg.readEntry(temp,""); //currentFileName
776 760
777 QFileInfo info(filePath); 761 QFileInfo info(filePath);
778 fileDate = info.lastModified().toString(); 762 fileDate = info.lastModified().toString();
779 763
780 fileS = cfg.readEntry( filePath, "0" );// file length in seconds 764 fileS = cfg.readEntry( filePath, "0" );// file length in seconds
781 mediaLocation=getStorage( filePath); 765 mediaLocation=getStorage( filePath);
782 if(info.exists()) { 766 if(info.exists()) {
783 item = new QListViewItem( ListView1, temp, fileS, mediaLocation, fileDate); 767 item = new QListViewItem( ListView1, temp, fileS, mediaLocation, fileDate);
784 item->setPixmap( 0, image0); 768 item->setPixmap( 0, image0);
785 if(currentFileName == filePath) 769 if(currentFileName == filePath)
786 ListView1->setSelected( item, true); 770 ListView1->setSelected( item, true);
787 } 771 }
788 } 772 }
789} 773}
790 774
791void QtRec::initConnections() { 775void QtRec::initConnections() {
792 connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); 776 connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
793 777
794 connect( toBeginningButton, SIGNAL( pressed()), this, SLOT( rewindPressed() )); 778 connect( toBeginningButton, SIGNAL( pressed()), this, SLOT( rewindPressed() ));
795 connect( toBeginningButton, SIGNAL( released()), this, SLOT( rewindReleased() )); 779 connect( toBeginningButton, SIGNAL( released()), this, SLOT( rewindReleased() ));
796 connect( toEndButton, SIGNAL( pressed()), this, SLOT( FastforwardPressed() )); 780 connect( toEndButton, SIGNAL( pressed()), this, SLOT( FastforwardPressed() ));
797 connect( toEndButton, SIGNAL( released()), this, SLOT( FastforwardReleased() )); 781 connect( toEndButton, SIGNAL( released()), this, SLOT( FastforwardReleased() ));
798 connect( deleteSoundButton, SIGNAL(released()), this, SLOT( deleteSound() )); 782 connect( deleteSoundButton, SIGNAL(released()), this, SLOT( deleteSound() ));
799 connect( Stop_PushButton, SIGNAL(released()), this, SLOT( doPlayBtn() )); 783 connect( Stop_PushButton, SIGNAL(released()), this, SLOT( doPlayBtn() ));
800 connect( Rec_PushButton, SIGNAL(released()), this, SLOT( newSound() ) ); 784 connect( Rec_PushButton, SIGNAL(released()), this, SLOT( newSound() ) );
801 connect( TabWidget, SIGNAL( currentChanged( QWidget*)),this, SLOT(thisTab(QWidget*) )); 785 connect( TabWidget, SIGNAL( currentChanged( QWidget*)),this, SLOT(thisTab(QWidget*) ));
802 connect( OutputSlider, SIGNAL(sliderReleased()), this, SLOT( changedOutVolume()) ); 786 connect( OutputSlider, SIGNAL(sliderReleased()), this, SLOT( changedOutVolume()) );
803 connect( InputSlider, SIGNAL(sliderReleased()), this, SLOT( changedInVolume()) ); 787 connect( InputSlider, SIGNAL(sliderReleased()), this, SLOT( changedInVolume()) );
804 788
805 // connect( OutputSlider, SIGNAL(valueChanged( int)), this, SLOT(changedOutVolume(int)) ); 789 // connect( OutputSlider, SIGNAL(valueChanged( int)), this, SLOT(changedOutVolume(int)) );
806 // connect( InputSlider, SIGNAL(valueChanged( int)), this, SLOT(changedInVolume(int)) ); 790 // connect( InputSlider, SIGNAL(valueChanged( int)), this, SLOT(changedInVolume(int)) );
807 791
808 connect( sampleRateComboBox, SIGNAL(activated( int)), this, SLOT( changesamplerateCombo(int)) ); 792 connect( sampleRateComboBox, SIGNAL(activated( int)), this, SLOT( changesamplerateCombo(int)) );
809 connect( bitRateComboBox, SIGNAL(activated( int)), this, SLOT( changebitrateCombo(int)) ); 793 connect( bitRateComboBox, SIGNAL(activated( int)), this, SLOT( changebitrateCombo(int)) );
810 connect( directoryComboBox, SIGNAL(activated( int)), this, SLOT( changeDirCombo(int)) ); 794 connect( directoryComboBox, SIGNAL(activated( int)), this, SLOT( changeDirCombo(int)) );
811 connect( sizeLimitCombo, SIGNAL(activated( int)), this, SLOT( changeSizeLimitCombo(int)) ); 795 connect( sizeLimitCombo, SIGNAL(activated( int)), this, SLOT( changeSizeLimitCombo(int)) );
812 connect( outMuteCheckBox, SIGNAL(toggled( bool)), this, SLOT( doVolMuting(bool)) ); 796 connect( outMuteCheckBox, SIGNAL(toggled( bool)), this, SLOT( doVolMuting(bool)) );
813 connect( inMuteCheckBox , SIGNAL(toggled( bool)), this, SLOT( doMicMuting(bool)) ); 797 connect( inMuteCheckBox , SIGNAL(toggled( bool)), this, SLOT( doMicMuting(bool)) );
814 connect( ListView1,SIGNAL(doubleClicked( QListViewItem*)),this,SLOT( itClick(QListViewItem*))); 798 connect( ListView1,SIGNAL(doubleClicked( QListViewItem*)),this,SLOT( itClick(QListViewItem*)));
815 connect( ListView1, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), 799 connect( ListView1, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
816 this,SLOT( listPressed(int, QListViewItem *, const QPoint&, int)) ); 800 this,SLOT( listPressed(int, QListViewItem *, const QPoint&, int)) );
817 connect( timeSlider, SIGNAL( sliderMoved( int)), this, SLOT( changeTimeSlider(int) )); 801 connect( timeSlider, SIGNAL( sliderMoved( int)), this, SLOT( changeTimeSlider(int) ));
818 connect( timeSlider, SIGNAL( sliderPressed( )), this, SLOT( timeSliderPressed() )); 802 connect( timeSlider, SIGNAL( sliderPressed( )), this, SLOT( timeSliderPressed() ));
819 connect( timeSlider, SIGNAL( sliderReleased( )), this, SLOT( timeSliderReleased() )); 803 connect( timeSlider, SIGNAL( sliderReleased( )), this, SLOT( timeSliderReleased() ));
820 connect( compressionCheckBox, SIGNAL( toggled(bool)),this, SLOT( compressionSelected(bool))); 804 connect( compressionCheckBox, SIGNAL( toggled(bool)),this, SLOT( compressionSelected(bool)));
821 connect( autoMuteCheckBox, SIGNAL( toggled(bool)),this, SLOT( slotAutoMute(bool))); 805 connect( autoMuteCheckBox, SIGNAL( toggled(bool)),this, SLOT( slotAutoMute(bool)));
822} 806}
823 807
824void QtRec::initConfig() { 808void QtRec::initConfig() {
825 int index, fred, i; 809 int index, fred, i;
826 Config cfg("OpieRec"); 810 Config cfg("OpieRec");
827 cfg.setGroup("Settings"); 811 cfg.setGroup("Settings");
diff --git a/noncore/multimedia/opierec/wavFile.cpp b/noncore/multimedia/opierec/wavFile.cpp
index 0bb5736..7bfffb6 100644
--- a/noncore/multimedia/opierec/wavFile.cpp
+++ b/noncore/multimedia/opierec/wavFile.cpp
@@ -1,303 +1,301 @@
1//wavFile.cpp 1//wavFile.cpp
2#include "wavFile.h" 2#include "wavFile.h"
3#include "qtrec.h" 3#include "qtrec.h"
4 4
5#include <qdatetime.h>
6#include <qstring.h>
7#include <qmessagebox.h> 5#include <qmessagebox.h>
8#include <qdir.h> 6#include <qdir.h>
9 7
10#include <qpe/timestring.h> 8#include <qpe/timestring.h>
11#include <qpe/config.h> 9#include <qpe/config.h>
12 10
13#include <errno.h> 11#include <errno.h>
14 12
15#include <sys/time.h> 13#include <sys/time.h>
16#include <sys/types.h> 14#include <sys/types.h>
17#include <sys/vfs.h> 15#include <sys/vfs.h>
18 16
19#include <fcntl.h> 17#include <fcntl.h>
20#include <math.h> 18#include <math.h>
21#include <mntent.h> 19#include <mntent.h>
22#include <stdio.h> 20#include <stdio.h>
23#include <stdlib.h> 21#include <stdlib.h>
24#include <unistd.h> 22#include <unistd.h>
25 23
26WavFile::WavFile( QObject * parent,const QString &fileName, bool makeNwFile, int sampleRate, 24WavFile::WavFile( QObject * parent,const QString &fileName, bool makeNwFile, int sampleRate,
27 int channels, int resolution, int format ) 25 int channels, int resolution, int format )
28 : QObject( parent) 26 : QObject( parent)
29{ 27{
30qDebug("new wave file"); 28qDebug("new wave file");
31 bool b = makeNwFile; 29 bool b = makeNwFile;
32 wavSampleRate=sampleRate; 30 wavSampleRate=sampleRate;
33 wavFormat=format; 31 wavFormat=format;
34 wavChannels=channels; 32 wavChannels=channels;
35 wavResolution=resolution; 33 wavResolution=resolution;
36 useTmpFile=false; 34 useTmpFile=false;
37 if( b) { 35 if( b) {
38 newFile(); 36 newFile();
39 } else { 37 } else {
40 openFile(fileName); 38 openFile(fileName);
41 } 39 }
42} 40}
43 41
44bool WavFile::newFile() { 42bool WavFile::newFile() {
45 43
46 qDebug("Set up new file"); 44 qDebug("Set up new file");
47 Config cfg("OpieRec"); 45 Config cfg("OpieRec");
48 cfg.setGroup("Settings"); 46 cfg.setGroup("Settings");
49 47
50 currentFileName=cfg.readEntry("directory",QDir::homeDirPath()); 48 currentFileName=cfg.readEntry("directory",QDir::homeDirPath());
51 QString date; 49 QString date;
52 date = TimeString::dateString( QDateTime::currentDateTime(),false,true); 50 date = TimeString::dateString( QDateTime::currentDateTime(),false,true);
53 date.replace(QRegExp("'"),""); 51 date.replace(QRegExp("'"),"");
54 date.replace(QRegExp(" "),"_"); 52 date.replace(QRegExp(" "),"_");
55 date.replace(QRegExp(":"),"."); 53 date.replace(QRegExp(":"),".");
56 date.replace(QRegExp(","),""); 54 date.replace(QRegExp(","),"");
57 55
58 QString currentFile=date; 56 QString currentFile=date;
59 if(currentFileName.right(1).find("/",0,true) == -1) 57 if(currentFileName.right(1).find("/",0,true) == -1)
60 currentFileName += "/" + date; 58 currentFileName += "/" + date;
61 else 59 else
62 currentFileName += date; 60 currentFileName += date;
63 currentFileName+=".wav"; 61 currentFileName+=".wav";
64 62
65 qDebug("set up file for recording: "+currentFileName); 63 qDebug("set up file for recording: "+currentFileName);
66 char *pointer; 64 char *pointer;
67 65
68 if( currentFileName.find("/mnt",0,true) == -1 66 if( currentFileName.find("/mnt",0,true) == -1
69 && currentFileName.find("/tmp",0,true) == -1 ) { 67 && currentFileName.find("/tmp",0,true) == -1 ) {
70 // if destination file is most likely in flash (assuming jffs2) 68 // if destination file is most likely in flash (assuming jffs2)
71 // we have to write to a different filesystem first 69 // we have to write to a different filesystem first
72 70
73 useTmpFile = true; 71 useTmpFile = true;
74 pointer=tmpnam(NULL); 72 pointer=tmpnam(NULL);
75 qDebug("Opening tmp file %s",pointer); 73 qDebug("Opening tmp file %s",pointer);
76 track.setName( pointer); 74 track.setName( pointer);
77 75
78 } else { //just use regular file.. no moving 76 } else { //just use regular file.. no moving
79 77
80 useTmpFile = false; 78 useTmpFile = false;
81 track.setName( currentFileName); 79 track.setName( currentFileName);
82 } 80 }
83 if(!track.open( IO_ReadWrite | IO_Truncate)) { 81 if(!track.open( IO_ReadWrite | IO_Truncate)) {
84 QString errorMsg=(QString)strerror(errno); 82 QString errorMsg=(QString)strerror(errno);
85 qDebug(errorMsg); 83 qDebug(errorMsg);
86 QMessageBox::message("Note", "Error opening file.\n" +errorMsg); 84 QMessageBox::message("Note", "Error opening file.\n" +errorMsg);
87 85
88 return false; 86 return false;
89 } else { 87 } else {
90 setWavHeader( track.handle() , &hdr); 88 setWavHeader( track.handle() , &hdr);
91 } 89 }
92return true; 90return true;
93} 91}
94 92
95WavFile::~WavFile() { 93WavFile::~WavFile() {
96 94
97 closeFile(); 95 closeFile();
98} 96}
99 97
100void WavFile::closeFile() { 98void WavFile::closeFile() {
101 if(track.isOpen()) 99 if(track.isOpen())
102 track.close(); 100 track.close();
103} 101}
104 102
105int WavFile::openFile(const QString &currentFileName) { 103int WavFile::openFile(const QString &currentFileName) {
106 qDebug("open play file "+currentFileName); 104 qDebug("open play file "+currentFileName);
107 closeFile(); 105 closeFile();
108 106
109 track.setName(currentFileName); 107 track.setName(currentFileName);
110 108
111 if(!track.open(IO_ReadOnly)) { 109 if(!track.open(IO_ReadOnly)) {
112 QString errorMsg=(QString)strerror(errno); 110 QString errorMsg=(QString)strerror(errno);
113 qDebug("<<<<<<<<<<< "+errorMsg+currentFileName); 111 qDebug("<<<<<<<<<<< "+errorMsg+currentFileName);
114 QMessageBox::message("Note", "Error opening file.\n" +errorMsg); 112 QMessageBox::message("Note", "Error opening file.\n" +errorMsg);
115 return -1; 113 return -1;
116 } else { 114 } else {
117 parseWavHeader( track.handle()); 115 parseWavHeader( track.handle());
118 } 116 }
119 return track.handle(); 117 return track.handle();
120} 118}
121 119
122bool WavFile::setWavHeader(int fd, wavhdr *hdr) { 120bool WavFile::setWavHeader(int fd, wavhdr *hdr) {
123 121
124 strncpy((*hdr).riffID, "RIFF", 4); // RIFF 122 strncpy((*hdr).riffID, "RIFF", 4); // RIFF
125 strncpy((*hdr).wavID, "WAVE", 4); //WAVE 123 strncpy((*hdr).wavID, "WAVE", 4); //WAVE
126 strncpy((*hdr).fmtID, "fmt ", 4); // fmt 124 strncpy((*hdr).fmtID, "fmt ", 4); // fmt
127 (*hdr).fmtLen = 16; // format length = 16 125 (*hdr).fmtLen = 16; // format length = 16
128 126
129 if( wavFormat == WAVE_FORMAT_PCM) { 127 if( wavFormat == WAVE_FORMAT_PCM) {
130 (*hdr).fmtTag = 1; // PCM 128 (*hdr).fmtTag = 1; // PCM
131 qDebug("set header WAVE_FORMAT_PCM"); 129 qDebug("set header WAVE_FORMAT_PCM");
132 } 130 }
133 else { 131 else {
134 (*hdr).fmtTag = WAVE_FORMAT_DVI_ADPCM; //intel ADPCM 132 (*hdr).fmtTag = WAVE_FORMAT_DVI_ADPCM; //intel ADPCM
135 qDebug("set header WAVE_FORMAT_DVI_ADPCM"); 133 qDebug("set header WAVE_FORMAT_DVI_ADPCM");
136 } 134 }
137 135
138 // (*hdr).nChannels = 1;//filePara.channels;// ? 2 : 1*/; // channels 136 // (*hdr).nChannels = 1;//filePara.channels;// ? 2 : 1*/; // channels
139 (*hdr).nChannels = wavChannels;// ? 2 : 1*/; // channels 137 (*hdr).nChannels = wavChannels;// ? 2 : 1*/; // channels
140 138
141 (*hdr).sampleRate = wavSampleRate; //samples per second 139 (*hdr).sampleRate = wavSampleRate; //samples per second
142 (*hdr).avgBytesPerSec = (wavSampleRate)*( wavChannels*(wavResolution/8)); // bytes per second 140 (*hdr).avgBytesPerSec = (wavSampleRate)*( wavChannels*(wavResolution/8)); // bytes per second
143 (*hdr).nBlockAlign = wavChannels*( wavResolution/8); //block align 141 (*hdr).nBlockAlign = wavChannels*( wavResolution/8); //block align
144 (*hdr).bitsPerSample = wavResolution; //bits per sample 8, or 16 142 (*hdr).bitsPerSample = wavResolution; //bits per sample 8, or 16
145 143
146 strncpy((*hdr).dataID, "data", 4); 144 strncpy((*hdr).dataID, "data", 4);
147 145
148 write( fd,hdr, sizeof(*hdr)); 146 write( fd,hdr, sizeof(*hdr));
149 qDebug("writing header: bitrate%d, samplerate %d, channels %d", 147 qDebug("writing header: bitrate%d, samplerate %d, channels %d",
150 wavResolution, wavSampleRate, wavChannels); 148 wavResolution, wavSampleRate, wavChannels);
151 return true; 149 return true;
152} 150}
153 151
154bool WavFile::adjustHeaders(int fd, int total) { 152bool WavFile::adjustHeaders(int fd, int total) {
155 lseek(fd, 4, SEEK_SET); 153 lseek(fd, 4, SEEK_SET);
156 int i = total + 36; 154 int i = total + 36;
157 write( fd, &i, sizeof(i)); 155 write( fd, &i, sizeof(i));
158 lseek( fd, 40, SEEK_SET); 156 lseek( fd, 40, SEEK_SET);
159 write( fd, &total, sizeof(total)); 157 write( fd, &total, sizeof(total));
160 qDebug("adjusting header %d", total); 158 qDebug("adjusting header %d", total);
161 return true; 159 return true;
162} 160}
163 161
164int WavFile::parseWavHeader(int fd) { 162int WavFile::parseWavHeader(int fd) {
165 qDebug("Parsing wav header"); 163 qDebug("Parsing wav header");
166 char string[4]; 164 char string[4];
167 int found; 165 int found;
168 short fmt; 166 short fmt;
169 unsigned short ch, bitrate; 167 unsigned short ch, bitrate;
170 unsigned long samplerrate, longdata; 168 unsigned long samplerrate, longdata;
171 169
172 if (read(fd, string, 4) < 4) { 170 if (read(fd, string, 4) < 4) {
173 qDebug(" Could not read from sound file.\n"); 171 qDebug(" Could not read from sound file.\n");
174 return -1; 172 return -1;
175 } 173 }
176 if (strncmp(string, "RIFF", 4)) { 174 if (strncmp(string, "RIFF", 4)) {
177 qDebug(" not a valid WAV file.\n"); 175 qDebug(" not a valid WAV file.\n");
178 return -1; 176 return -1;
179 } 177 }
180 lseek(fd, 4, SEEK_CUR); 178 lseek(fd, 4, SEEK_CUR);
181 if (read(fd, string, 4) < 4) { 179 if (read(fd, string, 4) < 4) {
182 qDebug("Could not read from sound file.\n"); 180 qDebug("Could not read from sound file.\n");
183 return -1; 181 return -1;
184 } 182 }
185 if (strncmp(string, "WAVE", 4)) { 183 if (strncmp(string, "WAVE", 4)) {
186 qDebug("not a valid WAV file.\n"); 184 qDebug("not a valid WAV file.\n");
187 return -1; 185 return -1;
188 } 186 }
189 found = 0; 187 found = 0;
190 188
191 while (!found) { 189 while (!found) {
192 if (read(fd, string, 4) < 4) { 190 if (read(fd, string, 4) < 4) {
193 qDebug("Could not read from sound file.\n"); 191 qDebug("Could not read from sound file.\n");
194 return -1; 192 return -1;
195 } 193 }
196 if (strncmp(string, "fmt ", 4)) { 194 if (strncmp(string, "fmt ", 4)) {
197 if (read(fd, &longdata, 4) < 4) { 195 if (read(fd, &longdata, 4) < 4) {
198 qDebug("Could not read from sound file.\n"); 196 qDebug("Could not read from sound file.\n");
199 return -1; 197 return -1;
200 } 198 }
201 lseek(fd, longdata, SEEK_CUR); 199 lseek(fd, longdata, SEEK_CUR);
202 } else { 200 } else {
203 lseek(fd, 4, SEEK_CUR); 201 lseek(fd, 4, SEEK_CUR);
204 if (read(fd, &fmt, 2) < 2) { 202 if (read(fd, &fmt, 2) < 2) {
205 qDebug("Could not read format chunk.\n"); 203 qDebug("Could not read format chunk.\n");
206 return -1; 204 return -1;
207 } 205 }
208 if (fmt != WAVE_FORMAT_PCM && fmt != WAVE_FORMAT_DVI_ADPCM) { 206 if (fmt != WAVE_FORMAT_PCM && fmt != WAVE_FORMAT_DVI_ADPCM) {
209 qDebug("Wave file contains unknown format." 207 qDebug("Wave file contains unknown format."
210 " Unable to continue.\n"); 208 " Unable to continue.\n");
211 return -1; 209 return -1;
212 } 210 }
213 wavFormat = fmt; 211 wavFormat = fmt;
214 // compressionFormat=fmt; 212 // compressionFormat=fmt;
215 qDebug("compressionFormat is %d", fmt); 213 qDebug("compressionFormat is %d", fmt);
216 if (read(fd, &ch, 2) < 2) { 214 if (read(fd, &ch, 2) < 2) {
217 qDebug("Could not read format chunk.\n"); 215 qDebug("Could not read format chunk.\n");
218 return -1; 216 return -1;
219 } else { 217 } else {
220 wavChannels = ch; 218 wavChannels = ch;
221 qDebug("File has %d channels", ch); 219 qDebug("File has %d channels", ch);
222 } 220 }
223 if (read(fd, &samplerrate, 4) < 4) { 221 if (read(fd, &samplerrate, 4) < 4) {
224 qDebug("Could not read from format chunk.\n"); 222 qDebug("Could not read from format chunk.\n");
225 return -1; 223 return -1;
226 } else { 224 } else {
227 wavSampleRate = samplerrate; 225 wavSampleRate = samplerrate;
228 // sampleRate = samplerrate; 226 // sampleRate = samplerrate;
229 qDebug("File has samplerate of %d",(int) samplerrate); 227 qDebug("File has samplerate of %d",(int) samplerrate);
230 } 228 }
231 lseek(fd, 6, SEEK_CUR); 229 lseek(fd, 6, SEEK_CUR);
232 if (read(fd, &bitrate, 2) < 2) { 230 if (read(fd, &bitrate, 2) < 2) {
233 qDebug("Could not read format chunk.\n"); 231 qDebug("Could not read format chunk.\n");
234 return -1; 232 return -1;
235 } else { 233 } else {
236 wavResolution=bitrate; 234 wavResolution=bitrate;
237 // resolution = bitrate; 235 // resolution = bitrate;
238 qDebug("File has bitrate of %d", bitrate); 236 qDebug("File has bitrate of %d", bitrate);
239 } 237 }
240 found++; 238 found++;
241 } 239 }
242 } 240 }
243 found = 0; 241 found = 0;
244 while (!found) { 242 while (!found) {
245 if (read(fd, string, 4) < 4) { 243 if (read(fd, string, 4) < 4) {
246 qDebug("Could not read from sound file.\n"); 244 qDebug("Could not read from sound file.\n");
247 return -1; 245 return -1;
248 } 246 }
249 247
250 if (strncmp(string, "data", 4)) { 248 if (strncmp(string, "data", 4)) {
251 if (read(fd, &longdata, 4)<4) { 249 if (read(fd, &longdata, 4)<4) {
252 qDebug("Could not read from sound file.\n"); 250 qDebug("Could not read from sound file.\n");
253 return -1; 251 return -1;
254 } 252 }
255 253
256 lseek(fd, longdata, SEEK_CUR); 254 lseek(fd, longdata, SEEK_CUR);
257 } else { 255 } else {
258 if (read(fd, &longdata, 4) < 4) { 256 if (read(fd, &longdata, 4) < 4) {
259 qDebug("Could not read from sound file.\n"); 257 qDebug("Could not read from sound file.\n");
260 return -1; 258 return -1;
261 } else { 259 } else {
262 wavNumberSamples = longdata; 260 wavNumberSamples = longdata;
263 qDebug("file has length of %d \nlasting %d seconds", longdata, 261 qDebug("file has length of %d \nlasting %d seconds", longdata,
264 (( longdata / wavSampleRate) / wavChannels) / ( wavChannels*( wavResolution/8)) ); 262 (( longdata / wavSampleRate) / wavChannels) / ( wavChannels*( wavResolution/8)) );
265// wavSeconds = (( longdata / wavSampleRate) / wavChannels) / ( wavChannels*( wavResolution/8)); 263// wavSeconds = (( longdata / wavSampleRate) / wavChannels) / ( wavChannels*( wavResolution/8));
266 264
267 return longdata; 265 return longdata;
268 } 266 }
269 } 267 }
270 } 268 }
271 269
272 lseek(fd, 0, SEEK_SET); 270 lseek(fd, 0, SEEK_SET);
273 271
274 return 0; 272 return 0;
275} 273}
276 274
277QString WavFile::trackName() { 275QString WavFile::trackName() {
278 return track.name(); 276 return track.name();
279} 277}
280 278
281int WavFile::wavHandle(){ 279int WavFile::wavHandle(){
282 return track.handle(); 280 return track.handle();
283} 281}
284 282
285int WavFile::getFormat() { 283int WavFile::getFormat() {
286return wavFormat; 284return wavFormat;
287} 285}
288 286
289int WavFile::getResolution() { 287int WavFile::getResolution() {
290return wavResolution; 288return wavResolution;
291} 289}
292 290
293int WavFile::getSampleRate() { 291int WavFile::getSampleRate() {
294return wavSampleRate; 292return wavSampleRate;
295} 293}
296 294
297int WavFile::getNumberSamples() { 295int WavFile::getNumberSamples() {
298return wavNumberSamples; 296return wavNumberSamples;
299} 297}
300 298
301bool WavFile::isTempFile() { 299bool WavFile::isTempFile() {
302return useTmpFile; 300return useTmpFile;
303} 301}