[farsight2/master] Fix various compiler warnings
Olivier Crête
olivier.crete at collabora.co.uk
Tue Dec 23 15:18:59 PST 2008
---
gst-libs/gst/farsight/fs-base-conference.c | 2 --
gst-libs/gst/farsight/fs-candidate.h | 2 ++
gst-libs/gst/farsight/fs-codec.h | 2 ++
gst-libs/gst/farsight/fs-session.c | 1 +
gst-libs/gst/farsight/fs-stream-transmitter.h | 2 +-
gst-libs/gst/farsight/fs-stream.c | 1 +
gst/fsrtpconference/fs-rtp-conference.c | 18 ++++++++++++------
gst/fsrtpconference/fs-rtp-participant.c | 20 ++++++++++----------
gst/fsrtpconference/fs-rtp-session.c | 4 +---
9 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/gst-libs/gst/farsight/fs-base-conference.c b/gst-libs/gst/farsight/fs-base-conference.c
index a6bb4f0..f99d8f1 100644
--- a/gst-libs/gst/farsight/fs-base-conference.c
+++ b/gst-libs/gst/farsight/fs-base-conference.c
@@ -185,8 +185,6 @@ static void
fs_base_conference_init (FsBaseConference *conf,
FsBaseConferenceClass *bclass)
{
- GstPadTemplate *pad_template;
-
GST_DEBUG ("fs_base_conference_init");
conf->priv = FS_BASE_CONFERENCE_GET_PRIVATE (conf);
diff --git a/gst-libs/gst/farsight/fs-candidate.h b/gst-libs/gst/farsight/fs-candidate.h
index fd6b427..132965b 100644
--- a/gst-libs/gst/farsight/fs-candidate.h
+++ b/gst-libs/gst/farsight/fs-candidate.h
@@ -110,6 +110,8 @@ struct _FsCandidate
gpointer _padding[4];
};
+GType fs_candidate_get_type (void);
+
void fs_candidate_destroy (FsCandidate *cand);
FsCandidate *fs_candidate_copy (const FsCandidate *cand);
diff --git a/gst-libs/gst/farsight/fs-codec.h b/gst-libs/gst/farsight/fs-codec.h
index ece2a57..9795c83 100644
--- a/gst-libs/gst/farsight/fs-codec.h
+++ b/gst-libs/gst/farsight/fs-codec.h
@@ -111,6 +111,8 @@ struct _FsCodecPreference {
GType fs_codec_get_type (void);
GType fs_codec_list_get_type (void);
+GType fs_media_type_get_type (void);
+
FsCodec *fs_codec_new (int id, const char *encoding_name,
FsMediaType media_type, guint clock_rate);
diff --git a/gst-libs/gst/farsight/fs-session.c b/gst-libs/gst/farsight/fs-session.c
index 087a773..7a7c9e5 100644
--- a/gst-libs/gst/farsight/fs-session.c
+++ b/gst-libs/gst/farsight/fs-session.c
@@ -41,6 +41,7 @@
#endif
#include "fs-session.h"
+#include "fs-codec.h"
#include "fs-marshal.h"
#include <gst/gst.h>
diff --git a/gst-libs/gst/farsight/fs-stream-transmitter.h b/gst-libs/gst/farsight/fs-stream-transmitter.h
index a860770..f2a89e7 100644
--- a/gst-libs/gst/farsight/fs-stream-transmitter.h
+++ b/gst-libs/gst/farsight/fs-stream-transmitter.h
@@ -60,7 +60,7 @@ struct _FsStreamTransmitterClass
/*virtual functions */
gboolean (*add_remote_candidate) (FsStreamTransmitter *streamtransmitter,
- FsCandidate *candidate, GError *error);
+ FsCandidate *candidate, GError **error);
/*< private >*/
gpointer _padding[8];
diff --git a/gst-libs/gst/farsight/fs-stream.c b/gst-libs/gst/farsight/fs-stream.c
index f113b9a..6a6a13c 100644
--- a/gst-libs/gst/farsight/fs-stream.c
+++ b/gst-libs/gst/farsight/fs-stream.c
@@ -42,6 +42,7 @@
#include "fs-stream.h"
#include "fs-marshal.h"
#include "fs-codec.h"
+#include "fs-candidate.h"
#include "fs-stream-transmitter.h"
#include <gst/gst.h>
diff --git a/gst/fsrtpconference/fs-rtp-conference.c b/gst/fsrtpconference/fs-rtp-conference.c
index 7552274..8a8dbcd 100644
--- a/gst/fsrtpconference/fs-rtp-conference.c
+++ b/gst/fsrtpconference/fs-rtp-conference.c
@@ -34,6 +34,7 @@
#endif
#include "fs-rtp-conference.h"
+#include "fs-rtp-session.h"
#include "fs-rtp-participant.h"
GST_DEBUG_CATEGORY_STATIC (fs_rtp_conference_debug);
@@ -81,10 +82,13 @@ struct _FsRtpConferencePrivate
{
GstElement *gstrtpbin;
+ /* Protected by GST_OBJECT_LOCK */
+ GList *sessions;
+
gboolean disposed;
};
-static void fs_rtp_conference_do_init (gpointer g_class);
+static void fs_rtp_conference_do_init (GType type);
GST_BOILERPLATE_FULL (FsRtpConference, fs_rtp_conference, FsBaseConference,
@@ -96,9 +100,15 @@ static FsSession *fs_rtp_conference_new_session (FsBaseConference *conf,
static FsParticipant *fs_rtp_conference_new_participant (FsBaseConference *conf,
gchar *cname);
+static FsRtpSession *fs_rtp_conference_get_session_by_id (
+ FsRtpConference *self, guint session_id);
+static GstCaps *fs_rtp_conference_request_pt_map (GstElement *element,
+ guint session_id,
+ guint pt, gpointer user_data);
+
static void
-fs_rtp_conference_do_init (gpointer g_class)
+fs_rtp_conference_do_init (GType type)
{
GST_DEBUG_CATEGORY_INIT (fs_rtp_conference_debug, "fsrtpconference", 0,
"farsight rtp conference element");
@@ -126,8 +136,6 @@ fs_rtp_conference_dispose (GObject * object)
static void
fs_rtp_conference_finalize (GObject * object)
{
- FsRtpConference *conf = FS_RTP_CONFERENCE (object);
-
G_OBJECT_CLASS (parent_class)->finalize (object);
}
@@ -210,8 +218,6 @@ static FsParticipant *
fs_rtp_conference_new_participant (FsBaseConference *conf,
gchar *cname)
{
- FsRtpConference *rtp_conf = FS_RTP_CONFERENCE (conf);
-
FsParticipant *new_participant = NULL;
new_participant = FS_PARTICIPANT_CAST (fs_rtp_participant_new (cname));
diff --git a/gst/fsrtpconference/fs-rtp-participant.c b/gst/fsrtpconference/fs-rtp-participant.c
index 43fb893..85e6db7 100644
--- a/gst/fsrtpconference/fs-rtp-participant.c
+++ b/gst/fsrtpconference/fs-rtp-participant.c
@@ -47,17 +47,17 @@ enum
PROP_0,
};
-struct _FsParticipantPrivate
+struct _FsRtpParticipantPrivate
{
gboolean disposed;
};
#define FS_RTP_PARTICIPANT_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), FS_TYPE_PARTICIPANT, \
- FsParticipantPrivate))
+ FsRtpParticipantPrivate))
-static void fs_rtp_participant_class_init (FsParticipantClass *klass);
-static void fs_rtp_participant_init (FsParticipant *self);
+static void fs_rtp_participant_class_init (FsRtpParticipantClass *klass);
+static void fs_rtp_participant_init (FsRtpParticipant *self);
static void fs_rtp_participant_dispose (GObject *object);
static void fs_rtp_participant_finalize (GObject *object);
@@ -71,7 +71,7 @@ static void fs_rtp_participant_set_property (GObject *object,
GParamSpec *pspec);
static GObjectClass *parent_class = NULL;
-static guint signals[LAST_SIGNAL] = { 0 };
+// static guint signals[LAST_SIGNAL] = { 0 };
GType
fs_rtp_participant_get_type (void)
@@ -80,7 +80,7 @@ fs_rtp_participant_get_type (void)
if (type == 0) {
static const GTypeInfo info = {
- sizeof (FsParticipantClass),
+ sizeof (FsRtpParticipantClass),
NULL,
NULL,
(GClassInitFunc) fs_rtp_participant_class_init,
@@ -99,7 +99,7 @@ fs_rtp_participant_get_type (void)
}
static void
-fs_rtp_participant_class_init (FsParticipantClass *klass)
+fs_rtp_participant_class_init (FsRtpParticipantClass *klass)
{
GObjectClass *gobject_class;
@@ -113,11 +113,11 @@ fs_rtp_participant_class_init (FsParticipantClass *klass)
gobject_class->dispose = fs_rtp_participant_dispose;
gobject_class->finalize = fs_rtp_participant_finalize;
- g_type_class_add_private (klass, sizeof (FsParticipantPrivate));
+ g_type_class_add_private (klass, sizeof (FsRtpParticipantPrivate));
}
static void
-fs_rtp_participant_init (FsParticipant *self)
+fs_rtp_participant_init (FsRtpParticipant *self)
{
/* member init */
self->priv = FS_RTP_PARTICIPANT_GET_PRIVATE (self);
@@ -127,7 +127,7 @@ fs_rtp_participant_init (FsParticipant *self)
static void
fs_rtp_participant_dispose (GObject *object)
{
- FsParticipant *self = FS_RTP_PARTICIPANT (object);
+ FsRtpParticipant *self = FS_RTP_PARTICIPANT (object);
if (self->priv->disposed) {
/* If dispose did already run, return. */
diff --git a/gst/fsrtpconference/fs-rtp-session.c b/gst/fsrtpconference/fs-rtp-session.c
index 71951b9..5cf6f00 100644
--- a/gst/fsrtpconference/fs-rtp-session.c
+++ b/gst/fsrtpconference/fs-rtp-session.c
@@ -197,8 +197,6 @@ fs_rtp_session_dispose (GObject *object)
static void
fs_rtp_session_finalize (GObject *object)
{
- FsRtpSession *self = FS_RTP_SESSION (object);
-
parent_class->finalize (object);
}
@@ -259,7 +257,7 @@ fs_rtp_session_new_stream (FsSession *session, FsParticipant *participant,
{
FsRtpSession *self = FS_RTP_SESSION (session);
FsRtpParticipant *rtpparticipant = NULL;
- FsRtpStream *new_stream = NULL;
+ FsStream *new_stream = NULL;
if (!FS_IS_RTP_PARTICIPANT (participant)) {
// *error = g_error_new ();
--
1.5.6.5
More information about the farsight-commits
mailing list