diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-01-06 15:59:02 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-01-06 15:59:02 +0000 |
| commit | c1f8650bc4334eeccb85a358ed8f7800ef347e24 (patch) | |
| tree | 41504a3786a64ebfed07176eab1bef75c3af6727 | |
| parent | 0051f0e18ecb90e900d6c4f92a01b473408f493e (diff) | |
| download | gst-plugins-bad-c1f8650bc4334eeccb85a358ed8f7800ef347e24.tar.gz gst-plugins-bad-c1f8650bc4334eeccb85a358ed8f7800ef347e24.tar.bz2 gst-plugins-bad-c1f8650bc4334eeccb85a358ed8f7800ef347e24.zip | |
ext/shout/gstshout.c: fix for new caps system.
Original commit message from CVS:
2004-01-06 Ronald Bultje <rbultje@ronald.bitfreak.net>
* ext/shout/gstshout.c: (gst_icecastsend_base_init),
(gst_icecastsend_init):
fix for new caps system.
* gst-libs/gst/mixer/mixertrack.h:
* sys/oss/gstossmixer.c: (gst_ossmixer_build_list):
Add 'master track' flag (for tools like ACME that only want to
change the main volume).
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | gst-libs/gst/mixer/mixertrack.h | 8 |
2 files changed, 18 insertions, 0 deletions
@@ -1,3 +1,13 @@ +2004-01-06 Ronald Bultje <rbultje@ronald.bitfreak.net> + + * ext/shout/gstshout.c: (gst_icecastsend_base_init), + (gst_icecastsend_init): + fix for new caps system. + * gst-libs/gst/mixer/mixertrack.h: + * sys/oss/gstossmixer.c: (gst_ossmixer_build_list): + Add 'master track' flag (for tools like ACME that only want to + change the main volume). + 2004-01-07 Jan Schmidt <thaytan@mad.scientist.com> * ext/xvid/gstxvid.c: (gst_xvid_structure_to_csp), diff --git a/gst-libs/gst/mixer/mixertrack.h b/gst-libs/gst/mixer/mixertrack.h index 7776a353..94304cf2 100644 --- a/gst-libs/gst/mixer/mixertrack.h +++ b/gst-libs/gst/mixer/mixertrack.h @@ -46,6 +46,13 @@ G_BEGIN_DECLS * microphone, etc.). Channels are then single streams * within a track. A mono stream has one channel, a stereo * stream has two, etc. + * + * Input tracks can have 'recording' enabled, which means + * that any input will be hearable into the speakers that + * are attached to the output. Mute is obvious. A track + * flagged as master is the master volume track on this + * mixer, which means that setting this track will change + * the hearable volume on any output. */ typedef enum { @@ -53,6 +60,7 @@ typedef enum { GST_MIXER_TRACK_OUTPUT = (1<<1), GST_MIXER_TRACK_MUTE = (1<<2), GST_MIXER_TRACK_RECORD = (1<<3), + GST_MIXER_TRACK_MASTER = (1<<4) } GstMixerTrackFlags; #define GST_MIXER_TRACK_HAS_FLAG(channel, flag) \ |