Changeset 598 for GPL/trunk/alsa-kernel/include/sound/control.h

Timestamp:

Apr 3, 2017, 4:51:56 PM (8 years ago)

Author:

David Azarewicz

Message:

Merged/reintegrated v2 branch into trunk. Trunk is now v2

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/include/sound/control.h (modified) (4 diffs)

GPL/trunk/alsa-kernel/include/sound/control.h

@@ -57 +57 @@
 struct snd_kcontrol_volatile {
         struct snd_ctl_file *owner;     /* locked */
-        pid_t owner_pid;
         unsigned int access;    /* access rights */
 };
@@ -95 +94 @@
 #define snd_kctl_event(n) list_entry(n, struct snd_kctl_event, list)
 
+struct pid;
+
 struct snd_ctl_file {
         struct list_head list;          /* list of all control files */
         struct snd_card *card;
-        pid_t pid;
+        struct pid *pid;
         int prefer_pcm_subdevice;
         int prefer_rawmidi_subdevice;
@@ -167 +168 @@
 
 /*
- * Frequently used control callbacks
+ * Frequently used control callbacks/helpers
  */
 int snd_ctl_boolean_mono_info(struct snd_kcontrol *kcontrol,
@@ -173 +174 @@
 int snd_ctl_boolean_stereo_info(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_info *uinfo);
+int snd_ctl_enum_info(struct snd_ctl_elem_info *info, unsigned int channels,
+                      unsigned int items, const char *const names[]);
 
 /*