Fix endianess of PMac driver

Fix endianess of PMac driver for the latest change of dmix.
Now need to specify the (big-endian) format explicitly.

diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am
index 961ae8eddc9f2f410e994e62dce27af4fcc57ba8..39930b96a4a5167157f53021ec01408c9b536953 100644 (file)
--- a/src/conf/cards/Makefile.am
+++ b/src/conf/cards/Makefile.am
@@ -33,6 +33,7 @@ cfg_files = aliases.conf \
        Maestro3.conf \
        NFORCE.conf \
        PC-Speaker.conf \
+       PMac.conf \
        PMacToonie.conf \
        RME9636.conf \
        RME9652.conf \

diff --git a/src/conf/cards/PMac.conf b/src/conf/cards/PMac.conf
new file mode 100644 (file)
index 0000000..15ba699
--- /dev/null
+++ b/src/conf/cards/PMac.conf
@@ -0,0 +1,38 @@
+#
+# Configuration for PMac
+#
+
+<confdir:pcm/front.conf>
+
+PMac.pcm.front.0 {
+       @args [ CARD ]
+       @args.CARD {
+               type string
+       }
+       type hw
+       card $CARD
+       device 0
+}      
+
+# default with dmix/dsnoop
+PMac.pcm.default {
+       @args [ CARD ]
+       @args.CARD {
+               type string
+       }
+       type asym
+       playback.pcm {
+               type plug
+               slave.pcm {
+                       @func concat
+                       strings [ "dmix:CARD=" $CARD ",FORMAT=S16" ]
+               }
+       }
+       capture.pcm {
+               type plug
+               slave.pcm {
+                       @func concat
+                       strings [ "dsnoop:CARD=" $CARD ",FORMAT=S16" ]
+               }
+       }
+}

diff --git a/src/conf/cards/PMacToonie.conf b/src/conf/cards/PMacToonie.conf
index 44db11cac685d9f597bfe7bce8da4270318defc6..8c6777ca00db661f2b2fe9132943a54da968852a 100644 (file)
--- a/src/conf/cards/PMacToonie.conf
+++ b/src/conf/cards/PMacToonie.conf
@@ -21,23 +21,19 @@ PMacToonie.pcm.front.0 {
        }
 }      
 
-# once when dmix is confirmed to work on ppc, we should enable dmix/dsnoop
-# for default, too
-
+# default with dmix+softvol & dsnoop
 PMacToonie.pcm.default {
        @args [ CARD ]
        @args.CARD {
                type string
        }
        type asym
-       playback.pcm {
                type plug
                slave.pcm {
                        type softvol
                        slave.pcm {
-                               type hw
-                               card $CARD
-                               device 0
+                               @func concat
+                               strings [ "dmix:CARD=" $CARD ",FORMAT=S16" ]
                        }
                        control {
                                name "PCM Playback Volume"
@@ -48,9 +44,8 @@ PMacToonie.pcm.default {
        capture.pcm {
                type plug
                slave.pcm {
-                       type hw
-                       card $CARD
-                       device 0
+                       @func concat
+                       strings [ "dsnoop:CARD=" $CARD ",FORMAT=S16" ]
                }
        }
 }