|
 |
39e4d3d |
Index: capplets/sound/sound-properties-capplet.c
|
|
|
39e4d3d |
===================================================================
|
|
|
39e4d3d |
--- capplets/sound/sound-properties-capplet.c (revision 9054)
|
|
|
39e4d3d |
+++ capplets/sound/sound-properties-capplet.c (working copy)
|
|
|
39e4d3d |
@@ -280,6 +280,7 @@
|
|
|
39e4d3d |
}
|
|
|
39e4d3d |
}
|
|
|
39e4d3d |
|
|
|
39e4d3d |
+#if 0
|
|
|
39e4d3d |
/* Adds an element which supports the GstPropertyProbe interface. Will add
|
|
|
39e4d3d |
* entries for all available devices. Elements should support retrieving the
|
|
|
39e4d3d |
* device-name in NULL state for this to work properly/nicely.
|
|
|
39e4d3d |
@@ -347,7 +348,7 @@
|
|
|
39e4d3d |
gst_object_unref (element);
|
|
|
39e4d3d |
return res;
|
|
|
39e4d3d |
}
|
|
|
39e4d3d |
-
|
|
|
39e4d3d |
+#endif
|
|
|
39e4d3d |
#if USE_HAL
|
|
|
39e4d3d |
static void
|
|
|
39e4d3d |
remove_device (int type, const gchar *pipeline)
|
|
|
39e4d3d |
@@ -836,13 +837,6 @@
|
|
|
39e4d3d |
add_device (AUDIO_PLAYBACK, "artsdsink", _("Artsd - ART Sound Daemon"), NULL);
|
|
|
39e4d3d |
add_device (AUDIO_PLAYBACK, "esdsink", _("ESD - Enlightened Sound Daemon"), NULL);
|
|
|
39e4d3d |
add_device (AUDIO_CAPTURE, "esdmon", _("ESD - Enlightened Sound Daemon"), NULL);
|
|
|
39e4d3d |
- /* only show legacy OSS if OSS4 isn't active and working */
|
|
|
39e4d3d |
- if (!add_device_with_probe (AUDIO_PLAYBACK, "oss4sink", "OSS4")) {
|
|
|
39e4d3d |
- add_device (AUDIO_PLAYBACK, "osssink", _("OSS - Open Sound System"), NULL);
|
|
|
39e4d3d |
- }
|
|
|
39e4d3d |
- if (!add_device_with_probe (AUDIO_CAPTURE, "oss4src", "OSS4")) {
|
|
|
39e4d3d |
- add_device (AUDIO_CAPTURE, "osssrc", _("OSS - Open Sound System"), NULL);
|
|
|
39e4d3d |
- }
|
|
|
39e4d3d |
add_device (AUDIO_PLAYBACK, "pulsesink", _("PulseAudio Sound Server"), NULL);
|
|
|
39e4d3d |
add_device (AUDIO_CAPTURE, "pulsesrc", _("PulseAudio Sound Server"), NULL);
|
|
|
39e4d3d |
add_device (AUDIO_CAPTURE, "audiotestsrc wave=triangle is-live=true", _("Test Sound"), NULL);
|