X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fschannel.h;h=ab1bee44d01c73863828eadcb74f205add7b0ef9;hb=HEAD;hp=465e7dc51fe9b7095dbf870ffec104dd0a14bc2a;hpb=ac30e8631fb7fc29e2954e9bfca734d9aeaa642b;p=projects%2Fchimara%2Fchimara.git diff --git a/libchimara/schannel.h b/libchimara/schannel.h index 465e7dc..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 @@ -25,11 +25,19 @@ struct glk_schannel_struct glui32 resource, notify; /* How many times to repeat the last sound played (-1 = forever) */ glui32 repeats; + /* Whether channel is paused */ + gboolean paused; -#ifdef GSTREAMER_SOUND + /* Volume change information */ + double target_volume; + long target_time_sec, target_time_usec; + guint volume_timer_id; + glui32 volume_notify; + +#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 }; -#endif \ No newline at end of file +#endif