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

ext/pulse/pulsesink.c: Change #if 0 to something more expresive and add pointer to related bug ticket.

Browse source 
Original commit message from CVS:
* ext/pulse/pulsesink.c:
Change #if 0 to something more expresive and add pointer to related
bug ticket.
This commit is contained in:
Stefan Kost 2008-11-23 15:08:45 +00:00
parent c6d33e5286
commit 81dd155274
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-11-23 Stefan Kost <ensonic@users.sf.net>
* ext/pulse/pulsesink.c:
Change #if 0 to something more expresive and add pointer to related
bug ticket.
2008-11-23 Sebastian Dröge <sebastian.droege@collabora.co.uk> 2008-11-23 Sebastian Dröge <sebastian.droege@collabora.co.uk>
Patch by: Tal Shalif <tshalif at nargila dot org> Patch by: Tal Shalif <tshalif at nargila dot org>

18
ext/pulse/pulsesink.c
View file

@ -61,6 +61,12 @@
GST_DEBUG_CATEGORY_EXTERN (pulse_debug); GST_DEBUG_CATEGORY_EXTERN (pulse_debug);
#define GST_CAT_DEFAULT pulse_debug #define GST_CAT_DEFAULT pulse_debug
/* according to
* http://www.pulseaudio.org/ticket/314
* we need pulse-0.9.12 to use sink volume properties
*/
/*#define HAVE_PULSE_0_9_12 */
enum enum
{ {
PROP_SERVER = 1, PROP_SERVER = 1,
@ -239,7 +245,7 @@ gst_pulsesink_class_init (GstPulseSinkClass * klass)
g_param_spec_string ("device-name", "Device name", g_param_spec_string ("device-name", "Device name",
"Human-readable name of the sound device", NULL, "Human-readable name of the sound device", NULL,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
#if 0 #ifdef HAVE_PULSE_0_9_12
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_VOLUME, PROP_VOLUME,
g_param_spec_double ("volume", "Volume", g_param_spec_double ("volume", "Volume",
@ -329,7 +335,7 @@ gst_pulsesink_dispose (GObject * object)
G_OBJECT_CLASS (parent_class)->dispose (object); G_OBJECT_CLASS (parent_class)->dispose (object);
} }
#if 0 #ifdef HAVE_PULSE_0_9_12
static void static void
gst_pulsesink_set_volume (GstPulseSink * pulsesink, gdouble volume) gst_pulsesink_set_volume (GstPulseSink * pulsesink, gdouble volume)
{ {
@ -401,7 +407,7 @@ gst_pulsesink_set_property (GObject * object,
pulsesink->device = g_value_dup_string (value); pulsesink->device = g_value_dup_string (value);
break; break;
#if 0 #ifdef HAVE_PULSE_0_9_12
case PROP_VOLUME: case PROP_VOLUME:
gst_pulsesink_set_volume (pulsesink, g_value_get_double (value)); gst_pulsesink_set_volume (pulsesink, g_value_get_double (value));
break; break;
@ -436,7 +442,7 @@ gst_pulsesink_get_property (GObject * object,
g_value_set_string (value, NULL); g_value_set_string (value, NULL);
break; break;
#if 0 #ifdef HAVE_PULSE_0_9_12
case PROP_VOLUME: case PROP_VOLUME:
g_value_set_double (value, gst_pulsesink_get_volume (pulsesink)); g_value_set_double (value, gst_pulsesink_get_volume (pulsesink));
break; break;
@ -637,7 +643,7 @@ gst_pulsesink_prepare (GstAudioSink * asink, GstRingBufferSpec * spec)
pa_threaded_mainloop_unlock (pulsesink->mainloop); pa_threaded_mainloop_unlock (pulsesink->mainloop);
#if 0 #ifdef HAVE_PULSE_0_9_12
gst_pulsesink_set_volume (pulsesink, pulsesink->volume); gst_pulsesink_set_volume (pulsesink, pulsesink->volume);
#endif #endif
@ -911,7 +917,7 @@ gst_pulsesink_change_state (GstElement * element, GstStateChange transition)
case GST_STATE_CHANGE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
if (this->mixer) { if (this->mixer) {
#if 0 #ifdef HAVE_PULSE_0_9_12
this->volume = gst_pulsesink_get_volume (this); this->volume = gst_pulsesink_get_volume (this);
#endif #endif
gst_pulsemixer_ctrl_free (this->mixer); gst_pulsemixer_ctrl_free (this->mixer);