summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/vmemo/vmemo.cpp186
-rw-r--r--core/applets/vmemo/vmemo.h2
2 files changed, 98 insertions, 90 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>
@@ -26,30 +27,30 @@
#include <stdlib.h>
typedef struct _waveheader {
- u_long main_chunk; /* 'RIFF' */
- u_long length; /* filelen */
- u_long chunk_type; /* 'WAVE' */
-
- u_long sub_chunk; /* 'fmt ' */
- u_long sc_len; /* length of sub_chunk, =16 (chunckSize) */
- u_short format; /* should be 1 for PCM-code (formatTag) */
- u_short modus; /* 1 Mono, 2 Stereo (channels) */
- u_long sample_fq; /* samples per second (samplesPerSecond) */
- u_long byte_p_sec; /* avg bytes per second (avgBytePerSecond) */
- u_short byte_p_spl; /* samplesize; 1 or 2 bytes (blockAlign) */
- u_short bit_p_spl; /* 8, 12 or 16 bit (bitsPerSample) */
-
- u_long data_chunk; /* 'data' */
- u_long data_length; /* samplecount */
+ u_long main_chunk; /* 'RIFF' */
+ u_long length; /* filelen */
+ u_long chunk_type; /* 'WAVE' */
+
+ u_long sub_chunk; /* 'fmt ' */
+ u_long sc_len; /* length of sub_chunk, =16 (chunckSize) */
+ u_short format; /* should be 1 for PCM-code (formatTag) */
+ u_short modus; /* 1 Mono, 2 Stereo (channels) */
+ u_long sample_fq; /* samples per second (samplesPerSecond) */
+ u_long byte_p_sec; /* avg bytes per second (avgBytePerSecond) */
+ u_short byte_p_spl; /* samplesize; 1 or 2 bytes (blockAlign) */
+ u_short bit_p_spl; /* 8, 12 or 16 bit (bitsPerSample) */
+
+ u_long data_chunk; /* 'data' */
+ u_long data_length; /* samplecount */
} WaveHeader;
-#define RIFF 0x46464952
-#define WAVE 0x45564157
-#define FMT 0x20746D66
-#define DATA 0x61746164
-#define PCM_CODE 1
-#define WAVE_MONO 1
-#define WAVE_STEREO 2
+#define RIFF 0x46464952
+#define WAVE 0x45564157
+#define FMT 0x20746D66
+#define DATA 0x61746164
+#define PCM_CODE 1
+#define WAVE_MONO 1
+#define WAVE_STEREO 2
#include "vmemo.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()
@@ -152,49 +164,48 @@ void VMemo::mousePressEvent( QMouseEvent * )
{
qWarning("VMemo::mousePress()");
QSound::play(Resource::findSound("vmemob"));
-
+
recording = TRUE;
qWarning("VMemo::mousePress() -> Starting to record");
if (openDSP() == -1)
- {
- // ### Display an error box
- qWarning("VMemo::mousePress() -> DSP error");
- recording = FALSE;
- return;
- }
-
+ {
+ // ### Display an error box
+ qWarning("VMemo::mousePress() -> DSP error");
+ recording = FALSE;
+ return;
+ }
+
Config vmCfg("VMemo");
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();
fileName += ".wav";
// No spaces in the filename
- fileName.replace(QRegExp("'"),"");
+ fileName.replace(QRegExp("'"),"");
fileName.replace(QRegExp(" "),"_");
fileName.replace(QRegExp(":"),".");
fileName.replace(QRegExp(","),"");
-
+
if(openWAV(fileName.latin1()) == -1)
- {
- // ### Display an error box
- qWarning("VMemo::mousePress() -> WAV error");
- close(dsp);
- return;
- }
-
+ {
+ // ### Display an error box
+ qWarning("VMemo::mousePress() -> WAV error");
+ close(dsp);
+ return;
+ }
+
QArray<int> cats(1);
cats[0] = vmCfg.readNumEntry("Category", 0);
-
+
QString dlName("vm_");
dlName += dt.toString();
DocLnk l;
@@ -203,7 +214,7 @@ void VMemo::mousePressEvent( QMouseEvent * )
l.setType("audio/x-wav");
l.setCategories(cats);
l.writeLink();
-
+
record();
}
@@ -218,35 +229,32 @@ int VMemo::openDSP()
{
Config cfg("Sound");
cfg.setGroup("Record");
-
+
speed = cfg.readNumEntry("SampleRate", 11025);
channels = cfg.readNumEntry("Stereo", 1) ? 2 : 1; // 1 = stereo(2), 0 = mono(1)
if (cfg.readNumEntry("SixteenBit", 1))
- {
- format = AFMT_S16_LE;
- resolution = 16;
- }
+ {
+ format = AFMT_S16_LE;
+ resolution = 16;
+ }
else
- {
- format = AFMT_U8;
- 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);
- dsp = open("/dev/dsp", O_RDWR);
-#endif
+ {
+ format = AFMT_U8;
+ resolution = 8;
+ }
+
+ if(systemZaurus)
+ dsp = open("/dev/dsp1", O_RDWR); //Zaurus needs /dev/dsp1
+ else
+ dsp = open("/dev/dsp", O_RDWR);
qWarning("speed = %i", speed);
-
+
if(dsp == -1)
- {
+ {
perror("open(\"/dev/dsp\")");
return -1;
- }
+ }
if(ioctl(dsp, SNDCTL_DSP_SETFMT , &format)==-1) {
perror("ioctl(\"SNDCTL_DSP_SETFMT\")");
@@ -265,7 +273,7 @@ int VMemo::openDSP()
return -1;
}
qWarning("speed = %i", speed);
-
+
return 1;
}
@@ -276,15 +284,15 @@ int VMemo::openWAV(const char *filename)
qDebug("Creating %s ",filename);
track.setName(filename);
if(!track.open(IO_WriteOnly|IO_Truncate|IO_Raw))
- {
- qDebug("Could not open file");
- return -1;
- }
+ {
+ qDebug("Could not open file");
+ return -1;
+ }
wav=track.handle();
WaveHeader wh;
- /*
+ /*
wh.main_chunk = RIFF;
wh.length = 0;
wh.chunk_type = WAVE;
@@ -314,10 +322,10 @@ int VMemo::openWAV(const char *filename)
wh.byte_p_spl = channels * (wh.bit_p_spl % 8);
qWarning("channels = %i\n"
- "samplesPerSecond = %i\n"
- "avgBytesPerSecond = %i\n"
- "blockAlign = %i\n"
- "bitsPerSecond = %i\n", wh.modus, wh.sample_fq, wh.byte_p_sec, wh.byte_p_spl, wh.bit_p_spl);
+ "samplesPerSecond = %i\n"
+ "avgBytesPerSecond = %i\n"
+ "blockAlign = %i\n"
+ "bitsPerSecond = %i\n", wh.modus, wh.sample_fq, wh.byte_p_sec, wh.byte_p_spl, wh.bit_p_spl);
wh.data_chunk = DATA;
wh.data_length= 0;
@@ -335,16 +343,16 @@ void VMemo::record(void)
qWarning("VMemo::record()");
while(recording)
- {
- result = read(dsp, sound, 8192);
- write(wav, sound, result);
- length += result;
- qApp->processEvents();
- }
-
+ {
+ result = read(dsp, sound, 8192);
+ write(wav, sound, result);
+ length += result;
+ qApp->processEvents();
+ }
+
qWarning("VMemo::record() -> Done recording");
qWarning("VMemo::record() -> Closing dsp");
-
+
value = length+36;
lseek(wav, 4, SEEK_SET);
write(wav, &value, 4);
@@ -353,8 +361,8 @@ void VMemo::record(void)
track.close();
if( ioctl( dsp, SNDCTL_DSP_RESET,0) == -1)// ); //tell driver to stop for a while
- perror("ioctl(\"SNDCTL_DSP_RESET\")");
+ perror("ioctl(\"SNDCTL_DSP_RESET\")");
::close(dsp);
-
+
qWarning("VMemo::record() -> terminating");
}
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;
};