mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

sys/sunaudio/gstsunaudio.c: Solve #152805.

Browse source 
Original commit message from CVS:
Reviewed by: Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
* sys/sunaudio/gstsunaudio.c: (gst_sunaudiosink_setparams):
Solve #152805.
* sys/sunaudio/gstsunmixer.c: (gst_sunaudiomixer_set_mute):
Solve 152806.
This commit is contained in:
Ronald S. Bultje 2004-10-01 11:44:22 +00:00
parent 1b6c3e0efa
commit e2513e5415
3 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2004-10-01 Balamurali Viswanathan <balamurali.viswanathan@wipro.com>
Reviewed by: Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* sys/sunaudio/gstsunaudio.c: (gst_sunaudiosink_setparams):
Solve #152805.
* sys/sunaudio/gstsunmixer.c: (gst_sunaudiomixer_set_mute):
Solve 152806.
2004-10-01 Ronald S. Bultje <rbultje@ronald.bitfreak.net> 2004-10-01 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* gst-libs/gst/riff/riff-media.c: * gst-libs/gst/riff/riff-media.c:

15
sys/sunaudio/gstsunaudio.c
View file

@ -276,6 +276,19 @@ gst_sunaudiosink_setparams (GstSunAudioSink * sunaudiosink)
{ {
audio_info_t ainfo; audio_info_t ainfo;
int ret; int ret;
int ports;
ret = ioctl (sunaudiosink->fd, AUDIO_GETINFO, &ainfo);
if (ret == -1) {
GST_ELEMENT_ERROR (sunaudiosink, RESOURCE, SETTINGS, (NULL), ("%s",
strerror (errno)));
return FALSE;
}
ports = ainfo.play.port;
if (!(ports & AUDIO_SPEAKER) && (ainfo.play.avail_ports & AUDIO_SPEAKER)) {
ports = ports | AUDIO_SPEAKER;
}
AUDIO_INITINFO (&ainfo); AUDIO_INITINFO (&ainfo);
@ -283,7 +296,7 @@ gst_sunaudiosink_setparams (GstSunAudioSink * sunaudiosink)
ainfo.play.channels = sunaudiosink->channels; ainfo.play.channels = sunaudiosink->channels;
ainfo.play.precision = sunaudiosink->width; ainfo.play.precision = sunaudiosink->width;
ainfo.play.encoding = AUDIO_ENCODING_LINEAR; ainfo.play.encoding = AUDIO_ENCODING_LINEAR;
ainfo.play.port = AUDIO_SPEAKER; ainfo.play.port = ports;
ainfo.play.buffer_size = sunaudiosink->buffer_size; ainfo.play.buffer_size = sunaudiosink->buffer_size;
ainfo.output_muted = 0; ainfo.output_muted = 0;

6
sys/sunaudio/gstsunmixer.c
View file

@ -130,8 +130,7 @@ fill_labels (void)
{ {
gchar *given, *wanted; gchar *given, *wanted;
} }
cases[] = cases[] = {
{
{ {
"Vol ", N_("Volume")} "Vol ", N_("Volume")}
, { , {
@ -279,13 +278,10 @@ gst_sunaudiomixer_set_mute (GstMixer * mixer,
return; return;
AUDIO_INITINFO (&audioinfo); AUDIO_INITINFO (&audioinfo);
ioctl (sunaudio->mixer_fd, AUDIO_GETINFO, &audioinfo);
if (mute) { if (mute) {
audioinfo.play.port = audioinfo.play.avail_ports;
audioinfo.output_muted = 1; audioinfo.output_muted = 1;
} else { } else {
audioinfo.play.port = 0;
audioinfo.output_muted = 0; audioinfo.output_muted = 0;
} }