changeset 888:7e24265fe540 trunk

[svn] alsa: small changes
author giacomo
date Wed, 21 Mar 2007 07:36:32 -0700
parents 2a0f31ee4501
children 13cdd6999598
files ChangeLog src/alsa/audio.c
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Mar 21 07:24:33 2007 -0700
+++ b/ChangeLog	Wed Mar 21 07:36:32 2007 -0700
@@ -1,3 +1,10 @@
+2007-03-21 14:24:33 +0000  Giacomo Lozito <james@develia.org>
+  revision [1874]
+  aosd: use g_locale_to_utf8 for osd strings (needs testing)
+  trunk/src/aosd/aosd_trigger.c |    4 ++--
+  1 file changed, 2 insertions(+), 2 deletions(-)
+
+
 2007-03-21 14:15:43 +0000  Giacomo Lozito <james@develia.org>
   revision [1872]
   - statusicon: use function/define names that do not collide with gtk >= 2.10 internals (paranoia)
--- a/src/alsa/audio.c	Wed Mar 21 07:24:33 2007 -0700
+++ b/src/alsa/audio.c	Wed Mar 21 07:36:32 2007 -0700
@@ -824,6 +824,7 @@
 static void *alsa_loop(void *arg)
 {
 	int npfds = snd_pcm_poll_descriptors_count(alsa_pcm);
+	int wr = 0;
 
 	g_mutex_lock(alsa_mutex);
 
@@ -837,7 +838,7 @@
 		if (!paused && !prebuffer &&
 		    get_thread_buffer_filled() > hw_period_size_in)
 		{
-			int wr = snd_pcm_wait(alsa_pcm, 10);
+			wr = snd_pcm_wait(alsa_pcm, 10);
 			if (wr > 0)
 			{
 				alsa_write_out_thread_data();