mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-22 16:26:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/pulse/: Some smaller cleanup. Use G_PARAM_STATIC_STRINGS, gst_element_class_set_details_simple() and fix coding s...

Browse source 
Original commit message from CVS:
* ext/pulse/pulsemixer.c: (gst_pulsemixer_base_init),
(gst_pulsemixer_class_init):
* ext/pulse/pulsesink.c: (gst_pulsesink_base_init),
(gst_pulsesink_class_init), (gst_pulsesink_prepare):
* ext/pulse/pulsesrc.c: (gst_pulsesrc_interface_supported),
(gst_pulsesrc_base_init), (gst_pulsesrc_class_init),
(gst_pulsesrc_prepare):
Some smaller cleanup. Use G_PARAM_STATIC_STRINGS,
gst_element_class_set_details_simple() and fix coding style a bit
more.
This commit is contained in:
Sebastian Dröge 2008-06-10 08:59:17 +00:00
parent 7390985262
commit 74e9eb72c5
4 changed files with 51 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,16 @@
2008-06-10 Sebastian Dröge <slomo@circular-chaos.org>
* ext/pulse/pulsemixer.c: (gst_pulsemixer_base_init),
(gst_pulsemixer_class_init):
* ext/pulse/pulsesink.c: (gst_pulsesink_base_init),
(gst_pulsesink_class_init), (gst_pulsesink_prepare):
* ext/pulse/pulsesrc.c: (gst_pulsesrc_interface_supported),
(gst_pulsesrc_base_init), (gst_pulsesrc_class_init),
(gst_pulsesrc_prepare):
Some smaller cleanup. Use G_PARAM_STATIC_STRINGS,
gst_element_class_set_details_simple() and fix coding style a bit
more.
2008-06-10 Sebastian Dröge <slomo@circular-chaos.org> 2008-06-10 Sebastian Dröge <slomo@circular-chaos.org>
* docs/plugins/Makefile.am: * docs/plugins/Makefile.am:

16
ext/pulse/pulsemixer.c
View file

@ -123,14 +123,11 @@ gst_pulsemixer_init_interfaces (GType type)
static void static void
gst_pulsemixer_base_init (gpointer g_class) gst_pulsemixer_base_init (gpointer g_class)
{ {
gst_element_class_set_details_simple (GST_ELEMENT_CLASS (g_class),
static const GstElementDetails details = "PulseAudio Mixer",
GST_ELEMENT_DETAILS ("PulseAudio Mixer",
"Generic/Audio", "Generic/Audio",
"Control sound input and output levels for PulseAudio", "Control sound input and output levels for PulseAudio",
"Lennart Poettering"); "Lennart Poettering");
gst_element_class_set_details (GST_ELEMENT_CLASS (g_class), &details);
} }
static void static void
@ -150,17 +147,20 @@ gst_pulsemixer_class_init (GstPulseMixerClass * g_class)
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_SERVER, PROP_SERVER,
g_param_spec_string ("server", "Server", g_param_spec_string ("server", "Server",
"The PulseAudio server to connect to", NULL, G_PARAM_READWRITE)); "The PulseAudio server to connect to", NULL,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_DEVICE, PROP_DEVICE,
g_param_spec_string ("device", "Sink/Source", g_param_spec_string ("device", "Sink/Source",
"The PulseAudio sink or source to control", NULL, G_PARAM_READWRITE)); "The PulseAudio sink or source to control", NULL,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_DEVICE_NAME, PROP_DEVICE_NAME,
g_param_spec_string ("device-name", "Device name", g_param_spec_string ("device-name", "Device name",
"Human-readable name of the sound device", NULL, G_PARAM_READABLE)); "Human-readable name of the sound device", NULL,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
} }
static void static void

16
ext/pulse/pulsesink.c
View file

@ -142,15 +142,11 @@ gst_pulsesink_base_init (gpointer g_class)
"rate = (int) [ 1, MAX], " "channels = (int) [ 1, 16 ]") "rate = (int) [ 1, MAX], " "channels = (int) [ 1, 16 ]")
); );
static const GstElementDetails details =
GST_ELEMENT_DETAILS ("PulseAudio Audio Sink",
"Sink/Audio",
"Plays audio to a PulseAudio server",
"Lennart Poettering");
GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
gst_element_class_set_details (element_class, &details); gst_element_class_set_details_simple (element_class,
"PulseAudio Audio Sink",
"Sink/Audio", "Plays audio to a PulseAudio server", "Lennart Poettering");
gst_element_class_add_pad_template (element_class, gst_element_class_add_pad_template (element_class,
gst_static_pad_template_get (&pad_template)); gst_static_pad_template_get (&pad_template));
} }
@ -186,10 +182,12 @@ gst_pulsesink_class_init (gpointer g_class, gpointer class_data)
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_SERVER, PROP_SERVER,
g_param_spec_string ("server", "Server", g_param_spec_string ("server", "Server",
"The PulseAudio server to connect to", NULL, G_PARAM_READWRITE)); "The PulseAudio server to connect to", NULL,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, PROP_DEVICE, g_object_class_install_property (gobject_class, PROP_DEVICE,
g_param_spec_string ("device", "Sink", g_param_spec_string ("device", "Sink",
"The PulseAudio sink device to connect to", NULL, G_PARAM_READWRITE)); "The PulseAudio sink device to connect to", NULL,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
} }
static void static void

47
ext/pulse/pulsesrc.c
View file

@ -63,33 +63,33 @@ enum
static GstAudioSrcClass *parent_class = NULL; static GstAudioSrcClass *parent_class = NULL;
GST_IMPLEMENT_PULSEMIXER_CTRL_METHODS (GstPulseSrc, gst_pulsesrc) GST_IMPLEMENT_PULSEMIXER_CTRL_METHODS (GstPulseSrc, gst_pulsesrc);
static void gst_pulsesrc_destroy_stream (GstPulseSrc * pulsesrc); static void gst_pulsesrc_destroy_stream (GstPulseSrc * pulsesrc);
static void gst_pulsesrc_destroy_context (GstPulseSrc * pulsesrc); static void gst_pulsesrc_destroy_context (GstPulseSrc * pulsesrc);
static void gst_pulsesrc_set_property (GObject * object, guint prop_id, static void gst_pulsesrc_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec); const GValue * value, GParamSpec * pspec);
static void gst_pulsesrc_get_property (GObject * object, guint prop_id, static void gst_pulsesrc_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static void gst_pulsesrc_finalize (GObject * object); static void gst_pulsesrc_finalize (GObject * object);
static void gst_pulsesrc_dispose (GObject * object); static void gst_pulsesrc_dispose (GObject * object);
static gboolean gst_pulsesrc_open (GstAudioSrc * asrc); static gboolean gst_pulsesrc_open (GstAudioSrc * asrc);
static gboolean gst_pulsesrc_close (GstAudioSrc * asrc); static gboolean gst_pulsesrc_close (GstAudioSrc * asrc);
static gboolean gst_pulsesrc_prepare (GstAudioSrc * asrc, static gboolean gst_pulsesrc_prepare (GstAudioSrc * asrc,
GstRingBufferSpec * spec); GstRingBufferSpec * spec);
static gboolean gst_pulsesrc_unprepare (GstAudioSrc * asrc); static gboolean gst_pulsesrc_unprepare (GstAudioSrc * asrc);
static guint gst_pulsesrc_read (GstAudioSrc * asrc, gpointer data, static guint gst_pulsesrc_read (GstAudioSrc * asrc, gpointer data,
guint length); guint length);
static guint gst_pulsesrc_delay (GstAudioSrc * asrc); static guint gst_pulsesrc_delay (GstAudioSrc * asrc);
static GstStateChangeReturn gst_pulsesrc_change_state (GstElement * static GstStateChangeReturn gst_pulsesrc_change_state (GstElement *
element, GstStateChange transition); element, GstStateChange transition);
#if (G_BYTE_ORDER == G_LITTLE_ENDIAN) #if (G_BYTE_ORDER == G_LITTLE_ENDIAN)
@ -98,7 +98,8 @@ GST_IMPLEMENT_PULSEMIXER_CTRL_METHODS (GstPulseSrc, gst_pulsesrc)
# define ENDIANNESS "BIG_ENDIAN, LITTLE_ENDIAN" # define ENDIANNESS "BIG_ENDIAN, LITTLE_ENDIAN"
#endif #endif
static gboolean gst_pulsesrc_interface_supported (GstImplementsInterface * static gboolean
gst_pulsesrc_interface_supported (GstImplementsInterface *
iface, GType interface_type) iface, GType interface_type)
{ {
GstPulseSrc *this = GST_PULSESRC (iface); GstPulseSrc *this = GST_PULSESRC (iface);
@ -173,15 +174,12 @@ gst_pulsesrc_base_init (gpointer g_class)
"rate = (int) [ 1, MAX], " "channels = (int) [ 1, 16 ]") "rate = (int) [ 1, MAX], " "channels = (int) [ 1, 16 ]")
); );
static const GstElementDetails details =
GST_ELEMENT_DETAILS ("PulseAudio Audio Source",
"Source/Audio",
"Captures audio from a PulseAudio server",
"Lennart Poettering");
GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
gst_element_class_set_details (element_class, &details); gst_element_class_set_details_simple (element_class,
"PulseAudio Audio Source",
"Source/Audio",
"Captures audio from a PulseAudio server", "Lennart Poettering");
gst_element_class_add_pad_template (element_class, gst_element_class_add_pad_template (element_class,
gst_static_pad_template_get (&pad_template)); gst_static_pad_template_get (&pad_template));
} }
@ -217,11 +215,12 @@ gst_pulsesrc_class_init (gpointer g_class, gpointer class_data)
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_SERVER, PROP_SERVER,
g_param_spec_string ("server", "Server", g_param_spec_string ("server", "Server",
"The PulseAudio server to connect to", NULL, G_PARAM_READWRITE)); "The PulseAudio server to connect to", NULL,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, PROP_DEVICE, g_object_class_install_property (gobject_class, PROP_DEVICE,
g_param_spec_string ("device", "Source", g_param_spec_string ("device", "Source",
"The PulseAudio source device to connect to", NULL, "The PulseAudio source device to connect to", NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
} }
static void static void