aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2014-09-02 19:10:11 +0000
committerDimitri Sokolyuk <demon@dim13.org>2014-09-02 19:10:11 +0000
commitdacaf798037d45118f87e57cf21f21ddd8c3e7c1 (patch)
treed677b0d62f9bed234da434871f58c3e8bf0f92e7
parent163caf91829b7ebf2f314c5fdd98b328fa629c4c (diff)
refactor names
-rw-r--r--alsa.c2
-rw-r--r--fft.c4
-rw-r--r--fft.h4
-rw-r--r--sio.c2
-rw-r--r--sio.h2
-rw-r--r--spectrogram.c14
6 files changed, 14 insertions, 14 deletions
diff --git a/alsa.c b/alsa.c
index 9511f4a..9193c6d 100644
--- a/alsa.c
+++ b/alsa.c
@@ -86,7 +86,7 @@ read_sio(struct sio *sio)
}
void
-del_sio(struct sio *sio)
+free_sio(struct sio *sio)
{
snd_pcm_drain(sio->handle);
snd_pcm_close(sio->handle);
diff --git a/fft.c b/fft.c
index 12ef65c..c0827c5 100644
--- a/fft.c
+++ b/fft.c
@@ -66,7 +66,7 @@ init_fft(size_t n)
}
int
-dofft(struct fft *p, int16_t *data, double *out, int odd)
+exec_fft(struct fft *p, int16_t *data, double *out, int odd)
{
int i;
@@ -84,7 +84,7 @@ dofft(struct fft *p, int16_t *data, double *out, int odd)
}
void
-del_fft(struct fft *p)
+free_fft(struct fft *p)
{
fftw_free(p->in);
fftw_free(p->out);
diff --git a/fft.h b/fft.h
index f1dd69a..02b1a69 100644
--- a/fft.h
+++ b/fft.h
@@ -22,8 +22,8 @@ struct fft;
__BEGIN_DECLS
struct fft *init_fft(int);
-int dofft(struct fft *, int16_t *, double *, int);
-void del_fft(struct fft *);
+int exec_fft(struct fft *, int16_t *, double *, int);
+void free_fft(struct fft *);
__END_DECLS
#endif
diff --git a/sio.c b/sio.c
index 54c25ad..4429742 100644
--- a/sio.c
+++ b/sio.c
@@ -103,7 +103,7 @@ read_sio(struct sio *sio)
}
void
-del_sio(struct sio *sio)
+free_sio(struct sio *sio)
{
sio_stop(sio->sio);
sio_close(sio->sio);
diff --git a/sio.h b/sio.h
index c800574..25c2e65 100644
--- a/sio.h
+++ b/sio.h
@@ -23,7 +23,7 @@ struct sio;
__BEGIN_DECLS
struct sio *init_sio(int);
int16_t *read_sio(struct sio *);
-void del_sio(struct sio *);
+void free_sio(struct sio *);
__END_DECLS
#endif
diff --git a/spectrogram.c b/spectrogram.c
index fffb372..b1b7aca 100644
--- a/spectrogram.c
+++ b/spectrogram.c
@@ -304,7 +304,7 @@ init_panel(Display *d, Window win, int x, int y, int w, int h, int mirror)
}
void
-del_panel(Display *d, struct panel *p)
+free_panel(Display *d, struct panel *p)
{
free(p->data);
free(p->palette);
@@ -515,8 +515,8 @@ main(int argc, char **argv)
while (!die) {
buffer = read_sio(sio);
- dofft(fft, buffer, left->data, 0);
- dofft(fft, buffer, right->data, 1);
+ exec_fft(fft, buffer, left->data, 0);
+ exec_fft(fft, buffer, right->data, 1);
draw_panel(dsp, left);
draw_panel(dsp, right);
@@ -554,10 +554,10 @@ main(int argc, char **argv)
}
}
- del_sio(sio);
- del_fft(fft);
- del_panel(dsp, left);
- del_panel(dsp, right);
+ free_sio(sio);
+ free_fft(fft);
+ free_panel(dsp, left);
+ free_panel(dsp, right);
XDestroyWindow(dsp, win);
XCloseDisplay(dsp);