aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2013-06-22 20:05:04 +0000
committerDimitri Sokolyuk <demon@dim13.org>2013-06-22 20:05:04 +0000
commit6b5eafcd63a1f82783539d901a88cdaa839e2567 (patch)
tree32192d84d33af98c114b2608eb09e5268e9e9899
parentcfdd8e839e2adfb02fb7b12d30d79b489e442447 (diff)
-rw-r--r--spectrogram.c20
1 files changed, 6 insertions, 14 deletions
diff --git a/spectrogram.c b/spectrogram.c
index 8815142..2755bea 100644
--- a/spectrogram.c
+++ b/spectrogram.c
@@ -63,9 +63,7 @@ struct data {
double *left;
double *right;
int *left_shadow;
- int *left_shadow_max;
int *right_shadow;
- int *right_shadow_max;
int maxval;
unsigned long *wf;
unsigned long *sp;
@@ -207,25 +205,23 @@ draw(struct data *data)
rx, sp_right.y,
rx, sp_right.y + sp_right.height - r - 1);
- if (data->left_shadow[x] < l) {
+ if (data->left_shadow[x] < l)
data->left_shadow[x] = l;
- data->left_shadow_max[x] = l;
- } else if(data->left_shadow[x] > 0) {
+ else if(data->left_shadow[x] > 0) {
data->left_shadow[x]--;
XSetForeground(dsp, gc,
- data->sp[data->left_shadow_max[x] - 1]);
+ data->sp[data->left_shadow[x] - 1]);
XDrawPoint(dsp, pix, gc,
lx, sp_left.y + sp_left.height
- data->left_shadow[x] - 1);
}
- if (data->right_shadow[x] < r) {
+ if (data->right_shadow[x] < r)
data->right_shadow[x] = r;
- data->right_shadow_max[x] = r;
- } else if(data->right_shadow[x] > 0) {
+ else if(data->right_shadow[x] > 0) {
data->right_shadow[x]--;
XSetForeground(dsp, gc,
- data->sp[data->right_shadow_max[x] - 1]);
+ data->sp[data->right_shadow[x] - 1]);
XDrawPoint(dsp, pix, gc,
rx, sp_right.y + sp_right.height
- data->right_shadow[x] - 1);
@@ -330,9 +326,7 @@ main(int argc, char **argv)
data.left = calloc(delta, sizeof(double));
data.right = calloc(delta, sizeof(double));
data.left_shadow = calloc(delta, sizeof(int));
- data.left_shadow_max = calloc(delta, sizeof(int));
data.right_shadow = calloc(delta, sizeof(int));
- data.right_shadow_max = calloc(delta, sizeof(int));
if (!data.left || !data.right)
errx(1, "malloc failed");
@@ -390,9 +384,7 @@ main(int argc, char **argv)
del_fft(fft);
free(data.left_shadow);
- free(data.left_shadow_max);
free(data.right_shadow);
- free(data.right_shadow_max);
free(data.left);
free(data.right);
free(data.buffer);