Commit graph

28 commits

Author SHA1 Message Date
Wim Taymans
42fad5a166 whitespace fixes 2009-09-09 10:25:33 +02:00
Jan Schmidt
c1bc55a4f5 docs: Fix a couple of warnings from the docs build. 2009-06-11 11:16:15 +01:00
Sebastian Dröge
59aa1251d9 interfaces: API: Add gst_mixer_get_mixer_type()
This is a convenience function that returns the mixer_type
of the interface struct.
2009-05-12 09:03:24 +02:00
Garret D'Amore
b8af1223db mixer interface: Add flags to enhance mixer interfaces
This patch adds a few flags to the mixer and mixerctrl interface to
better support OSSv4 (and potentially other backends).

Patch By: Garret D'Amore <garrett.damore@sun.com>
Signed-Off-By: Jan Schmidt <jan.schmidt@sun.com>

API: GST_MIXER_FLAG_HAS_WHITELIST, GST_MIXER_FLAG_GROUPING,
API: GST_MIXER_TRACK_NO_RECORD, GST_MIXER_TRACK_NO_MUTE,
API: GST_MIXER_TRACK_WHITELIST
2009-02-24 17:23:58 +00:00
Tim-Philipp Müller
5a3d087279 API: add gst_mixer_options_list_changed(), gst_mixer_mixer_changed() and gst_mixer_message_parse_options_list_changed...
Original commit message from CVS:
* docs/libs/gst-plugins-base-libs-sections.txt:
* gst-libs/gst/interfaces/mixer.c: (gst_mixer_option_changed),
(gst_mixer_options_list_changed), (gst_mixer_mixer_changed),
(gst_mixer_message_get_type),
(gst_mixer_message_parse_option_changed),
(gst_mixer_message_parse_options_list_changed):
* gst-libs/gst/interfaces/mixer.h: (GstMixerType),
(GST_MIXER_MESSAGE_OPTION_CHANGED),
(GST_MIXER_MESSAGE_OPTIONS_LIST_CHANGED),
(GST_MIXER_MESSAGE_MIXER_CHANGED):
API: add gst_mixer_options_list_changed(), gst_mixer_mixer_changed()
and gst_mixer_message_parse_options_list_changed(). Fixes #519916.
2008-03-03 13:56:38 +00:00
Stefan Kost
ffa52e2eac Fix the docs according to what gtk-doc complained about.
Original commit message from CVS:
* docs/libs/gst-plugins-base-libs-sections.txt:
* gst-libs/gst/audio/gstaudiofilter.h:
* gst-libs/gst/interfaces/mixer.h:
* gst-libs/gst/rtp/gstbasertpdepayload.c:
* gst-libs/gst/rtp/gstbasertpdepayload.h:
* gst-libs/gst/sdp/gstsdpmessage.c:
Fix the docs according to what gtk-doc complained about.
2007-10-30 20:32:14 +00:00
Jan Schmidt
0776d87e32 gst-libs/gst/interfaces/mixer.h: Add padding vars in place of the signal pointers when building with DISABLE_DEPRECAT...
Original commit message from CVS:
* gst-libs/gst/interfaces/mixer.h:
Add padding vars in place of the signal pointers
when building with DISABLE_DEPRECATED so that the
interface structure doesn't change size.
2007-07-21 09:56:09 +00:00
Marc-Andre Lureau
c161e29307 Fixes: #152864
Original commit message from CVS:
* docs/libs/gst-plugins-base-libs-sections.txt:
* ext/alsa/gstalsamixer.c:
* ext/alsa/gstalsamixer.h:
* ext/alsa/gstalsamixerelement.c:
* ext/alsa/gstalsamixertrack.c:
* gst-libs/gst/interfaces/mixer.c:
* gst-libs/gst/interfaces/mixer.h:
* gst-libs/gst/interfaces/mixeroptions.c:
* gst-libs/gst/interfaces/mixeroptions.h:
* gst-libs/gst/interfaces/mixertrack.c:
* gst-libs/gst/interfaces/mixertrack.h:
* tests/check/Makefile.am:
* tests/check/libs/mixer.c:
Patch By: Marc-Andre Lureau <marcandre.lureau@gmail.com>
Fixes: #152864
Add support for notifying mixer changes on the message bus, and
implement it in alsamixer.
API: gst_mixer_get_mixer_flags
API: gst_mixer_message_parse_mute_toggled
API: gst_mixer_message_parse_record_toggled
API: gst_mixer_message_parse_volume_changed
API: gst_mixer_message_parse_option_changed
API: GstMixerMessageType
API: GstMixerFlags
2007-07-21 09:21:12 +00:00
Jan Schmidt
588bc09c33 Revert commits towards #152864 made so far. We'll pick it up again after the 0.10.13 release.
Original commit message from CVS:
* ext/alsa/gstalsamixer.c: (gst_alsa_mixer_ensure_track_list),
(gst_alsa_mixer_free), (gst_alsa_mixer_update),
(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/gstalsamixerelement.c:
(gst_alsa_mixer_element_interface_supported),
(gst_alsa_mixer_element_finalize), (gst_alsa_mixer_element_init),
(gst_alsa_mixer_element_set_property),
(gst_alsa_mixer_element_get_property),
(gst_alsa_mixer_element_change_state):
* ext/alsa/gstalsamixertrack.c: (gst_alsa_mixer_track_update):
* gst-libs/gst/interfaces/mixer.c: (gst_mixer_volume_changed),
(gst_mixer_option_changed):
* gst-libs/gst/interfaces/mixer.h:
Revert commits towards #152864 made so far. We'll pick it up again
after the 0.10.13 release.
2007-05-25 10:07:26 +00:00
Marc-Andre Lureau
16b8bd4c49 gst-libs/gst/interfaces/mixer.h (mixer_type, option_changed, set_option, get_option, _gst_reserved):
Original commit message from CVS:
patch by: Marc-Andre Lureau <marcandre.lureau@gmail.com>
* gst-libs/gst/interfaces/mixer.h (mixer_type, option_changed,
set_option, get_option, _gst_reserved):
Revert reordering functions (keep ABI).
2007-05-18 15:10:08 +00:00
Marc-Andre Lureau
f2df2a6948 ext/alsa/gstalsamixer.c (main_context, GstAlsaMixerWatch, _GstAlsaMixerWatch, source, n_poll_fds, poll_fds, gst_alsa_...
Original commit message from CVS:
patch by: Marc-Andre Lureau <marcandre.lureau@gmail.com>
* ext/alsa/gstalsamixer.c (main_context, GstAlsaMixerWatch,
_GstAlsaMixerWatch, source, n_poll_fds, poll_fds,
gst_alsa_mixer_watch_funcs, gst_alsa_mixer_prepare,
gst_alsa_mixer_check, gst_alsa_mixer_dispatch,
gst_alsa_mixer_finalize, gst_alsa_mixer_find_master_mixer,
gst_alsa_mixer_handle_source_callback,
gst_alsa_mixer_handle_callback, gst_alsa_mixer_elem_handle_callback,
gst_alsa_mixer_ensure_track_list, gst_alsa_mixer_free,
gst_alsa_mixer_get_volume, gst_alsa_mixer_set_volume,
gst_alsa_mixer_set_mute, gst_alsa_mixer_set_record,
gst_alsa_mixer_get_option, gst_alsa_mixer_update_option,
gst_alsa_mixer_update_track, _gst_alsa_mixer_set_interface):
* ext/alsa/gstalsamixer.h (handle_source, interface, dir):
* ext/alsa/gstalsamixerelement.c (gst_alsa_mixer_element_details,
gst_alsa_mixer_element_interface_supported,
gst_alsa_mixer_element_finalize, gst_alsa_mixer_element_init,
gst_alsa_mixer_element_set_property,
gst_alsa_mixer_element_get_property,
gst_alsa_mixer_element_change_state):
* ext/alsa/gstalsamixertrack.c (gst_alsa_mixer_track_update):
* gst-libs/gst/interfaces/mixer.c (gst_mixer_volume_changed,
gst_mixer_option_changed):
* gst-libs/gst/interfaces/mixer.h (set_option, get_option,
volume_changed, option_changed, _gst_reserved):
Implement notification for alsamixer. Fixes #152864
2007-05-15 14:01:26 +00:00
Thomas Vander Stichele
5f83aa7dfa expand tabs
Original commit message from CVS:
expand tabs
2005-12-06 19:42:02 +00:00
Tim-Philipp Müller
074b6a3b64 gst-libs/gst/interfaces/mixer.h: Reset padding to GST_PADDING.
Original commit message from CVS:
* gst-libs/gst/interfaces/mixer.h:
Reset padding to GST_PADDING.
2005-08-08 14:13:59 +00:00
Thomas Vander Stichele
5014a9eee6 fold all interfaces in one interfaces dir, preserving CVS history
Original commit message from CVS:
fold all interfaces in one interfaces dir, preserving CVS history
2005-06-30 11:58:40 +00:00
Owen Fraser-Green
46616b104b Added property accessors for mixertrack and mixeroptions.
Original commit message from CVS:
Added property accessors for mixertrack and mixeroptions.
2004-06-01 20:08:52 +00:00
Ronald S. Bultje
8f88f9280d 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.
2004-05-27 03:36:17 +00:00
Johan Dahlin
bf07c7cc9b *.h: Revert indenting
Original commit message from CVS:
* *.h: Revert indenting
2004-03-15 16:32:55 +00:00
Thomas Vander Stichele
4df3f18839 gst-indent
Original commit message from CVS:
gst-indent
2004-03-14 22:34:34 +00:00
Thomas Vander Stichele
e963f78788 use glib-gen.mak fix Makefile.am bugs and clean them up
Original commit message from CVS:
use glib-gen.mak
fix Makefile.am bugs and clean them up
2004-02-03 16:49:54 +00:00
David I. Lehn
95778bdb9f gst-libs/gst/: Generate enum type code with glib-mkenums.
Original commit message from CVS:
* gst-libs/gst/colorbalance/Makefile.am:
* gst-libs/gst/colorbalance/colorbalance.h:
* gst-libs/gst/mixer/Makefile.am:
* gst-libs/gst/mixer/mixer.h:
* gst-libs/gst/play/Makefile.am:
* gst-libs/gst/play/play.h:
* gst-libs/gst/tuner/Makefile.am:
* gst-libs/gst/tuner/tuner.h:
Generate enum type code with glib-mkenums.
* gst-libs/gst/colorbalance/.cvsignore:
* gst-libs/gst/mixer/.cvsignore:
* gst-libs/gst/play/.cvsignore:
* gst-libs/gst/tuner/.cvsignore:
Ignore generated files.
2004-02-03 08:56:06 +00:00
Julien Moutte
9aa32817d9 ext/alsa/gstalsamixer.c: Setting mixer interface type to HARDWARE.
Original commit message from CVS:
2004-01-15  Julien MOUTTE <julien@moutte.net>

* ext/alsa/gstalsamixer.c: (gst_alsa_mixer_interface_init): Setting
mixer interface type to HARDWARE.
* gst-libs/gst/mixer/mixer.c: (gst_mixer_class_init): Adding a default
type to SOFTWARE.
* gst-libs/gst/mixer/mixer.h: Adding mixer interface type and macro.
* gst-libs/gst/mixer/mixertrack.h: Adding mixertrack flag SOFTWARE.
* gst/volume/gstvolume.c: (gst_volume_interface_supported),
(gst_volume_interface_init), (gst_volume_list_tracks),
(gst_volume_set_volume), (gst_volume_get_volume),
(gst_volume_set_mute), (gst_volume_mixer_init),
(gst_volume_dispose), (gst_volume_get_type), (volume_class_init),
(volume_init): Implementing mixer interface.
* gst/volume/gstvolume.h: Adding tracklist for mixer interface.
* sys/oss/gstosselement.c: (gst_osselement_get_type),
(gst_osselement_change_state): Removing some trailing commas in
structures.
* sys/oss/gstossmixer.c: (gst_ossmixer_interface_init): Setting mixer
interface type to HARDWARE.
* sys/v4l/gstv4lcolorbalance.c:
(gst_v4l_color_balance_interface_init): Setting colorbalance interface
type to HARDWARE.
* sys/v4l2/gstv4l2colorbalance.c:
(gst_v4l2_color_balance_interface_init): Setting colorbalance
interface type to HARDWARE.
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_chain): use exactly the
same code than ximagesink for event handling.
2004-01-15 15:50:10 +00:00
David Schleef
03f79e151b Change GST_*_PADDING to _gst_private[GST_PADDING]
Original commit message from CVS:
Change GST_*_PADDING to _gst_private[GST_PADDING]
2003-12-09 10:02:08 +00:00
Ronald S. Bultje
2ebfe048cc Move over from GstInterface to GstImplementsInterface. Also adds some signals to several interfaces
Original commit message from CVS:
Move over from GstInterface to GstImplementsInterface. Also adds some signals to several interfaces
2003-12-07 12:11:30 +00:00
Ronald S. Bultje
760a841261 Make GstMixerTrack a GObject. I also want to make it emit several signals, starting work is in here but it's not full...
Original commit message from CVS:
Make GstMixerTrack a GObject. I also want to make it emit several signals, starting work is in here but it's not fully implemented yet. for OSS, this will cause issues, but for ALSA, this is all automated.
2003-10-10 12:24:20 +00:00
Leif Johnson
6aa17f5bc1 changing 'channel' to 'track' to avoid naming overlap
Original commit message from CVS:
changing 'channel' to 'track' to avoid naming overlap
2003-10-09 22:02:35 +00:00
David Schleef
c85a3d73a9 add object and struct padding
Original commit message from CVS:
add object and struct padding
2003-10-09 01:57:54 +00:00
Ronald S. Bultje
a3890ba90c Copyright fix (code=mine)
Original commit message from CVS:
Copyright fix (code=mine)
2003-09-13 13:42:08 +00:00
Ronald S. Bultje
beea17989f Interface example: a mixer
Original commit message from CVS:
Interface example: a mixer
2003-09-13 01:20:04 +00:00