mirror of
				https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
				synced 2025-11-03 09:01:50 -05:00 
			
		
		
		
	Huge trailing whitespace cleanup. Let's keep the tree pure from here on,
mmmkay? git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1418 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
		
							parent
							
								
									1a460ee40a
								
							
						
					
					
						commit
						521daf6f0a
					
				
					 283 changed files with 3742 additions and 3742 deletions
				
			
		| 
						 | 
				
			
			@ -2,17 +2,17 @@
 | 
			
		|||
 | 
			
		||||
/***
 | 
			
		||||
  This file is part of PulseAudio.
 | 
			
		||||
 
 | 
			
		||||
 | 
			
		||||
  PulseAudio is free software; you can redistribute it and/or modify
 | 
			
		||||
  it under the terms of the GNU Lesser General Public License as published
 | 
			
		||||
  by the Free Software Foundation; either version 2 of the License,
 | 
			
		||||
  or (at your option) any later version.
 | 
			
		||||
 
 | 
			
		||||
 | 
			
		||||
  PulseAudio is distributed in the hope that it will be useful, but
 | 
			
		||||
  WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
			
		||||
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 | 
			
		||||
  General Public License for more details.
 | 
			
		||||
 
 | 
			
		||||
 | 
			
		||||
  You should have received a copy of the GNU Lesser General Public License
 | 
			
		||||
  along with PulseAudio; if not, write to the Free Software
 | 
			
		||||
  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 | 
			
		||||
| 
						 | 
				
			
			@ -35,23 +35,23 @@
 | 
			
		|||
 | 
			
		||||
const char *const table[] = {
 | 
			
		||||
    [PA_CHANNEL_POSITION_MONO] = "mono",
 | 
			
		||||
    
 | 
			
		||||
 | 
			
		||||
    [PA_CHANNEL_POSITION_FRONT_CENTER] = "front-center",
 | 
			
		||||
    [PA_CHANNEL_POSITION_FRONT_LEFT] = "front-left",
 | 
			
		||||
    [PA_CHANNEL_POSITION_FRONT_RIGHT] = "front-right",
 | 
			
		||||
    
 | 
			
		||||
 | 
			
		||||
    [PA_CHANNEL_POSITION_REAR_CENTER] = "rear-center",
 | 
			
		||||
    [PA_CHANNEL_POSITION_REAR_LEFT] = "rear-left",
 | 
			
		||||
    [PA_CHANNEL_POSITION_REAR_RIGHT] = "rear-right",
 | 
			
		||||
    
 | 
			
		||||
 | 
			
		||||
    [PA_CHANNEL_POSITION_LFE] = "lfe",
 | 
			
		||||
    
 | 
			
		||||
 | 
			
		||||
    [PA_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER] = "front-left-of-center",
 | 
			
		||||
    [PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER] = "front-right-of-center",
 | 
			
		||||
        
 | 
			
		||||
 | 
			
		||||
    [PA_CHANNEL_POSITION_SIDE_LEFT] = "side-left",
 | 
			
		||||
    [PA_CHANNEL_POSITION_SIDE_RIGHT] = "side-right",
 | 
			
		||||
    
 | 
			
		||||
 | 
			
		||||
    [PA_CHANNEL_POSITION_AUX0] = "aux0",
 | 
			
		||||
    [PA_CHANNEL_POSITION_AUX1] = "aux1",
 | 
			
		||||
    [PA_CHANNEL_POSITION_AUX2] = "aux2",
 | 
			
		||||
| 
						 | 
				
			
			@ -86,7 +86,7 @@ const char *const table[] = {
 | 
			
		|||
    [PA_CHANNEL_POSITION_AUX31] = "aux31",
 | 
			
		||||
 | 
			
		||||
    [PA_CHANNEL_POSITION_TOP_CENTER] = "top-center",
 | 
			
		||||
    
 | 
			
		||||
 | 
			
		||||
    [PA_CHANNEL_POSITION_TOP_FRONT_LEFT] = "top-front-left",
 | 
			
		||||
    [PA_CHANNEL_POSITION_TOP_FRONT_RIGHT] = "top-front-right",
 | 
			
		||||
    [PA_CHANNEL_POSITION_TOP_FRONT_CENTER] = "top-front-center",
 | 
			
		||||
| 
						 | 
				
			
			@ -140,14 +140,14 @@ pa_channel_map* pa_channel_map_init_auto(pa_channel_map *m, unsigned channels, p
 | 
			
		|||
 | 
			
		||||
    switch (def) {
 | 
			
		||||
        case PA_CHANNEL_MAP_AIFF:
 | 
			
		||||
            
 | 
			
		||||
 | 
			
		||||
            /* This is somewhat compatible with RFC3551 */
 | 
			
		||||
            
 | 
			
		||||
 | 
			
		||||
            switch (channels) {
 | 
			
		||||
                case 1:
 | 
			
		||||
                    m->map[0] = PA_CHANNEL_POSITION_MONO;
 | 
			
		||||
                    return m;
 | 
			
		||||
                    
 | 
			
		||||
 | 
			
		||||
                case 6:
 | 
			
		||||
                    m->map[0] = PA_CHANNEL_POSITION_FRONT_LEFT;
 | 
			
		||||
                    m->map[1] = PA_CHANNEL_POSITION_SIDE_LEFT;
 | 
			
		||||
| 
						 | 
				
			
			@ -156,31 +156,31 @@ pa_channel_map* pa_channel_map_init_auto(pa_channel_map *m, unsigned channels, p
 | 
			
		|||
                    m->map[4] = PA_CHANNEL_POSITION_SIDE_RIGHT;
 | 
			
		||||
                    m->map[5] = PA_CHANNEL_POSITION_LFE;
 | 
			
		||||
                    return m;
 | 
			
		||||
                    
 | 
			
		||||
 | 
			
		||||
                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;
 | 
			
		||||
                    /* Fall through */
 | 
			
		||||
                    
 | 
			
		||||
 | 
			
		||||
                case 2:
 | 
			
		||||
                    m->map[0] = PA_CHANNEL_POSITION_FRONT_LEFT;
 | 
			
		||||
                    m->map[1] = PA_CHANNEL_POSITION_FRONT_RIGHT;
 | 
			
		||||
                    return m;
 | 
			
		||||
                    
 | 
			
		||||
 | 
			
		||||
                case 3:
 | 
			
		||||
                    m->map[0] = PA_CHANNEL_POSITION_LEFT;
 | 
			
		||||
                    m->map[1] = PA_CHANNEL_POSITION_RIGHT;
 | 
			
		||||
                    m->map[2] = PA_CHANNEL_POSITION_CENTER;
 | 
			
		||||
                    return m;
 | 
			
		||||
                    
 | 
			
		||||
 | 
			
		||||
                case 4:
 | 
			
		||||
                    m->map[0] = PA_CHANNEL_POSITION_LEFT;
 | 
			
		||||
                    m->map[1] = PA_CHANNEL_POSITION_CENTER;
 | 
			
		||||
                    m->map[2] = PA_CHANNEL_POSITION_RIGHT;
 | 
			
		||||
                    m->map[3] = PA_CHANNEL_POSITION_LFE;
 | 
			
		||||
                    return m;
 | 
			
		||||
                    
 | 
			
		||||
 | 
			
		||||
                default:
 | 
			
		||||
                    return NULL;
 | 
			
		||||
            }
 | 
			
		||||
| 
						 | 
				
			
			@ -191,43 +191,43 @@ pa_channel_map* pa_channel_map_init_auto(pa_channel_map *m, unsigned channels, p
 | 
			
		|||
                case 1:
 | 
			
		||||
                    m->map[0] = PA_CHANNEL_POSITION_MONO;
 | 
			
		||||
                    return m;
 | 
			
		||||
                    
 | 
			
		||||
 | 
			
		||||
                case 8:
 | 
			
		||||
                    m->map[6] = PA_CHANNEL_POSITION_SIDE_LEFT;
 | 
			
		||||
                    m->map[7] = PA_CHANNEL_POSITION_SIDE_RIGHT;
 | 
			
		||||
                    /* Fall through */
 | 
			
		||||
                    
 | 
			
		||||
 | 
			
		||||
                case 6:
 | 
			
		||||
                    m->map[5] = PA_CHANNEL_POSITION_LFE;
 | 
			
		||||
                    /* Fall through */
 | 
			
		||||
                    
 | 
			
		||||
 | 
			
		||||
                case 5:
 | 
			
		||||
                    m->map[4] = PA_CHANNEL_POSITION_FRONT_CENTER;
 | 
			
		||||
                    /* Fall through */
 | 
			
		||||
                    
 | 
			
		||||
 | 
			
		||||
                case 4:
 | 
			
		||||
                    m->map[2] = PA_CHANNEL_POSITION_REAR_LEFT;
 | 
			
		||||
                    m->map[3] = PA_CHANNEL_POSITION_REAR_RIGHT;
 | 
			
		||||
                    /* Fall through */
 | 
			
		||||
                    
 | 
			
		||||
 | 
			
		||||
                case 2:
 | 
			
		||||
                    m->map[0] = PA_CHANNEL_POSITION_FRONT_LEFT;
 | 
			
		||||
                    m->map[1] = PA_CHANNEL_POSITION_FRONT_RIGHT;
 | 
			
		||||
                    return m;
 | 
			
		||||
                    
 | 
			
		||||
 | 
			
		||||
                default:
 | 
			
		||||
                    return NULL;
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
        case PA_CHANNEL_MAP_AUX: {
 | 
			
		||||
            unsigned i;
 | 
			
		||||
            
 | 
			
		||||
 | 
			
		||||
            if (channels >= PA_CHANNELS_MAX)
 | 
			
		||||
                return NULL;
 | 
			
		||||
 | 
			
		||||
            for (i = 0; i < channels; i++)
 | 
			
		||||
                m->map[i] = PA_CHANNEL_POSITION_AUX0 + i;
 | 
			
		||||
            
 | 
			
		||||
 | 
			
		||||
            return m;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -237,55 +237,55 @@ pa_channel_map* pa_channel_map_init_auto(pa_channel_map *m, unsigned channels, p
 | 
			
		|||
                case 1:
 | 
			
		||||
                    m->map[0] = PA_CHANNEL_POSITION_MONO;
 | 
			
		||||
                    return m;
 | 
			
		||||
                    
 | 
			
		||||
 | 
			
		||||
                case 18:
 | 
			
		||||
                    m->map[15] = PA_CHANNEL_POSITION_TOP_REAR_LEFT;
 | 
			
		||||
                    m->map[16] = PA_CHANNEL_POSITION_TOP_REAR_CENTER;
 | 
			
		||||
                    m->map[17] = PA_CHANNEL_POSITION_TOP_REAR_RIGHT;
 | 
			
		||||
                    /* Fall through */
 | 
			
		||||
                    
 | 
			
		||||
 | 
			
		||||
                case 15:
 | 
			
		||||
                    m->map[12] = PA_CHANNEL_POSITION_TOP_FRONT_LEFT;
 | 
			
		||||
                    m->map[13] = PA_CHANNEL_POSITION_TOP_FRONT_CENTER;
 | 
			
		||||
                    m->map[14] = PA_CHANNEL_POSITION_TOP_FRONT_RIGHT;
 | 
			
		||||
                    /* Fall through */
 | 
			
		||||
                    
 | 
			
		||||
 | 
			
		||||
                case 12:
 | 
			
		||||
                    m->map[11] = PA_CHANNEL_POSITION_TOP_CENTER;
 | 
			
		||||
                    /* Fall through */
 | 
			
		||||
                    
 | 
			
		||||
 | 
			
		||||
                case 11:
 | 
			
		||||
                    m->map[9] = PA_CHANNEL_POSITION_SIDE_LEFT;
 | 
			
		||||
                    m->map[10] = PA_CHANNEL_POSITION_SIDE_RIGHT;
 | 
			
		||||
                    /* Fall through */
 | 
			
		||||
                    
 | 
			
		||||
 | 
			
		||||
                case 9:
 | 
			
		||||
                    m->map[8] = PA_CHANNEL_POSITION_REAR_CENTER;
 | 
			
		||||
                    /* 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[4] = PA_CHANNEL_POSITION_REAR_LEFT;
 | 
			
		||||
                    m->map[5] = PA_CHANNEL_POSITION_REAR_RIGHT;
 | 
			
		||||
                    /* Fall through */
 | 
			
		||||
                    
 | 
			
		||||
 | 
			
		||||
                case 4:
 | 
			
		||||
                    m->map[3] = PA_CHANNEL_POSITION_LFE;
 | 
			
		||||
                    /* Fall through */
 | 
			
		||||
                    
 | 
			
		||||
 | 
			
		||||
                case 3:
 | 
			
		||||
                    m->map[2] = PA_CHANNEL_POSITION_FRONT_CENTER;
 | 
			
		||||
                    /* Fall through */
 | 
			
		||||
                    
 | 
			
		||||
 | 
			
		||||
                case 2:
 | 
			
		||||
                    m->map[0] = PA_CHANNEL_POSITION_FRONT_LEFT;
 | 
			
		||||
                    m->map[1] = PA_CHANNEL_POSITION_FRONT_RIGHT;
 | 
			
		||||
                    return m;
 | 
			
		||||
                    
 | 
			
		||||
 | 
			
		||||
                default:
 | 
			
		||||
                    return NULL;
 | 
			
		||||
            }
 | 
			
		||||
| 
						 | 
				
			
			@ -296,12 +296,12 @@ pa_channel_map* pa_channel_map_init_auto(pa_channel_map *m, unsigned channels, p
 | 
			
		|||
                case 1:
 | 
			
		||||
                    m->map[0] = PA_CHANNEL_POSITION_MONO;
 | 
			
		||||
                    return m;
 | 
			
		||||
                    
 | 
			
		||||
 | 
			
		||||
                case 8:
 | 
			
		||||
                    m->map[6] = PA_CHANNEL_POSITION_REAR_LEFT;
 | 
			
		||||
                    m->map[7] = PA_CHANNEL_POSITION_REAR_RIGHT;
 | 
			
		||||
                    /* Fall through */
 | 
			
		||||
                    
 | 
			
		||||
 | 
			
		||||
                case 6:
 | 
			
		||||
                    m->map[4] = PA_CHANNEL_POSITION_SIDE_LEFT;
 | 
			
		||||
                    m->map[5] = PA_CHANNEL_POSITION_SIDE_RIGHT;
 | 
			
		||||
| 
						 | 
				
			
			@ -310,20 +310,20 @@ pa_channel_map* pa_channel_map_init_auto(pa_channel_map *m, unsigned channels, p
 | 
			
		|||
                case 4:
 | 
			
		||||
                    m->map[3] = PA_CHANNEL_POSITION_LFE;
 | 
			
		||||
                    /* Fall through */
 | 
			
		||||
                    
 | 
			
		||||
 | 
			
		||||
                case 3:
 | 
			
		||||
                    m->map[2] = PA_CHANNEL_POSITION_FRONT_CENTER;
 | 
			
		||||
                    /* Fall through */
 | 
			
		||||
                    
 | 
			
		||||
 | 
			
		||||
                case 2:
 | 
			
		||||
                    m->map[0] = PA_CHANNEL_POSITION_FRONT_LEFT;
 | 
			
		||||
                    m->map[1] = PA_CHANNEL_POSITION_FRONT_RIGHT;
 | 
			
		||||
                    return m;
 | 
			
		||||
                    
 | 
			
		||||
 | 
			
		||||
                default:
 | 
			
		||||
                    return NULL;
 | 
			
		||||
            }
 | 
			
		||||
            
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        default:
 | 
			
		||||
            return NULL;
 | 
			
		||||
| 
						 | 
				
			
			@ -341,13 +341,13 @@ const char* pa_channel_position_to_string(pa_channel_position_t pos) {
 | 
			
		|||
 | 
			
		||||
int pa_channel_map_equal(const pa_channel_map *a, const pa_channel_map *b) {
 | 
			
		||||
    unsigned c;
 | 
			
		||||
    
 | 
			
		||||
 | 
			
		||||
    assert(a);
 | 
			
		||||
    assert(b);
 | 
			
		||||
 | 
			
		||||
    if (a->channels != b->channels)
 | 
			
		||||
        return 0;
 | 
			
		||||
    
 | 
			
		||||
 | 
			
		||||
    for (c = 0; c < a->channels; c++)
 | 
			
		||||
        if (a->map[c] != b->map[c])
 | 
			
		||||
            return 0;
 | 
			
		||||
| 
						 | 
				
			
			@ -359,7 +359,7 @@ char* pa_channel_map_snprint(char *s, size_t l, const pa_channel_map *map) {
 | 
			
		|||
    unsigned channel;
 | 
			
		||||
    int first = 1;
 | 
			
		||||
    char *e;
 | 
			
		||||
    
 | 
			
		||||
 | 
			
		||||
    assert(s);
 | 
			
		||||
    assert(l > 0);
 | 
			
		||||
    assert(map);
 | 
			
		||||
| 
						 | 
				
			
			@ -382,7 +382,7 @@ pa_channel_map *pa_channel_map_parse(pa_channel_map *rmap, const char *s) {
 | 
			
		|||
    const char *state;
 | 
			
		||||
    pa_channel_map map;
 | 
			
		||||
    char *p;
 | 
			
		||||
    
 | 
			
		||||
 | 
			
		||||
    assert(rmap);
 | 
			
		||||
    assert(s);
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -397,14 +397,14 @@ pa_channel_map *pa_channel_map_parse(pa_channel_map *rmap, const char *s) {
 | 
			
		|||
 | 
			
		||||
    state = NULL;
 | 
			
		||||
    map.channels = 0;
 | 
			
		||||
    
 | 
			
		||||
 | 
			
		||||
    while ((p = pa_split(s, ",", &state))) {
 | 
			
		||||
 | 
			
		||||
        if (map.channels >= PA_CHANNELS_MAX) {
 | 
			
		||||
            pa_xfree(p);
 | 
			
		||||
            return NULL;
 | 
			
		||||
        }
 | 
			
		||||
        
 | 
			
		||||
 | 
			
		||||
        /* Some special aliases */
 | 
			
		||||
        if (strcmp(p, "left") == 0)
 | 
			
		||||
            map.map[map.channels++] = PA_CHANNEL_POSITION_LEFT;
 | 
			
		||||
| 
						 | 
				
			
			@ -416,13 +416,13 @@ pa_channel_map *pa_channel_map_parse(pa_channel_map *rmap, const char *s) {
 | 
			
		|||
            map.map[map.channels++] = PA_CHANNEL_POSITION_SUBWOOFER;
 | 
			
		||||
        else {
 | 
			
		||||
            pa_channel_position_t i;
 | 
			
		||||
            
 | 
			
		||||
 | 
			
		||||
            for (i = 0; i < PA_CHANNEL_POSITION_MAX; i++)
 | 
			
		||||
                if (strcmp(p, table[i]) == 0) {
 | 
			
		||||
                    map.map[map.channels++] = i;
 | 
			
		||||
                    break;
 | 
			
		||||
                }
 | 
			
		||||
            
 | 
			
		||||
 | 
			
		||||
            if (i >= PA_CHANNEL_POSITION_MAX) {
 | 
			
		||||
                pa_xfree(p);
 | 
			
		||||
                return NULL;
 | 
			
		||||
| 
						 | 
				
			
			@ -433,24 +433,24 @@ pa_channel_map *pa_channel_map_parse(pa_channel_map *rmap, const char *s) {
 | 
			
		|||
    }
 | 
			
		||||
 | 
			
		||||
finish:
 | 
			
		||||
    
 | 
			
		||||
 | 
			
		||||
    if (!pa_channel_map_valid(&map))
 | 
			
		||||
        return NULL;
 | 
			
		||||
    
 | 
			
		||||
 | 
			
		||||
    *rmap = map;
 | 
			
		||||
    return rmap;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
int pa_channel_map_valid(const pa_channel_map *map) {
 | 
			
		||||
    unsigned c;
 | 
			
		||||
    
 | 
			
		||||
 | 
			
		||||
    assert(map);
 | 
			
		||||
 | 
			
		||||
    if (map->channels <= 0 || map->channels > PA_CHANNELS_MAX)
 | 
			
		||||
        return 0;
 | 
			
		||||
 | 
			
		||||
    for (c = 0; c < map->channels; c++) {
 | 
			
		||||
        
 | 
			
		||||
 | 
			
		||||
        if (map->map[c] < 0 ||map->map[c] >= PA_CHANNEL_POSITION_MAX)
 | 
			
		||||
            return 0;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue