[rygel-gst-0-10-fullscreen-renderer] Add header files.



commit 456f200928689bcf6dc1814dec871479f12fc217
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Jan 22 13:16:02 2013 +0100

    Add header files.

 src/Makefile.am              |    2 +-
 src/rygel-playbin-player.c   |   42 ++++-------------------
 src/rygel-playbin-renderer.c |   32 ++----------------
 src/rygel-renderer-gst.h     |   74 ------------------------------------------
 4 files changed, 12 insertions(+), 138 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index b3eabd6..983e585 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ fullscreen_renderer_SOURCES = \
 	fullscreen-renderer.c \
 	rygel-playbin-player.c \
 	rygel-playbin-renderer.c \
-	rygel-renderer-gst-h
+	rygel-playbin-renderer.h
 
 fullscreen_renderer_CFLAGS = \
 	$(DEPS_CFLAGS)
diff --git a/src/rygel-playbin-player.c b/src/rygel-playbin-player.c
index 77aa366..b503213 100644
--- a/src/rygel-playbin-player.c
+++ b/src/rygel-playbin-player.c
@@ -1,6 +1,3 @@
-/* rygel-playbin-player.c generated by valac 0.18.1, the Vala compiler
- * generated from rygel-playbin-player.vala, do not modify */
-
 /*
  * Copyright (C) 2008 OpenedHand Ltd.
  * Copyright (C) 2009,2010,2011,2012 Nokia Corporation.
@@ -27,26 +24,12 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <glib.h>
-#include <glib-object.h>
+#include "rygel-playbin-player.h"
+#include <libgupnp-av/gupnp-av.h>
 #include <rygel-renderer.h>
-#include <gst/gst.h>
 #include <stdlib.h>
 #include <string.h>
-#include <libgupnp-av/gupnp-av.h>
-#include <gio/gio.h>
-
-
-#define RYGEL_PLAYBIN_TYPE_PLAYER (rygel_playbin_player_get_type ())
-#define RYGEL_PLAYBIN_PLAYER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RYGEL_PLAYBIN_TYPE_PLAYER, RygelPlaybinPlayer))
-#define RYGEL_PLAYBIN_PLAYER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), RYGEL_PLAYBIN_TYPE_PLAYER, RygelPlaybinPlayerClass))
-#define RYGEL_PLAYBIN_IS_PLAYER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), RYGEL_PLAYBIN_TYPE_PLAYER))
-#define RYGEL_PLAYBIN_IS_PLAYER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), RYGEL_PLAYBIN_TYPE_PLAYER))
-#define RYGEL_PLAYBIN_PLAYER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), RYGEL_PLAYBIN_TYPE_PLAYER, RygelPlaybinPlayerClass))
 
-typedef struct _RygelPlaybinPlayer RygelPlaybinPlayer;
-typedef struct _RygelPlaybinPlayerClass RygelPlaybinPlayerClass;
-typedef struct _RygelPlaybinPlayerPrivate RygelPlaybinPlayerPrivate;
 #define _gst_object_unref0(var) ((var == NULL) ? NULL : (var = (gst_object_unref (var), NULL)))
 #define _g_free0(var) (var = (g_free (var), NULL))
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
@@ -55,15 +38,6 @@ typedef struct _RygelPlaybinPlayerPrivate RygelPlaybinPlayerPrivate;
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 
-struct _RygelPlaybinPlayer {
-	GObject parent_instance;
-	RygelPlaybinPlayerPrivate * priv;
-};
-
-struct _RygelPlaybinPlayerClass {
-	GObjectClass parent_class;
-};
-
 struct _RygelPlaybinPlayerPrivate {
 	gboolean duration_hint;
 	gboolean is_live;
@@ -91,7 +65,7 @@ static RygelPlaybinPlayer* rygel_playbin_player_player = NULL;
 static RygelMediaPlayerIface* rygel_playbin_player_rygel_media_player_parent_iface = NULL;
 
 GType rygel_playbin_player_get_type (void) G_GNUC_CONST;
-#define RYGEL_PLAYBIN_PLAYER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), RYGEL_PLAYBIN_TYPE_PLAYER, RygelPlaybinPlayerPrivate))
+#define RYGEL_PLAYBIN_PLAYER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), RYGEL_TYPE_PLAYBIN_PLAYER, RygelPlaybinPlayerPrivate))
 enum  {
 	RYGEL_PLAYBIN_PLAYER_DUMMY_PROPERTY,
 	RYGEL_PLAYBIN_PLAYER_PLAYBIN,
@@ -168,7 +142,7 @@ static RygelPlaybinPlayer* rygel_playbin_player_construct (GType object_type) {
 
 
 static RygelPlaybinPlayer* rygel_playbin_player_new (void) {
-	return rygel_playbin_player_construct (RYGEL_PLAYBIN_TYPE_PLAYER);
+	return rygel_playbin_player_construct (RYGEL_TYPE_PLAYBIN_PLAYER);
 }
 
 
@@ -196,7 +170,7 @@ RygelPlaybinPlayer* rygel_playbin_player_construct_wrap (GType object_type, GstE
 
 
 RygelPlaybinPlayer* rygel_playbin_player_new_wrap (GstElement* playbin) {
-	return rygel_playbin_player_construct_wrap (RYGEL_PLAYBIN_TYPE_PLAYER, playbin);
+	return rygel_playbin_player_construct_wrap (RYGEL_TYPE_PLAYBIN_PLAYER, playbin);
 }
 
 
@@ -1495,7 +1469,7 @@ static void rygel_playbin_player_instance_init (RygelPlaybinPlayer * self) {
 
 static void rygel_playbin_player_finalize (GObject* obj) {
 	RygelPlaybinPlayer * self;
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, RYGEL_PLAYBIN_TYPE_PLAYER, RygelPlaybinPlayer);
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, RYGEL_TYPE_PLAYBIN_PLAYER, RygelPlaybinPlayer);
 	_gst_object_unref0 (self->priv->_playbin);
 	_g_free0 (self->priv->_playback_state);
 	self->priv->_allowed_playback_speeds = (_vala_array_free (self->priv->_allowed_playback_speeds, self->priv->_allowed_playback_speeds_length1, (GDestroyNotify) g_free), NULL);
@@ -1531,7 +1505,7 @@ GType rygel_playbin_player_get_type (void) {
 
 static void _vala_rygel_playbin_player_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
 	RygelPlaybinPlayer * self;
-	self = G_TYPE_CHECK_INSTANCE_CAST (object, RYGEL_PLAYBIN_TYPE_PLAYER, RygelPlaybinPlayer);
+	self = G_TYPE_CHECK_INSTANCE_CAST (object, RYGEL_TYPE_PLAYBIN_PLAYER, RygelPlaybinPlayer);
 	switch (property_id) {
 		case RYGEL_PLAYBIN_PLAYER_PLAYBIN:
 		g_value_set_object (value, rygel_playbin_player_get_playbin (self));
@@ -1581,7 +1555,7 @@ static void _vala_rygel_playbin_player_get_property (GObject * object, guint pro
 
 static void _vala_rygel_playbin_player_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
 	RygelPlaybinPlayer * self;
-	self = G_TYPE_CHECK_INSTANCE_CAST (object, RYGEL_PLAYBIN_TYPE_PLAYER, RygelPlaybinPlayer);
+	self = G_TYPE_CHECK_INSTANCE_CAST (object, RYGEL_TYPE_PLAYBIN_PLAYER, RygelPlaybinPlayer);
 	switch (property_id) {
 		case RYGEL_PLAYBIN_PLAYER_PLAYBIN:
 		rygel_playbin_player_set_playbin (self, g_value_get_object (value));
diff --git a/src/rygel-playbin-renderer.c b/src/rygel-playbin-renderer.c
index bc6b7da..c43e671 100644
--- a/src/rygel-playbin-renderer.c
+++ b/src/rygel-playbin-renderer.c
@@ -1,6 +1,3 @@
-/* rygel-playbin-renderer.c generated by valac 0.18.1, the Vala compiler
- * generated from rygel-playbin-renderer.vala, do not modify */
-
 /*
  * Copyright (C) 2012 Openismus GmbH.
  * Copyright (C) 2012 Intel Corporation.
@@ -22,9 +19,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <glib.h>
-#include <glib-object.h>
-#include <rygel-renderer.h>
+#include "rygel-playbin-renderer.h"
 #include <gst/gst.h>
 #include <rygel-core.h>
 #include <stdlib.h>
@@ -54,17 +49,6 @@ typedef struct _RygelPlaybinWrappingPluginPrivate RygelPlaybinWrappingPluginPriv
 typedef struct _RygelPlaybinPlayer RygelPlaybinPlayer;
 typedef struct _RygelPlaybinPlayerClass RygelPlaybinPlayerClass;
 
-#define RYGEL_PLAYBIN_TYPE_RENDERER (rygel_playbin_renderer_get_type ())
-#define RYGEL_PLAYBIN_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RYGEL_PLAYBIN_TYPE_RENDERER, RygelPlaybinRenderer))
-#define RYGEL_PLAYBIN_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), RYGEL_PLAYBIN_TYPE_RENDERER, RygelPlaybinRendererClass))
-#define RYGEL_PLAYBIN_IS_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), RYGEL_PLAYBIN_TYPE_RENDERER))
-#define RYGEL_PLAYBIN_IS_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), RYGEL_PLAYBIN_TYPE_RENDERER))
-#define RYGEL_PLAYBIN_RENDERER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), RYGEL_PLAYBIN_TYPE_RENDERER, RygelPlaybinRendererClass))
-
-typedef struct _RygelPlaybinRenderer RygelPlaybinRenderer;
-typedef struct _RygelPlaybinRendererClass RygelPlaybinRendererClass;
-typedef struct _RygelPlaybinRendererPrivate RygelPlaybinRendererPrivate;
-
 #define RYGEL_PLAYBIN_TYPE_PLAYER (rygel_playbin_player_get_type ())
 #define RYGEL_PLAYBIN_PLAYER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RYGEL_PLAYBIN_TYPE_PLAYER, RygelPlaybinPlayer))
 #define RYGEL_PLAYBIN_PLAYER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), RYGEL_PLAYBIN_TYPE_PLAYER, RygelPlaybinPlayerClass))
@@ -76,16 +60,6 @@ typedef struct _RygelPlaybinPlayer RygelPlaybinPlayer;
 typedef struct _RygelPlaybinPlayerClass RygelPlaybinPlayerClass;
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 
-struct _RygelPlaybinRenderer {
-	RygelMediaRenderer parent_instance;
-	RygelPlaybinRendererPrivate * priv;
-};
-
-struct _RygelPlaybinRendererClass {
-	RygelMediaRendererClass parent_class;
-};
-
-
 static gpointer rygel_playbin_renderer_parent_class = NULL;
 
 GType rygel_playbin_renderer_get_type (void) G_GNUC_CONST;
@@ -129,7 +103,7 @@ RygelPlaybinRenderer* rygel_playbin_renderer_construct (GType object_type, const
 
 
 RygelPlaybinRenderer* rygel_playbin_renderer_new (const gchar* title) {
-	return rygel_playbin_renderer_construct (RYGEL_PLAYBIN_TYPE_RENDERER, title);
+	return rygel_playbin_renderer_construct (RYGEL_TYPE_PLAYBIN_RENDERER, title);
 }
 
 
@@ -169,7 +143,7 @@ RygelPlaybinRenderer* rygel_playbin_renderer_construct_wrap (GType object_type,
 
 
 RygelPlaybinRenderer* rygel_playbin_renderer_new_wrap (GstElement* pipeline, const gchar* title) {
-	return rygel_playbin_renderer_construct_wrap (RYGEL_PLAYBIN_TYPE_RENDERER, pipeline, title);
+	return rygel_playbin_renderer_construct_wrap (RYGEL_TYPE_PLAYBIN_RENDERER, pipeline, title);
 }
 
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]