[commit] r2147 - snd_pcm updates info before reading; fix typo in squeak.sh

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[commit] r2147 - snd_pcm updates info before reading; fix typo in squeak.sh

commits-3
 
Author: piumarta
Date: 2009-12-17 10:29:39 -0800 (Thu, 17 Dec 2009)
New Revision: 2147

Modified:
   trunk/platforms/unix/ChangeLog
   trunk/platforms/unix/cmake/squeak.sh.in
   trunk/platforms/unix/vm-sound-ALSA/sqUnixSoundALSA.c
Log:
snd_pcm updates info before reading; fix typo in squeak.sh

Modified: trunk/platforms/unix/ChangeLog
===================================================================
--- trunk/platforms/unix/ChangeLog 2009-10-26 19:32:39 UTC (rev 2146)
+++ trunk/platforms/unix/ChangeLog 2009-12-17 18:29:39 UTC (rev 2147)
@@ -1,3 +1,10 @@
+2009-12-17  Ian Piumarta  <com -dot- gmail -at- piumarta (backwards)>
+
+ * vm-sound-ALSA/sqUnixSoundALSA.c (sound_AvailableSpace): Update
+ available space info before reading state.
+
+ * cmake/squeak.sh.in (vm): Fix typo: xkdialog -> kdialog.
+
 2009-10-26  Ian Piumarta  <com -dot- gmail -at- piumarta (backwards)>
 
  * vm/build.cmake: gnu-interp.c depends on generated interp.c.

Modified: trunk/platforms/unix/cmake/squeak.sh.in
===================================================================
--- trunk/platforms/unix/cmake/squeak.sh.in 2009-10-26 19:32:39 UTC (rev 2146)
+++ trunk/platforms/unix/cmake/squeak.sh.in 2009-12-17 18:29:39 UTC (rev 2147)
@@ -2,7 +2,7 @@
 #
 # Launch squeak from a menu, prompting for and/or installing an image
 #
-# Last edited: 2009-08-27 02:06:21 by piumarta on ubuntu.piumarta.com
+# Last edited: 2009-12-17 10:21:38 by piumarta on ubuntu
 
 PATH=/usr/bin:/bin
 
@@ -15,7 +15,7 @@
 
 # find a way to display dialogues
 
-if test -n "$DISPLAY" -a -x "`which xkdialog 2>/dev/null`"; then
+if test -n "$DISPLAY" -a -x "`which kdialog 2>/dev/null`"; then
     error () { kdialog --error "${me}: $*"; exit 1; }
     confirm () { if kdialog --yesno "${1} ${2}?"; then result="${2}"; else result=""; fi; }
     chooseItem () { title="$1"; shift; result=`kdialog --combobox "${title}" $*`; }

Modified: trunk/platforms/unix/vm-sound-ALSA/sqUnixSoundALSA.c
===================================================================
--- trunk/platforms/unix/vm-sound-ALSA/sqUnixSoundALSA.c 2009-10-26 19:32:39 UTC (rev 2146)
+++ trunk/platforms/unix/vm-sound-ALSA/sqUnixSoundALSA.c 2009-12-17 18:29:39 UTC (rev 2147)
@@ -2,7 +2,7 @@
  *
  * Author: [hidden email]
  *
- * Last edited: 2008-04-21 14:48:26 by piumarta on emilia
+ * Last edited: 2009-12-17 10:26:20 by piumarta on ubuntu
  *
  *   Copyright (C) 2006 by Ian Piumarta
  *   All rights reserved.
@@ -168,7 +168,8 @@
   if (!output_handle) return 0;
 
   snd_pcm_delay(output_handle, &delay);
-  state= snd_pcm_state (output_handle);
+  snd_pcm_avail_update(output_handle);
+  state= snd_pcm_state(output_handle);
 
   /* if underrun causes, max delay is loosened */
   if (state == SND_PCM_STATE_XRUN)