update for new memory api

5 files changed, 30 insertions, 27 deletions

diff --git a/tests/check/elements/decodebin.c b/tests/check/elements/decodebin.c
index fb3de7311..21dc4f4f9 100644
--- a/tests/check/elements/decodebin.c
+++ b/tests/check/elements/decodebin.c
@@ -52,8 +52,8 @@ src_need_data_cb (GstElement * src, guint size, gpointer data)
   buf = gst_buffer_new ();
   gst_buffer_take_memory (buf, 0,
       gst_memory_new_wrapped (GST_MEMORY_FLAG_READONLY,
-          (gpointer) dummytext, NULL, sizeof (dummytext), 0,
-          sizeof (dummytext)));
+          (gpointer) dummytext, sizeof (dummytext), 0,
+          sizeof (dummytext), NULL, NULL));
 
   GST_BUFFER_OFFSET (buf) = 0;
 
diff --git a/tests/check/elements/subparse.c b/tests/check/elements/subparse.c
index b0f43ba86..4366f660a 100644
--- a/tests/check/elements/subparse.c
+++ b/tests/check/elements/subparse.c
@@ -50,7 +50,7 @@ buffer_from_static_string (const gchar * s)
   buf = gst_buffer_new ();
   gst_buffer_take_memory (buf, -1,
       gst_memory_new_wrapped (GST_MEMORY_FLAG_READONLY,
-          (gpointer) s, NULL, len, 0, len));
+          (gpointer) s, len, 0, len, NULL, NULL));
 
   return buf;
 }
diff --git a/tests/check/gst/typefindfunctions.c b/tests/check/gst/typefindfunctions.c
index 218fe7689..c3fe0559e 100644
--- a/tests/check/gst/typefindfunctions.c
+++ b/tests/check/gst/typefindfunctions.c
@@ -64,8 +64,9 @@ GST_START_TEST (test_quicktime_mpeg4video)
   buf = gst_buffer_new ();
   gst_buffer_take_memory (buf, -1,
       gst_memory_new_wrapped (GST_MEMORY_FLAG_READONLY,
-          (gpointer) qt_redirect_396042, NULL,
-          sizeof (qt_redirect_396042), 0, sizeof (qt_redirect_396042)));
+          (gpointer) qt_redirect_396042,
+          sizeof (qt_redirect_396042), 0, sizeof (qt_redirect_396042), NULL,
+          NULL));
 
   GST_BUFFER_OFFSET (buf) = 0;
 
@@ -94,8 +95,8 @@ GST_START_TEST (test_broken_flac_in_ogg)
   buf = gst_buffer_new ();
   gst_buffer_take_memory (buf, -1,
       gst_memory_new_wrapped (GST_MEMORY_FLAG_READONLY,
-          (gpointer) flac_id_packet, NULL,
-          sizeof (flac_id_packet), 0, sizeof (flac_id_packet)));
+          (gpointer) flac_id_packet,
+          sizeof (flac_id_packet), 0, sizeof (flac_id_packet), NULL, NULL));
 
   GST_BUFFER_OFFSET (buf) = 0;
 
@@ -131,7 +132,7 @@ typefind_test_file (const gchar * filename)
   buf = gst_buffer_new ();
   gst_buffer_take_memory (buf, -1,
       gst_memory_new_wrapped (GST_MEMORY_FLAG_READONLY,
-          (gpointer) data, NULL, data_len, 0, data_len));
+          (gpointer) data, data_len, 0, data_len, NULL, NULL));
 
   GST_BUFFER_OFFSET (buf) = 0;
 
@@ -353,7 +354,7 @@ GST_START_TEST (test_random_data)
   buf = gst_buffer_new ();
   gst_buffer_take_memory (buf, -1,
       gst_memory_new_wrapped (GST_MEMORY_FLAG_READONLY,
-          data, NULL, TEST_RANDOM_DATA_SIZE, 0, TEST_RANDOM_DATA_SIZE));
+          data, TEST_RANDOM_DATA_SIZE, 0, TEST_RANDOM_DATA_SIZE, NULL, NULL));
 
   GST_BUFFER_OFFSET (buf) = 0;
 
diff --git a/tests/check/libs/audio.c b/tests/check/libs/audio.c
index 745a0a61a..31aa2da5e 100644
--- a/tests/check/libs/audio.c
+++ b/tests/check/libs/audio.c
@@ -42,7 +42,7 @@ GST_START_TEST (test_buffer_clipping_time)
   buf = gst_buffer_new ();
   data = (guint8 *) g_malloc (1000);
   gst_buffer_take_memory (buf, -1,
-      gst_memory_new_wrapped (0, data, g_free, 1000, 0, 1000));
+      gst_memory_new_wrapped (0, data, 1000, 0, 1000, data, g_free));
 
   gst_segment_init (&s, GST_FORMAT_TIME);
   s.start = 4 * GST_SECOND;
@@ -72,7 +72,7 @@ GST_START_TEST (test_buffer_clipping_time)
   buf = gst_buffer_new ();
   data = (guint8 *) g_malloc (1000);
   gst_buffer_take_memory (buf, -1,
-      gst_memory_new_wrapped (0, data, g_free, 1000, 0, 1000));
+      gst_memory_new_wrapped (0, data, 1000, 0, 1000, data, g_free));
 
   gst_segment_init (&s, GST_FORMAT_TIME);
   s.start = 4 * GST_SECOND;
@@ -102,7 +102,7 @@ GST_START_TEST (test_buffer_clipping_time)
   buf = gst_buffer_new ();
   data = (guint8 *) g_malloc (1000);
   gst_buffer_take_memory (buf, -1,
-      gst_memory_new_wrapped (0, data, g_free, 1000, 0, 1000));
+      gst_memory_new_wrapped (0, data, 1000, 0, 1000, data, g_free));
 
   gst_segment_init (&s, GST_FORMAT_TIME);
   s.start = 2 * GST_SECOND;
@@ -132,7 +132,7 @@ GST_START_TEST (test_buffer_clipping_time)
   buf = gst_buffer_new ();
   data = (guint8 *) g_malloc (1000);
   gst_buffer_take_memory (buf, -1,
-      gst_memory_new_wrapped (0, data, g_free, 1000, 0, 1000));
+      gst_memory_new_wrapped (0, data, 1000, 0, 1000, data, g_free));
 
   gst_segment_init (&s, GST_FORMAT_TIME);
   s.start = 12 * GST_SECOND;
@@ -151,7 +151,7 @@ GST_START_TEST (test_buffer_clipping_time)
   buf = gst_buffer_new ();
   data = (guint8 *) g_malloc (1000);
   gst_buffer_take_memory (buf, -1,
-      gst_memory_new_wrapped (0, data, g_free, 1000, 0, 1000));
+      gst_memory_new_wrapped (0, data, 1000, 0, 1000, data, g_free));
 
   gst_segment_init (&s, GST_FORMAT_TIME);
   s.start = 4 * GST_SECOND;
@@ -184,7 +184,7 @@ GST_START_TEST (test_buffer_clipping_time)
   buf = gst_buffer_new ();
   data = (guint8 *) g_malloc (1000);
   gst_buffer_take_memory (buf, -1,
-      gst_memory_new_wrapped (0, data, g_free, 1000, 0, 1000));
+      gst_memory_new_wrapped (0, data, 1000, 0, 1000, data, g_free));
 
   gst_segment_init (&s, GST_FORMAT_TIME);
   s.start = 0 * GST_SECOND;
@@ -208,7 +208,7 @@ GST_START_TEST (test_buffer_clipping_time)
   buf = gst_buffer_new ();
   data = (guint8 *) g_malloc (1000);
   gst_buffer_take_memory (buf, -1,
-      gst_memory_new_wrapped (0, data, g_free, 1000, 0, 1000));
+      gst_memory_new_wrapped (0, data, 1000, 0, 1000, data, g_free));
 
   gst_segment_init (&s, GST_FORMAT_PERCENT);
   s.start = 0;
@@ -240,7 +240,7 @@ GST_START_TEST (test_buffer_clipping_samples)
   buf = gst_buffer_new ();
   data = (guint8 *) g_malloc (1000);
   gst_buffer_take_memory (buf, -1,
-      gst_memory_new_wrapped (0, data, g_free, 1000, 0, 1000));
+      gst_memory_new_wrapped (0, data, 1000, 0, 1000, data, g_free));
 
   gst_segment_init (&s, GST_FORMAT_DEFAULT);
   s.start = 400;
@@ -270,7 +270,7 @@ GST_START_TEST (test_buffer_clipping_samples)
   buf = gst_buffer_new ();
   data = (guint8 *) g_malloc (1000);
   gst_buffer_take_memory (buf, -1,
-      gst_memory_new_wrapped (0, data, g_free, 1000, 0, 1000));
+      gst_memory_new_wrapped (0, data, 1000, 0, 1000, data, g_free));
 
   gst_segment_init (&s, GST_FORMAT_DEFAULT);
   s.start = 400;
@@ -300,7 +300,7 @@ GST_START_TEST (test_buffer_clipping_samples)
   buf = gst_buffer_new ();
   data = (guint8 *) g_malloc (1000);
   gst_buffer_take_memory (buf, -1,
-      gst_memory_new_wrapped (0, data, g_free, 1000, 0, 1000));
+      gst_memory_new_wrapped (0, data, 1000, 0, 1000, data, g_free));
 
   gst_segment_init (&s, GST_FORMAT_DEFAULT);
   s.start = 200;
@@ -330,7 +330,7 @@ GST_START_TEST (test_buffer_clipping_samples)
   buf = gst_buffer_new ();
   data = (guint8 *) g_malloc (1000);
   gst_buffer_take_memory (buf, -1,
-      gst_memory_new_wrapped (0, data, g_free, 1000, 0, 1000));
+      gst_memory_new_wrapped (0, data, 1000, 0, 1000, data, g_free));
 
   gst_segment_init (&s, GST_FORMAT_DEFAULT);
   s.start = 1200;
@@ -349,7 +349,7 @@ GST_START_TEST (test_buffer_clipping_samples)
   buf = gst_buffer_new ();
   data = (guint8 *) g_malloc (1000);
   gst_buffer_take_memory (buf, -1,
-      gst_memory_new_wrapped (0, data, g_free, 1000, 0, 1000));
+      gst_memory_new_wrapped (0, data, 1000, 0, 1000, data, g_free));
 
   gst_segment_init (&s, GST_FORMAT_DEFAULT);
   s.start = 400;
@@ -382,7 +382,7 @@ GST_START_TEST (test_buffer_clipping_samples)
   buf = gst_buffer_new ();
   data = (guint8 *) g_malloc (1000);
   gst_buffer_take_memory (buf, -1,
-      gst_memory_new_wrapped (0, data, g_free, 1000, 0, 1000));
+      gst_memory_new_wrapped (0, data, 1000, 0, 1000, data, g_free));
 
   gst_segment_init (&s, GST_FORMAT_DEFAULT);
   s.start = 0;
diff --git a/tests/check/libs/tag.c b/tests/check/libs/tag.c
index b03987c6f..b90857535 100644
--- a/tests/check/libs/tag.c
+++ b/tests/check/libs/tag.c
@@ -446,8 +446,9 @@ GST_START_TEST (test_vorbis_tags)
     buf = gst_buffer_new ();
     gst_buffer_take_memory (buf, -1,
         gst_memory_new_wrapped (GST_MEMORY_FLAG_READONLY,
-            (gpointer) speex_comments_buf1, NULL,
-            sizeof (speex_comments_buf1), 0, sizeof (speex_comments_buf1)));
+            (gpointer) speex_comments_buf1,
+            sizeof (speex_comments_buf1), 0, sizeof (speex_comments_buf1), NULL,
+            NULL));
 
     /* make sure it doesn't memcmp over the end of the buffer */
     fail_unless (gst_tag_list_from_vorbiscomment_buffer (buf,
@@ -491,8 +492,9 @@ GST_START_TEST (test_vorbis_tags)
     buf = gst_buffer_new ();
     gst_buffer_take_memory (buf, -1,
         gst_memory_new_wrapped (GST_MEMORY_FLAG_READONLY,
-            (gpointer) vorbis_comments_buf, NULL,
-            sizeof (vorbis_comments_buf), 0, sizeof (vorbis_comments_buf)));
+            (gpointer) vorbis_comments_buf,
+            sizeof (vorbis_comments_buf), 0, sizeof (vorbis_comments_buf), NULL,
+            NULL));
 
     /* make sure it doesn't memcmp over the end of the buffer */
     fail_unless (gst_tag_list_from_vorbiscomment_buffer (buf,
@@ -1046,7 +1048,7 @@ GST_START_TEST (test_xmp_parsing)
       buf = gst_buffer_new ();
       len = strlen (text) + 1;
       gst_buffer_take_memory (buf, -1,
-          gst_memory_new_wrapped (0, text, NULL, len, 0, len));
+          gst_memory_new_wrapped (0, text, len, 0, len, NULL, NULL));
 
       list = gst_tag_list_from_xmp_buffer (buf);
       if (test_data[i].result_size >= 0) {