Skip to content

V
vlc-1.1
Commit 6e9c1d1e authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Visual: reindent (2)

parent 81b22c5a
Hide whitespace changes
Inline Side-by-side
Showing with 117 additions and 117 deletions
modules/visualization/visual/effects.c
View file @ 6e9c1d1e
...@@ -855,134 +855,134 @@ int scope_Run(visual_effect_t * p_effect, aout_instance_t *p_aout, ...@@ -855,134 +855,134 @@ int scope_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
int vuMeter_Run(visual_effect_t * p_effect, aout_instance_t *p_aout, int vuMeter_Run(visual_effect_t * p_effect, aout_instance_t *p_aout,
aout_buffer_t * p_buffer , picture_t * p_picture) aout_buffer_t * p_buffer , picture_t * p_picture)
{ {
VLC_UNUSED(p_aout); VLC_UNUSED(p_aout);
int j; int j;
float i_value_l = 0; float i_value_l = 0;
float i_value_r = 0; float i_value_r = 0;
/* Compute the peack values */ /* Compute the peack values */
for ( unsigned i = 0 ; i < p_buffer->i_nb_samples; i++ ) for ( unsigned i = 0 ; i < p_buffer->i_nb_samples; i++ )
{ {
const float *p_sample = (float *)p_buffer->p_buffer; const float *p_sample = (float *)p_buffer->p_buffer;
float ch; float ch;
ch = p_sample[p_effect->i_idx_left] * 256; ch = p_sample[p_effect->i_idx_left] * 256;
if (ch > i_value_l) if (ch > i_value_l)
i_value_l = ch; i_value_l = ch;
ch = p_sample[p_effect->i_idx_right] * 256; ch = p_sample[p_effect->i_idx_right] * 256;
if (ch > i_value_r) if (ch > i_value_r)
i_value_r = ch; i_value_r = ch;
p_sample += p_effect->i_nb_chans; p_sample += p_effect->i_nb_chans;
} }
i_value_l = abs(i_value_l); i_value_l = abs(i_value_l);
i_value_r = abs(i_value_r); i_value_r = abs(i_value_r);
/* Stay under maximum value admited */ /* Stay under maximum value admited */
if ( i_value_l > 200 * M_PI_2 ) if ( i_value_l > 200 * M_PI_2 )
i_value_l = 200 * M_PI_2; i_value_l = 200 * M_PI_2;
if ( i_value_r > 200 * M_PI_2 ) if ( i_value_r > 200 * M_PI_2 )
i_value_r = 200 * M_PI_2; i_value_r = 200 * M_PI_2;
float *i_value; float *i_value;
if( !p_effect->p_data ) if( !p_effect->p_data )
{ {
/* Allocate memory to save hand positions */ /* Allocate memory to save hand positions */
p_effect->p_data = (void *)malloc( 2 * sizeof(float) ); p_effect->p_data = (void *)malloc( 2 * sizeof(float) );
i_value = p_effect->p_data; i_value = p_effect->p_data;
i_value[0] = i_value_l; i_value[0] = i_value_l;
i_value[1] = i_value_r; i_value[1] = i_value_r;
} }
else else
{ {
/* Make the hands go down slowly if the current values are slower /* Make the hands go down slowly if the current values are slower
than the previous */ than the previous */
i_value = p_effect->p_data; i_value = p_effect->p_data;
if ( i_value_l > i_value[0] - 6 ) if ( i_value_l > i_value[0] - 6 )
i_value[0] = i_value_l; i_value[0] = i_value_l;
else else
i_value[0] = i_value[0] - 6; i_value[0] = i_value[0] - 6;
if ( i_value_r > i_value[1] - 6 ) if ( i_value_r > i_value[1] - 6 )
i_value[1] = i_value_r; i_value[1] = i_value_r;
else else
i_value[1] = i_value[1] - 6; i_value[1] = i_value[1] - 6;
} }
int x, y, k; int x, y, k;
float teta; float teta;
float teta_grad; float teta_grad;
for ( j = 0; j < 2; j++ ) for ( j = 0; j < 2; j++ )
{
/* Draw the two scales */
k = 0;
teta_grad = GRAD_ANGLE_MIN;
for ( teta = -M_PI_4; teta <= M_PI_4; teta = teta + 0.003 )
{ {
/* Draw the two scales */ for ( unsigned i = 140; i <= 150; i++ )
k = 0; {
teta_grad = GRAD_ANGLE_MIN; y = i * cos(teta) + 20;
for ( teta = -M_PI_4; teta <= M_PI_4; teta = teta + 0.003 ) x = i * sin(teta) + 150 + 240 * j;
{ /* Compute the last color for the gradation */
for ( unsigned i = 140; i <= 150; i++ ) if (teta >= teta_grad + GRAD_INCR && teta_grad <= GRAD_ANGLE_MAX)
{
y = i * cos(teta) + 20;
x = i * sin(teta) + 150 + 240 * j;
/* Compute the last color for the gradation */
if (teta >= teta_grad + GRAD_INCR && teta_grad <= GRAD_ANGLE_MAX)
{
teta_grad = teta_grad + GRAD_INCR;
k = k + 5;
}
*(p_picture->p[0].p_pixels +
(p_picture->p[0].i_lines - y - 1 ) * p_picture->p[0].i_pitch
+ x ) = 0x45;
*(p_picture->p[1].p_pixels +
(p_picture->p[1].i_lines - y / 2 - 1 ) * p_picture->p[1].i_pitch
+ x / 2 ) = 0x0;
*(p_picture->p[2].p_pixels +
(p_picture->p[2].i_lines - y / 2 - 1 ) * p_picture->p[2].i_pitch
+ x / 2 ) = 0x4D + k;
}
}
/* Draw the two hands */
teta = (float)i_value[j] / 200 - M_PI_4;
for ( int i = 0; i <= 150; i++ )
{ {
y = i * cos(teta) + 20; teta_grad = teta_grad + GRAD_INCR;
x = i * sin(teta) + 150 + 240 * j; k = k + 5;
*(p_picture->p[0].p_pixels +
(p_picture->p[0].i_lines - y - 1 ) * p_picture->p[0].i_pitch
+ x ) = 0xAD;
*(p_picture->p[1].p_pixels +
(p_picture->p[1].i_lines - y / 2 - 1 ) * p_picture->p[1].i_pitch
+ x / 2 ) = 0xFC;
*(p_picture->p[2].p_pixels +
(p_picture->p[2].i_lines - y / 2 - 1 ) * p_picture->p[2].i_pitch
+ x / 2 ) = 0xAC;
} }
*(p_picture->p[0].p_pixels +
(p_picture->p[0].i_lines - y - 1 ) * p_picture->p[0].i_pitch
+ x ) = 0x45;
*(p_picture->p[1].p_pixels +
(p_picture->p[1].i_lines - y / 2 - 1 ) * p_picture->p[1].i_pitch
+ x / 2 ) = 0x0;
*(p_picture->p[2].p_pixels +
(p_picture->p[2].i_lines - y / 2 - 1 ) * p_picture->p[2].i_pitch
+ x / 2 ) = 0x4D + k;
}
}
/* Draw the hand bases */ /* Draw the two hands */
for ( teta = -M_PI_2; teta <= M_PI_2 + 0.01; teta = teta + 0.003 ) teta = (float)i_value[j] / 200 - M_PI_4;
{ for ( int i = 0; i <= 150; i++ )
for ( int i = 0; i < 10; i++ ) {
{ y = i * cos(teta) + 20;
y = i * cos(teta) + 20; x = i * sin(teta) + 150 + 240 * j;
x = i * sin(teta) + 150 + 240 * j; *(p_picture->p[0].p_pixels +
*(p_picture->p[0].p_pixels + (p_picture->p[0].i_lines - y - 1 ) * p_picture->p[0].i_pitch
(p_picture->p[0].i_lines - y - 1 ) * p_picture->p[0].i_pitch + x ) = 0xAD;
+ x ) = 0xFF; *(p_picture->p[1].p_pixels +
*(p_picture->p[1].p_pixels + (p_picture->p[1].i_lines - y / 2 - 1 ) * p_picture->p[1].i_pitch
(p_picture->p[1].i_lines - y / 2 - 1 ) * p_picture->p[1].i_pitch + x / 2 ) = 0xFC;
+ x / 2 ) = 0x80; *(p_picture->p[2].p_pixels +
*(p_picture->p[2].p_pixels + (p_picture->p[2].i_lines - y / 2 - 1 ) * p_picture->p[2].i_pitch
(p_picture->p[2].i_lines - y / 2 - 1 ) * p_picture->p[2].i_pitch + x / 2 ) = 0xAC;
+ x / 2 ) = 0x80; }
}
}
/* Draw the hand bases */
for ( teta = -M_PI_2; teta <= M_PI_2 + 0.01; teta = teta + 0.003 )
{
for ( int i = 0; i < 10; i++ )
{
y = i * cos(teta) + 20;
x = i * sin(teta) + 150 + 240 * j;
*(p_picture->p[0].p_pixels +
(p_picture->p[0].i_lines - y - 1 ) * p_picture->p[0].i_pitch
+ x ) = 0xFF;
*(p_picture->p[1].p_pixels +
(p_picture->p[1].i_lines - y / 2 - 1 ) * p_picture->p[1].i_pitch
+ x / 2 ) = 0x80;
*(p_picture->p[2].p_pixels +
(p_picture->p[2].i_lines - y / 2 - 1 ) * p_picture->p[2].i_pitch
+ x / 2 ) = 0x80;
}
} }
return 0; }
return 0;
} }
modules/visualization/visual/visual.c
View file @ 6e9c1d1e
...@@ -175,12 +175,12 @@ static const struct ...@@ -175,12 +175,12 @@ static const struct
aout_buffer_t *, picture_t *); aout_buffer_t *, picture_t *);
} pf_effect_run[]= } pf_effect_run[]=
{ {
{ "scope", scope_Run }, { "scope", scope_Run },
{ "vuMeter", vuMeter_Run }, { "vuMeter", vuMeter_Run },
{ "spectrum", spectrum_Run }, { "spectrum", spectrum_Run },
{ "spectrometer", spectrometer_Run }, { "spectrometer", spectrometer_Run },
{ "dummy", dummy_Run}, { "dummy", dummy_Run},
{ NULL, dummy_Run} { NULL, dummy_Run}
}; };
/***************************************************************************** /*****************************************************************************
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment