Merge branch 'gstreamer1.0'

[projects/chimara/chimara.git] / libchimara / schannel.h

diff --git a/libchimara/schannel.h b/libchimara/schannel.h
index a0eba8715520ac91d800fd8c9614c563397d32f0..ab1bee44d01c73863828eadcb74f205add7b0ef9 100644 (file)
--- a/libchimara/schannel.h
+++ b/libchimara/schannel.h
@@ -6,7 +6,7 @@
 #include "glk.h"
 #include "gi_dispa.h"
 #include "chimara-glk.h"
-#ifdef GSTREAMER_SOUND
+#if defined(GSTREAMER_0_10_SOUND) || defined(GSTREAMER_1_0_SOUND)
 #include <gst/gst.h>
 #endif
 
@@ -34,7 +34,7 @@ struct glk_schannel_struct
        guint volume_timer_id;
        glui32 volume_notify;
 
-#ifdef GSTREAMER_SOUND
+#if defined(GSTREAMER_0_10_SOUND) || defined(GSTREAMER_1_0_SOUND)
        /* Each sound channel is represented as a GStreamer pipeline.  */
        GstElement *pipeline, *source, *typefind, *demux, *decode, *convert, *filter, *sink;
 #endif