[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, stable-queue, updated. v0.9.22-66-g3bb6546

[Colin Guthrie]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The stable-queue branch has been updated
      from  4f677758b5771933b44743d1a97e1e99e891e26e (commit)

- Log -----------------------------------------------------------------
3bb6546 vala: More vala fixes
-----------------------------------------------------------------------

Summary of changes:
 vala/libpulse.vapi |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------

commit 3bb654654855abd9b0b527fb431b59f3b6bbfaf7
Author: Alexander Kurtz <kurtz.alex at googlemail.com>
Date:   Mon Apr 18 10:28:05 2011 +0200

    vala: More vala fixes
    
    1. Remove the "has_destroy_function=false" attribute. It was only
    necessary because of a bug in vala which is fixed in 0.12. [1]
    
    2. Add sizes to all fixed-size arrays to make vala recognize them as
    such. Using symbolic constants for this is not yet supported. [2]
    
    3. CardInfo struct: Move the brackets in the list of available profiles
    to the type to make it clear that this is a dynamically-sized array. [3]
    
    [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=622773
    [2] https://bugzilla.gnome.org/show_bug.cgi?id=647788
    [3] http://0pointer.de/lennart/projects/pulseaudio/doxygen/structpa__card__info.html

diff --git a/vala/libpulse.vapi b/vala/libpulse.vapi
index 06f412d..3e595f8 100644
--- a/vala/libpulse.vapi
+++ b/vala/libpulse.vapi
@@ -243,7 +243,8 @@ namespace PulseAudio {
         [CCode (cname="pa_cvolume")]
         public struct CVolume {
                 public uint8 channels;
-                public Volume values[];
+                // TODO: Replace array length with CHANNELS_MAX once vala's bug #647788 is fixed
+                public Volume values[32];
 
                 [CCode (cname="PA_SW_CVOLUME_SNPRINT_DB_MAX")]
                 public static const size_t SW_SNPRINT_DB_MAX;
@@ -373,10 +374,11 @@ namespace PulseAudio {
                 public unowned CVolume? dec(Volume minus = 1);
         }
 
-        [CCode (cname="pa_channel_map",has_destroy_function=false)]
+        [CCode (cname="pa_channel_map")]
         public struct ChannelMap {
                 public uint8 channels;
-                public ChannelPosition map[];
+                // TODO: Replace array length with CHANNELS_MAX once vala's bug #647788 is fixed
+                public ChannelPosition map[32];
 
                 [CCode (cname="PA_CHANNEL_MAP_SNPRINT_MAX")]
                 public static const size_t SNPRINT_MAX;
@@ -1350,7 +1352,7 @@ namespace PulseAudio {
                 public uint32 owner_module;
                 public string driver;
                 public uint32 n_profiles;
-                public CardProfileInfo profiles[];
+                public CardProfileInfo[] profiles;
                 public CardProfileInfo *active_profile;
                 public Proplist proplist;
         }

-- 
hooks/post-receive
PulseAudio Sound Server