summaryrefslogtreecommitdiff
path: root/tests/check
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2010-03-16 15:45:23 +0100
committerBenjamin Otte <otte@redhat.com>2010-03-16 17:41:50 +0100
commit5e21fa5e0e21d112a7e1c6fbed35d8669d37d061 (patch)
tree5badbb558ed6fba1e6717bd83431699b1ab00cfc /tests/check
parent6cc138436c3d8443249797bf2889b657ff491aa9 (diff)
gst_element_class_set_details => gst_element_class_set_details_simple
Also change my email from the old university one to the current one.
Diffstat (limited to 'tests/check')
-rw-r--r--tests/check/elements/audioconvert.c1
-rw-r--r--tests/check/elements/playbin.c10
-rw-r--r--tests/check/elements/playbin2.c10
-rw-r--r--tests/check/elements/textoverlay.c4
-rw-r--r--tests/check/libs/cddabasesrc.c10
-rw-r--r--tests/check/libs/pbutils.c12
6 files changed, 19 insertions, 28 deletions
diff --git a/tests/check/elements/audioconvert.c b/tests/check/elements/audioconvert.c
index 58c69dd8c..2092d9d1f 100644
--- a/tests/check/elements/audioconvert.c
+++ b/tests/check/elements/audioconvert.c
@@ -1082,6 +1082,7 @@ static GstAudioChannelPosition n8chan_pos_remap_in[8] = {
GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT,
GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT
};
+
static GstAudioChannelPosition n8chan_pos_remap_out[8] = {
GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER,
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT,
diff --git a/tests/check/elements/playbin.c b/tests/check/elements/playbin.c
index f285df40e..befd605f5 100644
--- a/tests/check/elements/playbin.c
+++ b/tests/check/elements/playbin.c
@@ -453,8 +453,6 @@ GST_BOILERPLATE_FULL (GstRedVideoSrc, gst_red_video_src, GstPushSrc,
static void
gst_red_video_src_base_init (gpointer klass)
{
- static const GstElementDetails details =
- GST_ELEMENT_DETAILS ("Red Video Src", "Source/Video", "yep", "me");
static GstStaticPadTemplate src_templ = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("video/x-raw-yuv, format=(fourcc)I420")
@@ -463,7 +461,8 @@ gst_red_video_src_base_init (gpointer klass)
gst_element_class_add_pad_template (element_class,
gst_static_pad_template_get (&src_templ));
- gst_element_class_set_details (element_class, &details);
+ gst_element_class_set_details_simple (element_class,
+ "Red Video Src", "Source/Video", "yep", "me");
}
static GstFlowReturn
@@ -566,8 +565,6 @@ GST_BOILERPLATE_FULL (GstCodecSrc, gst_codec_src, GstPushSrc,
static void
gst_codec_src_base_init (gpointer klass)
{
- static const GstElementDetails details =
- GST_ELEMENT_DETAILS ("Codec Src", "Source/Video", "yep", "me");
static GstStaticPadTemplate src_templ = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("application/x-codec")
@@ -576,7 +573,8 @@ gst_codec_src_base_init (gpointer klass)
gst_element_class_add_pad_template (element_class,
gst_static_pad_template_get (&src_templ));
- gst_element_class_set_details (element_class, &details);
+ gst_element_class_set_details_simple (element_class,
+ "Codec Src", "Source/Video", "yep", "me");
}
static GstFlowReturn
diff --git a/tests/check/elements/playbin2.c b/tests/check/elements/playbin2.c
index a90dc84b2..75679eebf 100644
--- a/tests/check/elements/playbin2.c
+++ b/tests/check/elements/playbin2.c
@@ -522,8 +522,6 @@ GST_BOILERPLATE_FULL (GstRedVideoSrc, gst_red_video_src, GstPushSrc,
static void
gst_red_video_src_base_init (gpointer klass)
{
- static const GstElementDetails details =
- GST_ELEMENT_DETAILS ("Red Video Src", "Source/Video", "yep", "me");
static GstStaticPadTemplate src_templ = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("video/x-raw-yuv, format=(fourcc)I420")
@@ -532,7 +530,8 @@ gst_red_video_src_base_init (gpointer klass)
gst_element_class_add_pad_template (element_class,
gst_static_pad_template_get (&src_templ));
- gst_element_class_set_details (element_class, &details);
+ gst_element_class_set_details_simple (element_class,
+ "Red Video Src", "Source/Video", "yep", "me");
}
static GstFlowReturn
@@ -635,8 +634,6 @@ GST_BOILERPLATE_FULL (GstCodecSrc, gst_codec_src, GstPushSrc,
static void
gst_codec_src_base_init (gpointer klass)
{
- static const GstElementDetails details =
- GST_ELEMENT_DETAILS ("Codec Src", "Source/Video", "yep", "me");
static GstStaticPadTemplate src_templ = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("application/x-codec")
@@ -645,7 +642,8 @@ gst_codec_src_base_init (gpointer klass)
gst_element_class_add_pad_template (element_class,
gst_static_pad_template_get (&src_templ));
- gst_element_class_set_details (element_class, &details);
+ gst_element_class_set_details_simple (element_class,
+ "Codec Src", "Source/Video", "yep", "me");
}
static GstFlowReturn
diff --git a/tests/check/elements/textoverlay.c b/tests/check/elements/textoverlay.c
index 63dd31d58..3c970b257 100644
--- a/tests/check/elements/textoverlay.c
+++ b/tests/check/elements/textoverlay.c
@@ -569,8 +569,8 @@ GST_START_TEST (test_video_waits_for_text)
fail_unless_equals_int (g_list_length (buffers), 3);
/* ... and there should not be any text rendered on it */
- fail_unless (buffer_is_all_black (GST_BUFFER_CAST (buffers->next->next->
- data)));
+ fail_unless (buffer_is_all_black (GST_BUFFER_CAST (buffers->next->
+ next->data)));
/* a fourth video buffer */
inbuffer = gst_buffer_make_metadata_writable (inbuffer);
diff --git a/tests/check/libs/cddabasesrc.c b/tests/check/libs/cddabasesrc.c
index abe7c2c8e..8747c9a5d 100644
--- a/tests/check/libs/cddabasesrc.c
+++ b/tests/check/libs/cddabasesrc.c
@@ -192,18 +192,14 @@ static gboolean gst_cd_foo_src_open (GstCddaBaseSrc * src,
const gchar * device);
static void gst_cd_foo_src_close (GstCddaBaseSrc * src);
-static const GstElementDetails cdfoo_details =
-GST_ELEMENT_DETAILS ("CD Audio (cdda) Source, FooBar",
- "Source/File",
- "Read audio from CD",
- "Foo Bar <foo@bar.com>");
-
static void
gst_cd_foo_src_base_init (gpointer g_class)
{
GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
- gst_element_class_set_details (element_class, &cdfoo_details);
+ gst_element_class_set_details_simple (element_class,
+ "CD Audio (cdda) Source, FooBar", "Source/File",
+ "Read audio from CD", "Foo Bar <foo@bar.com>");
}
static void
diff --git a/tests/check/libs/pbutils.c b/tests/check/libs/pbutils.c
index 61b8b6097..c1219ba59 100644
--- a/tests/check/libs/pbutils.c
+++ b/tests/check/libs/pbutils.c
@@ -72,7 +72,8 @@ GST_START_TEST (test_pb_utils_post_missing_messages)
bus = gst_element_get_bus (pipeline);
/* first, test common assertion failure cases */
- ASSERT_CRITICAL (msg = gst_missing_uri_source_message_new (NULL, "http"););
+ ASSERT_CRITICAL (msg = gst_missing_uri_source_message_new (NULL, "http");
+ );
ASSERT_CRITICAL (gst_missing_uri_source_message_new (pipeline, NULL));
ASSERT_CRITICAL (gst_missing_uri_sink_message_new (NULL, "http"));
@@ -553,14 +554,11 @@ GST_START_TEST (test_pb_utils_install_plugins)
ctx = gst_install_plugins_context_new ();
- ASSERT_CRITICAL (ret = gst_install_plugins_sync (NULL, ctx);
- );
+ ASSERT_CRITICAL (ret = gst_install_plugins_sync (NULL, ctx););
ASSERT_CRITICAL (ret =
- gst_install_plugins_async (NULL, ctx, result_cb, (gpointer) & marker);
- );
+ gst_install_plugins_async (NULL, ctx, result_cb, (gpointer) & marker););
ASSERT_CRITICAL (ret =
- gst_install_plugins_async (details, ctx, NULL, (gpointer) & marker);
- );
+ gst_install_plugins_async (details, ctx, NULL, (gpointer) & marker););
/* make sure the functions return the right error code if the helper does
* not exist */