X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fschannel.h;h=ab1bee44d01c73863828eadcb74f205add7b0ef9;hb=68a6bb0f8c5be236fe81af76961c85ac5cd63e22;hp=846f13ef0e7381458683ed8b70601d8680a90911;hpb=fc25ba60eb14b16fe5bba7ff94e29e70ac1d9955;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/schannel.h b/libchimara/schannel.h
index 846f13e..ab1bee4 100644
--- a/libchimara/schannel.h
+++ b/libchimara/schannel.h
@@ -5,7 +5,8 @@
 #include <glib.h>
 #include "glk.h"
 #include "gi_dispa.h"
-#ifdef GSTREAMER_SOUND
+#include "chimara-glk.h"
+#if defined(GSTREAMER_0_10_SOUND) || defined(GSTREAMER_1_0_SOUND)
 #include <gst/gst.h>
 #endif
 
@@ -17,11 +18,26 @@ struct glk_schannel_struct
 	/* Pointer to the list node in the global sound channel list that contains 
 	 this sound channel */
 	GList *schannel_list;
+	/* Pointer to the GTK widget this sound channel belongs to, for convenience */
+	ChimaraGlk *glk;
 
-#ifdef GSTREAMER_SOUND
+	/* Resource number and notification ID of last played sound */
+	glui32 resource, notify;
+	/* How many times to repeat the last sound played (-1 = forever) */
+	glui32 repeats;
+	/* Whether channel is paused */
+	gboolean paused;
+	
+	/* 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