Deleted Added
full compact
matrix.h (193640) matrix.h (243138)
1/*-
2 * Copyright (c) 2007-2009 Ariff Abdullah <ariff@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 2007-2009 Ariff Abdullah <ariff@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $FreeBSD: head/sys/dev/sound/pcm/matrix.h 193640 2009-06-07 19:12:08Z ariff $
26 * $FreeBSD: head/sys/dev/sound/pcm/matrix.h 243138 2012-11-16 07:05:57Z mav $
27 */
28
29#ifndef _SND_MATRIX_H_
30#define _SND_MATRIX_H_
31
32#undef SND_MULTICHANNEL
33#ifndef SND_OLDSTEREO
34#define SND_MULTICHANNEL 1

--- 94 unchanged lines hidden (view full) ---

129#define SND_CHN_MATRIX_2_0 1
130#define SND_CHN_MATRIX_2 SND_CHN_MATRIX_2_0
131
132/* 3 @ 2.1 (lfe), 3.0 (rear center, DEFAULT) */
133#define SND_CHN_MATRIX_2_1 2
134#define SND_CHN_MATRIX_3_0 3
135#define SND_CHN_MATRIX_3 SND_CHN_MATRIX_3_0
136
27 */
28
29#ifndef _SND_MATRIX_H_
30#define _SND_MATRIX_H_
31
32#undef SND_MULTICHANNEL
33#ifndef SND_OLDSTEREO
34#define SND_MULTICHANNEL 1

--- 94 unchanged lines hidden (view full) ---

129#define SND_CHN_MATRIX_2_0 1
130#define SND_CHN_MATRIX_2 SND_CHN_MATRIX_2_0
131
132/* 3 @ 2.1 (lfe), 3.0 (rear center, DEFAULT) */
133#define SND_CHN_MATRIX_2_1 2
134#define SND_CHN_MATRIX_3_0 3
135#define SND_CHN_MATRIX_3 SND_CHN_MATRIX_3_0
136
137/* 4 @ 4.0 Quadraphonic */
138#define SND_CHN_MATRIX_4_0 4
137/* 4 @ 3.1 (lfe), 4.0 (Quadraphonic, DEFAULT) */
138#define SND_CHN_MATRIX_3_1 4
139#define SND_CHN_MATRIX_4_0 5
139#define SND_CHN_MATRIX_4 SND_CHN_MATRIX_4_0
140
141/* 5 @ 4.1 (lfe), 5.0 (center, DEFAULT) */
140#define SND_CHN_MATRIX_4 SND_CHN_MATRIX_4_0
141
142/* 5 @ 4.1 (lfe), 5.0 (center, DEFAULT) */
142#define SND_CHN_MATRIX_4_1 5
143#define SND_CHN_MATRIX_5_0 6
143#define SND_CHN_MATRIX_4_1 6
144#define SND_CHN_MATRIX_5_0 7
144#define SND_CHN_MATRIX_5 SND_CHN_MATRIX_5_0
145
146/* 6 @ 5.1 (lfe, DEFAULT), 6.0 (rear center) */
145#define SND_CHN_MATRIX_5 SND_CHN_MATRIX_5_0
146
147/* 6 @ 5.1 (lfe, DEFAULT), 6.0 (rear center) */
147#define SND_CHN_MATRIX_5_1 7
148#define SND_CHN_MATRIX_6_0 8
148#define SND_CHN_MATRIX_5_1 8
149#define SND_CHN_MATRIX_6_0 9
149#define SND_CHN_MATRIX_6 SND_CHN_MATRIX_5_1
150
150#define SND_CHN_MATRIX_6 SND_CHN_MATRIX_5_1
151
151/* 7 @ 6.1 (lfe) */
152#define SND_CHN_MATRIX_6_1 9
152/* 7 @ 6.1 (lfe, DEFAULT), 7.0 */
153#define SND_CHN_MATRIX_6_1 10
154#define SND_CHN_MATRIX_7_0 11
153#define SND_CHN_MATRIX_7 SND_CHN_MATRIX_6_1
154
155/* 8 @ 7.1 (lfe) */
155#define SND_CHN_MATRIX_7 SND_CHN_MATRIX_6_1
156
157/* 8 @ 7.1 (lfe) */
156#define SND_CHN_MATRIX_7_1 10
158#define SND_CHN_MATRIX_7_1 12
157#define SND_CHN_MATRIX_8 SND_CHN_MATRIX_7_1
158
159#define SND_CHN_MATRIX_8 SND_CHN_MATRIX_7_1
160
159#define SND_CHN_MATRIX_MAX 11
161#define SND_CHN_MATRIX_MAX 13
160
161#define SND_CHN_MATRIX_BEGIN SND_CHN_MATRIX_1_0
162#define SND_CHN_MATRIX_END SND_CHN_MATRIX_7_1
163
164/* Custom matrix identity */
165#define SND_CHN_MATRIX_DRV -4 /* driver own identity */
166#define SND_CHN_MATRIX_PCMCHANNEL -3 /* PCM channel identity */
167#define SND_CHN_MATRIX_MISC -2 /* misc, custom defined */

--- 51 unchanged lines hidden ---
162
163#define SND_CHN_MATRIX_BEGIN SND_CHN_MATRIX_1_0
164#define SND_CHN_MATRIX_END SND_CHN_MATRIX_7_1
165
166/* Custom matrix identity */
167#define SND_CHN_MATRIX_DRV -4 /* driver own identity */
168#define SND_CHN_MATRIX_PCMCHANNEL -3 /* PCM channel identity */
169#define SND_CHN_MATRIX_MISC -2 /* misc, custom defined */

--- 51 unchanged lines hidden ---