use struct initializer for audio.c
Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
		
							parent
							
								
									777aec7ac9
								
							
						
					
					
						commit
						14658cd151
					
				@ -60,45 +60,45 @@ static struct {
 | 
				
			|||||||
    int plive;
 | 
					    int plive;
 | 
				
			||||||
    int log_to_monitor;
 | 
					    int log_to_monitor;
 | 
				
			||||||
} conf = {
 | 
					} conf = {
 | 
				
			||||||
    {                           /* DAC fixed settings */
 | 
					    .fixed_out = { /* DAC fixed settings */
 | 
				
			||||||
        1,                      /* enabled */
 | 
					        .enabled = 1,
 | 
				
			||||||
        1,                      /* nb_voices */
 | 
					        .nb_voices = 1,
 | 
				
			||||||
        1,                      /* greedy */
 | 
					        .greedy = 1,
 | 
				
			||||||
        {
 | 
					        .settings = {
 | 
				
			||||||
            44100,              /* freq */
 | 
					            .freq = 44100,
 | 
				
			||||||
            2,                  /* nchannels */
 | 
					            .nchannels = 2,
 | 
				
			||||||
            AUD_FMT_S16,        /* fmt */
 | 
					            .fmt = AUD_FMT_S16,
 | 
				
			||||||
            AUDIO_HOST_ENDIANNESS
 | 
					            .endianness =  AUDIO_HOST_ENDIANNESS,
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    {                           /* ADC fixed settings */
 | 
					    .fixed_in = { /* ADC fixed settings */
 | 
				
			||||||
        1,                      /* enabled */
 | 
					        .enabled = 1,
 | 
				
			||||||
        1,                      /* nb_voices */
 | 
					        .nb_voices = 1,
 | 
				
			||||||
        1,                      /* greedy */
 | 
					        .greedy = 1,
 | 
				
			||||||
        {
 | 
					        .settings = {
 | 
				
			||||||
            44100,              /* freq */
 | 
					            .freq = 44100,
 | 
				
			||||||
            2,                  /* nchannels */
 | 
					            .nchannels = 2,
 | 
				
			||||||
            AUD_FMT_S16,        /* fmt */
 | 
					            .fmt = AUD_FMT_S16,
 | 
				
			||||||
            AUDIO_HOST_ENDIANNESS
 | 
					            .endianness = AUDIO_HOST_ENDIANNESS,
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    { 250 },                    /* period */
 | 
					    .period = { .ticks = 250 },
 | 
				
			||||||
    0,                          /* plive */
 | 
					    .plive = 0,
 | 
				
			||||||
    0                           /* log_to_monitor */
 | 
					    .log_to_monitor = 0,
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static AudioState glob_audio_state;
 | 
					static AudioState glob_audio_state;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct mixeng_volume nominal_volume = {
 | 
					struct mixeng_volume nominal_volume = {
 | 
				
			||||||
    0,
 | 
					    .mute = 0,
 | 
				
			||||||
#ifdef FLOAT_MIXENG
 | 
					#ifdef FLOAT_MIXENG
 | 
				
			||||||
    1.0,
 | 
					    .r = 1.0,
 | 
				
			||||||
    1.0
 | 
					    .l = 1.0,
 | 
				
			||||||
#else
 | 
					#else
 | 
				
			||||||
    1ULL << 32,
 | 
					    .r = 1ULL << 32,
 | 
				
			||||||
    1ULL << 32
 | 
					    .l = 1ULL << 32,
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user