.. | .. |
---|
4 | 4 | |
---|
5 | 5 | #include <sound/info.h> |
---|
6 | 6 | |
---|
| 7 | +struct media_mixer_ctl; |
---|
| 8 | + |
---|
7 | 9 | struct usbmix_connector_map { |
---|
8 | 10 | u8 id; |
---|
9 | 11 | u8 delegated_id; |
---|
.. | .. |
---|
33 | 35 | struct urb *rc_urb; |
---|
34 | 36 | struct usb_ctrlrequest *rc_setup_packet; |
---|
35 | 37 | u8 rc_buffer[6]; |
---|
| 38 | + struct media_mixer_ctl *media_mixer_ctl; |
---|
36 | 39 | |
---|
37 | 40 | bool disconnected; |
---|
| 41 | + |
---|
| 42 | + void *private_data; |
---|
| 43 | + void (*private_free)(struct usb_mixer_interface *mixer); |
---|
| 44 | + void (*private_suspend)(struct usb_mixer_interface *mixer); |
---|
38 | 45 | }; |
---|
39 | 46 | |
---|
40 | 47 | #define MAX_CHANNELS 16 /* max logical channels */ |
---|
.. | .. |
---|
48 | 55 | USB_MIXER_U16, |
---|
49 | 56 | USB_MIXER_S32, |
---|
50 | 57 | USB_MIXER_U32, |
---|
| 58 | + USB_MIXER_BESPOKEN, /* non-standard type */ |
---|
51 | 59 | }; |
---|
52 | 60 | |
---|
53 | 61 | typedef void (*usb_mixer_elem_dump_func_t)(struct snd_info_buffer *buffer, |
---|
.. | .. |
---|
124 | 132 | |
---|
125 | 133 | extern void snd_usb_mixer_elem_free(struct snd_kcontrol *kctl); |
---|
126 | 134 | |
---|
127 | | -extern struct snd_kcontrol_new *snd_usb_feature_unit_ctl; |
---|
| 135 | +extern const struct snd_kcontrol_new *snd_usb_feature_unit_ctl; |
---|
128 | 136 | |
---|
129 | 137 | #endif /* __USBMIXER_H */ |
---|