X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fschannel.h;h=ab1bee44d01c73863828eadcb74f205add7b0ef9;hb=HEAD;hp=9a7712d72f80b60548da4559d1745237bdbf7e4b;hpb=04fac8083a2bed8f866b608c60897c1d69b7aaf5;p=projects%2Fchimara%2Fchimara.git diff --git a/libchimara/schannel.h b/libchimara/schannel.h index 9a7712d..ab1bee4 100644 --- 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 #endif @@ -31,9 +31,10 @@ struct glk_schannel_struct /* Volume change information */ double target_volume; long target_time_sec, target_time_usec; + 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