Mercurial > hg > release > icedtea6-1.11
changeset 2610:be0c585e6d35
Fix pulse audio regression.
| author | Denis Lila <dlila@redhat.com> |
|---|---|
| date | Mon, 20 Jun 2011 14:14:56 -0400 |
| parents | 50b12236cc6d |
| children | 62f0bbb8d3db |
| files | ChangeLog pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c |
| diffstat | 2 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jun 20 11:38:07 2011 -0400 +++ 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-06-20 Denis Lila <dlila@redhat.com> * Makefile.am: Add patch.
--- a/pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.c Mon Jun 20 11:38:07 2011 -0400 +++ 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