|
 |
653e74b |
diff -up snack2.2.10/unix/jkAudIO_alsa.c.newALSA snack2.2.10/unix/jkAudIO_alsa.c
|
|
|
653e74b |
--- snack2.2.10/unix/jkAudIO_alsa.c.newALSA 2008-09-22 14:19:55.000000000 -0400
|
|
|
653e74b |
+++ snack2.2.10/unix/jkAudIO_alsa.c 2008-09-22 14:21:44.000000000 -0400
|
|
|
653e74b |
@@ -49,6 +49,8 @@ static int littleEndian = 0;
|
|
|
653e74b |
|
|
|
653e74b |
static int minNumChan = 1;
|
|
|
653e74b |
|
|
|
653e74b |
+static snd_pcm_uframes_t hw_bufsize = 0;
|
|
|
653e74b |
+
|
|
|
653e74b |
int
|
|
|
653e74b |
SnackAudioOpen(ADesc *A, Tcl_Interp *interp, char *device, int mode, int freq,
|
|
|
653e74b |
int nchannels, int encoding)
|
|
|
653e74b |
@@ -135,6 +137,9 @@ SnackAudioOpen(ADesc *A, Tcl_Interp *int
|
|
|
653e74b |
Tcl_AppendResult(interp, "Failed setting HW params.", NULL);
|
|
|
653e74b |
return TCL_ERROR;
|
|
|
653e74b |
}
|
|
|
653e74b |
+
|
|
|
653e74b |
+ snd_pcm_hw_params_get_buffer_size (hw_params, &hw_bufsize);
|
|
|
653e74b |
+
|
|
|
653e74b |
snd_pcm_hw_params_free(hw_params);
|
|
|
653e74b |
snd_pcm_prepare(A->handle);
|
|
|
653e74b |
if (A->mode == RECORD) {
|
|
|
653e74b |
@@ -202,6 +207,8 @@ SnackAudioPost(ADesc *A)
|
|
|
653e74b |
int i;
|
|
|
653e74b |
static char buf[64];
|
|
|
653e74b |
|
|
|
653e74b |
+ return;
|
|
|
653e74b |
+
|
|
|
653e74b |
if (A->debug > 1) Snack_WriteLog(" Enter SnackAudioPost\n");
|
|
|
653e74b |
|
|
|
653e74b |
for (i = 0; i < 1000; i++) {
|
|
|
653e74b |
@@ -267,12 +274,14 @@ SnackAudioWriteable(ADesc *A)
|
|
|
653e74b |
long
|
|
|
653e74b |
SnackAudioPlayed(ADesc *A)
|
|
|
653e74b |
{
|
|
|
653e74b |
- long avail = _snd_pcm_mmap_hw_ptr(A->handle);
|
|
|
653e74b |
+ // FIX Here, _snd_pcm_mmap_hw_ptr is deprecated in new alsalib
|
|
|
653e74b |
+ long played = A->nWritten - (hw_bufsize - SnackAudioWriteable(A));
|
|
|
653e74b |
+ // long avail = _snd_pcm_mmap_hw_ptr(A->handle);
|
|
|
653e74b |
|
|
|
653e74b |
- if (avail < 0)
|
|
|
653e74b |
- avail = 0;
|
|
|
653e74b |
+ if (played < 0)
|
|
|
653e74b |
+ return 0;
|
|
|
653e74b |
|
|
|
653e74b |
- return (avail+A->nPlayed);
|
|
|
653e74b |
+ return (played);
|
|
|
653e74b |
}
|
|
|
653e74b |
|
|
|
653e74b |
void
|