summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-02-14 02:13:19 (UTC)
committer llornkcor <llornkcor>2002-02-14 02:13:19 (UTC)
commit9c6a0c5da964dae08f3d9299fa5a47446f9977e2 (patch) (side-by-side diff)
treedaa708f7da56a32bad5f7ecfd57191abb7ae6990
parenta3b4e55734b9a1d2b1f2f7278caa165138dd2aa2 (diff)
downloadopie-9c6a0c5da964dae08f3d9299fa5a47446f9977e2.zip
opie-9c6a0c5da964dae08f3d9299fa5a47446f9977e2.tar.gz
opie-9c6a0c5da964dae08f3d9299fa5a47446f9977e2.tar.bz2
added runtime check for zaurus kernel
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/applets/vmemo/vmemo.cpp32
-rw-r--r--core/applets/vmemo/vmemo.h2
2 files changed, 21 insertions, 13 deletions
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index 6f04c66..6bd1622 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -14,6 +14,7 @@
* $Id$
*/
+#include <sys/utsname.h>
#include <sys/time.h>
#include <sys/types.h>
#include <unistd.h>
@@ -136,6 +137,17 @@ VMemo::VMemo( QWidget *parent, const char *name )
setFixedWidth( 14 );
recording = FALSE;
+
+ struct utsname name; //check for embedix kernel running on the zaurus, if lineo change string, this break
+ if (uname(&name) != -1) {
+ QString release=name.release;
+ if(release.find("embedix",0,TRUE) !=-1) {
+ systemZaurus=TRUE;
+ printf("System release: %s\n", name.release);
+ } else
+ systemZaurus=FALSE;
+ }
+
}
VMemo::~VMemo()
@@ -167,12 +179,11 @@ void VMemo::mousePressEvent( QMouseEvent * )
vmCfg.setGroup("Defaults");
QDateTime dt = QDateTime::currentDateTime();
-
-#if defined(QT_QWS_EBX) //if zaurus
- QString fileName(vmCfg.readEntry("Dir", "/mnt/cf/")); // zaurus does not have /mnt/ramfs
-#else
- QString fileName(vmCfg.readEntry("Dir", "/mnt/ramfs/"));
-#endif
+ QString fileName;
+ if(systemZaurus)
+ fileName=vmCfg.readEntry("Dir", "/mnt/cf/"); // zaurus does not have /mnt/ramfs
+ else
+ fileName=vmCfg.readEntry("Dir", "/mnt/ramfs/");
fileName += "vm_";
fileName += dt.toString();
@@ -232,13 +243,10 @@ int VMemo::openDSP()
resolution = 8;
}
-#if defined(QT_QWS_EBX) //if zaurus
- //dsp = open("/dev/dsp1", O_RDONLY); //on the Zaurus this needs to be /dev/dsp1 !!!!
- dsp = open("/dev/dsp1", O_RDWR); //on the Zaurus this needs to be /dev/dsp1 !!!!
-#else
- //dsp = open("/dev/dsp", O_RDONLY);
+ if(systemZaurus)
+ dsp = open("/dev/dsp1", O_RDWR); //Zaurus needs /dev/dsp1
+ else
dsp = open("/dev/dsp", O_RDWR);
-#endif
qWarning("speed = %i", speed);
diff --git a/core/applets/vmemo/vmemo.h b/core/applets/vmemo/vmemo.h
index 9ce08f2..ee375b0 100644
--- a/core/applets/vmemo/vmemo.h
+++ b/core/applets/vmemo/vmemo.h
@@ -41,7 +41,7 @@ private:
int openWAV(const char *filename);
QPixmap vmemoPixmap;
-
+ bool systemZaurus;
int dsp, wav, rate, speed, channels, format, resolution;
bool recording;
};