hdspmixer: Add support for RME RPM

This patch adds support for the RME RPM devices. It's mostly based on
Florian Faber's previous patch against hdspmixer 1.0.23,
forwarded-ported to the current hdspmixer code.

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/hdspmixer/src/HDSPMixerCard.cxx b/hdspmixer/src/HDSPMixerCard.cxx
index fbd5de5f5aee9e678a779b73f5cf2f08cb88c1ea..78b88b65eee8ad4f811c5fbc66bb984cd9e7fc33 100644 (file)
--- a/hdspmixer/src/HDSPMixerCard.cxx
+++ b/hdspmixer/src/HDSPMixerCard.cxx
@@ -255,6 +255,17 @@ void HDSPMixerCard::adjustSettings() {
         }
     }
 
+    if (type == RPM) {
+        /* RPM has no digital audio connectors, hence channel mappings don't
+         * depend on speedmode */
+        channels_input = 5;
+        channels_playback = channels_output = 6; /* 2xMain,2xMon,2xPH */
+        channel_map_input = channel_map_playback = channel_map_rpm;
+        dest_map = dest_map_rpm;
+        meter_map_input = meter_map_playback = channel_map_rpm;
+    }
+
+
     if (type == H9652) {
         switch (speed_mode) {
         case 0:

diff --git a/hdspmixer/src/HDSPMixerCard.h b/hdspmixer/src/HDSPMixerCard.h
index d2ef8a6f59f68168e0fc3b4c207f8ad45c5e52ed..656702b168de27baa1de0c86085b6efb5cc78d4b 100644 (file)
--- a/hdspmixer/src/HDSPMixerCard.h
+++ b/hdspmixer/src/HDSPMixerCard.h
@@ -32,6 +32,11 @@
 #include "channelmap.h"
 #include "HDSPMixerWindow.h"
 
+/* temporary workaround until hdsp.h (HDSP_IO_Type gets fixed */
+#ifndef RPM
+# define RPM   5
+#endif
+
 class HDSPMixerWindow;
 
 class HDSPMixerCard

diff --git a/hdspmixer/src/HDSPMixerOutput.cxx b/hdspmixer/src/HDSPMixerOutput.cxx
index 17ab25d7c2c22a980484d3fee6dcb75c893bda6a..5a88f41065e9c56c2dc005820a2fefdd42a4a569 100644 (file)
--- a/hdspmixer/src/HDSPMixerOutput.cxx
+++ b/hdspmixer/src/HDSPMixerOutput.cxx
@@ -77,6 +77,15 @@ static char const *labels_raydat_qs[12] = {
   "SP.L", "SP.R"
 };
 
+static char const *labels_rpm_output[6] = {
+  "Main L", "Main R", "Mon L", "Mon R", "PH L", "PH R"
+};
+
+static char const *labels_rpm_input[5] = {
+  "Phono 1.L", "Phono 1.R",
+  "Phono 2.L", "Phono 2.R",
+  "Mic"
+};
 
 static char const *labels_aio_ss_input[14] = {
   "AN 1",  "AN 2",
@@ -219,6 +228,12 @@ void HDSPMixerOutput::setLabels()
             labels_input = labels_playback = labels_mf_ss;
         return;
     };
+
+    if (type == RPM) {
+        labels_input = labels_rpm_input;
+        labels_playback = labels_rpm_output;
+        return;
+    };
     
     if (type == Digiface || type == H9652) {
         if (sm)

diff --git a/hdspmixer/src/HDSPMixerSelector.cxx b/hdspmixer/src/HDSPMixerSelector.cxx
index 32d91dbfa14df8cb0cc11178b3cd5dd1eba77e7f..084c80d524eb3148299169d07d493e2656e04e61 100644 (file)
--- a/hdspmixer/src/HDSPMixerSelector.cxx
+++ b/hdspmixer/src/HDSPMixerSelector.cxx
@@ -131,6 +131,10 @@ static char const *destinations_df_ds[8] = {
   "SPDIF", "Analog"
 };
 
+static char const *destinations_rpm[3] = {
+  "Main", "Mon", "Phones"
+};
+
 static char const *destinations_h9652_ss[13] = {
   "A1 1+2", "A1 3+4", "A1 5+6", "A1 7+8",
   "A2 1+2", "A2 3+4", "A2 5+6", "A2 7+8",
@@ -261,6 +265,9 @@ void HDSPMixerSelector::setLabels()
            /* should never happen */
            break;
        }
+    } else if (type == RPM) {
+        max_dest = 3;
+        destinations = destinations_rpm;
     } else if (type == H9652) {
        switch (sm) {
        case 0:

diff --git a/hdspmixer/src/HDSPMixerWindow.cxx b/hdspmixer/src/HDSPMixerWindow.cxx
index 74b5630b74c7d57bdae377ddc988d5637e7083f9..e1fe18c8301edeebc0ed8878ad25780150a3ee9d 100644 (file)
--- a/hdspmixer/src/HDSPMixerWindow.cxx
+++ b/hdspmixer/src/HDSPMixerWindow.cxx
@@ -709,6 +709,10 @@ void HDSPMixerWindow::restoreDefaults(int card)
        maxdest[0] = 14;
        maxdest[1] = 8;
        break;
+    case RPM:
+    chnls[0] = chnls[1] = 6;
+    maxdest[0] = maxdest[1] = 3;
+    break;
     case H9652:
        chnls[0] = 26;
        chnls[1] = 14;

diff --git a/hdspmixer/src/channelmap.cxx b/hdspmixer/src/channelmap.cxx
index 598be56fb238b4c00dc4c30b281db81f68bf586f..e3ca15c1694c572ab46e49f7f47b617b7acd2e25 100644 (file)
--- a/hdspmixer/src/channelmap.cxx
+++ b/hdspmixer/src/channelmap.cxx
@@ -78,6 +78,18 @@ char dest_map_ds[8] = {
        0, 2, 8, 10, 16, 18, 24, 26
 };
 
+/* RPM */
+char dest_map_rpm[3] = {
+    0, 2, 4
+};
+
+char channel_map_rpm[26] = {
+     0,  1,  2,  3,  4,  5, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1
+};
+
 // HDSP 9652
 
 char dest_map_h9652_ss[13] = {

diff --git a/hdspmixer/src/channelmap.h b/hdspmixer/src/channelmap.h
index 6b151a045b231b168a36a0d81aff1d2af1e3eb14..51b69ce2eeae30d1e3cd808eb18e350c2f69199f 100644 (file)
--- a/hdspmixer/src/channelmap.h
+++ b/hdspmixer/src/channelmap.h
@@ -54,6 +54,11 @@ extern char channel_map_ds[26];
 
 extern char dest_map_ds[8];
 
+// RPM
+
+extern char dest_map_rpm[3];
+extern char channel_map_rpm[26];
+
 // HDSP 9652
 
 extern char dest_map_h9652_ss[13];

diff --git a/hdspmixer/src/hdspmixer.cxx b/hdspmixer/src/hdspmixer.cxx
index 49298635c160f6a77e18b20f36a013535821c5e8..9c0a3c4cb7a00641848249da870ee8274a1fd6bf 100644 (file)
--- a/hdspmixer/src/hdspmixer.cxx
+++ b/hdspmixer/src/hdspmixer.cxx
@@ -65,6 +65,10 @@ int main(int argc, char **argv)
             printf("Digiface found!\n");
             hdsp_cards[cards] = new HDSPMixerCard(Digiface, card, shortname);
             cards++;
+        } else if (!strncmp(name, "RME Hammerfall DSP + RPM", 24)) {
+            printf("RPM found!\n");
+            hdsp_cards[cards] = new HDSPMixerCard(RPM, card, shortname);
+            cards++;
         } else if (!strncmp(name, "RME Hammerfall HDSP 9652", 24)) {
             printf("HDSP 9652 found!\n");
             hdsp_cards[cards] = new HDSPMixerCard(H9652, card, shortname);