rpms
/
tcl-snack
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix snack to work with new alsa

This commit is contained in:
Tom Callaway 2008-09-22 18:37:30 +00:00
parent 267b1c2e91
commit 653e74ba66
2 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
snack2.2.10-newALSA.patch Normal file
View File

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

7
tcl-snack.spec
View File

@ -9,7 +9,7 @@
Name: tcl-%{realname}
Version: 2.2.10
Release: 4%{?dist}
Release: 5%{?dist}
Summary: Sound toolkit
Group: System Environment/Libraries
License: GPLv2+
@ -24,6 +24,7 @@ Source0: %{realname}%{version}-nomp3.tar.gz
Patch0: snack2.2.10-nomp3.patch
Patch1: snack2.2.10-extracflags.patch
Patch2: snack2.2.10-shared-stubs.patch
Patch3: snack2.2.10-newALSA.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: tcl-devel, tk-devel, alsa-lib-devel, libogg-devel, libvorbis-devel
BuildRequires: python-devel
@ -59,6 +60,7 @@ Tkinter are also required to use Snack.
%patch0 -p1 -b .nomp3
%patch1 -p1 -b .extracflags
%patch2 -p1 -b .shared-stubs
%patch3 -p1 -b .newALSA
chmod -x generic/*.c generic/*.h unix/*.c COPYING README demos/python/*
iconv -f iso-8859-1 -t utf-8 -o README{.utf8,}
mv README{.utf8,}
@ -101,6 +103,9 @@ rm -rf %{buildroot}
%{python_sitelib}/tkSnack*
%changelog
* Mon Sep 22 2008 Tom "spot" Callaway <tcallawa@redhat.com> 2.2.10-5
- fix to work with new alsa (from Jeremiah at Myah OS)
* Thu Sep 18 2008 Tom "spot" Callaway <tcallawa@redhat.com> 2.2.10-4
- *sigh* hardcoding the tcl version is the only way to get it through the buildsystem