[cogl/wip/cogl-gst: 11/27] cogl-gst: removes cogl_gst_init
- From: Neil Roberts <nroberts src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/wip/cogl-gst: 11/27] cogl-gst: removes cogl_gst_init
- Date: Wed, 6 Mar 2013 18:53:19 +0000 (UTC)
commit 38c74a986a33ad14849f0512a4d2897bb4079da5
Author: Robert Bragg <robert linux intel com>
Date: Fri Feb 22 16:19:38 2013 +0000
cogl-gst: removes cogl_gst_init
We probably shouldn't ever need to depend on argument parsing to
initialize anything in cogl-gst so we can leave it up to applications
for call gst_init themselves.
cogl-gst/Makefile.am | 2 -
cogl-gst/cogl-gst-util.c | 51 ------------------------------------
cogl-gst/cogl-gst-util.h | 43 ------------------------------
cogl-gst/cogl-gst.h | 1 -
examples/cogl-basic-video-player.c | 2 +-
5 files changed, 1 insertions(+), 98 deletions(-)
---
diff --git a/cogl-gst/Makefile.am b/cogl-gst/Makefile.am
index c33dd98..316656e 100644
--- a/cogl-gst/Makefile.am
+++ b/cogl-gst/Makefile.am
@@ -9,14 +9,12 @@ EXTRA_DIST =
source_c = \
cogl-gst-shader.c \
- cogl-gst-util.c \
cogl-gst-video-player.c \
cogl-gst-video-sink.c \
$(NULL)
source_h = \
cogl-gst.h \
- cogl-gst-util.h \
cogl-gst-video-player.h \
cogl-gst-video-sink.h \
$(NULL)
diff --git a/cogl-gst/cogl-gst.h b/cogl-gst/cogl-gst.h
index c9588d7..e2cab38 100644
--- a/cogl-gst/cogl-gst.h
+++ b/cogl-gst/cogl-gst.h
@@ -33,7 +33,6 @@
#ifndef __COGL_GST_H__
#define __COGL_GST_H__
-#include <cogl-gst/cogl-gst-util.h>
#include <cogl-gst/cogl-gst-video-sink.h>
#include <cogl-gst/cogl-gst-video-player.h>
diff --git a/examples/cogl-basic-video-player.c b/examples/cogl-basic-video-player.c
index 0de6430..2f72a74 100644
--- a/examples/cogl-basic-video-player.c
+++ b/examples/cogl-basic-video-player.c
@@ -141,7 +141,7 @@ main (int argc,
640, 480);
cogl_framebuffer_set_modelview_matrix (data.fb, &view);
- cogl_gst_init (&argc, &argv);
+ gst_init (&argc, &argv);
player = cogl_gst_video_player_new (ctx, TRUE,
"http://docs.gstreamer.com/media/sintel_trailer-480p.webm");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]