applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

free the alsa device, after 4 seconds, with gstreamer too. Patch from

Browse source 
2004-11-30  Sebastien Bacher  <seb128@debian.org>

	* actions/acme-volume-gstreamer.c:
	(acme_volume_gstreamer_finalize), (acme_volume_gstreamer_set_mute),
	(acme_volume_gstreamer_get_mute),
	(acme_volume_gstreamer_get_volume),
	(acme_volume_gstreamer_set_volume),
	(acme_volume_gstreamer_close_real), (acme_volume_gstreamer_open),
	(acme_volume_gstreamer_close), (acme_volume_gstreamer_init):
	free the alsa device, after 4 seconds, with gstreamer too.
	Patch from Arnaud Patard <Arnaud Patard> (Closes: #141793).
This commit is contained in:
Sebastien Bacher 2004-11-30 16:46:38 +00:00 • committed by Sebastien Bacher
parent 41889beb0c
commit 16e644c1ad
2 changed files with 112 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

12
gnome-settings-daemon/ChangeLog
View file

@ -1,3 +1,15 @@
2004-11-30 Sebastien Bacher <seb128@debian.org>
* actions/acme-volume-gstreamer.c:
(acme_volume_gstreamer_finalize), (acme_volume_gstreamer_set_mute),
(acme_volume_gstreamer_get_mute),
(acme_volume_gstreamer_get_volume),
(acme_volume_gstreamer_set_volume),
(acme_volume_gstreamer_close_real), (acme_volume_gstreamer_open),
(acme_volume_gstreamer_close), (acme_volume_gstreamer_init):
free the alsa device, after 4 seconds, with gstreamer too.
Patch from Arnaud Patard <Arnaud Patard> (Closes: #141793).
2004-11-30 Bastien Nocera <hadess@hadess.net> 2004-11-30 Bastien Nocera <hadess@hadess.net>
* gnome-settings-multimedia-keys.c: (do_exit_action): hack * gnome-settings-multimedia-keys.c: (do_exit_action): hack

122
gnome-settings-daemon/actions/acme-volume-gstreamer.c
View file

@ -33,10 +33,13 @@
#include <string.h> #include <string.h>
#define TIMEOUT 4000
struct AcmeVolumeGStreamerPrivate struct AcmeVolumeGStreamerPrivate
{ {
GstMixer *mixer; GstMixer *mixer;
GstMixerTrack *track; GstMixerTrack *track;
guint timer_id;
}; };
static GObjectClass *parent_class = NULL; static GObjectClass *parent_class = NULL;
@ -45,6 +48,9 @@ G_DEFINE_TYPE (AcmeVolumeGStreamer, acme_volume_gstreamer, ACME_TYPE_VOLUME)
static int acme_volume_gstreamer_get_volume (AcmeVolume *self); static int acme_volume_gstreamer_get_volume (AcmeVolume *self);
static void acme_volume_gstreamer_set_volume (AcmeVolume *self, int val); static void acme_volume_gstreamer_set_volume (AcmeVolume *self, int val);
static gboolean acme_volume_gstreamer_open (AcmeVolumeGStreamer *self);
static void acme_volume_gstreamer_close (AcmeVolumeGStreamer *self);
static gboolean acme_volume_gstreamer_close_real (AcmeVolumeGStreamer *self);
static void static void
acme_volume_gstreamer_finalize (GObject *object) acme_volume_gstreamer_finalize (GObject *object)
@ -57,12 +63,14 @@ acme_volume_gstreamer_finalize (GObject *object)
self = ACME_VOLUME_GSTREAMER (object); self = ACME_VOLUME_GSTREAMER (object);
g_return_if_fail (self->_priv != NULL); g_return_if_fail (self->_priv != NULL);
if (self->_priv->mixer != NULL) { if (self->_priv->timer_id != 0)
g_object_unref (self->_priv->mixer); {
g_object_unref (self->_priv->track); g_source_remove (self->_priv->timer_id);
self->_priv->timer_id = 0;
} }
acme_volume_gstreamer_close_real (self);
g_free (self->_priv); g_free (self->_priv);
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
@ -72,25 +80,32 @@ static void
acme_volume_gstreamer_set_mute (AcmeVolume *vol, gboolean val) acme_volume_gstreamer_set_mute (AcmeVolume *vol, gboolean val)
{ {
AcmeVolumeGStreamer *self = (AcmeVolumeGStreamer *) vol; AcmeVolumeGStreamer *self = (AcmeVolumeGStreamer *) vol;
if (self->_priv->mixer == NULL) if (acme_volume_gstreamer_open (self) == FALSE)
return; return;
gst_mixer_set_mute (self->_priv->mixer, gst_mixer_set_mute (self->_priv->mixer,
self->_priv->track, self->_priv->track,
val); val);
acme_volume_gstreamer_close (self);
} }
static gboolean static gboolean
acme_volume_gstreamer_get_mute (AcmeVolume *vol) acme_volume_gstreamer_get_mute (AcmeVolume *vol)
{ {
AcmeVolumeGStreamer *self = (AcmeVolumeGStreamer *) vol; AcmeVolumeGStreamer *self = (AcmeVolumeGStreamer *) vol;
gboolean mute;
if (self->_priv->mixer == NULL) if (acme_volume_gstreamer_open (self) == FALSE)
return FALSE; return FALSE;
return GST_MIXER_TRACK_HAS_FLAG (self->_priv->track, mute = GST_MIXER_TRACK_HAS_FLAG (self->_priv->track,
GST_MIXER_TRACK_MUTE); GST_MIXER_TRACK_MUTE);
acme_volume_gstreamer_close (self);
return mute;
} }
static int static int
@ -101,7 +116,7 @@ acme_volume_gstreamer_get_volume (AcmeVolume *vol)
AcmeVolumeGStreamer *self = (AcmeVolumeGStreamer *) vol; AcmeVolumeGStreamer *self = (AcmeVolumeGStreamer *) vol;
GstMixerTrack *track; GstMixerTrack *track;
if (self->_priv->mixer == NULL) if (acme_volume_gstreamer_open (self) == FALSE)
return 0; return 0;
track = self->_priv->track; track = self->_priv->track;
@ -112,6 +127,8 @@ acme_volume_gstreamer_get_volume (AcmeVolume *vol)
vol_total += volumes[i]; vol_total += volumes[i];
g_free (volumes); g_free (volumes);
acme_volume_gstreamer_close (self);
volume = vol_total / (double)track->num_channels; volume = vol_total / (double)track->num_channels;
/* Normalize the volume to the [0, 100] scale that acme expects. */ /* Normalize the volume to the [0, 100] scale that acme expects. */
@ -126,11 +143,12 @@ acme_volume_gstreamer_set_volume (AcmeVolume *vol, int val)
gint i, *volumes; gint i, *volumes;
double volume; double volume;
AcmeVolumeGStreamer *self = (AcmeVolumeGStreamer *) vol; AcmeVolumeGStreamer *self = (AcmeVolumeGStreamer *) vol;
GstMixerTrack *track = self->_priv->track; GstMixerTrack *track;
if (self->_priv->mixer == NULL) if (acme_volume_gstreamer_open (self) == FALSE)
return; return;
track = self->_priv->track;
val = CLAMP (val, 0, 100); val = CLAMP (val, 0, 100);
/* Rescale the volume from [0, 100] to [track min, track max]. */ /* Rescale the volume from [0, 100] to [track min, track max]. */
@ -141,17 +159,49 @@ acme_volume_gstreamer_set_volume (AcmeVolume *vol, int val)
volumes[i] = (gint) volume; volumes[i] = (gint) volume;
gst_mixer_set_volume (self->_priv->mixer, track, volumes); gst_mixer_set_volume (self->_priv->mixer, track, volumes);
g_free (volumes); g_free (volumes);
acme_volume_gstreamer_close (self);
}
static gboolean
acme_volume_gstreamer_close_real (AcmeVolumeGStreamer *self)
{
if (self->_priv == NULL)
return FALSE;
if (self->_priv->mixer != NULL)
{
gst_element_set_state (GST_ELEMENT(self->_priv->mixer), GST_STATE_NULL);
gst_element_set_state (GST_ELEMENT(self->_priv->track), GST_STATE_NULL);
g_object_unref (GST_OBJECT (self->_priv->mixer));
g_object_unref (GST_OBJECT (self->_priv->track));
self->_priv->mixer=NULL;
self->_priv->track=NULL;
}
self->_priv->timer_id = 0;
return FALSE;
} }
/* This is a modified version of code from gnome-media's gst-mixer */ /* This is a modified version of code from gnome-media's gst-mixer */
static void static gboolean
acme_volume_gstreamer_init (AcmeVolumeGStreamer *self) acme_volume_gstreamer_open (AcmeVolumeGStreamer *vol)
{ {
const GList *elements; AcmeVolumeGStreamer *self = (AcmeVolumeGStreamer *) vol;
gint num = 0; const GList *elements;
gint num = 0;
self->_priv = g_new0 (AcmeVolumeGStreamerPrivate, 1);
if (self->_priv == NULL)
return FALSE;
if (self->_priv->timer_id != 0)
{
g_source_remove (self->_priv->timer_id);
self->_priv->timer_id = 0;
return TRUE;
}
/* Go through all elements of a certain class and check whether /* Go through all elements of a certain class and check whether
* they implement a mixer. If so, walk through the tracks and look * they implement a mixer. If so, walk through the tracks and look
* for first one named "volume". * for first one named "volume".
@ -239,8 +289,36 @@ acme_volume_gstreamer_init (AcmeVolumeGStreamer *self)
g_value_array_free (array); g_value_array_free (array);
g_free (title); g_free (title);
} }
return FALSE;
} }
static void
acme_volume_gstreamer_close (AcmeVolumeGStreamer *self)
{
self->_priv->timer_id = g_timeout_add (TIMEOUT,
(GSourceFunc) acme_volume_gstreamer_close_real, self);
}
static void
acme_volume_gstreamer_init (AcmeVolumeGStreamer *self)
{
self->_priv = g_new0 (AcmeVolumeGStreamerPrivate, 1);
if (acme_volume_gstreamer_open (self) == FALSE)
{
g_free (self->_priv);
self->_priv = NULL;
return;
}
if (self->_priv->mixer != NULL) {
acme_volume_gstreamer_close_real (self);
return;
}
}
static void static void
acme_volume_gstreamer_class_init (AcmeVolumeGStreamerClass *klass) acme_volume_gstreamer_class_init (AcmeVolumeGStreamerClass *klass)
{ {