summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStéphane Loeuillet <gstreamer@leroutier.net>2004-06-02 12:01:52 +0000
committerStéphane Loeuillet <gstreamer@leroutier.net>2004-06-02 12:01:52 +0000
commit2eed99edbf113f16cc7d8cb14462e7d6dfb7702e (patch)
tree1efed7c69ffe4af9c4f95dca788649a25d9d1b69
parentca58ea6c4ed84218ba69cd209a6f028f39d4cab9 (diff)
downloadgst-plugins-bad-2eed99edbf113f16cc7d8cb14462e7d6dfb7702e.tar.gz
gst-plugins-bad-2eed99edbf113f16cc7d8cb14462e7d6dfb7702e.tar.bz2
gst-plugins-bad-2eed99edbf113f16cc7d8cb14462e7d6dfb7702e.zip
real fix thise time : don't use glib 2.4 specific defines
Original commit message from CVS: real fix thise time : don't use glib 2.4 specific defines
-rw-r--r--ChangeLog4
-rw-r--r--gst-libs/gst/mixer/mixertrack.c8
2 files changed, 5 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index fc9fca0e..3d38b5be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,8 +34,8 @@
* ext/vorbis/vorbisdec.c : sign warning fixes
- * gst-libs/gst/mixer/mixertrack.c : forgoten include
- to define newly used G_MAXINT32, bad owen, bad
+ * gst-libs/gst/mixer/mixertrack.c :
+ do no use defines which are glib 2.4 specific
2004-06-01 Christophe Fergeau <teuf@gnome.org>
diff --git a/gst-libs/gst/mixer/mixertrack.c b/gst-libs/gst/mixer/mixertrack.c
index 2bada7ca..ea531d5f 100644
--- a/gst-libs/gst/mixer/mixertrack.c
+++ b/gst-libs/gst/mixer/mixertrack.c
@@ -23,8 +23,6 @@
#include "config.h"
#endif
-#include <glib.h>
-
#include "mixertrack.h"
enum
@@ -98,18 +96,18 @@ gst_mixer_track_class_init (GstMixerTrackClass * klass)
g_object_class_install_property (object_klass, ARG_MIN_VOLUME,
g_param_spec_int ("min_volume", "Minimum volume level",
- "The minimum possible volume level", G_MININT32, G_MAXINT,
+ "The minimum possible volume level", G_MININT, G_MAXINT,
0, G_PARAM_READABLE));
g_object_class_install_property (object_klass, ARG_MAX_VOLUME,
g_param_spec_int ("max_volume", "Maximum volume level",
- "The maximum possible volume level", G_MININT32, G_MAXINT,
+ "The maximum possible volume level", G_MININT, G_MAXINT,
0, G_PARAM_READABLE));
g_object_class_install_property (object_klass, ARG_FLAGS,
g_param_spec_uint ("flags", "Flags",
"Flags indicating the type of mixer track",
- 0, G_MAXUINT32, 0, G_PARAM_READABLE));
+ 0, G_MAXUINT, 0, G_PARAM_READABLE));
g_object_class_install_property (object_klass, ARG_NUM_CHANNELS,
g_param_spec_int ("num_channels", "Number of channels",