diff -Nur src_old/pulseaudio/src/pulse/channelmap.c src_new/pulseaudio/src/pulse/channelmap.c
--- src_old/pulseaudio/src/pulse/channelmap.c	2012-10-05 20:41:53.220542708 -0300
+++ src_new/pulseaudio/src/pulse/channelmap.c	2012-10-05 21:55:11.169365321 -0300
@@ -228,8 +228,8 @@ //AIFF
 
                 case 5:
                     m->map[2] = PA_CHANNEL_POSITION_FRONT_CENTER;
-                    m->map[3] = PA_CHANNEL_POSITION_REAR_LEFT;
-                    m->map[4] = PA_CHANNEL_POSITION_REAR_RIGHT;
+                    m->map[3] = PA_CHANNEL_POSITION_SIDE_LEFT;
+                    m->map[4] = PA_CHANNEL_POSITION_SIDE_RIGHT;
                     /* Fall through */
 
                 case 2:
@@ -264,7 +264,23 @@ //ALSA
                 case 8:
                     m->map[6] = PA_CHANNEL_POSITION_SIDE_LEFT;
                     m->map[7] = PA_CHANNEL_POSITION_SIDE_RIGHT;
-                    /* Fall through */
+                    m->map[5] = PA_CHANNEL_POSITION_LFE;
+                    m->map[4] = PA_CHANNEL_POSITION_FRONT_CENTER;
+                    m->map[2] = PA_CHANNEL_POSITION_REAR_LEFT;
+                    m->map[3] = PA_CHANNEL_POSITION_REAR_RIGHT;
+                    m->map[0] = PA_CHANNEL_POSITION_FRONT_LEFT;
+                    m->map[1] = PA_CHANNEL_POSITION_FRONT_RIGHT;
+					return m;
+
+			    case 7:
+                    m->map[6] = PA_CHANNEL_POSITION_REAR_CENTER;
+                    m->map[4] = PA_CHANNEL_POSITION_SIDE_LEFT;
+                    m->map[5] = PA_CHANNEL_POSITION_SIDE_RIGHT;
+                    m->map[3] = PA_CHANNEL_POSITION_LFE;
+                    m->map[2] = PA_CHANNEL_POSITION_FRONT_CENTER;
+                    m->map[0] = PA_CHANNEL_POSITION_FRONT_LEFT;
+                    m->map[1] = PA_CHANNEL_POSITION_FRONT_RIGHT;
+					return m;
 
                 case 6:
                     m->map[5] = PA_CHANNEL_POSITION_LFE;
@@ -275,8 +291,8 @@
                     /* Fall through */
 
                 case 4:
-                    m->map[2] = PA_CHANNEL_POSITION_REAR_LEFT;
-                    m->map[3] = PA_CHANNEL_POSITION_REAR_RIGHT;
+                    m->map[2] = PA_CHANNEL_POSITION_SIDE_LEFT;
+                    m->map[3] = PA_CHANNEL_POSITION_SIDE_RIGHT;
                     /* Fall through */
 
                 case 2:
@@ -323,8 +339,8 @@ //WAVEEX
                     /* Fall through */
 
                 case 11:
-                    m->map[9] = PA_CHANNEL_POSITION_SIDE_LEFT;
-                    m->map[10] = PA_CHANNEL_POSITION_SIDE_RIGHT;
+					m->map[9] = PA_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER;
+                    m->map[10] = PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER;
                     /* Fall through */
 
                 case 9:
@@ -332,18 +348,43 @@
                     /* Fall through */
 
                 case 8:
-                    m->map[6] = PA_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER;
-                    m->map[7] = PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER;
-                    /* Fall through */
-
-                case 6:
+                    m->map[6] = PA_CHANNEL_POSITION_SIDE_LEFT;
+                    m->map[7] = PA_CHANNEL_POSITION_SIDE_RIGHT;
                     m->map[4] = PA_CHANNEL_POSITION_REAR_LEFT;
                     m->map[5] = PA_CHANNEL_POSITION_REAR_RIGHT;
+                    m->map[3] = PA_CHANNEL_POSITION_LFE;
+                    m->map[2] = PA_CHANNEL_POSITION_FRONT_CENTER;
+                    m->map[0] = PA_CHANNEL_POSITION_FRONT_LEFT;
+                    m->map[1] = PA_CHANNEL_POSITION_FRONT_RIGHT;
+					return m;
+
+                case 7:
+                    m->map[6] = PA_CHANNEL_POSITION_REAR_CENTER;
                     /* Fall through */
 
-                case 4:
+                case 6:
+                    m->map[4] = PA_CHANNEL_POSITION_SIDE_LEFT;
+                    m->map[5] = PA_CHANNEL_POSITION_SIDE_RIGHT;
                     m->map[3] = PA_CHANNEL_POSITION_LFE;
-                    /* Fall through */
+                    m->map[2] = PA_CHANNEL_POSITION_FRONT_CENTER;
+                    m->map[0] = PA_CHANNEL_POSITION_FRONT_LEFT;
+                    m->map[1] = PA_CHANNEL_POSITION_FRONT_RIGHT;
+                    return m;
+
+                case 5:
+                    m->map[3] = PA_CHANNEL_POSITION_SIDE_LEFT;
+                    m->map[4] = PA_CHANNEL_POSITION_SIDE_RIGHT;
+                    m->map[2] = PA_CHANNEL_POSITION_FRONT_CENTER;
+                    m->map[0] = PA_CHANNEL_POSITION_FRONT_LEFT;
+                    m->map[1] = PA_CHANNEL_POSITION_FRONT_RIGHT;
+                    return m;
+
+                case 4:
+                    m->map[2] = PA_CHANNEL_POSITION_REAR_LEFT;
+                    m->map[3] = PA_CHANNEL_POSITION_REAR_RIGHT;
+                    m->map[0] = PA_CHANNEL_POSITION_FRONT_LEFT;
+                    m->map[1] = PA_CHANNEL_POSITION_FRONT_RIGHT;
+                    return m;
 
                 case 3:
                     m->map[2] = PA_CHANNEL_POSITION_FRONT_CENTER;
@@ -558,19 +599,29 @@
         map.channels = 5;
         map.map[0] = PA_CHANNEL_POSITION_FRONT_LEFT;
         map.map[1] = PA_CHANNEL_POSITION_FRONT_RIGHT;
-        map.map[2] = PA_CHANNEL_POSITION_REAR_LEFT;
-        map.map[3] = PA_CHANNEL_POSITION_REAR_RIGHT;
+        map.map[2] = PA_CHANNEL_POSITION_SIDE_LEFT;
+        map.map[3] = PA_CHANNEL_POSITION_SIDE_RIGHT;
         map.map[4] = PA_CHANNEL_POSITION_FRONT_CENTER;
         goto finish;
     } else if (pa_streq(s, "surround-51")) {
         map.channels = 6;
         map.map[0] = PA_CHANNEL_POSITION_FRONT_LEFT;
         map.map[1] = PA_CHANNEL_POSITION_FRONT_RIGHT;
-        map.map[2] = PA_CHANNEL_POSITION_REAR_LEFT;
-        map.map[3] = PA_CHANNEL_POSITION_REAR_RIGHT;
+        map.map[2] = PA_CHANNEL_POSITION_SIDE_LEFT;
+        map.map[3] = PA_CHANNEL_POSITION_SIDE_RIGHT;
         map.map[4] = PA_CHANNEL_POSITION_FRONT_CENTER;
         map.map[5] = PA_CHANNEL_POSITION_LFE;
         goto finish;
+    } else if (pa_streq(s, "surround-61")) {
+        map.channels = 6;
+        map.map[0] = PA_CHANNEL_POSITION_FRONT_LEFT;
+        map.map[1] = PA_CHANNEL_POSITION_FRONT_RIGHT;
+        map.map[2] = PA_CHANNEL_POSITION_SIDE_LEFT;
+        map.map[3] = PA_CHANNEL_POSITION_SIDE_RIGHT;
+        map.map[4] = PA_CHANNEL_POSITION_FRONT_CENTER;
+        map.map[5] = PA_CHANNEL_POSITION_LFE;
+        map.map[6] = PA_CHANNEL_POSITION_REAR_CENTER;
+        goto finish;
     } else if (pa_streq(s, "surround-71")) {
         map.channels = 8;
         map.map[0] = PA_CHANNEL_POSITION_FRONT_LEFT;
@@ -717,18 +768,25 @@
 
     if (pa_bitset_equals(in_map, PA_CHANNEL_POSITION_MAX,
                          PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
-                         PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT,
+                         PA_CHANNEL_POSITION_SIDE_LEFT, PA_CHANNEL_POSITION_SIDE_RIGHT,
                          PA_CHANNEL_POSITION_FRONT_CENTER, -1))
         return "surround-50";
 
     if (pa_bitset_equals(in_map, PA_CHANNEL_POSITION_MAX,
                          PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
-                         PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT,
+                         PA_CHANNEL_POSITION_SIDE_LEFT, PA_CHANNEL_POSITION_SIDE_RIGHT,
                          PA_CHANNEL_POSITION_FRONT_CENTER, PA_CHANNEL_POSITION_LFE, -1))
         return "surround-51";
 
     if (pa_bitset_equals(in_map, PA_CHANNEL_POSITION_MAX,
                          PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
+                         PA_CHANNEL_POSITION_SIDE_LEFT, PA_CHANNEL_POSITION_SIDE_RIGHT,
+                         PA_CHANNEL_POSITION_FRONT_CENTER, PA_CHANNEL_POSITION_LFE,
+						 PA_CHANNEL_POSITION_REAR_CENTER, -1))
+        return "surround-61";
+
+    if (pa_bitset_equals(in_map, PA_CHANNEL_POSITION_MAX,
+                         PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
                          PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT,
                          PA_CHANNEL_POSITION_FRONT_CENTER, PA_CHANNEL_POSITION_LFE,
                          PA_CHANNEL_POSITION_SIDE_LEFT, PA_CHANNEL_POSITION_SIDE_RIGHT, -1))
@@ -773,18 +831,25 @@
 
     if (pa_bitset_equals(in_map, PA_CHANNEL_POSITION_MAX,
                          PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
-                         PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT,
+                         PA_CHANNEL_POSITION_SIDE_LEFT, PA_CHANNEL_POSITION_SIDE_RIGHT,
                          PA_CHANNEL_POSITION_FRONT_CENTER, -1))
         return _("Surround 5.0");
 
     if (pa_bitset_equals(in_map, PA_CHANNEL_POSITION_MAX,
                          PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
-                         PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT,
+                         PA_CHANNEL_POSITION_SIDE_LEFT, PA_CHANNEL_POSITION_SIDE_RIGHT,
                          PA_CHANNEL_POSITION_FRONT_CENTER, PA_CHANNEL_POSITION_LFE, -1))
         return _("Surround 5.1");
 
     if (pa_bitset_equals(in_map, PA_CHANNEL_POSITION_MAX,
                          PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
+                         PA_CHANNEL_POSITION_SIDE_LEFT, PA_CHANNEL_POSITION_SIDE_RIGHT,
+                         PA_CHANNEL_POSITION_FRONT_CENTER, PA_CHANNEL_POSITION_LFE,
+						 PA_CHANNEL_POSITION_REAR_CENTER, -1))
+        return _("Surround 6.1");
+
+    if (pa_bitset_equals(in_map, PA_CHANNEL_POSITION_MAX,
+                         PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
                          PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT,
                          PA_CHANNEL_POSITION_FRONT_CENTER, PA_CHANNEL_POSITION_LFE,
                          PA_CHANNEL_POSITION_SIDE_LEFT, PA_CHANNEL_POSITION_SIDE_RIGHT, -1))