From 8e13d30a5a08f5b9733197432caf0500553c9072 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 21 Mar 2012 13:19:50 +0100 Subject: [PATCH] tests: don't include element header files --- tests/check/elements/multifdsink.c | 19 ++++++------------- tests/check/elements/multisocketsink.c | 18 ++++++------------ 2 files changed, 12 insertions(+), 25 deletions(-) diff --git a/tests/check/elements/multifdsink.c b/tests/check/elements/multifdsink.c index 43ff72a95a..8cee401520 100644 --- a/tests/check/elements/multifdsink.c +++ b/tests/check/elements/multifdsink.c @@ -26,9 +26,6 @@ #include -/* FIXME: remove this header once formats are refactored */ -#include "gst/tcp/gstmultifdsink.h" - static GstPad *mysrcpad; static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", @@ -509,9 +506,9 @@ GST_START_TEST (test_burst_client_bytes) fail_unless_num_handles (sink, 0); g_signal_emit_by_name (sink, "add", pfd1[1]); fail_unless_num_handles (sink, 1); - g_signal_emit_by_name (sink, "add_full", pfd2[1], GST_SYNC_METHOD_BURST, + g_signal_emit_by_name (sink, "add_full", pfd2[1], 3, GST_FORMAT_BYTES, (guint64) 50, GST_FORMAT_BYTES, (guint64) 200); - g_signal_emit_by_name (sink, "add_full", pfd3[1], GST_SYNC_METHOD_BURST, + g_signal_emit_by_name (sink, "add_full", pfd3[1], 3, GST_FORMAT_BYTES, (guint64) 50, GST_FORMAT_BYTES, (guint64) 50); fail_unless_num_handles (sink, 3); @@ -601,11 +598,9 @@ GST_START_TEST (test_burst_client_bytes_keyframe) /* now add the clients */ g_signal_emit_by_name (sink, "add", pfd1[1]); g_signal_emit_by_name (sink, "add_full", pfd2[1], - GST_SYNC_METHOD_BURST_KEYFRAME, GST_FORMAT_BYTES, (guint64) 50, - GST_FORMAT_BYTES, (guint64) 90); + 4, GST_FORMAT_BYTES, (guint64) 50, GST_FORMAT_BYTES, (guint64) 90); g_signal_emit_by_name (sink, "add_full", pfd3[1], - GST_SYNC_METHOD_BURST_KEYFRAME, GST_FORMAT_BYTES, (guint64) 50, - GST_FORMAT_BYTES, (guint64) 50); + 4, GST_FORMAT_BYTES, (guint64) 50, GST_FORMAT_BYTES, (guint64) 50); /* push last buffer to make client fds ready for reading */ for (i = 9; i < 10; i++) { @@ -694,11 +689,9 @@ GST_START_TEST (test_burst_client_bytes_with_keyframe) /* now add the clients */ g_signal_emit_by_name (sink, "add", pfd1[1]); g_signal_emit_by_name (sink, "add_full", pfd2[1], - GST_SYNC_METHOD_BURST_WITH_KEYFRAME, GST_FORMAT_BYTES, - (guint64) 50, GST_FORMAT_BYTES, (guint64) 90); + 5, GST_FORMAT_BYTES, (guint64) 50, GST_FORMAT_BYTES, (guint64) 90); g_signal_emit_by_name (sink, "add_full", pfd3[1], - GST_SYNC_METHOD_BURST_WITH_KEYFRAME, GST_FORMAT_BYTES, - (guint64) 50, GST_FORMAT_BYTES, (guint64) 50); + 5, GST_FORMAT_BYTES, (guint64) 50, GST_FORMAT_BYTES, (guint64) 50); /* push last buffer to make client fds ready for reading */ for (i = 9; i < 10; i++) { diff --git a/tests/check/elements/multisocketsink.c b/tests/check/elements/multisocketsink.c index a4266588f0..b985b0a488 100644 --- a/tests/check/elements/multisocketsink.c +++ b/tests/check/elements/multisocketsink.c @@ -28,8 +28,6 @@ #include #include -#include "gst/tcp/gstmultisocketsink.h" - static GstPad *mysrcpad; static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", @@ -546,9 +544,9 @@ GST_START_TEST (test_burst_client_bytes) fail_unless_num_handles (sink, 0); g_signal_emit_by_name (sink, "add", socket[0]); fail_unless_num_handles (sink, 1); - g_signal_emit_by_name (sink, "add_full", socket[2], GST_SYNC_METHOD_BURST, + g_signal_emit_by_name (sink, "add_full", socket[2], 3, GST_FORMAT_BYTES, (guint64) 50, GST_FORMAT_BYTES, (guint64) 200); - g_signal_emit_by_name (sink, "add_full", socket[4], GST_SYNC_METHOD_BURST, + g_signal_emit_by_name (sink, "add_full", socket[4], 3, GST_FORMAT_BYTES, (guint64) 50, GST_FORMAT_BYTES, (guint64) 50); fail_unless_num_handles (sink, 3); @@ -636,11 +634,9 @@ GST_START_TEST (test_burst_client_bytes_keyframe) /* now add the clients */ g_signal_emit_by_name (sink, "add", socket[0]); g_signal_emit_by_name (sink, "add_full", socket[2], - GST_SYNC_METHOD_BURST_KEYFRAME, GST_FORMAT_BYTES, (guint64) 50, - GST_FORMAT_BYTES, (guint64) 90); + 4, GST_FORMAT_BYTES, (guint64) 50, GST_FORMAT_BYTES, (guint64) 90); g_signal_emit_by_name (sink, "add_full", socket[4], - GST_SYNC_METHOD_BURST_KEYFRAME, GST_FORMAT_BYTES, (guint64) 50, - GST_FORMAT_BYTES, (guint64) 50); + 4, GST_FORMAT_BYTES, (guint64) 50, GST_FORMAT_BYTES, (guint64) 50); /* push last buffer to make client fds ready for reading */ for (i = 9; i < 10; i++) { @@ -730,11 +726,9 @@ GST_START_TEST (test_burst_client_bytes_with_keyframe) /* now add the clients */ g_signal_emit_by_name (sink, "add", socket[0]); g_signal_emit_by_name (sink, "add_full", socket[2], - GST_SYNC_METHOD_BURST_WITH_KEYFRAME, GST_FORMAT_BYTES, (guint64) 50, - GST_FORMAT_BYTES, (guint64) 90); + 5, GST_FORMAT_BYTES, (guint64) 50, GST_FORMAT_BYTES, (guint64) 90); g_signal_emit_by_name (sink, "add_full", socket[4], - GST_SYNC_METHOD_BURST_WITH_KEYFRAME, GST_FORMAT_BYTES, (guint64) 50, - GST_FORMAT_BYTES, (guint64) 50); + 5, GST_FORMAT_BYTES, (guint64) 50, GST_FORMAT_BYTES, (guint64) 50); /* push last buffer to make client fds ready for reading */ for (i = 9; i < 10; i++) {