diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-06-10 20:00:23 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-06-10 20:00:23 +0400 |
| commit | c092ee861a7b581859f38531612215fcb5d06044 (patch) | |
| tree | 5a54fe30f68d1c2a607846b567e9995ffedfb199 /src | |
| parent | 85b22ecd270bd4fc1c91bb35d1e244a26900e602 (diff) | |
cosmetics
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@5078 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src')
| -rw-r--r-- | src/DSUtil/AudioParser.cpp | 78 | ||||
| -rw-r--r-- | src/SubPic/CoordGeom.cpp | 2 |
2 files changed, 40 insertions, 40 deletions
diff --git a/src/DSUtil/AudioParser.cpp b/src/DSUtil/AudioParser.cpp index 1a621b975..8d7a0e7e4 100644 --- a/src/DSUtil/AudioParser.cpp +++ b/src/DSUtil/AudioParser.cpp @@ -261,35 +261,35 @@ DWORD GetDefChannelMask(WORD nChannels) {
switch (nChannels) {
case 1: // 1.0 Mono (KSAUDIO_SPEAKER_MONO)
- return SPEAKER_FRONT_CENTER;
+ return SPEAKER_FRONT_CENTER;
case 2: // 2.0 Stereo (KSAUDIO_SPEAKER_STEREO)
- return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT;
+ return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT;
case 3: // 2.1 Stereo
- return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_LOW_FREQUENCY;
+ return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_LOW_FREQUENCY;
case 4: // 4.0 Quad (KSAUDIO_SPEAKER_QUAD)
- return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT
- | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT;
+ return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT
+ | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT;
case 5: // 5.0
- return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER
- | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT;
+ return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER
+ | 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;
+ 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_BACK_CENTER
- | SPEAKER_SIDE_LEFT | SPEAKER_SIDE_RIGHT;
+ return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER
+ | SPEAKER_LOW_FREQUENCY | SPEAKER_BACK_CENTER
+ | SPEAKER_SIDE_LEFT | SPEAKER_SIDE_RIGHT;
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;
+ 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;
+ 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;
+ return 0;
}
}
@@ -300,32 +300,32 @@ DWORD GetVorbisChannelMask(WORD nChannels) // http://flac.sourceforge.net/format.html#frame_header
switch (nChannels) {
case 1: // 1.0 Mono (KSAUDIO_SPEAKER_MONO)
- return SPEAKER_FRONT_CENTER;
+ return SPEAKER_FRONT_CENTER;
case 2: // 2.0 Stereo (KSAUDIO_SPEAKER_STEREO)
- return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT;
+ return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT;
case 3: // 3.0
- return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_CENTER | SPEAKER_FRONT_RIGHT;
+ return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_CENTER | SPEAKER_FRONT_RIGHT;
case 4: // 4.0 Quad (KSAUDIO_SPEAKER_QUAD)
- return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT
- | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT;
+ return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT
+ | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT;
case 5: // 5.0
- return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_CENTER | SPEAKER_FRONT_RIGHT
- | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT;
+ return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_CENTER | SPEAKER_FRONT_RIGHT
+ | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT;
case 6: // 5.1 (KSAUDIO_SPEAKER_5POINT1)
- return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_CENTER | SPEAKER_FRONT_RIGHT
- | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT
- | SPEAKER_LOW_FREQUENCY;
+ return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_CENTER | SPEAKER_FRONT_RIGHT
+ | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT
+ | SPEAKER_LOW_FREQUENCY;
case 7: // 6.1 Side
- return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_CENTER | SPEAKER_FRONT_RIGHT
- | SPEAKER_SIDE_LEFT | SPEAKER_SIDE_RIGHT
- | SPEAKER_BACK_CENTER
- | SPEAKER_LOW_FREQUENCY;
+ return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_CENTER | SPEAKER_FRONT_RIGHT
+ | SPEAKER_SIDE_LEFT | SPEAKER_SIDE_RIGHT
+ | SPEAKER_BACK_CENTER
+ | SPEAKER_LOW_FREQUENCY;
case 8: // 7.1 Surround (KSAUDIO_SPEAKER_7POINT1_SURROUND)
- return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_CENTER | SPEAKER_FRONT_RIGHT
- | SPEAKER_SIDE_LEFT | SPEAKER_SIDE_RIGHT
- | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT
- | SPEAKER_LOW_FREQUENCY;
+ return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_CENTER | SPEAKER_FRONT_RIGHT
+ | SPEAKER_SIDE_LEFT | SPEAKER_SIDE_RIGHT
+ | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT
+ | SPEAKER_LOW_FREQUENCY;
default:
- return 0;
+ return 0;
}
}
diff --git a/src/SubPic/CoordGeom.cpp b/src/SubPic/CoordGeom.cpp index b143fe592..2c43f10f6 100644 --- a/src/SubPic/CoordGeom.cpp +++ b/src/SubPic/CoordGeom.cpp @@ -366,7 +366,7 @@ float Ray::GetDistanceFrom(Ray& r) {
float t = (d | r.d);
if (IsZero(t)) {
- return (float)-BIGNUMBER; // plane is paralell to the ray, return -infinite
+ return -BIGNUMBER; // plane is paralell to the ray, return -infinite
}
return (((r.p - p) | r.d) / t);
}
|