projects
/
projects
/
chimara
/
chimara.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Finished preferred interpreters list
[projects/chimara/chimara.git]
/
libchimara
/
schannel.h
diff --git
a/libchimara/schannel.h
b/libchimara/schannel.h
index 8970c97bcddb5390411f1019483929dc0eab37a1..465e7dc51fe9b7095dbf870ffec104dd0a14bc2a 100644
(file)
--- a/
libchimara/schannel.h
+++ b/
libchimara/schannel.h
@@
-5,6
+5,7
@@
#include <glib.h>
#include "glk.h"
#include "gi_dispa.h"
#include <glib.h>
#include "glk.h"
#include "gi_dispa.h"
+#include "chimara-glk.h"
#ifdef GSTREAMER_SOUND
#include <gst/gst.h>
#endif
#ifdef GSTREAMER_SOUND
#include <gst/gst.h>
#endif
@@
-17,10
+18,17
@@
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 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;
+ /* 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;
+
#ifdef GSTREAMER_SOUND
/* Each sound channel is represented as a GStreamer pipeline. */
#ifdef GSTREAMER_SOUND
/* Each sound channel is represented as a GStreamer pipeline. */
- GstElement *pipeline, *source, *typefind, *de
code
, *filter, *sink;
+ GstElement *pipeline, *source, *typefind, *de
mux, *decode, *convert
, *filter, *sink;
#endif
};
#endif
};