# HG changeset patch
# User Denis Lila <dlila@redhat.com>
# Date 1308593696 14400
# Node ID e94cd8db46cdd441dc24c95f96b8cc04c7399e41
# Parent  aa2257220561bb312f7b8e46b1e48e0aee7ab650
PR1741: Fix pulse audio regression.

2011-06-20  Denis Lila  <dlila@redhat.com>

	* pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c
	(SET_STREAM_ENUM): Add an underscore after java_prefix so that
	the produced string matches the names in Stream.java.

diff -r aa2257220561 -r e94cd8db46cd ChangeLog
--- a/ChangeLog	Mon Oct 03 13:07:54 2011 +0200
+++ b/ChangeLog	Mon Jun 20 14:14:56 2011 -0400
@@ -1,3 +1,9 @@
+2011-06-20  Denis Lila  <dlila@redhat.com>
+
+	* pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c
+	(SET_STREAM_ENUM): Add an underscore after java_prefix so that
+	the produced string matches the names in Stream.java.
+
 2011-10-03  Xerxes Rånby  <xerxes@zafena.se>
 	    David Henningsson <david.henningsson@canonical.com>
 	    Matthias Klose <doko@ubuntu.com>
diff -r aa2257220561 -r e94cd8db46cd pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c
--- a/pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c	Mon Oct 03 13:07:54 2011 +0200
+++ b/pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c	Mon Jun 20 14:14:56 2011 -0400
@@ -254,8 +254,12 @@
 }
 
 // used to set stream flags and states.
+// The names in Stream.java have a {STATE_,FLAG_} prefix, but we don't want to
+// add the underscore in every line in init_constants, so we add it here. If
+// constants with no prefix are ever introduced (i.e. java_prefix is "",
+// it's important to remove the ##_ )
 #define SET_STREAM_ENUM(env, clz, java_prefix, state_name) \
-    SET_JAVA_STATIC_LONG_FIELD_TO_PA_ENUM(env, clz, java_prefix, STREAM, state_name)
+    SET_JAVA_STATIC_LONG_FIELD_TO_PA_ENUM(env, clz, java_prefix##_, STREAM, state_name)
 
 /*
  * Class:     org_classpath_icedtea_pulseaudio_Stream