[rygel-gst-0-10-media-engine] cleanup
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel-gst-0-10-media-engine] cleanup
- Date: Fri, 21 Dec 2012 10:30:32 +0000 (UTC)
commit 8f2e004571fc62c7e6e8fdb18700d40d56dc021c
Author: Murray Cumming <murrayc murrayc com>
Date: Fri Dec 21 11:30:19 2012 +0100
cleanup
src/rygel-aac-transcoder.c | 7 ++---
src/rygel-aac-transcoder.h | 4 +-
src/rygel-audio-transcoder.c | 35 +++++++++++-------------
src/rygel-audio-transcoder.h | 6 ++--
src/rygel-avc-transcoder.c | 13 ++++-----
src/rygel-avc-transcoder.h | 2 +-
src/rygel-gst-data-source.c | 58 +++++++++++++++++++++---------------------
src/rygel-gst-data-source.h | 4 +-
src/rygel-gst-media-engine.h | 2 +-
src/rygel-gst-sink.c | 24 ++++++++--------
src/rygel-gst-sink.h | 2 +-
src/rygel-gst-transcoder.c | 24 ++++++++--------
src/rygel-gst-transcoder.h | 4 +-
src/rygel-gst-utils.c | 14 +++++-----
src/rygel-gst-utils.h | 4 +-
src/rygel-l16-transcoder.c | 26 +++++++++---------
src/rygel-l16-transcoder.h | 2 +-
src/rygel-mp2ts-transcoder.c | 28 ++++++++++----------
src/rygel-mp2ts-transcoder.h | 2 +-
src/rygel-mp3-transcoder.c | 6 ++--
src/rygel-mp3-transcoder.h | 2 +-
src/rygel-video-transcoder.c | 58 +++++++++++++++++++++---------------------
src/rygel-video-transcoder.h | 4 +-
src/rygel-wmv-transcoder.c | 6 ++--
src/rygel-wmv-transcoder.h | 2 +-
25 files changed, 167 insertions(+), 172 deletions(-)
---
diff --git a/src/rygel-aac-transcoder.c b/src/rygel-aac-transcoder.c
index f46da27..c34ad91 100644
--- a/src/rygel-aac-transcoder.c
+++ b/src/rygel-aac-transcoder.c
@@ -29,7 +29,7 @@ G_DEFINE_TYPE (RygelAACTranscoder, rygel_aac_transcoder, RYGEL_TYPE_AUDIO_TRANSC
RygelAACTranscoder*
rygel_aac_transcoder_construct (GType object_type) {
- RygelAACTranscoder * self = RYGEL_AAC_TRANSCODER (rygel_audio_transcoder_construct (object_type, "audio/vnd.dlna.adts", "AAC_ADTS_320", RYGEL_AAC_TRANSCODER_BITRATE, NULL, RYGEL_AAC_TRANSCODER_CODEC, "adts"));
+ RygelAACTranscoder *self = RYGEL_AAC_TRANSCODER (rygel_audio_transcoder_construct (object_type, "audio/vnd.dlna.adts", "AAC_ADTS_320", RYGEL_AAC_TRANSCODER_BITRATE, NULL, RYGEL_AAC_TRANSCODER_CODEC, "adts"));
rygel_gst_transcoder_set_preset (RYGEL_GST_TRANSCODER (self), "Rygel AAC_ADTS_320 preset");
return self;
}
@@ -40,11 +40,10 @@ rygel_aac_transcoder_new (void) {
}
static void
-rygel_aac_transcoder_class_init (RygelAACTranscoderClass * klass) {
+rygel_aac_transcoder_class_init (RygelAACTranscoderClass *klass) {
rygel_aac_transcoder_parent_class = g_type_class_peek_parent (klass);
}
static void
-rygel_aac_transcoder_init (RygelAACTranscoder * self) {
+rygel_aac_transcoder_init (RygelAACTranscoder *self) {
}
-
diff --git a/src/rygel-aac-transcoder.h b/src/rygel-aac-transcoder.h
index e3d19e5..0ae3075 100644
--- a/src/rygel-aac-transcoder.h
+++ b/src/rygel-aac-transcoder.h
@@ -47,7 +47,7 @@ typedef struct _RygelAACTranscoderPrivate RygelAACTranscoderPrivate;
struct _RygelAACTranscoder {
RygelAudioTranscoder parent_instance;
- RygelAACTranscoderPrivate * priv;
+ RygelAACTranscoderPrivate *priv;
};
struct _RygelAACTranscoderClass {
@@ -58,7 +58,7 @@ GType rygel_aac_transcoder_get_type (void) G_GNUC_CONST;
RygelAACTranscoder* rygel_aac_transcoder_new (void);
-void rygel_gst_transcoder_set_preset (RygelGstTranscoder* self, const gchar* value);
+void rygel_gst_transcoder_set_preset (RygelGstTranscoder* self, const gchar *value);
G_END_DECLS
diff --git a/src/rygel-audio-transcoder.c b/src/rygel-audio-transcoder.c
index a3f04d7..5840e31 100644
--- a/src/rygel-audio-transcoder.c
+++ b/src/rygel-audio-transcoder.c
@@ -32,8 +32,8 @@ G_DEFINE_TYPE (RygelAudioTranscoder, rygel_audio_transcoder, RYGEL_TYPE_GST_TRAN
static void rygel_audio_transcoder_finalize (GObject* obj);
RygelAudioTranscoder*
-rygel_audio_transcoder_construct (GType object_type, const gchar* content_type, gint audio_bitrate, const gchar* container_caps, const gchar* audio_codec_caps, const gchar* extension) {
- RygelAudioTranscoder * self = NULL;
+rygel_audio_transcoder_construct (GType object_type, const gchar *content_type, gint audio_bitrate, const gchar *container_caps, const gchar *audio_codec_caps, const gchar *extension) {
+ RygelAudioTranscoder *self = NULL;
g_return_val_if_fail (content_type != NULL, NULL);
g_return_val_if_fail (audio_codec_caps != NULL, NULL);
@@ -48,13 +48,13 @@ rygel_audio_transcoder_construct (GType object_type, const gchar* content_type,
}
RygelAudioTranscoder*
-rygel_audio_transcoder_new (const gchar* content_type, gint audio_bitrate, const gchar* container_caps, const gchar* audio_codec_caps, const gchar* extension) {
+rygel_audio_transcoder_new (const gchar *content_type, gint audio_bitrate, const gchar *container_caps, const gchar *audio_codec_caps, const gchar *extension) {
return rygel_audio_transcoder_construct (RYGEL_TYPE_AUDIO_TRANSCODER, content_type, audio_bitrate, container_caps, audio_codec_caps, extension);
}
RygelAudioTranscoder*
-rygel_audio_transcoder_construct_with_class (GType object_type, const gchar* content_type, const gchar* upnp_class, gint audio_bitrate, const gchar* container_caps, const gchar* audio_codec_caps, const gchar* extension) {
- RygelAudioTranscoder * self = NULL;
+rygel_audio_transcoder_construct_with_class (GType object_type, const gchar *content_type, const gchar *upnp_class, gint audio_bitrate, const gchar *container_caps, const gchar *audio_codec_caps, const gchar *extension) {
+ RygelAudioTranscoder *self = NULL;
g_return_val_if_fail (content_type != NULL, NULL);
g_return_val_if_fail (upnp_class != NULL, NULL);
@@ -68,13 +68,13 @@ rygel_audio_transcoder_construct_with_class (GType object_type, const gchar* con
}
RygelAudioTranscoder*
-rygel_audio_transcoder_new_with_class (const gchar* content_type, const gchar* upnp_class, gint audio_bitrate, const gchar* container_caps, const gchar* audio_codec_caps, const gchar* extension) {
+rygel_audio_transcoder_new_with_class (const gchar *content_type, const gchar *upnp_class, gint audio_bitrate, const gchar *container_caps, const gchar *audio_codec_caps, const gchar *extension) {
return rygel_audio_transcoder_construct_with_class (RYGEL_TYPE_AUDIO_TRANSCODER, content_type, upnp_class, audio_bitrate, container_caps, audio_codec_caps, extension);
}
static GUPnPDIDLLiteResource*
-rygel_audio_transcoder_real_add_resource (RygelTranscoder* base, GUPnPDIDLLiteItem* didl_item, RygelMediaItem* item, RygelTranscodeManager* manager, GError** error) {
- RygelAudioTranscoder * self;
+rygel_audio_transcoder_real_add_resource (RygelTranscoder *base, GUPnPDIDLLiteItem *didl_item, RygelMediaItem *item, RygelTranscodeManager *manager, GError **error) {
+ RygelAudioTranscoder *self;
GUPnPDIDLLiteResource* resource;
GError *inner_error = NULL;
@@ -95,8 +95,8 @@ rygel_audio_transcoder_real_add_resource (RygelTranscoder* base, GUPnPDIDLLiteIt
}
static guint
-rygel_audio_transcoder_real_get_distance (RygelTranscoder* base, RygelMediaItem* item) {
- RygelAudioTranscoder * self;
+rygel_audio_transcoder_real_get_distance (RygelTranscoder *base, RygelMediaItem *item) {
+ RygelAudioTranscoder *self;
RygelAudioItem *audio_item;
guint distance;
guint bitrate;
@@ -121,10 +121,10 @@ rygel_audio_transcoder_real_get_distance (RygelTranscoder* base, RygelMediaItem*
}
static GstEncodingProfile*
-rygel_audio_transcoder_real_get_encoding_profile (RygelGstTranscoder* base) {
- RygelAudioTranscoder * self;
+rygel_audio_transcoder_real_get_encoding_profile (RygelGstTranscoder *base) {
+ RygelAudioTranscoder *self;
GstEncodingProfile* enc_audio_profile = NULL;
- const gchar* preset;
+ const gchar *preset;
self = RYGEL_AUDIO_TRANSCODER (base);
@@ -143,7 +143,7 @@ rygel_audio_transcoder_real_get_encoding_profile (RygelGstTranscoder* base) {
}
static void
-rygel_audio_transcoder_class_init (RygelAudioTranscoderClass * klass) {
+rygel_audio_transcoder_class_init (RygelAudioTranscoderClass *klass) {
rygel_audio_transcoder_parent_class = g_type_class_peek_parent (klass);
RYGEL_TRANSCODER_CLASS (klass)->add_resource = rygel_audio_transcoder_real_add_resource;
RYGEL_TRANSCODER_CLASS (klass)->get_distance = rygel_audio_transcoder_real_get_distance;
@@ -152,14 +152,14 @@ rygel_audio_transcoder_class_init (RygelAudioTranscoderClass * klass) {
}
static void
-rygel_audio_transcoder_init (RygelAudioTranscoder * self) {
+rygel_audio_transcoder_init (RygelAudioTranscoder *self) {
self->container_format = NULL;
self->audio_codec_format = NULL;
}
static void
rygel_audio_transcoder_finalize (GObject* obj) {
- RygelAudioTranscoder * self;
+ RygelAudioTranscoder *self;
self = RYGEL_AUDIO_TRANSCODER (obj);
if (self->container_format) {
@@ -172,6 +172,3 @@ rygel_audio_transcoder_finalize (GObject* obj) {
G_OBJECT_CLASS (rygel_audio_transcoder_parent_class)->finalize (obj);
}
-
-
-
diff --git a/src/rygel-audio-transcoder.h b/src/rygel-audio-transcoder.h
index 5fcc6c0..d9361cf 100644
--- a/src/rygel-audio-transcoder.h
+++ b/src/rygel-audio-transcoder.h
@@ -47,7 +47,7 @@ typedef struct _RygelAudioTranscoderPrivate RygelAudioTranscoderPrivate;
struct _RygelAudioTranscoder {
RygelGstTranscoder parent_instance;
- RygelAudioTranscoderPrivate * priv;
+ RygelAudioTranscoderPrivate *priv;
/* TODO: Put this in priv? */
gint audio_bitrate;
@@ -61,8 +61,8 @@ struct _RygelAudioTranscoderClass {
GType rygel_audio_transcoder_get_type (void) G_GNUC_CONST;
-RygelAudioTranscoder* rygel_audio_transcoder_new (const gchar* content_type, gint audio_bitrate, const gchar* container_caps, const gchar* audio_codec_caps, const gchar* extension);
-RygelAudioTranscoder* rygel_audio_transcoder_new_with_class (const gchar* content_type, const gchar* upnp_class, gint audio_bitrate, const gchar* container_caps, const gchar* audio_codec_caps, const gchar* extension);
+RygelAudioTranscoder* rygel_audio_transcoder_new (const gchar *content_type, gint audio_bitrate, const gchar *container_caps, const gchar *audio_codec_caps, const gchar *extension);
+RygelAudioTranscoder* rygel_audio_transcoder_new_with_class (const gchar *content_type, const gchar *upnp_class, gint audio_bitrate, const gchar *container_caps, const gchar *audio_codec_caps, const gchar *extension);
#define RYGEL_AUDIO_TRANSCODER_NO_CONTAINER NULL
diff --git a/src/rygel-avc-transcoder.c b/src/rygel-avc-transcoder.c
index 2cd7bb1..d2a3e39 100644
--- a/src/rygel-avc-transcoder.c
+++ b/src/rygel-avc-transcoder.c
@@ -31,12 +31,11 @@ G_DEFINE_TYPE (RygelAVCTranscoder, rygel_avc_transcoder, RYGEL_TYPE_VIDEO_TRANSC
#define RYGEL_AVC_TRANSCODER_VIDEO_CAPS "video/x-h264,stream-format=avc"
#define RYGEL_AVC_TRANSCODER_RESTRICTIONS "video/x-raw-yuv,framerate=(fraction)15/1,width=352,height=288"
-static GUPnPDIDLLiteResource*rygel_avc_transcoder_real_add_resource (RygelTranscoder* base, GUPnPDIDLLiteItem* didl_item, RygelMediaItem* item, RygelTranscodeManager* manager, GError** error);
-
+static GUPnPDIDLLiteResource* rygel_avc_transcoder_real_add_resource (RygelTranscoder *base, GUPnPDIDLLiteItem *didl_item, RygelMediaItem *item, RygelTranscodeManager *manager, GError **error);
RygelAVCTranscoder*
rygel_avc_transcoder_construct (GType object_type) {
- RygelAVCTranscoder * self = RYGEL_AVC_TRANSCODER (rygel_video_transcoder_construct (object_type, "video/mp4", "AVC_MP4_BL_CIF15_AAC_520", RYGEL_AVC_TRANSCODER_AUDIO_BITRATE, RYGEL_AVC_TRANSCODER_VIDEO_BITRATE, RYGEL_AVC_TRANSCODER_CONTAINER, RYGEL_AVC_TRANSCODER_AUDIO_CAPS, RYGEL_AVC_TRANSCODER_VIDEO_CAPS, "mp4", RYGEL_AVC_TRANSCODER_RESTRICTIONS));
+ RygelAVCTranscoder *self = RYGEL_AVC_TRANSCODER (rygel_video_transcoder_construct (object_type, "video/mp4", "AVC_MP4_BL_CIF15_AAC_520", RYGEL_AVC_TRANSCODER_AUDIO_BITRATE, RYGEL_AVC_TRANSCODER_VIDEO_BITRATE, RYGEL_AVC_TRANSCODER_CONTAINER, RYGEL_AVC_TRANSCODER_AUDIO_CAPS, RYGEL_AVC_TRANSCODER_VIDEO_CAPS, "mp4", RYGEL_AVC_TRANSCODER_RESTRICTIONS));
rygel_gst_transcoder_set_preset (RYGEL_GST_TRANSCODER (self), "Rygel AVC_MP4_BL_CIF15_AAC_520 preset");
return self;
}
@@ -47,8 +46,8 @@ rygel_avc_transcoder_new (void) {
}
static GUPnPDIDLLiteResource*
-rygel_avc_transcoder_real_add_resource (RygelTranscoder* base, GUPnPDIDLLiteItem* didl_item, RygelMediaItem* item, RygelTranscodeManager* manager, GError** error) {
- RygelAVCTranscoder * self;
+rygel_avc_transcoder_real_add_resource (RygelTranscoder *base, GUPnPDIDLLiteItem *didl_item, RygelMediaItem *item, RygelTranscodeManager *manager, GError **error) {
+ RygelAVCTranscoder *self;
GUPnPDIDLLiteResource* resource;
GError* inner_error = NULL;
@@ -75,12 +74,12 @@ rygel_avc_transcoder_real_add_resource (RygelTranscoder* base, GUPnPDIDLLiteItem
}
static void
-rygel_avc_transcoder_class_init (RygelAVCTranscoderClass * klass) {
+rygel_avc_transcoder_class_init (RygelAVCTranscoderClass *klass) {
rygel_avc_transcoder_parent_class = g_type_class_peek_parent (klass);
RYGEL_TRANSCODER_CLASS (klass)->add_resource = rygel_avc_transcoder_real_add_resource;
}
static void
-rygel_avc_transcoder_init (RygelAVCTranscoder * self) {
+rygel_avc_transcoder_init (RygelAVCTranscoder *self) {
}
diff --git a/src/rygel-avc-transcoder.h b/src/rygel-avc-transcoder.h
index c5801ba..11895f0 100644
--- a/src/rygel-avc-transcoder.h
+++ b/src/rygel-avc-transcoder.h
@@ -37,7 +37,7 @@ typedef struct _RygelAVCTranscoderPrivate RygelAVCTranscoderPrivate;
struct _RygelAVCTranscoder {
RygelVideoTranscoder parent_instance;
- RygelAVCTranscoderPrivate * priv;
+ RygelAVCTranscoderPrivate *priv;
};
struct _RygelAVCTranscoderClass {
diff --git a/src/rygel-gst-data-source.c b/src/rygel-gst-data-source.c
index f8dcab1..eebc81e 100644
--- a/src/rygel-gst-data-source.c
+++ b/src/rygel-gst-data-source.c
@@ -24,7 +24,7 @@
#include "rygel-gst-data-source.h"
#include "rygel-gst-sink.h"
-static void rygel_gst_data_source_rygel_data_source_interface_init (RygelDataSourceIface * iface);
+static void rygel_gst_data_source_rygel_data_source_interface_init (RygelDataSourceIface *iface);
G_DEFINE_TYPE_WITH_CODE (RygelGstDataSource, rygel_gst_data_source, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (RYGEL_TYPE_DATA_SOURCE, rygel_gst_data_source_rygel_data_source_interface_init))
@@ -47,11 +47,11 @@ static RygelDataSourceIface* rygel_gst_data_source_rygel_data_source_parent_ifac
GQuark rygel_gst_data_source_error_quark (void);
#define RYGEL_GST_DATA_SOURCE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), RYGEL_TYPE_GST_DATA_SOURCE, RygelGstDataSourcePrivate))
-static void rygel_gst_data_source_real_start (RygelDataSource* base, RygelHTTPSeek* offsets, GError** error);
-static void rygel_gst_data_source_prepare_pipeline (RygelGstDataSource* self, const gchar* name, GstElement* src, GError** error);
-static void rygel_gst_data_source_real_freeze (RygelDataSource* base);
-static void rygel_gst_data_source_real_thaw (RygelDataSource* base);
-static void rygel_gst_data_source_real_stop (RygelDataSource* base);
+static void rygel_gst_data_source_real_start (RygelDataSource *base, RygelHTTPSeek* offsets, GError **error);
+static void rygel_gst_data_source_prepare_pipeline (RygelGstDataSource* self, const gchar *name, GstElement* src, GError **error);
+static void rygel_gst_data_source_real_freeze (RygelDataSource *base);
+static void rygel_gst_data_source_real_thaw (RygelDataSource *base);
+static void rygel_gst_data_source_real_stop (RygelDataSource *base);
static void rygel_gst_data_source_src_pad_added (RygelGstDataSource* self, GstElement* src, GstPad* src_pad);
static void on_pad_added (GstElement* _sender, GstPad* pad, gpointer self);
GQuark rygel_gst_error_quark (void);
@@ -71,8 +71,8 @@ GQuark rygel_gst_data_source_error_quark (void) {
RygelGstDataSource*
-rygel_gst_data_source_construct (GType object_type, const gchar* uri, GError** error) {
- RygelGstDataSource * self = RYGEL_GST_DATA_SOURCE (g_object_new (object_type, NULL));
+rygel_gst_data_source_construct (GType object_type, const gchar *uri, GError **error) {
+ RygelGstDataSource *self = RYGEL_GST_DATA_SOURCE (g_object_new (object_type, NULL));
self->src = rygel_gst_utils_create_source_for_uri (uri);
if (self->src == NULL) {
@@ -87,13 +87,13 @@ rygel_gst_data_source_construct (GType object_type, const gchar* uri, GError** e
}
RygelGstDataSource*
-rygel_gst_data_source_new (const gchar* uri, GError** error) {
+rygel_gst_data_source_new (const gchar *uri, GError **error) {
return rygel_gst_data_source_construct (RYGEL_TYPE_GST_DATA_SOURCE, uri, error);
}
RygelGstDataSource*
rygel_gst_data_source_construct_from_element (GType object_type, GstElement* element) {
- RygelGstDataSource * self = RYGEL_GST_DATA_SOURCE (g_object_new (object_type, NULL));
+ RygelGstDataSource *self = RYGEL_GST_DATA_SOURCE (g_object_new (object_type, NULL));
self->src = element;
}
@@ -104,9 +104,9 @@ rygel_gst_data_source_new_from_element (GstElement* element) {
}
static void
-rygel_gst_data_source_real_start (RygelDataSource* base, RygelHTTPSeek* offsets, GError** error) {
- RygelGstDataSource * self = RYGEL_DATA_SOURCE (base);
- GError * inner_error = NULL;
+rygel_gst_data_source_real_start (RygelDataSource *base, RygelHTTPSeek* offsets, GError **error) {
+ RygelGstDataSource *self = RYGEL_DATA_SOURCE (base);
+ GError *inner_error = NULL;
self->priv->seek = offsets;
rygel_gst_data_source_prepare_pipeline (self, "RygelGstDataSource", self->src, &inner_error);
@@ -123,15 +123,15 @@ rygel_gst_data_source_real_start (RygelDataSource* base, RygelHTTPSeek* offsets,
}
static void
-rygel_gst_data_source_real_freeze (RygelDataSource* base) {
- RygelGstDataSource * self = RYGEL_DATA_SOURCE (base);
+rygel_gst_data_source_real_freeze (RygelDataSource *base) {
+ RygelGstDataSource *self = RYGEL_DATA_SOURCE (base);
rygel_gst_sink_freeze (self->priv->sink);
}
static void
-rygel_gst_data_source_real_thaw (RygelDataSource* base) {
- RygelGstDataSource * self;
+rygel_gst_data_source_real_thaw (RygelDataSource *base) {
+ RygelGstDataSource *self;
RygelGstSink* _tmp0_;
self = (RygelGstDataSource*) base;
_tmp0_ = self->priv->sink;
@@ -140,15 +140,15 @@ rygel_gst_data_source_real_thaw (RygelDataSource* base) {
static gboolean
on_idle_emit_done (gpointer user_data) {
- RygelGstDataSource * self = RYGEL_DATA_SOURCE (user_data);
+ RygelGstDataSource *self = RYGEL_DATA_SOURCE (user_data);
g_signal_emit_by_name (self, "done");
return FALSE;
}
static void
-rygel_gst_data_source_real_stop (RygelDataSource* base) {
- RygelGstDataSource * self = RYGEL_DATA_SOURCE (base);
+rygel_gst_data_source_real_stop (RygelDataSource *base) {
+ RygelGstDataSource *self = RYGEL_DATA_SOURCE (base);
if (self->priv->sink) {
g_cancellable_cancel (self->priv->sink->cancellable);
@@ -166,7 +166,7 @@ rygel_gst_data_source_real_stop (RygelDataSource* base) {
static void
on_pad_added (GstElement* src, GstPad* src_pad, gpointer user_data) {
- RygelGstDataSource * self = RYGEL_DATA_SOURCE (user_data);
+ RygelGstDataSource *self = RYGEL_DATA_SOURCE (user_data);
g_return_if_fail (self != NULL);
g_return_if_fail (src != NULL);
@@ -235,7 +235,7 @@ on_pad_added (GstElement* src, GstPad* src_pad, gpointer user_data) {
static gboolean
on_bus_watch (GstBus* bus, GstMessage* message, gpointer user_data) {
- RygelGstDataSource * self = RYGEL_DATA_SOURCE (user_data);
+ RygelGstDataSource *self = RYGEL_DATA_SOURCE (user_data);
gboolean ret = TRUE;
if (message->type == GST_MESSAGE_EOS) {
@@ -254,7 +254,7 @@ on_bus_watch (GstBus* bus, GstMessage* message, gpointer user_data) {
if (element) {
GstElementFactory* factory = gst_element_get_factory (element);
if (factory) {
- gchar* name = gst_plugin_feature_get_name (GST_PLUGIN_FEATURE (factory));
+ gchar *name = gst_plugin_feature_get_name (GST_PLUGIN_FEATURE (factory));
// Awesome gross hack, really.
if (g_strcmp0 (name, "mp4mux") == 0) {
@@ -280,7 +280,7 @@ on_bus_watch (GstBus* bus, GstMessage* message, gpointer user_data) {
} else {
- gchar* err_msg = NULL;
+ gchar *err_msg = NULL;
gst_message_parse_error (message, NULL, &err_msg);
gchar *pipeline_name = gst_object_get_name (GST_OBJECT (self->priv->pipeline));
@@ -309,7 +309,7 @@ on_bus_watch (GstBus* bus, GstMessage* message, gpointer user_data) {
}
static void
-rygel_gst_data_source_prepare_pipeline (RygelGstDataSource* self, const gchar* name, GstElement* src, GError** error) {
+rygel_gst_data_source_prepare_pipeline (RygelGstDataSource* self, const gchar *name, GstElement* src, GError **error) {
self->priv->sink = rygel_gst_sink_new (self, self->priv->seek);
self->priv->pipeline = GST_PIPLINE (gst_pipeline_new (name));
@@ -400,14 +400,14 @@ rygel_gst_data_source_perform_seek (RygelGstDataSource* self) {
}
static void
-rygel_gst_data_source_class_init (RygelGstDataSourceClass * klass) {
+rygel_gst_data_source_class_init (RygelGstDataSourceClass *klass) {
rygel_gst_data_source_parent_class = g_type_class_peek_parent (klass);
g_type_class_add_private (klass, sizeof (RygelGstDataSourcePrivate));
G_OBJECT_CLASS (klass)->finalize = rygel_gst_data_source_finalize;
}
static void
-rygel_gst_data_source_rygel_data_source_interface_init (RygelDataSourceIface * iface) {
+rygel_gst_data_source_rygel_data_source_interface_init (RygelDataSourceIface *iface) {
rygel_gst_data_source_rygel_data_source_parent_iface = g_type_interface_peek_parent (iface);
iface->start = (void (*)(RygelDataSource*, RygelHTTPSeek*, GError**)) rygel_gst_data_source_real_start;
iface->freeze = (void (*)(RygelDataSource*)) rygel_gst_data_source_real_freeze;
@@ -416,14 +416,14 @@ rygel_gst_data_source_rygel_data_source_interface_init (RygelDataSourceIface * i
}
static void
-rygel_gst_data_source_init (RygelGstDataSource * self) {
+rygel_gst_data_source_init (RygelGstDataSource *self) {
self->priv = RYGEL_GST_DATA_SOURCE_GET_PRIVATE (self);
self->priv->seek = NULL;
}
static void
rygel_gst_data_source_finalize (GObject* obj) {
- RygelGstDataSource * self = RYGEL_DATA_SOURCE (obj);
+ RygelGstDataSource *self = RYGEL_DATA_SOURCE (obj);
if (self->priv->sink) {
g_cancellable_cancel (self->priv->sink->cancellable);
diff --git a/src/rygel-gst-data-source.h b/src/rygel-gst-data-source.h
index dfc48d2..fe207d1 100644
--- a/src/rygel-gst-data-source.h
+++ b/src/rygel-gst-data-source.h
@@ -46,7 +46,7 @@ typedef struct _RygelGstDataSourcePrivate RygelGstDataSourcePrivate;
struct _RygelGstDataSource {
GObject parent_instance;
- RygelGstDataSourcePrivate * priv;
+ RygelGstDataSourcePrivate *priv;
GstElement* src;
};
@@ -56,7 +56,7 @@ struct _RygelGstDataSourceClass {
GType rygel_gst_data_source_get_type (void) G_GNUC_CONST;
-RygelGstDataSource* rygel_gst_data_source_new (const gchar* uri, GError** error);
+RygelGstDataSource* rygel_gst_data_source_new (const gchar *uri, GError **error);
typedef enum {
diff --git a/src/rygel-gst-media-engine.h b/src/rygel-gst-media-engine.h
index 58a92f4..936f9df 100644
--- a/src/rygel-gst-media-engine.h
+++ b/src/rygel-gst-media-engine.h
@@ -47,7 +47,7 @@ typedef struct _RygelGstMediaEnginePrivate RygelGstMediaEnginePrivate;
struct _RygelGstMediaEngine {
RygelMediaEngine parent_instance;
- RygelGstMediaEnginePrivate * priv;
+ RygelGstMediaEnginePrivate *priv;
};
struct _RygelGstMediaEngineClass {
diff --git a/src/rygel-gst-sink.c b/src/rygel-gst-sink.c
index bc375d8..ec1a1f2 100644
--- a/src/rygel-gst-sink.c
+++ b/src/rygel-gst-sink.c
@@ -44,7 +44,7 @@ typedef struct _CallbackData CallbackData;
struct _CallbackData {
int _ref_count_;
- RygelGstSink * self;
+ RygelGstSink *self;
GstBuffer* buffer;
};
@@ -57,12 +57,12 @@ struct _CallbackData {
static void rygel_gst_sink_on_cancelled (RygelGstSink* self);
static void on_cancelled (GCancellable* _sender, gpointer self);
-static GstFlowReturn rygel_gst_sink_real_render (GstBaseSink* base, GstBuffer* buffer);
+static GstFlowReturn rygel_gst_sink_real_render (GstBaseSink *base, GstBuffer* buffer);
gboolean rygel_gst_sink_push_data (RygelGstSink* self, GstBuffer* buffer);
static gboolean on_idle_push_data (gpointer self);
static void rygel_gst_sink_finalize (GObject* obj);
-static void clear_gmutex (GMutex * mutex);
-static void clear_gcond (GCond * mutex);
+static void clear_gmutex (GMutex *mutex);
+static void clear_gcond (GCond *mutex);
static void
on_cancelled (GCancellable* _sender, gpointer self) {
@@ -141,17 +141,17 @@ callback_data_ref (CallbackData* callback_data) {
}
static void
-callback_data_unref (void * user_data) {
+callback_data_unref (void *user_data) {
CallbackData* callback_data = (CallbackData*) user_data;
if (g_atomic_int_dec_and_test (&callback_data->_ref_count_)) {
- RygelGstSink * self = callback_data->self;
+ RygelGstSink *self = callback_data->self;
gst_buffer_unref (callback_data->buffer);
gst_object_unref (self);
g_slice_free (CallbackData, callback_data);
}
}
-static GstFlowReturn rygel_gst_sink_real_render (GstBaseSink* base, GstBuffer* buffer) {
+static GstFlowReturn rygel_gst_sink_real_render (GstBaseSink *base, GstBuffer* buffer) {
RygelGstSink *self = RYGEL_GST_SINK (base);
CallbackData* callback_data;
@@ -208,7 +208,7 @@ rygel_gst_sink_on_cancelled (RygelGstSink* self) {
}
static void
-rygel_gst_sink_class_init (RygelGstSinkClass * klass) {
+rygel_gst_sink_class_init (RygelGstSinkClass *klass) {
GstCaps* caps;
GstPadTemplate* template;
@@ -227,7 +227,7 @@ rygel_gst_sink_class_init (RygelGstSinkClass * klass) {
}
static void
-rygel_gst_sink_init (RygelGstSink * self) {
+rygel_gst_sink_init (RygelGstSink *self) {
GMutex mutex = {0};
GCond cond = {0};
@@ -241,7 +241,7 @@ rygel_gst_sink_init (RygelGstSink * self) {
static void
rygel_gst_sink_finalize (GObject* obj) {
- RygelGstSink * self = RYGEL_GST_SINK (obj);
+ RygelGstSink *self = RYGEL_GST_SINK (obj);
g_object_unref (self->cancellable);
clear_gmutex (&self->priv->buffer_mutex);
@@ -252,7 +252,7 @@ rygel_gst_sink_finalize (GObject* obj) {
}
static void
-clear_gmutex (GMutex * mutex) {
+clear_gmutex (GMutex *mutex) {
GMutex zero_mutex = { 0 };
if (memcmp (mutex, &zero_mutex, sizeof (GMutex))) {
g_mutex_clear (mutex);
@@ -261,7 +261,7 @@ clear_gmutex (GMutex * mutex) {
}
static void
-clear_gcond (GCond * mutex) {
+clear_gcond (GCond *mutex) {
GCond zero_mutex = { 0 };
if (memcmp (mutex, &zero_mutex, sizeof (GCond))) {
g_cond_clear (mutex);
diff --git a/src/rygel-gst-sink.h b/src/rygel-gst-sink.h
index 8d40b41..9fc1ff2 100644
--- a/src/rygel-gst-sink.h
+++ b/src/rygel-gst-sink.h
@@ -48,7 +48,7 @@ typedef struct _RygelGstSinkPrivate RygelGstSinkPrivate;
struct _RygelGstSink {
GstBaseSink parent_instance;
- RygelGstSinkPrivate * priv;
+ RygelGstSinkPrivate *priv;
/* TODO: Put this in priv? */
GCancellable* cancellable;
diff --git a/src/rygel-gst-transcoder.c b/src/rygel-gst-transcoder.c
index a87c33a..489a05d 100644
--- a/src/rygel-gst-transcoder.c
+++ b/src/rygel-gst-transcoder.c
@@ -34,18 +34,18 @@ enum {
G_DEFINE_TYPE (RygelGstTranscoder, rygel_gst_transcoder, RYGEL_TYPE_TRANSCODER)
struct _RygelGstTranscoderPrivate {
- gchar* _preset;
+ gchar *_preset;
GstElement* decoder;
GstElement* encoder;
gboolean link_failed;
};
-static void rygel_gst_transcoder_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
-static void rygel_gst_transcoder_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
+static void rygel_gst_transcoder_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec);
+static void rygel_gst_transcoder_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec);
static void rygel_gst_transcoder_finalize (GObject* obj);
static RygelGstTranscoder*
-rygel_gst_transcoder_construct (GType object_type, const gchar* mime_type, const gchar* dlna_profile, const gchar* extension) {
+rygel_gst_transcoder_construct (GType object_type, const gchar *mime_type, const gchar *dlna_profile, const gchar *extension) {
RygelGstTranscoder *self;
g_return_val_if_fail (mime_type != NULL, NULL);
@@ -125,7 +125,7 @@ on_decoder_no_more_pads (GstElement* decodebin, gpointer user_data) {
}
static RygelDataSource*
-rygel_gst_transcoder_create_source (RygelTranscoder* base, RygelMediaItem* item, RygelDataSource* src, GError** error) {
+rygel_gst_transcoder_create_source (RygelTranscoder *base, RygelMediaItem *item, RygelDataSource* src, GError **error) {
RygelGstTranscoder *self;
RygelGstDataSource *data_source;
GstEncodingProfile *encoding_profile;
@@ -222,7 +222,7 @@ rygel_gst_transcoder_get_preset (RygelGstTranscoder* self) {
}
void
-rygel_gst_transcoder_set_preset (RygelGstTranscoder* self, const gchar* value) {
+rygel_gst_transcoder_set_preset (RygelGstTranscoder* self, const gchar *value) {
g_return_if_fail (self != NULL);
if (self->priv->_preset) {
@@ -238,7 +238,7 @@ rygel_gst_transcoder_set_preset (RygelGstTranscoder* self, const gchar* value) {
}
static
-void rygel_gst_transcoder_class_init (RygelGstTranscoderClass * klass) {
+void rygel_gst_transcoder_class_init (RygelGstTranscoderClass *klass) {
rygel_gst_transcoder_parent_class = g_type_class_peek_parent (klass);
g_type_class_add_private (klass, sizeof (RygelGstTranscoderPrivate));
RYGEL_TRANSCODER_CLASS (klass)->create_source = rygel_gst_transcoder_create_source;
@@ -250,7 +250,7 @@ void rygel_gst_transcoder_class_init (RygelGstTranscoderClass * klass) {
}
static
-void rygel_gst_transcoder_init (RygelGstTranscoder * self) {
+void rygel_gst_transcoder_init (RygelGstTranscoder *self) {
self->priv = RYGEL_GST_TRANSCODER_GET_PRIVATE (self);
self->priv->_preset = g_strdup (RYGEL_GST_TRANSCODER_DEFAULT_ENCODING_PRESET);
}
@@ -268,8 +268,8 @@ void rygel_gst_transcoder_finalize (GObject* obj) {
}
static void
-rygel_gst_transcoder_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
- RygelGstTranscoder * self;
+rygel_gst_transcoder_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) {
+ RygelGstTranscoder *self;
self = RYGEL_GST_TRANSCODER (object);
switch (property_id) {
@@ -283,8 +283,8 @@ rygel_gst_transcoder_get_property (GObject * object, guint property_id, GValue *
}
static void
-rygel_gst_transcoder_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
- RygelGstTranscoder * self;
+rygel_gst_transcoder_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) {
+ RygelGstTranscoder *self;
self = RYGEL_GST_TRANSCODER (object);
switch (property_id) {
diff --git a/src/rygel-gst-transcoder.h b/src/rygel-gst-transcoder.h
index dc46150..bcd415e 100644
--- a/src/rygel-gst-transcoder.h
+++ b/src/rygel-gst-transcoder.h
@@ -46,7 +46,7 @@ typedef struct _RygelGstTranscoderPrivate RygelGstTranscoderPrivate;
struct _RygelGstTranscoder {
RygelTranscoder parent_instance;
- RygelGstTranscoderPrivate * priv;
+ RygelGstTranscoderPrivate *priv;
};
struct _RygelGstTranscoderClass {
@@ -60,7 +60,7 @@ GType rygel_gst_transcoder_get_type (void) G_GNUC_CONST;
RygelGstTranscoder* rygel_gst_transcoder_new (void);
GstEncodingProfile* rygel_gst_transcoder_get_encoding_profile (RygelGstTranscoder *self);
-const gchar* rygel_gst_transcoder_get_preset (RygelGstTranscoder *self);
+const gchar *rygel_gst_transcoder_get_preset (RygelGstTranscoder *self);
void rygel_gst_transcoder_set_preset (RygelGstTranscoder *self, const gchar *value);
G_END_DECLS
diff --git a/src/rygel-gst-utils.c b/src/rygel-gst-utils.c
index 234e279..7b143c7 100644
--- a/src/rygel-gst-utils.c
+++ b/src/rygel-gst-utils.c
@@ -31,7 +31,7 @@
static gboolean rygel_gst_utils_need_rtp_depayloader (GstCaps* caps);
GstElement*
-rygel_gst_utils_create_element (const gchar* factoryname, const gchar* name, GError** error) {
+rygel_gst_utils_create_element (const gchar *factoryname, const gchar *name, GError **error) {
GstElement* element;
g_return_val_if_fail (factoryname != NULL, NULL);
@@ -50,7 +50,7 @@ rygel_gst_utils_create_element (const gchar* factoryname, const gchar* name, GEr
}
GstElement*
-rygel_gst_utils_create_source_for_uri (const gchar* uri) {
+rygel_gst_utils_create_source_for_uri (const gchar *uri) {
GstElement* src;
g_return_val_if_fail (uri != NULL, NULL);
@@ -76,9 +76,9 @@ rygel_gst_utils_create_source_for_uri (const gchar* uri) {
void
rygel_gst_utils_dump_encoding_profile (GstEncodingProfile* profile, gint indent) {
- gchar* indent_s;
+ gchar *indent_s;
const GstCaps* caps;
- gchar* format_name;
+ gchar *format_name;
const GstCaps* restriction;
g_return_if_fail (profile != NULL);
@@ -93,7 +93,7 @@ rygel_gst_utils_dump_encoding_profile (GstEncodingProfile* profile, gint indent)
restriction = gst_encoding_profile_get_restriction (profile);
if (restriction) {
- gchar* restriction_name = gst_caps_to_string (restriction);
+ gchar *restriction_name = gst_caps_to_string (restriction);
g_debug ("%s Restriction: %s", indent_s, restriction_name);
g_free (restriction_name);
}
@@ -128,7 +128,7 @@ static void _g_list_free__gst_object_unref0_ (GList* self) {
GstElement* rygel_gst_utils_get_rtp_depayloader (GstCaps* caps) {
GList* features;
GList* temp;
- const gchar* feature_name;
+ const gchar *feature_name;
if (!rygel_gst_utils_need_rtp_depayloader (caps)) {
return NULL;
@@ -166,7 +166,7 @@ GstElement* rygel_gst_utils_get_rtp_depayloader (GstCaps* caps) {
static gboolean
rygel_gst_utils_need_rtp_depayloader (GstCaps* caps) {
const GstStructure* structure;
- const gchar* name;
+ const gchar *name;
gboolean result;
g_return_val_if_fail (caps != NULL, FALSE);
diff --git a/src/rygel-gst-utils.h b/src/rygel-gst-utils.h
index 91382ea..58d542e 100644
--- a/src/rygel-gst-utils.h
+++ b/src/rygel-gst-utils.h
@@ -35,8 +35,8 @@
G_BEGIN_DECLS
-GstElement* rygel_gst_utils_create_element (const gchar* factoryname, const gchar* name, GError** error);
-GstElement* rygel_gst_utils_create_source_for_uri (const gchar* uri);
+GstElement* rygel_gst_utils_create_element (const gchar *factoryname, const gchar *name, GError **error);
+GstElement* rygel_gst_utils_create_source_for_uri (const gchar *uri);
void rygel_gst_utils_dump_encoding_profile (GstEncodingProfile* profile, gint indent);
GstElement* rygel_gst_utils_get_rtp_depayloader (GstCaps* caps);
static gboolean rygel_gst_utils_need_rtp_depayloader (GstCaps* caps);
diff --git a/src/rygel-l16-transcoder.c b/src/rygel-l16-transcoder.c
index 13fc530..80fde5d 100644
--- a/src/rygel-l16-transcoder.c
+++ b/src/rygel-l16-transcoder.c
@@ -28,19 +28,19 @@ G_DEFINE_TYPE (RygelL16Transcoder, rygel_l16_transcoder, RYGEL_TYPE_AUDIO_TRANSC
#define RYGEL_L16_TRANSCODER_SIGNED TRUE
#define RYGEL_L16_TRANSCODER_ENDIANNESS ((gint) G_BIG_ENDIAN)
-static GUPnPDIDLLiteResource* rygel_l16_transcoder_real_add_resource (RygelTranscoder* base, GUPnPDIDLLiteItem* didl_item, RygelMediaItem* item, RygelTranscodeManager* manager, GError** error);
-static guint rygel_l16_transcoder_real_get_distance (RygelTranscoder* base, RygelMediaItem* item);
+static GUPnPDIDLLiteResource* rygel_l16_transcoder_real_add_resource (RygelTranscoder *base, GUPnPDIDLLiteItem *didl_item, RygelMediaItem *item, RygelTranscodeManager *manager, GError **error);
+static guint rygel_l16_transcoder_real_get_distance (RygelTranscoder *base, RygelMediaItem *item);
RygelL16Transcoder*
rygel_l16_transcoder_construct (GType object_type) {
- RygelL16Transcoder * self;
+ RygelL16Transcoder *self;
- gchar* mime_type = g_strdup_printf ("audio/L%i"
+ gchar *mime_type = g_strdup_printf ("audio/L%i"
";rate=%i"
";channels=%i",
RYGEL_L16_TRANSCODER_WIDTH, RYGEL_L16_TRANSCODER_FREQUENCY, RYGEL_L16_TRANSCODER_CHANNELS);
- gchar* caps_str = g_strdup_printf ("audio/format=S16BE"
+ gchar *caps_str = g_strdup_printf ("audio/format=S16BE"
",rate=%i"
",width=%i"
",depth=%i"
@@ -65,9 +65,9 @@ rygel_l16_transcoder_new (void) {
}
static GUPnPDIDLLiteResource*
-rygel_l16_transcoder_real_add_resource (RygelTranscoder* base, GUPnPDIDLLiteItem* didl_item, RygelMediaItem* item, RygelTranscodeManager* manager, GError** error) {
- RygelL16Transcoder * self = RYGEL_L16_TRANSCODER (base);
- GError * inner_error = NULL;
+rygel_l16_transcoder_real_add_resource (RygelTranscoder *base, GUPnPDIDLLiteItem *didl_item, RygelMediaItem *item, RygelTranscodeManager *manager, GError **error) {
+ RygelL16Transcoder *self = RYGEL_L16_TRANSCODER (base);
+ GError *inner_error = NULL;
g_return_val_if_fail (didl_item != NULL, NULL);
g_return_val_if_fail (item != NULL, NULL);
@@ -94,9 +94,9 @@ rygel_l16_transcoder_real_add_resource (RygelTranscoder* base, GUPnPDIDLLiteItem
}
static guint
-rygel_l16_transcoder_real_get_distance (RygelTranscoder* base, RygelMediaItem* item) {
- RygelL16Transcoder * self = RYGEL_L16_TRANSCODER (base);
- RygelAudioItem* audio_item;
+rygel_l16_transcoder_real_get_distance (RygelTranscoder *base, RygelMediaItem *item) {
+ RygelL16Transcoder *self = RYGEL_L16_TRANSCODER (base);
+ RygelAudioItem *audio_item;
guint distance;
guint sample_freq;
guint channels;
@@ -130,14 +130,14 @@ rygel_l16_transcoder_real_get_distance (RygelTranscoder* base, RygelMediaItem* i
}
static void
-rygel_l16_transcoder_class_init (RygelL16TranscoderClass * klass) {
+rygel_l16_transcoder_class_init (RygelL16TranscoderClass *klass) {
rygel_l16_transcoder_parent_class = g_type_class_peek_parent (klass);
RYGEL_TRANSCODER_CLASS (klass)->add_resource = rygel_l16_transcoder_real_add_resource;
RYGEL_TRANSCODER_CLASS (klass)->get_distance = rygel_l16_transcoder_real_get_distance;
}
static void
-rygel_l16_transcoder_init (RygelL16Transcoder * self) {
+rygel_l16_transcoder_init (RygelL16Transcoder *self) {
}
diff --git a/src/rygel-l16-transcoder.h b/src/rygel-l16-transcoder.h
index 82c060b..c7d62ad 100644
--- a/src/rygel-l16-transcoder.h
+++ b/src/rygel-l16-transcoder.h
@@ -47,7 +47,7 @@ typedef struct _RygelL16TranscoderPrivate RygelL16TranscoderPrivate;
struct _RygelL16Transcoder {
RygelAudioTranscoder parent_instance;
- RygelL16TranscoderPrivate * priv;
+ RygelL16TranscoderPrivate *priv;
};
struct _RygelL16TranscoderClass {
diff --git a/src/rygel-mp2ts-transcoder.c b/src/rygel-mp2ts-transcoder.c
index 23d989b..e682cd4 100644
--- a/src/rygel-mp2ts-transcoder.c
+++ b/src/rygel-mp2ts-transcoder.c
@@ -44,18 +44,18 @@ struct _RygelMP2TSTranscoderPrivate {
#define RYGEL_MP2_TS_TRANSCODER_BASE_VIDEO_FORMAT "video/mpeg,mpegversion=2,systemstream=false"
#define RYGEL_MP2_TS_TRANSCODER_RESTRICTION_TEMPLATE "video/x-raw-yuv,framerate=(fraction)%d/1,width=%d,height=%d"
-static GUPnPDIDLLiteResource* rygel_mp2_ts_transcoder_real_add_resource (RygelTranscoder* base, GUPnPDIDLLiteItem* didl_item, RygelMediaItem* item, RygelTranscodeManager* manager, GError** error);
-static guint rygel_mp2_ts_transcoder_real_get_distance (RygelTranscoder* base, RygelMediaItem* item);
+static GUPnPDIDLLiteResource* rygel_mp2_ts_transcoder_real_add_resource (RygelTranscoder *base, GUPnPDIDLLiteItem *didl_item, RygelMediaItem *item, RygelTranscodeManager *manager, GError **error);
+static guint rygel_mp2_ts_transcoder_real_get_distance (RygelTranscoder *base, RygelMediaItem *item);
static void rygel_mp2_ts_transcoder_finalize (GObject* obj);
static const gint RYGEL_MP2_TS_TRANSCODER_WIDTH[2] = {720, 1280};
static const gint RYGEL_MP2_TS_TRANSCODER_HEIGHT[2] = {576, 720};
static const gint RYGEL_MP2_TS_TRANSCODER_FRAME_RATE[2] = {25, 30};
-static const gchar* RYGEL_MP2_TS_TRANSCODER_PROFILES[2] = {"MPEG_TS_SD_EU_ISO", "MPEG_TS_HD_NA_ISO"};
+static const gchar *RYGEL_MP2_TS_TRANSCODER_PROFILES[2] = {"MPEG_TS_SD_EU_ISO", "MPEG_TS_HD_NA_ISO"};
RygelMP2TSTranscoder* rygel_mp2_ts_transcoder_construct (GType object_type, RygelMP2TSProfile profile) {
- RygelMP2TSTranscoder * self;
- gchar* restriction_template;
+ RygelMP2TSTranscoder *self;
+ gchar *restriction_template;
restriction_template = g_strdup_printf (
RYGEL_MP2_TS_TRANSCODER_RESTRICTION_TEMPLATE,
@@ -86,9 +86,9 @@ rygel_mp2_ts_transcoder_new (RygelMP2TSProfile profile) {
}
static GUPnPDIDLLiteResource*
-rygel_mp2_ts_transcoder_real_add_resource (RygelTranscoder* base, GUPnPDIDLLiteItem* didl_item, RygelMediaItem* item, RygelTranscodeManager* manager, GError** error) {
- RygelMP2TSTranscoder * self = RYGEL_MP2_TS_TRANSCODER (base);
- GError * inner_error = NULL;
+rygel_mp2_ts_transcoder_real_add_resource (RygelTranscoder *base, GUPnPDIDLLiteItem *didl_item, RygelMediaItem *item, RygelTranscodeManager *manager, GError **error) {
+ RygelMP2TSTranscoder *self = RYGEL_MP2_TS_TRANSCODER (base);
+ GError *inner_error = NULL;
g_return_val_if_fail (didl_item != NULL, NULL);
g_return_val_if_fail (item != NULL, NULL);
@@ -114,10 +114,10 @@ rygel_mp2_ts_transcoder_real_add_resource (RygelTranscoder* base, GUPnPDIDLLiteI
}
static guint
-rygel_mp2_ts_transcoder_real_get_distance (RygelTranscoder* base, RygelMediaItem* item) {
- RygelMP2TSTranscoder * self = RYGEL_MP2_TS_TRANSCODER (base);
+rygel_mp2_ts_transcoder_real_get_distance (RygelTranscoder *base, RygelMediaItem *item) {
+ RygelMP2TSTranscoder *self = RYGEL_MP2_TS_TRANSCODER (base);
- RygelVideoItem* video_item;
+ RygelVideoItem *video_item;
guint distance;
guint bitrate;
guint width;
@@ -151,7 +151,7 @@ rygel_mp2_ts_transcoder_real_get_distance (RygelTranscoder* base, RygelMediaItem
}
static void
-rygel_mp2_ts_transcoder_class_init (RygelMP2TSTranscoderClass * klass) {
+rygel_mp2_ts_transcoder_class_init (RygelMP2TSTranscoderClass *klass) {
rygel_mp2_ts_transcoder_parent_class = g_type_class_peek_parent (klass);
g_type_class_add_private (klass, sizeof (RygelMP2TSTranscoderPrivate));
RYGEL_TRANSCODER_CLASS (klass)->add_resource = rygel_mp2_ts_transcoder_real_add_resource;
@@ -161,13 +161,13 @@ rygel_mp2_ts_transcoder_class_init (RygelMP2TSTranscoderClass * klass) {
static void
-rygel_mp2_ts_transcoder_init (RygelMP2TSTranscoder * self) {
+rygel_mp2_ts_transcoder_init (RygelMP2TSTranscoder *self) {
self->priv = RYGEL_MP2_TS_TRANSCODER_GET_PRIVATE (self);
}
static void
rygel_mp2_ts_transcoder_finalize (GObject* obj) {
- RygelMP2TSTranscoder * self;
+ RygelMP2TSTranscoder *self;
self = RYGEL_MP2_TS_TRANSCODER (obj);
G_OBJECT_CLASS (rygel_mp2_ts_transcoder_parent_class)->finalize (obj);
}
diff --git a/src/rygel-mp2ts-transcoder.h b/src/rygel-mp2ts-transcoder.h
index e0f02ae..589f873 100644
--- a/src/rygel-mp2ts-transcoder.h
+++ b/src/rygel-mp2ts-transcoder.h
@@ -47,7 +47,7 @@ typedef struct _RygelMP2TSTranscoderPrivate RygelMP2TSTranscoderPrivate;
struct _RygelMP2TSTranscoder {
RygelVideoTranscoder parent_instance;
- RygelMP2TSTranscoderPrivate * priv;
+ RygelMP2TSTranscoderPrivate *priv;
};
struct _RygelMP2TSTranscoderClass {
diff --git a/src/rygel-mp3-transcoder.c b/src/rygel-mp3-transcoder.c
index dba9fd2..1038d89 100644
--- a/src/rygel-mp3-transcoder.c
+++ b/src/rygel-mp3-transcoder.c
@@ -34,7 +34,7 @@ G_DEFINE_TYPE (RygelMP3Transcoder, rygel_mp3_transcoder, RYGEL_TYPE_AUDIO_TRANSC
#define RYGEL_MP3_TRANSCODER_FORMAT "audio/mpeg,mpegversion=1,layer=3"
RygelMP3Transcoder* rygel_mp3_transcoder_construct (GType object_type) {
- RygelMP3Transcoder * self = RYGEL_MP3_TRANSCODER (rygel_audio_transcoder_construct (object_type, "audio/mpeg", "MP3", RYGEL_MP3_TRANSCODER_BITRATE, RYGEL_AUDIO_TRANSCODER_NO_CONTAINER, RYGEL_MP3_TRANSCODER_FORMAT, "mp3"));
+ RygelMP3Transcoder *self = RYGEL_MP3_TRANSCODER (rygel_audio_transcoder_construct (object_type, "audio/mpeg", "MP3", RYGEL_MP3_TRANSCODER_BITRATE, RYGEL_AUDIO_TRANSCODER_NO_CONTAINER, RYGEL_MP3_TRANSCODER_FORMAT, "mp3"));
return self;
}
@@ -45,12 +45,12 @@ rygel_mp3_transcoder_new (void) {
}
static void
-rygel_mp3_transcoder_class_init (RygelMP3TranscoderClass * klass) {
+rygel_mp3_transcoder_class_init (RygelMP3TranscoderClass *klass) {
rygel_mp3_transcoder_parent_class = g_type_class_peek_parent (klass);
}
static void
-rygel_mp3_transcoder_init (RygelMP3Transcoder * self) {
+rygel_mp3_transcoder_init (RygelMP3Transcoder *self) {
}
diff --git a/src/rygel-mp3-transcoder.h b/src/rygel-mp3-transcoder.h
index 676b59c..a7afe02 100644
--- a/src/rygel-mp3-transcoder.h
+++ b/src/rygel-mp3-transcoder.h
@@ -47,7 +47,7 @@ typedef struct _RygelMP3TranscoderPrivate RygelMP3TranscoderPrivate;
struct _RygelMP3Transcoder {
RygelAudioTranscoder parent_instance;
- RygelMP3TranscoderPrivate * priv;
+ RygelMP3TranscoderPrivate *priv;
};
struct _RygelMP3TranscoderClass {
diff --git a/src/rygel-video-transcoder.c b/src/rygel-video-transcoder.c
index 4929507..014494c 100644
--- a/src/rygel-video-transcoder.c
+++ b/src/rygel-video-transcoder.c
@@ -37,8 +37,8 @@ struct _RygelVideoTranscoderPrivate {
static void rygel_video_transcoder_finalize (GObject* obj);
RygelVideoTranscoder*
-rygel_video_transcoder_construct (GType object_type, const gchar* content_type, gint audio_bitrate, gint video_bitrate, const gchar* container_caps, const gchar* audio_codec_caps, const gchar* video_codec_caps, const gchar* extension, const gchar* restrictions) {
- RygelVideoTranscoder * self = NULL;
+rygel_video_transcoder_construct (GType object_type, const gchar *content_type, gint audio_bitrate, gint video_bitrate, const gchar *container_caps, const gchar *audio_codec_caps, const gchar *video_codec_caps, const gchar *extension, const gchar *restrictions) {
+ RygelVideoTranscoder *self = NULL;
g_return_val_if_fail (content_type != NULL, NULL);
g_return_val_if_fail (container_caps != NULL, NULL);
@@ -58,30 +58,30 @@ rygel_video_transcoder_construct (GType object_type, const gchar* content_type,
}
RygelVideoTranscoder*
-rygel_video_transcoder_new (const gchar* content_type, gint audio_bitrate, gint video_bitrate, const gchar* container_caps, const gchar* audio_codec_caps, const gchar* video_codec_caps, const gchar* extension, const gchar* restrictions) {
+rygel_video_transcoder_new (const gchar *content_type, gint audio_bitrate, gint video_bitrate, const gchar *container_caps, const gchar *audio_codec_caps, const gchar *video_codec_caps, const gchar *extension, const gchar *restrictions) {
return rygel_video_transcoder_construct (RYGEL_TYPE_VIDEO_TRANSCODER, content_type, audio_bitrate, video_bitrate, container_caps, audio_codec_caps, video_codec_caps, extension, restrictions);
}
-static GUPnPDIDLLiteResource* rygel_video_transcoder_real_add_resource (RygelTranscoder* base, GUPnPDIDLLiteItem* didl_item, RygelMediaItem* item, RygelTranscodeManager* manager, GError** error) {
- RygelVideoTranscoder * self;
+static GUPnPDIDLLiteResource* rygel_video_transcoder_real_add_resource (RygelTranscoder *base, GUPnPDIDLLiteItem *didl_item, RygelMediaItem *item, RygelTranscodeManager *manager, GError **error) {
+ RygelVideoTranscoder *self;
GUPnPDIDLLiteResource* result = NULL;
- GUPnPDIDLLiteItem* _tmp0_;
- RygelMediaItem* _tmp1_;
- RygelTranscodeManager* _tmp2_;
+ GUPnPDIDLLiteItem *_tmp0_;
+ RygelMediaItem *_tmp1_;
+ RygelTranscodeManager *_tmp2_;
GUPnPDIDLLiteResource* _tmp3_ = NULL;
GUPnPDIDLLiteResource* resource;
- RygelMediaItem* _tmp4_;
- RygelVideoItem* _tmp5_;
- RygelVideoItem* video_item;
- RygelVideoItem* _tmp6_;
+ RygelMediaItem *_tmp4_;
+ RygelVideoItem *_tmp5_;
+ RygelVideoItem *video_item;
+ RygelVideoItem *_tmp6_;
gint _tmp7_;
gint _tmp8_;
- RygelVideoItem* _tmp9_;
+ RygelVideoItem *_tmp9_;
gint _tmp10_;
gint _tmp11_;
gint _tmp12_;
gint _tmp13_;
- GError * inner_error = NULL;
+ GError *inner_error = NULL;
self = (RygelVideoTranscoder*) base;
g_return_val_if_fail (didl_item != NULL, NULL);
g_return_val_if_fail (item != NULL, NULL);
@@ -120,17 +120,17 @@ static GUPnPDIDLLiteResource* rygel_video_transcoder_real_add_resource (RygelTra
}
-static guint rygel_video_transcoder_real_get_distance (RygelTranscoder* base, RygelMediaItem* item) {
+static guint rygel_video_transcoder_real_get_distance (RygelTranscoder *base, RygelMediaItem *item) {
- RygelVideoTranscoder * self;
+ RygelVideoTranscoder *self;
guint result = 0U;
- RygelMediaItem* _tmp0_;
- RygelMediaItem* _tmp2_;
- RygelVideoItem* _tmp3_;
- RygelVideoItem* video_item;
+ RygelMediaItem *_tmp0_;
+ RygelMediaItem *_tmp2_;
+ RygelVideoItem *_tmp3_;
+ RygelVideoItem *video_item;
guint _tmp4_;
guint distance;
- RygelVideoItem* _tmp5_;
+ RygelVideoItem *_tmp5_;
gint _tmp6_;
gint _tmp7_;
self = (RygelVideoTranscoder*) base;
@@ -152,7 +152,7 @@ static guint rygel_video_transcoder_real_get_distance (RygelTranscoder* base, Ry
_tmp7_ = _tmp6_;
if (_tmp7_ > 0) {
guint _tmp8_;
- RygelVideoItem* _tmp9_;
+ RygelVideoItem *_tmp9_;
gint _tmp10_;
gint _tmp11_;
gint _tmp12_;
@@ -176,14 +176,14 @@ static gpointer _gst_encoding_profile_ref0 (gpointer self) {
}
-static GstEncodingProfile* rygel_video_transcoder_real_get_encoding_profile (RygelGstTranscoder* base) {
- RygelVideoTranscoder * self;
+static GstEncodingProfile* rygel_video_transcoder_real_get_encoding_profile (RygelGstTranscoder *base) {
+ RygelVideoTranscoder *self;
GstEncodingProfile* result = NULL;
GstEncodingProfile* _tmp0_ = NULL;
GstEncodingContainerProfile* enc_container_profile;
GstCaps* _tmp1_;
- const gchar* _tmp2_;
- const gchar* _tmp3_;
+ const gchar *_tmp2_;
+ const gchar *_tmp3_;
GstCaps* _tmp4_;
GstEncodingVideoProfile* _tmp5_;
GstEncodingVideoProfile* enc_video_profile;
@@ -206,7 +206,7 @@ static GstEncodingProfile* rygel_video_transcoder_real_get_encoding_profile (Ryg
}
-static void rygel_video_transcoder_class_init (RygelVideoTranscoderClass * klass) {
+static void rygel_video_transcoder_class_init (RygelVideoTranscoderClass *klass) {
rygel_video_transcoder_parent_class = g_type_class_peek_parent (klass);
g_type_class_add_private (klass, sizeof (RygelVideoTranscoderPrivate));
RYGEL_TRANSCODER_CLASS (klass)->add_resource = rygel_video_transcoder_real_add_resource;
@@ -216,14 +216,14 @@ static void rygel_video_transcoder_class_init (RygelVideoTranscoderClass * klass
}
-static void rygel_video_transcoder_init (RygelVideoTranscoder * self) {
+static void rygel_video_transcoder_init (RygelVideoTranscoder *self) {
self->priv = RYGEL_VIDEO_TRANSCODER_GET_PRIVATE (self);
self->priv->video_restrictions = NULL;
}
static void rygel_video_transcoder_finalize (GObject* obj) {
- RygelVideoTranscoder * self;
+ RygelVideoTranscoder *self;
self = RYGEL_VIDEO_TRANSCODER (obj);
_gst_caps_unref0 (self->priv->video_codec_format);
_gst_caps_unref0 (self->priv->video_restrictions);
diff --git a/src/rygel-video-transcoder.h b/src/rygel-video-transcoder.h
index 7359a0b..90acaca 100644
--- a/src/rygel-video-transcoder.h
+++ b/src/rygel-video-transcoder.h
@@ -48,7 +48,7 @@ typedef struct _RygelVideoTranscoderPrivate RygelVideoTranscoderPrivate;
struct _RygelVideoTranscoder {
RygelAudioTranscoder parent_instance;
- RygelVideoTranscoderPrivate * priv;
+ RygelVideoTranscoderPrivate *priv;
};
struct _RygelVideoTranscoderClass {
@@ -57,7 +57,7 @@ struct _RygelVideoTranscoderClass {
GType rygel_video_transcoder_get_type (void) G_GNUC_CONST;
-RygelVideoTranscoder* rygel_video_transcoder_new (const gchar* content_type, gint audio_bitrate, gint video_bitrate, const gchar* container_caps, const gchar* audio_codec_caps, const gchar* video_codec_caps, const gchar* extension, const gchar* restrictions);
+RygelVideoTranscoder* rygel_video_transcoder_new (const gchar *content_type, gint audio_bitrate, gint video_bitrate, const gchar *container_caps, const gchar *audio_codec_caps, const gchar *video_codec_caps, const gchar *extension, const gchar *restrictions);
G_END_DECLS
diff --git a/src/rygel-wmv-transcoder.c b/src/rygel-wmv-transcoder.c
index 599e66e..62a28cf 100644
--- a/src/rygel-wmv-transcoder.c
+++ b/src/rygel-wmv-transcoder.c
@@ -29,7 +29,7 @@ G_DEFINE_TYPE (RygelWMVTranscoder, rygel_wmv_transcoder, RYGEL_TYPE_VIDEO_TRANSC
#define RYGEL_WMV_TRANSCODER_AUDIO_BITRATE 64
RygelWMVTranscoder* rygel_wmv_transcoder_construct (GType object_type) {
- RygelWMVTranscoder * self = NULL;
+ RygelWMVTranscoder *self = NULL;
self = (RygelWMVTranscoder*) rygel_video_transcoder_construct (object_type, "video/x-ms-wmv", "WMVHIGH_FULL", RYGEL_WMV_TRANSCODER_AUDIO_BITRATE, RYGEL_WMV_TRANSCODER_VIDEO_BITRATE, "video/x-ms-asf,parsed=true", "audio/x-wma,channels=2,wmaversion=1", "video/x-wmv,wmvversion=1", "wmv", NULL);
return self;
}
@@ -40,12 +40,12 @@ rygel_wmv_transcoder_new (void) {
}
static void
-rygel_wmv_transcoder_class_init (RygelWMVTranscoderClass * klass) {
+rygel_wmv_transcoder_class_init (RygelWMVTranscoderClass *klass) {
rygel_wmv_transcoder_parent_class = g_type_class_peek_parent (klass);
}
static void
-rygel_wmv_transcoder_init (RygelWMVTranscoder * self) {
+rygel_wmv_transcoder_init (RygelWMVTranscoder *self) {
}
diff --git a/src/rygel-wmv-transcoder.h b/src/rygel-wmv-transcoder.h
index 663241d..9179ff5 100644
--- a/src/rygel-wmv-transcoder.h
+++ b/src/rygel-wmv-transcoder.h
@@ -37,7 +37,7 @@ typedef struct _RygelWMVTranscoderPrivate RygelWMVTranscoderPrivate;
struct _RygelWMVTranscoder {
RygelVideoTranscoder parent_instance;
- RygelWMVTranscoderPrivate * priv;
+ RygelWMVTranscoderPrivate *priv;
};
struct _RygelWMVTranscoderClass {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]