summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opierec/device.cpp192
1 files changed, 96 insertions, 96 deletions
diff --git a/noncore/multimedia/opierec/device.cpp b/noncore/multimedia/opierec/device.cpp
index db2d63f..683f0a5 100644
--- a/noncore/multimedia/opierec/device.cpp
+++ b/noncore/multimedia/opierec/device.cpp
@@ -3,9 +3,6 @@
#include "device.h"
-/* OPIE */
-#include <opie2/odebug.h>
#include <qpe/config.h>
#include <qpe/qcopenvelope_qws.h>
-using namespace Opie::Core;
/* STD */
@@ -33,8 +30,8 @@ Device::Device( QObject * parent, const char * dsp, const char * mixr, bool reco
if( !record){ //playing
- odebug << "setting up DSP for playing" << oendl;
+ qDebug( "setting up DSP for playing" );
flags = O_WRONLY;
} else { //recording
- odebug << "setting up DSP for recording" << oendl;
+ qDebug( "setting up DSP for recording" );
flags = O_RDWR;
// flags = O_RDONLY;
@@ -53,4 +50,87 @@ bool Device::openDsp() {
}
+int Device::openDevice( int flags) {
+/* pid_t pid;
+ int status;
+ int pipefd[2];
+ char message[20];
+ if (pipe(pipefd) == -1){
+ perror ("Error creating pipe");
+exit(1);
+ }
+ switch (pid = fork()) {
+ case -1:
+ perror("The fork failed!");
+ break;
+ case 0: {
+ */
+qDebug( "Opening %s",dspstr);
+ if (( sd = ::open( dspstr, flags)) == -1) {
+ perror("open(\"/dev/dsp\")");
+ QString errorMsg="Could not open audio device\n /dev/dsp\n"
+ +(QString)strerror(errno);
+ qDebug( "XXXXXXXXXXXXXXXXXXXXXXX "+errorMsg );
+ return -1;
+ }
+
+qDebug( "Opening mixer" );
+ int mixerHandle=0;
+ if (( mixerHandle = open("/dev/mixer",O_RDWR))<0) {
+ perror("open(\"/dev/mixer\")");
+ QString errorMsg="Could not open audio device\n /dev/dsp\n"
+ +(QString)strerror(errno);
+ qDebug( "XXXXXXXXXXXXXXXXXXXXXX "+errorMsg );
+ }
+
+ if(ioctl(sd,SNDCTL_DSP_RESET,0)<0){
+ perror("ioctl RESET");
+ }
+// sprintf(message, "%d", sd);
+
+/* QFile f1("/pid");
+ f1.open(IO_WriteOnly );
+ f1.writeBlock(message, strlen(message));
+ f1.close();
+ */
+ /* close(pipefd[0]);
+ write(pipefd[1], message, sizeof(message));
+ close(pipefd[1]);
+ // qDebug( "" + soundDevice->sd );
+ _exit(0);
+ }
+ default:
+ // pid greater than zero is parent getting the child's pid
+ printf("Child's pid is %d\n",pid);
+ QString s;
+ close(pipefd[1]);
+ read(pipefd[0], message, sizeof(message));
+ s = message;
+ close(pipefd[0]);
+
+// while(wait(NULL)!=pid)
+ // ;
+ printf("child %ld terminated normally, return status is zero\n", (long) pid);
+ */
+ // filePara.sd=(long) pid;
+ /* QFile f2("/pid");
+ f2.open(IO_ReadOnly);
+ QTextStream t(&f2);
+ // for(int f=0; f < t.atEnd() ;f++) {
+ s = t.readLine();
+ // }
+ */
+// bool ok;
+// sd = s.toInt(&ok, 10);
+// qDebug( "<<<<<<<<<<<<<>>>>>>>>>>>>"+s );
+
+// f2.close();
+// }
+::close(mixerHandle );
+// qDebug( "open device " + dspstr );
+// qDebug( "success! " + sd );
+ return sd;
+}
+
+
int Device::getOutVolume( ) {
unsigned int volume;
@@ -97,5 +177,5 @@ void Device::changedOutVolume(int vol) {
cfg.writeEntry("VolumePercent", QString::number( vol ));
QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << false;
- owarn << "changing output vol " << vol << "" << oendl;
+ qDebug("changing output vol %d" ,vol );
}
::close(fd);
@@ -112,5 +192,5 @@ void Device::changedInVolume(int vol ) {
cfg.writeEntry("Mic", QString::number(vol ));
QCopEnvelope( "QPE/System", "micChange(bool)" ) << false;
- owarn << "changing input volume " << vol << "" << oendl;
+ qDebug("changing input volume %d",vol);
}
::close(fd);
@@ -135,86 +215,4 @@ bool Device::selectMicInput() {
}
-int Device::openDevice( int flags) {
-/* pid_t pid;
- int status;
- int pipefd[2];
- char message[20];
- if (pipe(pipefd) == -1){
- perror ("Error creating pipe");
-exit(1);
- }
- switch (pid = fork()) {
- case -1:
- perror("The fork failed!");
- break;
- case 0: {
- */
-odebug << "Opening " << dspstr << "" << oendl;
- if (( sd = ::open( dspstr, flags)) == -1) {
- perror("open(\"/dev/dsp\")");
- QString errorMsg="Could not open audio device\n /dev/dsp\n"
- +(QString)strerror(errno);
- odebug << "XXXXXXXXXXXXXXXXXXXXXXX "+errorMsg << oendl;
- return -1;
- }
-
-odebug << "Opening mixer" << oendl;
- int mixerHandle=0;
- if (( mixerHandle = open("/dev/mixer",O_RDWR))<0) {
- perror("open(\"/dev/mixer\")");
- QString errorMsg="Could not open audio device\n /dev/dsp\n"
- +(QString)strerror(errno);
- odebug << "XXXXXXXXXXXXXXXXXXXXXX "+errorMsg << oendl;
- }
-
- if(ioctl(sd,SNDCTL_DSP_RESET,0)<0){
- perror("ioctl RESET");
- }
-// sprintf(message, "%d", sd);
-
-/* QFile f1("/pid");
- f1.open(IO_WriteOnly );
- f1.writeBlock(message, strlen(message));
- f1.close();
- */
- /* close(pipefd[0]);
- write(pipefd[1], message, sizeof(message));
- close(pipefd[1]);
- // odebug << "" << soundDevice->sd << "" << oendl;
- _exit(0);
- }
- default:
- // pid greater than zero is parent getting the child's pid
- printf("Child's pid is %d\n",pid);
- QString s;
- close(pipefd[1]);
- read(pipefd[0], message, sizeof(message));
- s = message;
- close(pipefd[0]);
-
-// while(wait(NULL)!=pid)
- // ;
- printf("child %ld terminated normally, return status is zero\n", (long) pid);
- */
- // filePara.sd=(long) pid;
- /* QFile f2("/pid");
- f2.open(IO_ReadOnly);
- QTextStream t(&f2);
- // for(int f=0; f < t.atEnd() ;f++) {
- s = t.readLine();
- // }
- */
-// bool ok;
-// sd = s.toInt(&ok, 10);
-// odebug << "<<<<<<<<<<<<<>>>>>>>>>>>>"+s << oendl;
-
-// f2.close();
-// }
-::close(mixerHandle );
-// odebug << "open device " << dspstr << "" << oendl;
-// odebug << "success! " << sd << "" << oendl;
- return sd;
-}
-
bool Device::closeDevice( bool) {
// if(b) {//close now
@@ -231,10 +229,10 @@ bool Device::closeDevice( bool) {
// sdfd=0;
// sd=0;
-// odebug << "closed dsp" << oendl;
+// qDebug( "closed dsp" );
return true;
}
bool Device::setDeviceFormat( int form) {
- odebug << "set device res " << form << " " << sd << "" << oendl;
+ qDebug( "set device res %d: %d ",form, sd );
if (ioctl( sd, SNDCTL_DSP_SETFMT, &form)==-1) { //set format
perror("ioctl(\"SNDCTL_DSP_SETFMT\")");
@@ -246,5 +244,5 @@ bool Device::setDeviceFormat( int form) {
bool Device::setDeviceChannels( int ch) {
- odebug << "set channels " << ch << " " << sd << "" << oendl;
+ qDebug( "set channels %d: %d",ch ,sd);
if (ioctl( sd, SNDCTL_DSP_CHANNELS, &ch)==-1) {
perror("ioctl(\"SNDCTL_DSP_CHANNELS\")");
@@ -256,5 +254,5 @@ bool Device::setDeviceChannels( int ch) {
bool Device::setDeviceRate( int rate) {
- odebug << "set rate " << rate << " " << sd << "" << oendl;
+ qDebug( "set rate %d: %d",rate,sd);
if (ioctl( sd, SNDCTL_DSP_SPEED, &rate) == -1) {
perror("ioctl(\"SNDCTL_DSP_SPEED\")");
@@ -319,7 +317,7 @@ int Device::getDeviceFragSize() {
if (ioctl( sd, SNDCTL_DSP_GETBLKSIZE, &frag_size) == -1) {
- odebug << "no fragsize" << oendl;
+ qDebug( "no fragsize" );
} else {
- odebug << "driver says frag size is " << frag_size << "" << oendl;
+ qDebug( "driver says frag size is %d",frag_size);
}
return frag_size;
@@ -345,4 +343,5 @@ bool Device::reset() {
int Device::devRead(int soundDescriptor, short *buf, int size) {
+ Q_UNUSED(soundDescriptor);
int number = 0;
number = ::read( sd /*soundDescriptor*/, (char *)buf, size);
@@ -351,5 +350,6 @@ int Device::devRead(int soundDescriptor, short *buf, int size) {
int Device::devWrite(int soundDescriptor, short * buf, int size) {
- int bytesWritten = 0;
+ Q_UNUSED(soundDescriptor);
+ int bytesWritten = 0;
bytesWritten = ::write( sd /*soundDescriptor*/, buf, size);
return bytesWritten;