mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-04-27 23:44:47 +00:00
gst-indent
Original commit message from CVS: gst-indent
This commit is contained in:
parent
d952e72d42
commit
c2bcfc8446
3 changed files with 595 additions and 557 deletions
|
@ -74,15 +74,16 @@ static void gst_jack_get_property (GObject *object, guint prop_id,
|
|||
|
||||
static GstPadTemplate *gst_jack_src_request_pad_factory ();
|
||||
static GstPadTemplate *gst_jack_sink_request_pad_factory ();
|
||||
static GstPad* gst_jack_request_new_pad (GstElement *element, GstPadTemplate *templ,
|
||||
const gchar *name);
|
||||
static GstPad *gst_jack_request_new_pad (GstElement * element,
|
||||
GstPadTemplate * templ, const gchar * name);
|
||||
static GstElementStateReturn gst_jack_change_state (GstElement * element);
|
||||
static GstPadLinkReturn gst_jack_link (GstPad * pad, const GstCaps * caps);
|
||||
|
||||
static void gst_jack_loop (GstElement * element);
|
||||
|
||||
|
||||
enum {
|
||||
enum
|
||||
{
|
||||
ARG_0,
|
||||
ARG_PORT_NAME_PREFIX,
|
||||
};
|
||||
|
@ -105,7 +106,8 @@ gst_jack_get_type (void)
|
|||
0,
|
||||
NULL,
|
||||
};
|
||||
jack_type = g_type_register_static (GST_TYPE_ELEMENT, "GstJack", &jack_info, 0);
|
||||
jack_type =
|
||||
g_type_register_static (GST_TYPE_ELEMENT, "GstJack", &jack_info, 0);
|
||||
}
|
||||
return jack_type;
|
||||
}
|
||||
|
@ -127,7 +129,8 @@ gst_jack_sink_get_type (void)
|
|||
0,
|
||||
(GInstanceInitFunc) gst_jack_init,
|
||||
};
|
||||
jack_type = g_type_register_static (GST_TYPE_JACK, "GstJackSink", &jack_info, 0);
|
||||
jack_type =
|
||||
g_type_register_static (GST_TYPE_JACK, "GstJackSink", &jack_info, 0);
|
||||
}
|
||||
return jack_type;
|
||||
}
|
||||
|
@ -149,7 +152,8 @@ gst_jack_src_get_type (void)
|
|||
0,
|
||||
(GInstanceInitFunc) gst_jack_init,
|
||||
};
|
||||
jack_type = g_type_register_static (GST_TYPE_JACK, "GstJackSrc", &jack_info, 0);
|
||||
jack_type =
|
||||
g_type_register_static (GST_TYPE_JACK, "GstJackSrc", &jack_info, 0);
|
||||
}
|
||||
return jack_type;
|
||||
}
|
||||
|
@ -167,7 +171,8 @@ gst_jack_src_base_init (gpointer g_class)
|
|||
{
|
||||
GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
|
||||
|
||||
gst_element_class_add_pad_template (element_class, gst_jack_src_request_pad_factory ());
|
||||
gst_element_class_add_pad_template (element_class,
|
||||
gst_jack_src_request_pad_factory ());
|
||||
gst_element_class_set_details (element_class, &gst_jack_src_details);
|
||||
}
|
||||
|
||||
|
@ -176,7 +181,8 @@ gst_jack_sink_base_init (gpointer g_class)
|
|||
{
|
||||
GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
|
||||
|
||||
gst_element_class_add_pad_template (element_class, gst_jack_sink_request_pad_factory ());
|
||||
gst_element_class_add_pad_template (element_class,
|
||||
gst_jack_sink_request_pad_factory ());
|
||||
gst_element_class_set_details (element_class, &gst_jack_sink_details);
|
||||
}
|
||||
|
||||
|
@ -226,7 +232,8 @@ gst_jack_init(GstJack *this)
|
|||
}
|
||||
|
||||
static void
|
||||
gst_jack_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
|
||||
gst_jack_set_property (GObject * object, guint prop_id, const GValue * value,
|
||||
GParamSpec * pspec)
|
||||
{
|
||||
GstJack *this = (GstJack *) object;
|
||||
|
||||
|
@ -243,7 +250,8 @@ gst_jack_set_property(GObject *object, guint prop_id, const GValue *value, GPara
|
|||
}
|
||||
|
||||
static void
|
||||
gst_jack_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
|
||||
gst_jack_get_property (GObject * object, guint prop_id, GValue * value,
|
||||
GParamSpec * pspec)
|
||||
{
|
||||
GstJack *this = (GstJack *) object;
|
||||
|
||||
|
@ -264,9 +272,9 @@ gst_jack_src_request_pad_factory (void)
|
|||
|
||||
if (!template) {
|
||||
GstCaps *caps;
|
||||
|
||||
caps = gst_caps_from_string (GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_CAPS);
|
||||
template = gst_pad_template_new ("%s", GST_PAD_SRC,
|
||||
GST_PAD_REQUEST, caps);
|
||||
template = gst_pad_template_new ("%s", GST_PAD_SRC, GST_PAD_REQUEST, caps);
|
||||
}
|
||||
|
||||
return template;
|
||||
|
@ -279,16 +287,17 @@ gst_jack_sink_request_pad_factory (void)
|
|||
|
||||
if (!template) {
|
||||
GstCaps *caps;
|
||||
|
||||
caps = gst_caps_from_string (GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_CAPS);
|
||||
template = gst_pad_template_new ("%s", GST_PAD_SINK,
|
||||
GST_PAD_REQUEST, caps);
|
||||
template = gst_pad_template_new ("%s", GST_PAD_SINK, GST_PAD_REQUEST, caps);
|
||||
}
|
||||
|
||||
return template;
|
||||
}
|
||||
|
||||
static GstPad *
|
||||
gst_jack_request_new_pad (GstElement *element, GstPadTemplate *templ, const gchar *name)
|
||||
gst_jack_request_new_pad (GstElement * element, GstPadTemplate * templ,
|
||||
const gchar * name)
|
||||
{
|
||||
GstJack *this;
|
||||
gchar *newname;
|
||||
|
@ -327,8 +336,11 @@ gst_jack_request_new_pad (GstElement *element, GstPadTemplate *templ, const gcha
|
|||
if (!port_name_counts)
|
||||
port_name_counts = g_hash_table_new (g_str_hash, g_str_equal);
|
||||
|
||||
count = GPOINTER_TO_INT (g_hash_table_lookup (port_name_counts, this->port_name_prefix));
|
||||
g_hash_table_insert (port_name_counts, g_strdup (this->port_name_prefix), GINT_TO_POINTER (count+1));
|
||||
count =
|
||||
GPOINTER_TO_INT (g_hash_table_lookup (port_name_counts,
|
||||
this->port_name_prefix));
|
||||
g_hash_table_insert (port_name_counts, g_strdup (this->port_name_prefix),
|
||||
GINT_TO_POINTER (count + 1));
|
||||
|
||||
pad->name = g_strdup_printf ("%s%d", this->port_name_prefix, count);
|
||||
|
||||
|
@ -339,7 +351,8 @@ gst_jack_request_new_pad (GstElement *element, GstPadTemplate *templ, const gcha
|
|||
|
||||
this->pads = g_list_append (this->pads, pad);
|
||||
|
||||
g_print ("returning from request_new_pad, pad %s created, to connect to %s\n", pad->name, pad->peer_name);
|
||||
g_print ("returning from request_new_pad, pad %s created, to connect to %s\n",
|
||||
pad->name, pad->peer_name);
|
||||
return pad->pad;
|
||||
}
|
||||
|
||||
|
@ -374,10 +387,13 @@ gst_jack_change_state (GstElement *element)
|
|||
|
||||
/* fixme: verify that all names are unique */
|
||||
l = this->pads;
|
||||
pads = (this->direction == GST_PAD_SRC) ? &this->bin->src_pads : &this->bin->sink_pads;
|
||||
pads =
|
||||
(this->direction ==
|
||||
GST_PAD_SRC) ? &this->bin->src_pads : &this->bin->sink_pads;
|
||||
while (l) {
|
||||
pad = GST_JACK_PAD (l);
|
||||
JACK_DEBUG ("%s: appending pad %s:%s to list", GST_OBJECT_NAME (this), pad->name, pad->peer_name);
|
||||
JACK_DEBUG ("%s: appending pad %s:%s to list", GST_OBJECT_NAME (this),
|
||||
pad->name, pad->peer_name);
|
||||
*pads = g_list_append (*pads, pad);
|
||||
l = g_list_next (l);
|
||||
}
|
||||
|
@ -395,8 +411,7 @@ gst_jack_change_state (GstElement *element)
|
|||
caps = gst_caps_copy (gst_pad_get_negotiated_caps (pad->pad));
|
||||
gst_caps_set_simple (caps,
|
||||
"rate", G_TYPE_INT, (int) this->bin->rate,
|
||||
"buffer-frames", G_TYPE_INT, (gint)this->bin->nframes,
|
||||
NULL);
|
||||
"buffer-frames", G_TYPE_INT, (gint) this->bin->nframes, NULL);
|
||||
if (gst_pad_try_set_caps (pad->pad, caps) <= 0)
|
||||
return GST_STATE_FAILURE;
|
||||
l = g_list_next (l);
|
||||
|
@ -457,6 +472,7 @@ gst_jack_loop (GstElement *element)
|
|||
|
||||
if (GST_IS_EVENT (buffer)) {
|
||||
GstEvent *event = GST_EVENT (buffer);
|
||||
|
||||
switch (GST_EVENT_TYPE (buffer)) {
|
||||
case GST_EVENT_EOS:
|
||||
gst_element_set_eos (element);
|
||||
|
@ -472,8 +488,7 @@ gst_jack_loop (GstElement *element)
|
|||
they should), if the length of the GstBuffer is different
|
||||
from nframes then the buffer is short and we will get EOS
|
||||
next */
|
||||
memcpy (pad->data, GST_BUFFER_DATA (buffer),
|
||||
GST_BUFFER_SIZE (buffer));
|
||||
memcpy (pad->data, GST_BUFFER_DATA (buffer), GST_BUFFER_SIZE (buffer));
|
||||
if (len != GST_BUFFER_SIZE (buffer))
|
||||
memset (pad->data + GST_BUFFER_SIZE (buffer), 0,
|
||||
len - GST_BUFFER_SIZE (buffer));
|
||||
|
@ -493,25 +508,22 @@ gst_jack_loop (GstElement *element)
|
|||
static gboolean
|
||||
plugin_init (GstPlugin * plugin)
|
||||
{
|
||||
if (!gst_element_register (plugin, "jackbin", GST_RANK_NONE, GST_TYPE_JACK_BIN))
|
||||
if (!gst_element_register (plugin, "jackbin", GST_RANK_NONE,
|
||||
GST_TYPE_JACK_BIN))
|
||||
return FALSE;
|
||||
|
||||
if (!gst_element_register (plugin, "jacksrc", GST_RANK_NONE, GST_TYPE_JACK_SRC))
|
||||
if (!gst_element_register (plugin, "jacksrc", GST_RANK_NONE,
|
||||
GST_TYPE_JACK_SRC))
|
||||
return FALSE;
|
||||
|
||||
if (!gst_element_register (plugin, "jacksink", GST_RANK_NONE, GST_TYPE_JACK_SINK))
|
||||
if (!gst_element_register (plugin, "jacksink", GST_RANK_NONE,
|
||||
GST_TYPE_JACK_SINK))
|
||||
return FALSE;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
GST_PLUGIN_DEFINE (
|
||||
GST_VERSION_MAJOR,
|
||||
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
|
||||
GST_VERSION_MINOR,
|
||||
"jack",
|
||||
"Jack Plugin Library",
|
||||
plugin_init,
|
||||
VERSION,
|
||||
"GPL",
|
||||
GST_PACKAGE,
|
||||
GST_ORIGIN)
|
||||
"Jack Plugin Library", plugin_init, VERSION, "GPL", GST_PACKAGE, GST_ORIGIN)
|
||||
|
|
|
@ -64,7 +64,8 @@ typedef GstJack GstJackSrc;
|
|||
typedef GstJackClass GstJackSrcClass;
|
||||
|
||||
|
||||
enum {
|
||||
enum
|
||||
{
|
||||
GST_JACK_OPEN = GST_BIN_FLAG_LAST,
|
||||
GST_JACK_ACTIVE,
|
||||
GST_JACK_FLAG_LAST = GST_BIN_FLAG_LAST + 3,
|
||||
|
@ -73,7 +74,8 @@ enum {
|
|||
|
||||
typedef jack_default_audio_sample_t sample_t;
|
||||
|
||||
typedef struct {
|
||||
typedef struct
|
||||
{
|
||||
GstPad *pad;
|
||||
void *data;
|
||||
const gchar *name;
|
||||
|
@ -81,7 +83,8 @@ typedef struct {
|
|||
jack_port_t *port;
|
||||
} GstJackPad;
|
||||
|
||||
struct _GstJack {
|
||||
struct _GstJack
|
||||
{
|
||||
GstElement element;
|
||||
|
||||
/* list of GstJackPads */
|
||||
|
@ -95,11 +98,13 @@ struct _GstJack {
|
|||
GstJackBin *bin;
|
||||
};
|
||||
|
||||
struct _GstJackClass {
|
||||
struct _GstJackClass
|
||||
{
|
||||
GstElementClass parent_class;
|
||||
};
|
||||
|
||||
struct _GstJackBin {
|
||||
struct _GstJackBin
|
||||
{
|
||||
GstBin bin;
|
||||
|
||||
jack_client_t *client;
|
||||
|
@ -115,7 +120,8 @@ struct _GstJackBin {
|
|||
jack_nframes_t nframes;
|
||||
};
|
||||
|
||||
struct _GstJackBinClass {
|
||||
struct _GstJackBinClass
|
||||
{
|
||||
GstBinClass parent_class;
|
||||
};
|
||||
|
||||
|
|
|
@ -51,6 +51,7 @@ GType
|
|||
gst_jack_bin_get_type (void)
|
||||
{
|
||||
static GType jack_bin_type = 0;
|
||||
|
||||
if (!jack_bin_type) {
|
||||
static const GTypeInfo jack_bin_info = {
|
||||
sizeof (GstJackBinClass),
|
||||
|
@ -63,7 +64,8 @@ if (!jack_bin_type) {
|
|||
0,
|
||||
(GInstanceInitFunc) gst_jack_bin_init,
|
||||
};
|
||||
jack_bin_type = g_type_register_static (GST_TYPE_BIN, "GstJackBin", &jack_bin_info, 0);
|
||||
jack_bin_type =
|
||||
g_type_register_static (GST_TYPE_BIN, "GstJackBin", &jack_bin_info, 0);
|
||||
}
|
||||
return jack_bin_type;
|
||||
}
|
||||
|
@ -146,13 +148,15 @@ gst_jack_bin_change_state (GstElement *element)
|
|||
if (GST_FLAG_IS_SET (GST_OBJECT (this), GST_JACK_OPEN)) {
|
||||
l = this->src_pads;
|
||||
while (l) {
|
||||
JACK_DEBUG ("jackbin: unregistering pad %s:%s", GST_JACK_PAD (l)->name, GST_JACK_PAD (l)->peer_name);
|
||||
JACK_DEBUG ("jackbin: unregistering pad %s:%s",
|
||||
GST_JACK_PAD (l)->name, GST_JACK_PAD (l)->peer_name);
|
||||
jack_port_unregister (this->client, GST_JACK_PAD (l)->port);
|
||||
l = g_list_next (l);
|
||||
}
|
||||
l = this->sink_pads;
|
||||
while (l) {
|
||||
JACK_DEBUG ("jackbin: unregistering pad %s:%s", GST_JACK_PAD (l)->name, GST_JACK_PAD (l)->peer_name);
|
||||
JACK_DEBUG ("jackbin: unregistering pad %s:%s",
|
||||
GST_JACK_PAD (l)->name, GST_JACK_PAD (l)->peer_name);
|
||||
jack_port_unregister (this->client, GST_JACK_PAD (l)->port);
|
||||
l = g_list_next (l);
|
||||
}
|
||||
|
@ -176,15 +180,22 @@ gst_jack_bin_change_state (GstElement *element)
|
|||
l = this->src_pads;
|
||||
while (l) {
|
||||
pad = GST_JACK_PAD (l);
|
||||
JACK_DEBUG ("jackbin: registering input port %s (peer %s)", pad->name, pad->peer_name);
|
||||
pad->port = jack_port_register (this->client, pad->name, JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput|JackPortIsTerminal, 0);
|
||||
JACK_DEBUG ("jackbin: registering input port %s (peer %s)", pad->name,
|
||||
pad->peer_name);
|
||||
pad->port =
|
||||
jack_port_register (this->client, pad->name,
|
||||
JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput | JackPortIsTerminal, 0);
|
||||
l = g_list_next (l);
|
||||
}
|
||||
l = this->sink_pads;
|
||||
while (l) {
|
||||
pad = GST_JACK_PAD (l);
|
||||
JACK_DEBUG ("jackbin: registering output port %s (peer %s)", pad->name, pad->peer_name);
|
||||
pad->port = jack_port_register (this->client, pad->name, JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput|JackPortIsTerminal, 0);
|
||||
JACK_DEBUG ("jackbin: registering output port %s (peer %s)",
|
||||
pad->name, pad->peer_name);
|
||||
pad->port =
|
||||
jack_port_register (this->client, pad->name,
|
||||
JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput | JackPortIsTerminal,
|
||||
0);
|
||||
l = g_list_next (l);
|
||||
}
|
||||
|
||||
|
@ -198,9 +209,12 @@ gst_jack_bin_change_state (GstElement *element)
|
|||
l = this->src_pads;
|
||||
while (l) {
|
||||
pad = GST_JACK_PAD (l);
|
||||
JACK_DEBUG ("connecting jack port %s to gst jack port %s", pad->peer_name, jack_port_name (pad->port));
|
||||
if (jack_connect (this->client, pad->peer_name, jack_port_name (pad->port))) {
|
||||
g_warning ("jackbin: could not connect %s and %s", pad->peer_name, jack_port_name (pad->port));
|
||||
JACK_DEBUG ("connecting jack port %s to gst jack port %s",
|
||||
pad->peer_name, jack_port_name (pad->port));
|
||||
if (jack_connect (this->client, pad->peer_name,
|
||||
jack_port_name (pad->port))) {
|
||||
g_warning ("jackbin: could not connect %s and %s", pad->peer_name,
|
||||
jack_port_name (pad->port));
|
||||
return GST_STATE_FAILURE;
|
||||
}
|
||||
l = g_list_next (l);
|
||||
|
@ -208,9 +222,12 @@ gst_jack_bin_change_state (GstElement *element)
|
|||
l = this->sink_pads;
|
||||
while (l) {
|
||||
pad = GST_JACK_PAD (l);
|
||||
JACK_DEBUG ("connecting gst jack port %s to jack port %s", jack_port_name (pad->port), pad->peer_name);
|
||||
if (jack_connect (this->client, jack_port_name (pad->port), pad->peer_name)) {
|
||||
g_warning ("jackbin: could not connect %s and %s", pad->peer_name, jack_port_name (pad->port));
|
||||
JACK_DEBUG ("connecting gst jack port %s to jack port %s",
|
||||
jack_port_name (pad->port), pad->peer_name);
|
||||
if (jack_connect (this->client, jack_port_name (pad->port),
|
||||
pad->peer_name)) {
|
||||
g_warning ("jackbin: could not connect %s and %s", pad->peer_name,
|
||||
jack_port_name (pad->port));
|
||||
return GST_STATE_FAILURE;
|
||||
}
|
||||
l = g_list_next (l);
|
||||
|
@ -293,6 +310,7 @@ static int
|
|||
sample_rate (jack_nframes_t nframes, void *arg)
|
||||
{
|
||||
GstJackBin *bin = (GstJackBin *) arg;
|
||||
|
||||
JACK_DEBUG ("the sample rate is now %lu/sec\n", nframes);
|
||||
bin->rate = nframes;
|
||||
return 0;
|
||||
|
@ -302,6 +320,7 @@ static int
|
|||
buffer_size (jack_nframes_t nframes, void *arg)
|
||||
{
|
||||
GstJackBin *bin = (GstJackBin *) arg;
|
||||
|
||||
JACK_DEBUG ("the buffer size is now %lu\n", nframes);
|
||||
bin->nframes = nframes;
|
||||
return 0;
|
||||
|
@ -315,7 +334,8 @@ shutdown (void *arg)
|
|||
/* gst_element_set_state (GST_ELEMENT (client->manager), GST_STATE_READY); */
|
||||
}
|
||||
|
||||
static void sighup_handler (int sig)
|
||||
static void
|
||||
sighup_handler (int sig)
|
||||
{
|
||||
g_message ("got sighup, setting state to READY");
|
||||
watchdog_please_set_the_jackbin_to_ready = TRUE;
|
||||
|
|
Loading…
Reference in a new issue