diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-05-27 03:36:17 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-05-27 03:36:17 +0000 |
| commit | 4fffc6928f6a7be42b1f5f0ace39323e663b7ef2 (patch) | |
| tree | eb3556be4d0402a8b890732be5158b2603275c95 /sys/oss | |
| parent | 5d38431fe7cd2b6081129b53880902ec16f86330 (diff) | |
ext/alsa/: Add enumerations (as GstMixerOptions). Make correct distinction between input/output tracks. Add capture/p...
Original commit message from CVS:
* ext/alsa/Makefile.am:
* ext/alsa/gstalsamixer.c: (gst_alsa_mixer_interface_init),
(gst_alsa_mixer_build_list), (gst_alsa_mixer_get_volume),
(gst_alsa_mixer_set_volume), (gst_alsa_mixer_set_mute),
(gst_alsa_mixer_set_record), (gst_alsa_mixer_set_option),
(gst_alsa_mixer_get_option):
* ext/alsa/gstalsamixer.h:
* ext/alsa/gstalsamixeroptions.c:
(gst_alsa_mixer_options_get_type),
(gst_alsa_mixer_options_class_init), (gst_alsa_mixer_options_init),
(gst_alsa_mixer_options_new):
* ext/alsa/gstalsamixeroptions.h:
* ext/alsa/gstalsamixertrack.c: (gst_alsa_mixer_track_new):
* ext/alsa/gstalsamixertrack.h:
Add enumerations (as GstMixerOptions). Make correct distinction
between input/output tracks. Add capture/playback private flag.
Use flag to decide on whether to set capture or playback volumes
or switches. Use playback and record switches.
* gst-libs/gst/mixer/Makefile.am:
* gst-libs/gst/mixer/mixer-marshal.list:
* gst-libs/gst/mixer/mixer.c: (gst_mixer_class_init),
(gst_mixer_set_option), (gst_mixer_get_option),
(gst_mixer_mute_toggled), (gst_mixer_record_toggled),
(gst_mixer_volume_changed), (gst_mixer_option_changed):
* gst-libs/gst/mixer/mixer.h:
* gst-libs/gst/mixer/mixeroptions.c: (gst_mixer_options_get_type),
(gst_mixer_options_class_init), (gst_mixer_options_init),
(gst_mixer_options_dispose):
* gst-libs/gst/mixer/mixeroptions.h:
Add GstMixerOptions.
* sys/oss/gstosselement.c: (gst_osselement_class_probe_devices):
Rename Audio Mixer to OSS Mixer (similar to Alsa Mixer). Fix
broken device detection on computers with multiple OSS sound
cards.
Diffstat (limited to 'sys/oss')
| -rw-r--r-- | sys/oss/gstosselement.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/oss/gstosselement.c b/sys/oss/gstosselement.c index 8d8018df..4c3512f1 100644 --- a/sys/oss/gstosselement.c +++ b/sys/oss/gstosselement.c @@ -49,7 +49,7 @@ enum /* elementfactory information */ static GstElementDetails gst_osselement_details = -GST_ELEMENT_DETAILS ("Audio Mixer (OSS)", +GST_ELEMENT_DETAILS ("OSS Mixer", "Generic/Audio", "OSS-based mixer element", "Ronald Bultje <rbultje@ronald.bitfreak.net>"); @@ -300,6 +300,7 @@ gst_osselement_class_probe_devices (GstOssElementClass * klass, gboolean check) combi = g_new0 (GstOssDeviceCombination, 1); combi->dsp = dsp; combi->mixer = mixer; + combi->dev = mixer ? mixer_dev : dsp_dev; device_combinations = device_combination_append (device_combinations, combi); } else { |