1 files changed, 24 insertions, 5 deletions

diff --git a/plugins/alsa/alsa-softmixer.h b/plugins/alsa/alsa-softmixer.h
index 2e7874d..ea3e201 100644
--- a/plugins/alsa/alsa-softmixer.h
+++ b/plugins/alsa/alsa-softmixer.h
@@ -128,6 +128,10 @@ typedef struct {
 
 	bool closeAtDeletion; // intermediate pcms in the pcm chain must not be closed, else it make libasound abort()
 	bool isPcmPlug;
+
+	void * private_data;
+	void (*private_data_clean) (struct SoftMixerT_ *, void *);
+	unsigned int quirks;
 } AlsaPcmCtlT;
 
 typedef struct {
@@ -154,8 +158,11 @@ typedef struct {
     int tid;
     char* info;
 
-    int nbPcmFds;
-	struct pollfd * pollFds;
+    int nbPcmFdsIn;
+	struct pollfd * pollFdsIn;
+
+	int nbPcmFdsOut;
+	struct pollfd * pollFdsOut;
 
     sem_t sem;
     pthread_mutex_t mutex;
@@ -210,6 +217,7 @@ typedef struct AlsaSndCtlT_ {
 	long nbRegistry;
 	struct cds_list_head registryList;
 	struct SubscribeHandleT_ * eventSubscribeHandle;
+	bool optional;
 } AlsaSndCtlT;
 
 
@@ -220,12 +228,20 @@ typedef struct {
 	unsigned int nbSinks;
 	AlsaPcmChannelT sinks;
     int ccount;
+    int physicalChannelCount;
     AlsaPcmHwInfoT *params;
 	struct cds_list_head	list;
-	snd_config_t * routeConfig;
+
 	bool isPcmPlug;
+	unsigned int quirks;
 } AlsaSndZoneT;
 
+
+/* This is a list of known sound card (hardware or driver) specific bugs */
+
+/* - do not trust the result of snd_pcm_poll_descriptors_revents */
+#define	QUIRK_BOGUS_POLL_REVENTS_DEMANGLING (1<<0)
+
 typedef struct {
     const char *uid;
     const char *verb;
@@ -238,6 +254,8 @@ typedef struct {
 	struct cds_list_head	list;
 	bool isPcmPlug;
 	void * apiVerbHandle;
+	unsigned int quirks;
+	bool optional;
 } AlsaSndPcmT;
 
 typedef struct {
@@ -277,9 +295,10 @@ typedef struct AlsaStreamAudioT_ {
     AlsaPcmCopyHandleT *copy;
 	struct cds_list_head	list;	/* link to the global list*/
 	AlsaPcmCtlT * softvol;
-	snd_config_t * softvolConfig;
-	snd_config_t * rateConfig;
+
 	void * verbApiHandle;
+	bool optional;
+	bool noHwDetected;
 } AlsaStreamAudioT;
 
 typedef struct SoftMixerT_{