summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opierec/device.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/noncore/multimedia/opierec/device.cpp b/noncore/multimedia/opierec/device.cpp
index f9a80c5..11071d8 100644
--- a/noncore/multimedia/opierec/device.cpp
+++ b/noncore/multimedia/opierec/device.cpp
@@ -3,9 +3,9 @@
3#include "device.h" 3#include "device.h"
4 4
5#include <qpe/config.h> 5#include <qpe/config.h>
6#include <qpe/qcopenvelope_qws.h> 6#include <qpe/qcopenvelope_qws.h>
7 7#include <qpe/custom.h>
8 8
9#include <fcntl.h> 9#include <fcntl.h>
10#include <stdio.h> 10#include <stdio.h>
11#include <stdlib.h> 11#include <stdlib.h>
@@ -25,9 +25,9 @@ Device::Device( QObject * parent, const char * dsp, const char * mixr, bool reco
25 : QObject( parent) 25 : QObject( parent)
26{ 26{
27 dspstr = (char *)dsp; 27 dspstr = (char *)dsp;
28 mixstr = (char *)mixr; 28 mixstr = (char *)mixr;
29 29
30 devForm=-1; 30 devForm=-1;
31 devCh=-1; 31 devCh=-1;
32 devRate=-1; 32 devRate=-1;
33 33
@@ -143,9 +143,9 @@ exit(1);
143 case -1: 143 case -1:
144 perror("The fork failed!"); 144 perror("The fork failed!");
145 break; 145 break;
146 case 0: { 146 case 0: {
147 */ 147 */
148 if (( sd = ::open( dspstr, flags)) == -1) { 148 if (( sd = ::open( dspstr, flags)) == -1) {
149 perror("open(\"/dev/dsp\")"); 149 perror("open(\"/dev/dsp\")");
150 QString errorMsg="Could not open audio device\n /dev/dsp\n" 150 QString errorMsg="Could not open audio device\n /dev/dsp\n"
151 +(QString)strerror(errno); 151 +(QString)strerror(errno);
@@ -175,16 +175,16 @@ exit(1);
175 // qDebug("%d",soundDevice->sd ); 175 // qDebug("%d",soundDevice->sd );
176 _exit(0); 176 _exit(0);
177 } 177 }
178 default: 178 default:
179 // pid greater than zero is parent getting the child's pid 179 // pid greater than zero is parent getting the child's pid
180 printf("Child's pid is %d\n",pid); 180 printf("Child's pid is %d\n",pid);
181 QString s; 181 QString s;
182 close(pipefd[1]); 182 close(pipefd[1]);
183 read(pipefd[0], message, sizeof(message)); 183 read(pipefd[0], message, sizeof(message));
184 s = message; 184 s = message;
185 close(pipefd[0]); 185 close(pipefd[0]);
186 186
187// while(wait(NULL)!=pid) 187// while(wait(NULL)!=pid)
188 // ; 188 // ;
189 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);
190 */ 190 */
@@ -198,9 +198,9 @@ exit(1);
198 */ 198 */
199// bool ok; 199// bool ok;
200// sd = s.toInt(&ok, 10); 200// sd = s.toInt(&ok, 10);
201// qDebug("<<<<<<<<<<<<<>>>>>>>>>>>>"+s); 201// qDebug("<<<<<<<<<<<<<>>>>>>>>>>>>"+s);
202 202
203// f2.close(); 203// f2.close();
204// } 204// }
205::close(mixerHandle ); 205::close(mixerHandle );
206 qDebug("open device %s", dspstr); 206 qDebug("open device %s", dspstr);
@@ -289,9 +289,9 @@ int Device::getDeviceRate() {
289} 289}
290 290
291int Device::getDeviceBits() { 291int Device::getDeviceBits() {
292 int dBits=0; 292 int dBits=0;
293#ifndef QT_QWS_EBX // zaurus doesnt have this 293#if !defined(OPIE_NO_SOUND_PCM_READ_BITS) // zaurus doesnt have this
294 if (ioctl( sd, SOUND_PCM_READ_BITS, &dBits) == -1) { 294 if (ioctl( sd, SOUND_PCM_READ_BITS, &dBits) == -1) {
295 perror("ioctl(\"SNDCTL_PCM_READ_BITS\")"); 295 perror("ioctl(\"SNDCTL_PCM_READ_BITS\")");
296 } 296 }
297#endif 297#endif
@@ -307,9 +307,9 @@ int Device::getDeviceChannels() {
307} 307}
308 308
309int Device::getDeviceFragSize() { 309int Device::getDeviceFragSize() {
310 int frag_size; 310 int frag_size;
311 311
312 if (ioctl( sd, SNDCTL_DSP_GETBLKSIZE, &frag_size) == -1) { 312 if (ioctl( sd, SNDCTL_DSP_GETBLKSIZE, &frag_size) == -1) {
313 qDebug("no fragsize"); 313 qDebug("no fragsize");
314 } else 314 } else
315 qDebug("driver says frag size is %d", frag_size); 315 qDebug("driver says frag size is %d", frag_size);