summaryrefslogtreecommitdiff
authorzecke <zecke>2003-10-07 13:02:55 (UTC)
committer zecke <zecke>2003-10-07 13:02:55 (UTC)
commit75f35445e9f3ec2f730f779d67f4189296bd9c5e (patch) (unidiff)
tree58d137879aefe506af087f5a75e29f60b5aaae0a
parentd72a9cfe61cbc0910373e4604220021ebbcedaeb (diff)
downloadopie-75f35445e9f3ec2f730f779d67f4189296bd9c5e.zip
opie-75f35445e9f3ec2f730f779d67f4189296bd9c5e.tar.gz
opie-75f35445e9f3ec2f730f779d67f4189296bd9c5e.tar.bz2
instead of testing for QWS_EBX we now define OPIE_NO_SOUND_PCM_READ_BITS.
If your platform does not have that ioctl define it
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
@@ -5,5 +5,5 @@
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>
@@ -27,5 +27,5 @@ Device::Device( QObject * parent, const char * dsp, const char * mixr, bool reco
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;
@@ -145,5 +145,5 @@ exit(1);
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\")");
@@ -177,5 +177,5 @@ exit(1);
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;
@@ -184,5 +184,5 @@ exit(1);
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 // ;
@@ -200,5 +200,5 @@ exit(1);
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// }
@@ -291,5 +291,5 @@ int Device::getDeviceRate() {
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\")");
@@ -309,5 +309,5 @@ int Device::getDeviceChannels() {
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");