[cogl/wip/cogl-gst-1.x: 40/41] cogl-gst: remove dependencies on cogl2

[Lionel Landwerlin <llandwerlin src gnome org>]

commit 41fe02ef9c89fbe3a338a7dc0e9ddb5bde2b3539
Author: Lionel Landwerlin <llandwerlin gmail com>
Date:   Mon Mar 11 18:03:10 2013 +0000

    cogl-gst: remove dependencies on cogl2

 cogl-gst/Makefile.am           |    6 +++---
 cogl-gst/cogl-gst-video-sink.c |   27 ++++++++++++---------------
 2 files changed, 15 insertions(+), 18 deletions(-)
---
diff --git a/cogl-gst/Makefile.am b/cogl-gst/Makefile.am
index 57a64d8..02cf725 100644
--- a/cogl-gst/Makefile.am
+++ b/cogl-gst/Makefile.am
@@ -25,7 +25,7 @@ lib_LTLIBRARIES = libcogl-gst.la
 
 libcogl_gst_la_SOURCES = $(source_c) $(source_h) $(source_h_priv)
 libcogl_gst_la_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_GST_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS)
-libcogl_gst_la_LIBADD = $(top_builddir)/cogl/libcogl2.la
+libcogl_gst_la_LIBADD = $(top_builddir)/cogl/libcogl.la
 libcogl_gst_la_LIBADD += $(COGL_DEP_LIBS) $(COGL_GST_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
 libcogl_gst_la_LDFLAGS = \
        -export-dynamic \
@@ -43,7 +43,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)                 \
        -I$(top_builddir)
 
-cogl_gstheadersdir = $(includedir)/cogl2/cogl-gst
+cogl_gstheadersdir = $(includedir)/cogl/cogl-gst
 cogl_gstheaders_HEADERS = $(source_h)
 
 plugin_source_c = \
@@ -58,7 +58,7 @@ plugin_LTLIBRARIES = libgstcogl.la
 
 libgstcogl_la_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_GST_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS)
 libgstcogl_la_LIBADD = \
-       $(top_builddir)/cogl/libcogl2.la \
+       $(top_builddir)/cogl/libcogl.la \
        $(builddir)/libcogl-gst.la
 libgstcogl_la_LIBADD += $(COGL_DEP_LIBS) $(COGL_GST_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
 libgstcogl_la_LDFLAGS =        \
diff --git a/cogl-gst/cogl-gst-video-sink.c b/cogl-gst/cogl-gst-video-sink.c
index 5b17e53..8b97ef6 100644
--- a/cogl-gst/cogl-gst-video-sink.c
+++ b/cogl-gst/cogl-gst-video-sink.c
@@ -346,12 +346,12 @@ cogl_gst_rgb24_upload (CoglGstVideoSink *sink,
 
   clear_frame_textures (sink);
 
-  priv->frame[0] = cogl_texture_new_from_data (priv->ctx, priv->info.width,
+  priv->frame[0] = cogl_texture_new_from_data (priv->info.width,
                                                priv->info.height,
                                                COGL_GST_TEXTURE_FLAGS,
                                                format, format,
                                                priv->info.stride[0],
-                                               frame.data[0], NULL);
+                                               frame.data[0]);
 
   gst_video_frame_unmap (&frame);
 
@@ -393,12 +393,12 @@ cogl_gst_rgb32_upload (CoglGstVideoSink *sink,
 
   clear_frame_textures (sink);
 
-  priv->frame[0] = cogl_texture_new_from_data (priv->ctx, priv->info.width,
+  priv->frame[0] = cogl_texture_new_from_data (priv->info.width,
                                                priv->info.height,
                                                COGL_GST_TEXTURE_FLAGS,
                                                format, format,
                                                priv->info.stride[0],
-                                               frame.data[0], NULL);
+                                               frame.data[0]);
 
   gst_video_frame_unmap (&frame);
 
@@ -436,25 +436,22 @@ cogl_gst_yv12_upload (CoglGstVideoSink *sink,
   clear_frame_textures (sink);
 
   priv->frame[0] =
-    cogl_texture_new_from_data (priv->ctx,
-                                GST_VIDEO_INFO_COMP_WIDTH (&priv->info, 0),
+    cogl_texture_new_from_data (GST_VIDEO_INFO_COMP_WIDTH (&priv->info, 0),
                                 GST_VIDEO_INFO_COMP_HEIGHT (&priv->info, 0),
                                 COGL_GST_TEXTURE_FLAGS, format, format,
-                                priv->info.stride[0], frame.data[0], NULL);
+                                priv->info.stride[0], frame.data[0]);
 
   priv->frame[1] =
-    cogl_texture_new_from_data (priv->ctx,
-                                GST_VIDEO_INFO_COMP_WIDTH (&priv->info, 1),
+    cogl_texture_new_from_data (GST_VIDEO_INFO_COMP_WIDTH (&priv->info, 1),
                                 GST_VIDEO_INFO_COMP_HEIGHT (&priv->info, 1),
                                 COGL_GST_TEXTURE_FLAGS, format, format,
-                                priv->info.stride[1], frame.data[1], NULL);
+                                priv->info.stride[1], frame.data[1]);
 
   priv->frame[2] =
-    cogl_texture_new_from_data (priv->ctx,
-                                GST_VIDEO_INFO_COMP_WIDTH (&priv->info, 2),
+    cogl_texture_new_from_data (GST_VIDEO_INFO_COMP_WIDTH (&priv->info, 2),
                                 GST_VIDEO_INFO_COMP_HEIGHT (&priv->info, 2),
                                 COGL_GST_TEXTURE_FLAGS, format, format,
-                                priv->info.stride[2], frame.data[2], NULL);
+                                priv->info.stride[2], frame.data[2]);
 
   gst_video_frame_unmap (&frame);
 
@@ -535,12 +532,12 @@ cogl_gst_ayuv_upload (CoglGstVideoSink *sink,
 
   clear_frame_textures (sink);
 
-  priv->frame[0] = cogl_texture_new_from_data (priv->ctx, priv->info.width,
+  priv->frame[0] = cogl_texture_new_from_data (priv->info.width,
                                                priv->info.height,
                                                COGL_GST_TEXTURE_FLAGS,
                                                format, format,
                                                priv->info.stride[0],
-                                               frame.data[0], NULL);
+                                               frame.data[0]);
 
   gst_video_frame_unmap (&frame);