DirectSound: fix setting the default channel in surround cases

(cherry picked from commit a22323f27dfb09f467128be336dc4980d61898a9)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

modules/audio_output/directx.c

@@ -458,10 +458,12 @@ static void Probe( audio_output_t * p_aout )
     switch( DSSPEAKER_CONFIG(ui_speaker_config) )
     {
     case DSSPEAKER_7POINT1:
+    case DSSPEAKER_7POINT1_SURROUND:
         msg_Dbg( p_aout, "Windows says your SpeakerConfig is 7.1" );
         val.i_int = AOUT_VAR_7_1;
         break;
     case DSSPEAKER_5POINT1:
+    case DSSPEAKER_5POINT1_SURROUND:
         msg_Dbg( p_aout, "Windows says your SpeakerConfig is 5.1" );
         val.i_int = AOUT_VAR_5_1;
         break;

modules/audio_output/windows_audio_common.h

@@ -118,12 +118,18 @@ typedef struct {
 #ifndef DSSPEAKER_5POINT1
 #   define DSSPEAKER_5POINT1              0x00000006
 #endif
+#ifndef DSSPEAKER_5POINT1_BACK
+#   define DSSPEAKER_5POINT1_BACK         DSSPEAKER_5POINT1
+#endif
 #ifndef DSSPEAKER_7POINT1
 #   define DSSPEAKER_7POINT1              0x00000007
 #endif
 #ifndef DSSPEAKER_7POINT1_SURROUND
 #   define DSSPEAKER_7POINT1_SURROUND     0x00000008
 #endif
+#ifndef DSSPEAKER_5POINT1_SURROUND
+#   define DSSPEAKER_5POINT1_SURROUND     0x00000009
+#endif
 #ifndef DSSPEAKER_7POINT1_WIDE
 #   define DSSPEAKER_7POINT1_WIDE         DSSPEAKER_7POINT1
 #endif