moved GetDefChannelMask from DSUtil.h to AudioParser.h and use 5.0 instead of 4.1 for five channels

AudioParser: added GetVorbisChannelMask

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@5073 10f7b99b-c216-0410-bff0-8a66a9350fd8

1 files changed, 0 insertions, 36 deletions

diff --git a/src/DSUtil/DSUtil.cpp b/src/DSUtil/DSUtil.cpp
index 4f1ed4836..80916ce96 100644
--- a/src/DSUtil/DSUtil.cpp
+++ b/src/DSUtil/DSUtil.cpp
@@ -2829,42 +2829,6 @@ void HexDump(CString fileName, BYTE* buf, int size)
 	}

 }

 

-DWORD GetDefChannelMask(WORD nChannels)

-{

-	switch (nChannels) {

-		case 1: // 1.0 Mono

-				return SPEAKER_FRONT_CENTER;

-		case 2: // 2.0 Stereo

-				return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT;

-		case 3: // 2.1 Stereo

-				return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_LOW_FREQUENCY;

-		case 4: // 4.0 Quad

-				return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT

-					   | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT;

-		case 5: // 4.1

-				return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_LOW_FREQUENCY

-					   | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT;

-		case 6: // 5.1 Side (KSAUDIO_SPEAKER_5POINT1_SURROUND)

-				return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER

-					   | SPEAKER_LOW_FREQUENCY | SPEAKER_SIDE_LEFT | SPEAKER_SIDE_RIGHT;

-		case 7: // 6.1 Side

-				return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER

-					   | SPEAKER_LOW_FREQUENCY | SPEAKER_SIDE_LEFT | SPEAKER_SIDE_RIGHT

-					   | SPEAKER_BACK_CENTER;

-		case 8: // 7.1 Surround (KSAUDIO_SPEAKER_7POINT1_SURROUND)

-				return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER

-					   | SPEAKER_LOW_FREQUENCY | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT

-					   | SPEAKER_SIDE_LEFT | SPEAKER_SIDE_RIGHT;

-		case 10: // 9.1 Surround

-				return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER

-					   | SPEAKER_LOW_FREQUENCY | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT

-					   | SPEAKER_SIDE_LEFT | SPEAKER_SIDE_RIGHT

-					   | SPEAKER_TOP_FRONT_LEFT | SPEAKER_TOP_FRONT_RIGHT;

-		default:

-				return 0;

-	}

-}

-

 void CorrectComboListWidth(CComboBox& m_pComboBox)

 {

 	// Find the longest string in the combo box.