[FFADO-svn] r2241 - trunk/libffado/src/dice/focusrite

[<tr...@ff...>]

Author: jwoithe
Date: 2012-10-13 04:24:51 -0700 (Sat, 13 Oct 2012)
New Revision: 2241

Modified:
   trunk/libffado/src/dice/focusrite/saffire_pro40.cpp
Log:
saffire pro40: Add In/Out for sources and destinations where missing. Some users complained router section in ffado-mixer remains somewhat confusing.  Patch from Philippe Carriere.

Modified: trunk/libffado/src/dice/focusrite/saffire_pro40.cpp
===================================================================
--- trunk/libffado/src/dice/focusrite/saffire_pro40.cpp	2012-09-30 23:51:16 UTC (rev 2240)
+++ trunk/libffado/src/dice/focusrite/saffire_pro40.cpp	2012-10-13 11:24:51 UTC (rev 2241)
@@ -60,22 +60,23 @@
 void SaffirePro40::SaffirePro40EAP::setupSources_low() {
     addSource("SPDIF/In",  0,  2, eRS_AES, 1);
     addSource("ADAT/In",   0,  8, eRS_ADAT, 1);
-    addSource("Mic/Lin", 0,  8, eRS_InS1, 1);
+    addSource("Mic/Lin/Inst", 0,  2, eRS_InS1, 1);
+    addSource("Mic/Lin/In", 2,  6, eRS_InS1, 3);
     addSource("Mixer/Out",  0, 16, eRS_Mixer, 1);
-    addSource("1394",   0, 12, eRS_ARX0, 1);
-    addSource("1394",   0,  8, eRS_ARX1, 13);
+    addSource("1394/In",   0, 12, eRS_ARX0, 1);
+    addSource("1394/In",   0,  8, eRS_ARX1, 13);
     addSource("Mute",   0,  1, eRS_Muted);
 }
 
 void SaffirePro40::SaffirePro40EAP::setupDestinations_low() {
     addDestination("SPDIF/Out",  0,  2, eRD_AES, 1);
     addDestination("ADAT/Out",   0,  8, eRD_ADAT, 1);
-    addDestination("Line", 0,  2, eRD_InS0, 1);
-    addDestination("Line", 0,  8, eRD_InS1, 3);
+    addDestination("Line/Out", 0,  2, eRD_InS0, 1);
+    addDestination("Line/Out", 0,  8, eRD_InS1, 3);
     addDestination("Mixer/In",  0, 16, eRD_Mixer0, 1);
     addDestination("Mixer/In",  0,  2, eRD_Mixer1, 17);
-    addDestination("1394",   0, 10, eRD_ATX0, 1);
-    addDestination("1394",   0,  8, eRD_ATX1, 11);
+    addDestination("1394/Out",   0, 10, eRD_ATX0, 1);
+    addDestination("1394/Out",   0,  8, eRD_ATX1, 11);
     addDestination("Loop",   8,  2, eRD_ATX1, 1);
 // Is a Mute destination useful ?
 //    addDestination("Mute",   0,  1, eRD_Muted);
@@ -98,20 +99,21 @@
 void SaffirePro40::SaffirePro40EAP::setupSources_mid() {
     addSource("SPDIF/In",  0,  2, eRS_AES, 1);
     addSource("ADAT/In",   0,  4, eRS_ADAT, 1);
-    addSource("Mic/Lin", 0,  8, eRS_InS1, 1);
+    addSource("Mic/Lin/Inst", 0,  2, eRS_InS1, 1);
+    addSource("Mic/Lin/In", 2,  6, eRS_InS1, 3);
     addSource("Mixer/Out",  0, 16, eRS_Mixer, 1);
-    addSource("1394",   0, 16, eRS_ARX0, 1);
+    addSource("1394/In",   0, 16, eRS_ARX0, 1);
     addSource("Mute",   0,  1, eRS_Muted);
 }
 
 void SaffirePro40::SaffirePro40EAP::setupDestinations_mid() {
     addDestination("SPDIF/Out",  0,  2, eRD_AES, 1);
     addDestination("ADAT/Out",   0,  4, eRD_ADAT, 1);
-    addDestination("Line", 0,  2, eRD_InS0, 1);
-    addDestination("Line", 0,  8, eRD_InS1, 3);
+    addDestination("Line/Out", 0,  2, eRD_InS0, 1);
+    addDestination("Line/Out", 0,  8, eRD_InS1, 3);
     addDestination("Mixer/In",  0, 16, eRD_Mixer0, 1);
     addDestination("Mixer/In",  0,  2, eRD_Mixer1, 17);
-    addDestination("1394",   0, 14, eRD_ATX0, 1);
+    addDestination("1394/Out",   0, 14, eRD_ATX0, 1);
     addDestination("Loop",   14, 2, eRD_ATX0, 1);
 // Is a Mute destination useful ?
 //    addDestination("Mute",   0,  1, eRD_Muted);