diff options
Diffstat (limited to 'farstream')
-rw-r--r-- | farstream/fs-conference.c | 2 | ||||
-rw-r--r-- | farstream/fs-participant.c | 2 | ||||
-rw-r--r-- | farstream/fs-participant.h | 4 | ||||
-rw-r--r-- | farstream/fs-session.c | 2 | ||||
-rw-r--r-- | farstream/fs-session.h | 4 | ||||
-rw-r--r-- | farstream/fs-stream-transmitter.c | 2 | ||||
-rw-r--r-- | farstream/fs-stream-transmitter.h | 4 | ||||
-rw-r--r-- | farstream/fs-stream.c | 2 | ||||
-rw-r--r-- | farstream/fs-stream.h | 4 | ||||
-rw-r--r-- | farstream/fs-transmitter.c | 2 | ||||
-rw-r--r-- | farstream/fs-transmitter.h | 4 |
11 files changed, 16 insertions, 16 deletions
diff --git a/farstream/fs-conference.c b/farstream/fs-conference.c index 38e50046..a54c4472 100644 --- a/farstream/fs-conference.c +++ b/farstream/fs-conference.c @@ -62,7 +62,7 @@ GST_DEBUG_CATEGORY (fs_conference_debug); #define GST_CAT_DEFAULT fs_conference_debug -G_DEFINE_ABSTRACT_TYPE (FsConference, fs_conference,GST_TYPE_BIN) +G_DEFINE_ABSTRACT_TYPE (FsConference, fs_conference, GST_TYPE_BIN) GQuark diff --git a/farstream/fs-participant.c b/farstream/fs-participant.c index d8aaf334..125e9ba4 100644 --- a/farstream/fs-participant.c +++ b/farstream/fs-participant.c @@ -58,7 +58,7 @@ struct _FsParticipantPrivate }; */ -G_DEFINE_ABSTRACT_TYPE(FsParticipant, fs_participant, GST_TYPE_OBJECT); +G_DEFINE_ABSTRACT_TYPE(FsParticipant, fs_participant, G_TYPE_OBJECT); #define FS_PARTICIPANT_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE ((o), FS_TYPE_PARTICIPANT, \ diff --git a/farstream/fs-participant.h b/farstream/fs-participant.h index df344339..6658aa05 100644 --- a/farstream/fs-participant.h +++ b/farstream/fs-participant.h @@ -58,7 +58,7 @@ typedef struct _FsParticipantPrivate FsParticipantPrivate; struct _FsParticipantClass { - GstObjectClass parent_class; + GObjectClass parent_class; /* virtual functions */ @@ -74,7 +74,7 @@ struct _FsParticipantClass */ struct _FsParticipant { - GstObject parent; + GObject parent; /*< private >*/ diff --git a/farstream/fs-session.c b/farstream/fs-session.c index cf6c5d0e..ec5fa73d 100644 --- a/farstream/fs-session.c +++ b/farstream/fs-session.c @@ -182,7 +182,7 @@ struct _FsSessionPrivate (G_TYPE_INSTANCE_GET_PRIVATE ((o), FS_TYPE_SESSION, FsSessionPrivate)) */ -G_DEFINE_ABSTRACT_TYPE(FsSession, fs_session, GST_TYPE_OBJECT); +G_DEFINE_ABSTRACT_TYPE(FsSession, fs_session, G_TYPE_OBJECT); static void fs_session_get_property (GObject *object, guint prop_id, diff --git a/farstream/fs-session.h b/farstream/fs-session.h index 15fbe0c8..280627b4 100644 --- a/farstream/fs-session.h +++ b/farstream/fs-session.h @@ -116,7 +116,7 @@ typedef enum _FsDTMFMethod struct _FsSessionClass { - GstObjectClass parent_class; + GObjectClass parent_class; /*virtual functions */ FsStream *(* new_stream) (FsSession *session, @@ -153,7 +153,7 @@ struct _FsSessionClass */ struct _FsSession { - GstObject parent; + GObject parent; /*< private >*/ FsSessionPrivate *priv; diff --git a/farstream/fs-stream-transmitter.c b/farstream/fs-stream-transmitter.c index 971d1a4d..6bee2978 100644 --- a/farstream/fs-stream-transmitter.c +++ b/farstream/fs-stream-transmitter.c @@ -75,7 +75,7 @@ struct _FsStreamTransmitterPrivate }; G_DEFINE_ABSTRACT_TYPE(FsStreamTransmitter, fs_stream_transmitter, - GST_TYPE_OBJECT); + G_TYPE_OBJECT); #define FS_STREAM_TRANSMITTER_GET_PRIVATE(o) \ diff --git a/farstream/fs-stream-transmitter.h b/farstream/fs-stream-transmitter.h index 2aa1a5a7..e4df2029 100644 --- a/farstream/fs-stream-transmitter.h +++ b/farstream/fs-stream-transmitter.h @@ -67,7 +67,7 @@ typedef struct _FsStreamTransmitterPrivate FsStreamTransmitterPrivate; struct _FsStreamTransmitterClass { - GstObjectClass parent_class; + GObjectClass parent_class; /*virtual functions */ gboolean (*add_remote_candidates) (FsStreamTransmitter *streamtransmitter, @@ -91,7 +91,7 @@ struct _FsStreamTransmitterClass */ struct _FsStreamTransmitter { - GstObject parent; + GObject parent; /*< private >*/ FsStreamTransmitterPrivate *priv; diff --git a/farstream/fs-stream.c b/farstream/fs-stream.c index 195e8e15..c43cc72a 100644 --- a/farstream/fs-stream.c +++ b/farstream/fs-stream.c @@ -145,7 +145,7 @@ struct _FsStreamPrivate (G_TYPE_INSTANCE_GET_PRIVATE ((o), FS_TYPE_STREAM, FsStreamPrivate)) -G_DEFINE_ABSTRACT_TYPE(FsStream, fs_stream, GST_TYPE_OBJECT); +G_DEFINE_ABSTRACT_TYPE(FsStream, fs_stream, G_TYPE_OBJECT); static void fs_stream_constructed (GObject *obj); static void fs_stream_get_property (GObject *object, diff --git a/farstream/fs-stream.h b/farstream/fs-stream.h index 226107a9..a3c82158 100644 --- a/farstream/fs-stream.h +++ b/farstream/fs-stream.h @@ -111,7 +111,7 @@ typedef struct _FsStreamPrivate FsStreamPrivate; struct _FsStreamClass { - GstObjectClass parent_class; + GObjectClass parent_class; /*virtual functions */ gboolean (*add_remote_candidates) (FsStream *stream, @@ -145,7 +145,7 @@ struct _FsStreamClass */ struct _FsStream { - GstObject parent; + GObject parent; /*< private >*/ diff --git a/farstream/fs-transmitter.c b/farstream/fs-transmitter.c index 00698590..ef9b5eab 100644 --- a/farstream/fs-transmitter.c +++ b/farstream/fs-transmitter.c @@ -72,7 +72,7 @@ struct _FsTransmitterPrivate }; */ -G_DEFINE_ABSTRACT_TYPE(FsTransmitter, fs_transmitter, GST_TYPE_OBJECT); +G_DEFINE_ABSTRACT_TYPE(FsTransmitter, fs_transmitter, G_TYPE_OBJECT); #define FS_TRANSMITTER_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE ((o), FS_TYPE_TRANSMITTER, FsTransmitterPrivate)) diff --git a/farstream/fs-transmitter.h b/farstream/fs-transmitter.h index 13372912..302e531e 100644 --- a/farstream/fs-transmitter.h +++ b/farstream/fs-transmitter.h @@ -64,7 +64,7 @@ typedef struct _FsTransmitterPrivate FsTransmitterPrivate; struct _FsTransmitterClass { - GstObjectClass parent_class; + GObjectClass parent_class; /*virtual functions */ FsStreamTransmitter *(*new_stream_transmitter) (FsTransmitter *transmitter, @@ -85,7 +85,7 @@ struct _FsTransmitterClass */ struct _FsTransmitter { - GstObject parent; + GObject parent; /*< private >*/ FsTransmitterPrivate *priv; |