| -rw-r--r-- | core/applets/vmemo/vmemo.cpp | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp index 73bd996..83f19f5 100644 --- a/core/applets/vmemo/vmemo.cpp +++ b/core/applets/vmemo/vmemo.cpp @@ -32,6 +32,7 @@ typedef struct _waveheader { u_long chunk_type; /* 'WAVE' */ - u_long sub_chunk; /* 'fmt ' */ - u_long sc_len; /* length of sub_chunk, =16 (chunckSize) */ + u_long sc_len; /* length of sub_chunk, =16 + (chunckSize) format len */ u_short format; /* should be 1 for PCM-code (formatTag) */ + u_short modus; /* 1 Mono, 2 Stereo (channels) */ @@ -43,2 +44,3 @@ typedef struct _waveheader { u_long data_chunk; /* 'data' */ + u_long data_length;/* samplecount */ @@ -244,3 +246,3 @@ int VMemo::openDSP() channels = cfg.readNumEntry("Stereo", 1) ? 2 : 1; // 1 = stereo(2), 0 = mono(1) - if (cfg.readNumEntry("SixteenBit", 1)) + if (cfg.readNumEntry("SixteenBit", 1)==1) { @@ -256,3 +258,6 @@ int VMemo::openDSP() if(systemZaurus) + { dsp = open("/dev/dsp1", O_RDWR); //Zaurus needs /dev/dsp1 + channels=1; //zaurus has one input channel + } else @@ -303,18 +308,16 @@ int VMemo::openWAV(const char *filename) - wh.main_chunk = RIFF; - wh.length = 0; - wh.chunk_type = WAVE; - - wh.sub_chunk = FMT; - wh.sc_len = 16; - wh.format = PCM_CODE; - wh.modus = channels; - wh.sample_fq = speed; - wh.bit_p_spl = resolution; - wh.byte_p_sec = wh.sample_fq * wh.bit_p_spl; - wh.byte_p_spl = channels * (wh.bit_p_spl % 8); - + wh.main_chunk = RIFF;// RIFF + wh.chunk_type = WAVE;//WAVE + wh.sub_chunk = FMT;// fmt + wh.sc_len = 16;// format length = 16 + wh.format = PCM_CODE;// PCM + wh.modus = channels;// channels + wh.sample_fq = speed;//samplerate + wh.byte_p_sec = speed * channels * resolution/8;// av bytes per second + wh.byte_p_spl = channels * (resolution / 8); //block align + wh.bit_p_spl = resolution;//bits per sample 8, or 16 wh.data_chunk = DATA; - wh.data_length= 0; - + wh.data_length= 0; // <--- +// qDebug("Write header channels %d, speed %d, b/s %d, blockalign %d, bitrate %d" +// , wh.modus, wh.sample_fq, wh.byte_p_sec, wh.byte_p_spl, wh.bit_p_spl ); write (wav, &wh, sizeof(WaveHeader)); @@ -339,2 +342,4 @@ void VMemo::record(void) qApp->processEvents(); +// printf("%d\r",length); +// fflush(stdout); } @@ -349,2 +354,3 @@ void VMemo::record(void) write(wav, &length, 4); +// qDebug("File length %d, samplecount %d", value, length); track.close(); |