summaryrefslogtreecommitdiffstats
path: root/gst
diff options
context:
space:
mode:
authorSébastien Moutte <sebastien@moutte.net>2006-04-09 17:14:22 +0000
committerSébastien Moutte <sebastien@moutte.net>2006-04-09 17:14:22 +0000
commit078324cd8286894acbdac049de2d404bbd397b4e (patch)
tree6cf6ba5b107f63e432303e2ee9a0f59debefa1e8 /gst
parentaa99af6027716c05207535294673a92c89916cc4 (diff)
downloadgst-plugins-bad-078324cd8286894acbdac049de2d404bbd397b4e.tar.gz
gst-plugins-bad-078324cd8286894acbdac049de2d404bbd397b4e.tar.bz2
gst-plugins-bad-078324cd8286894acbdac049de2d404bbd397b4e.zip
gst/audioresample/debug.h: replace debug macros with variable number of parameters by a simple alias to gstreamer sta...
Original commit message from CVS: * gst/audioresample/debug.h: replace debug macros with variable number of parameters by a simple alias to gstreamer standard debug macros (#define RESAMPLE_ERROR GST_ERROR, __VA_ARGS__ is not supported by MSVC 6.0 and 7.1) * gst/audioresample/resample.h: define M_PI and rint for WIN32 * win32/common/libgstaudio.def: * win32/common/libgstriff.def: * win32/common/libgsttag.def: * win32/common/libgstvideo.def: add new exported functions * win32/vs6: update project files
Diffstat (limited to 'gst')
-rw-r--r--gst/audioresample/debug.h10
-rw-r--r--gst/audioresample/resample.h8
2 files changed, 13 insertions, 5 deletions
diff --git a/gst/audioresample/debug.h b/gst/audioresample/debug.h
index b369fe63..27342a0a 100644
--- a/gst/audioresample/debug.h
+++ b/gst/audioresample/debug.h
@@ -38,11 +38,11 @@ int resample_debug_get_level (void);
GST_DEBUG_CATEGORY_EXTERN (audioresample_debug);
#define GST_CAT_DEFAULT audioresample_debug
-#define RESAMPLE_ERROR(...) GST_ERROR(__VA_ARGS__)
-#define RESAMPLE_WARNING(...) GST_WARNING(__VA_ARGS__)
-#define RESAMPLE_INFO(...) GST_INFO(__VA_ARGS__)
-#define RESAMPLE_DEBUG(...) GST_DEBUG(__VA_ARGS__)
-#define RESAMPLE_LOG(...) GST_LOG(__VA_ARGS__)
+#define RESAMPLE_ERROR GST_ERROR
+#define RESAMPLE_WARNING GST_WARNING
+#define RESAMPLE_INFO GST_INFO
+#define RESAMPLE_DEBUG GST_DEBUG
+#define RESAMPLE_LOG GST_LOG
#define resample_debug_set_level(x) do { } while (0)
diff --git a/gst/audioresample/resample.h b/gst/audioresample/resample.h
index 2147542f..84bf8f09 100644
--- a/gst/audioresample/resample.h
+++ b/gst/audioresample/resample.h
@@ -24,6 +24,14 @@
#include "functable.h"
#include "buffer.h"
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+#ifdef WIN32
+#define rint(x) (floor((x)+0.5))
+#endif
+
typedef enum {
RESAMPLE_FORMAT_S16 = 0,
RESAMPLE_FORMAT_S32,