Mercurial > mplayer.hg
changeset 32078:0dfbb22d68c8
Get rid of MPLAYER_DSP_H hack and #include dsp.h instead.
If dsp.h #inclusion is a prerequisite for window.h/filter.h, the clean solution
is to have those headers #include dsp.h directly instead of relying on the user.
| author | diego |
|---|---|
| date | Sat, 11 Sep 2010 22:11:40 +0000 |
| parents | db0bb7511440 |
| children | 2e56ec7a0a7f |
| files | libaf/filter.h libaf/window.h |
| diffstat | 2 files changed, 4 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/libaf/filter.h Sat Sep 11 14:56:52 2010 +0000 +++ b/libaf/filter.h Sat Sep 11 22:11:40 2010 +0000 @@ -18,13 +18,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if !defined MPLAYER_DSP_H -# error Never use filter.h directly; include dsp.h instead. -#endif - #ifndef MPLAYER_FILTER_H #define MPLAYER_FILTER_H +#include "dsp.h" + // Design and implementation of different types of digital filters
--- a/libaf/window.h Sat Sep 11 14:56:52 2010 +0000 +++ b/libaf/window.h Sat Sep 11 22:11:40 2010 +0000 @@ -25,13 +25,11 @@ coefficients will be stored. */ -#if !defined MPLAYER_DSP_H -# error Never use window.h directly; include dsp.h instead. -#endif - #ifndef MPLAYER_WINDOW_H #define MPLAYER_WINDOW_H +#include "dsp.h" + void af_window_boxcar(int n, FLOAT_TYPE* w); void af_window_triang(int n, FLOAT_TYPE* w); void af_window_hanning(int n, FLOAT_TYPE* w);