bad bad ronald, here's the struct member

Original commit message from CVS:
bad bad ronald, here's the struct member

diff --git a/ChangeLog b/ChangeLog
index eb79928..73f857b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-03-15  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       * ext/alsa/gstalsa.h:
+         I assume Ronald forgot to commit the change to have cardname
+          as a struct member.  Expect some public spanking at the next
+          opportunity.
+
 2004-03-15  Ronald Bultje  <rbultje@ronald.bitfreak.net>
 
        * ext/alsa/gstalsa.c: (gst_alsa_get_property),

diff --git a/ext/alsa/gstalsa.h b/ext/alsa/gstalsa.h
index b289621..c432724 100644 (file)
--- a/ext/alsa/gstalsa.h
+++ b/ext/alsa/gstalsa.h
@@ -104,7 +104,8 @@ typedef enum
   GST_ALSA_CAPS_RESUME,
   GST_ALSA_CAPS_SYNC_START
       /* add more */
-} GstAlsaPcmCaps;
+}
+GstAlsaPcmCaps;
 
 #define GST_ALSA_CAPS_IS_SET(obj, flag) (GST_ALSA (obj)->pcm_caps & (1<<(flag)))
 #define GST_ALSA_CAPS_SET(obj, flag, set) G_STMT_START{  \
@@ -126,7 +127,8 @@ typedef struct
   snd_pcm_format_t format;
   guint rate;
   gint channels;
-} GstAlsaFormat;
+}
+GstAlsaFormat;
 
 struct _GstAlsa
 {
@@ -136,6 +138,7 @@ struct _GstAlsa
   GstPad *pad[GST_ALSA_MAX_TRACKS];
 
   gchar *device;
+  gchar *cardname;
   snd_pcm_t *handle;
   snd_pcm_info_t *info;
   guint pcm_caps;              /* capabilities of the pcm device, see GstAlsaPcmCaps */