cpw.maiku.media_refactor: a8f440dc: Add a media backend interface to handle ...
maiku at pidgin.im
maiku at pidgin.im
Thu Oct 22 22:36:06 EDT 2009
-----------------------------------------------------------------
Revision: a8f440dc499e7e36d3e758dffd7168668016a478
Ancestor: ca6a00ea47ebc632d265f1e0f37603c0b285aab1
Author: maiku at pidgin.im
Date: 2009-10-22T21:09:36
Branch: im.pidgin.cpw.maiku.media_refactor
URL: http://d.pidgin.im/viewmtn/revision/info/a8f440dc499e7e36d3e758dffd7168668016a478
Added files:
libpurple/media/backend-iface.c
libpurple/media/backend-iface.h
Modified files:
libpurple/Makefile.am libpurple/Makefile.mingw
libpurple/marshallers.list
ChangeLog:
Add a media backend interface to handle different backends in addition to
Farsight 2.
-------------- next part --------------
============================================================
--- libpurple/media/backend-iface.c 313d6ce2f6d9f279c833215fbff38821f3a7180b
+++ libpurple/media/backend-iface.c 313d6ce2f6d9f279c833215fbff38821f3a7180b
@@ -0,0 +1,184 @@
+/**
+ * @file backend-iface.c Interface for media backend
+ * @ingroup core
+ */
+
+/* purple
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+ */
+
+#include "backend-iface.h"
+
+#include "marshallers.h"
+
+enum {
+ S_ERROR,
+ CANDIDATES_PREPARED,
+ CODECS_CHANGED,
+ NEW_CANDIDATE,
+ ACTIVE_CANDIDATE_PAIR,
+ LAST_SIGNAL
+};
+
+static guint purple_media_backend_signals[LAST_SIGNAL] = {0};
+
+enum {
+ PROP_0,
+ PROP_MEDIA,
+};
+
+static void
+purple_media_backend_base_init(gpointer iface)
+{
+ static gboolean is_initialized = FALSE;
+
+ if (is_initialized)
+ return;
+
+ g_object_class_install_property(iface, PROP_MEDIA,
+ g_param_spec_object("media",
+ "Purple Media",
+ "The media object that this backend is bound to.",
+ PURPLE_TYPE_MEDIA,
+ G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
+
+ purple_media_backend_signals[S_ERROR] =
+ g_signal_new("error", G_TYPE_FROM_CLASS(iface),
+ G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+ g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE, 1, G_TYPE_STRING);
+ purple_media_backend_signals[CANDIDATES_PREPARED] =
+ g_signal_new("candidates-prepared",
+ G_TYPE_FROM_CLASS(iface),
+ G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+ purple_smarshal_VOID__STRING_STRING,
+ G_TYPE_NONE, 2, G_TYPE_STRING,
+ G_TYPE_STRING);
+ purple_media_backend_signals[CODECS_CHANGED] =
+ g_signal_new("codecs-changed",
+ G_TYPE_FROM_CLASS(iface),
+ G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+ g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE, 1, G_TYPE_STRING);
+ purple_media_backend_signals[NEW_CANDIDATE] =
+ g_signal_new("new-candidate",
+ G_TYPE_FROM_CLASS(iface),
+ G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+ purple_smarshal_VOID__POINTER_POINTER_OBJECT,
+ G_TYPE_NONE, 3, G_TYPE_POINTER,
+ G_TYPE_POINTER, PURPLE_TYPE_MEDIA_CANDIDATE);
+ purple_media_backend_signals[ACTIVE_CANDIDATE_PAIR] =
+ g_signal_new("active-candidate-pair",
+ G_TYPE_FROM_CLASS(iface),
+ G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+ purple_smarshal_VOID__STRING_STRING_OBJECT_OBJECT,
+ G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING,
+ PURPLE_TYPE_MEDIA_CANDIDATE,
+ PURPLE_TYPE_MEDIA_CANDIDATE);
+
+ is_initialized = TRUE;
+}
+
+GType
+purple_media_backend_get_type(void)
+{
+ static GType iface_type = 0;
+ if (iface_type == 0) {
+ static const GTypeInfo info = {
+ sizeof(PurpleMediaBackendIface),
+ purple_media_backend_base_init,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ 0,
+ 0,
+ NULL,
+ NULL
+ };
+
+ iface_type = g_type_register_static (G_TYPE_INTERFACE,
+ "PurpleMediaBackend", &info, 0);
+ }
+
+ return iface_type;
+}
+
+gboolean
+purple_media_backend_add_stream(PurpleMediaBackend *self,
+ const gchar *sess_id, const gchar *who,
+ PurpleMediaSessionType type, gboolean initiator,
+ const gchar *transmitter,
+ guint num_params, GParameter *params)
+{
+ g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND(self), FALSE);
+ return PURPLE_MEDIA_BACKEND_GET_INTERFACE(self)->add_stream(self,
+ sess_id, who, type, initiator, transmitter,
+ num_params, params);
+}
+
+void
+purple_media_backend_add_remote_candidates(PurpleMediaBackend *self,
+ const gchar *sess_id, const gchar *participant,
+ GList *remote_candidates)
+{
+ g_return_if_fail(PURPLE_IS_MEDIA_BACKEND(self));
+ PURPLE_MEDIA_BACKEND_GET_INTERFACE(self)->add_remote_candidates(self,
+ sess_id, participant, remote_candidates);
+}
+
+
+GList *
+purple_media_backend_get_codecs(PurpleMediaBackend *self,
+ const gchar *sess_id)
+{
+ g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND(self), NULL);
+ return PURPLE_MEDIA_BACKEND_GET_INTERFACE(self)->get_codecs(self,
+ sess_id);
+}
+
+GList *
+purple_media_backend_get_local_candidates(PurpleMediaBackend *self,
+ const gchar *sess_id, const gchar *participant)
+{
+ g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND(self), NULL);
+ return PURPLE_MEDIA_BACKEND_GET_INTERFACE(self)->
+ get_local_candidates(self,
+ sess_id, participant);
+}
+
+void
+purple_media_backend_set_remote_codecs(PurpleMediaBackend *self,
+ const gchar *sess_id, const gchar *participant,
+ GList *codecs)
+{
+ g_return_if_fail(PURPLE_IS_MEDIA_BACKEND(self));
+ PURPLE_MEDIA_BACKEND_GET_INTERFACE(self)->set_remote_codecs(self,
+ sess_id, participant, codecs);
+}
+
+void
+purple_media_backend_set_send_codec(PurpleMediaBackend *self,
+ const gchar *sess_id, PurpleMediaCodec *codec)
+{
+ g_return_if_fail(PURPLE_IS_MEDIA_BACKEND(self));
+ PURPLE_MEDIA_BACKEND_GET_INTERFACE(self)->set_send_codec(self,
+ sess_id, codec);
+}
============================================================
--- libpurple/media/backend-iface.h 1ad8369c289eb07fadd7ce0856f291ee0e72bc8d
+++ libpurple/media/backend-iface.h 1ad8369c289eb07fadd7ce0856f291ee0e72bc8d
@@ -0,0 +1,91 @@
+/**
+ * @file backend-iface.h Interface for media backends
+ * @ingroup core
+ */
+
+/* purple
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+ */
+
+#ifndef _MEDIA_BACKEND_IFACE_H_
+#define _MEDIA_BACKEND_IFACE_H_
+
+#include "codec.h"
+#include "enum-types.h"
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define PURPLE_TYPE_MEDIA_BACKEND (purple_media_backend_get_type())
+#define PURPLE_IS_MEDIA_BACKEND(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_MEDIA_BACKEND))
+#define PURPLE_MEDIA_BACKEND(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_MEDIA_BACKEND, PurpleMediaBackend))
+#define PURPLE_MEDIA_BACKEND_GET_INTERFACE(inst)(G_TYPE_INSTANCE_GET_INTERFACE((inst), PURPLE_TYPE_MEDIA_BACKEND, PurpleMediaBackendIface))
+
+typedef struct _PurpleMediaBackend PurpleMediaBackend;
+typedef struct _PurpleMediaBackendIface PurpleMediaBackendIface;
+
+struct _PurpleMediaBackendIface
+{
+ GTypeInterface parent_iface;
+
+ void (*do_action) (PurpleMediaBackend *self);
+ gboolean (*add_stream) (PurpleMediaBackend *self,
+ const gchar *sess_id, const gchar *who,
+ PurpleMediaSessionType type, gboolean initiator,
+ const gchar *transmitter,
+ guint num_params, GParameter *params);
+ void (*add_remote_candidates) (PurpleMediaBackend *self,
+ const gchar *sess_id, const gchar *participant,
+ GList *remote_candidates);
+ GList *(*get_codecs) (PurpleMediaBackend *self,
+ const gchar *sess_id);
+ GList *(*get_local_candidates) (PurpleMediaBackend *self,
+ const gchar *sess_id, const gchar *participant);
+ void (*set_remote_codecs) (PurpleMediaBackend *self,
+ const gchar *sess_id, const gchar *participant,
+ GList *codecs);
+ void (*set_send_codec) (PurpleMediaBackend *self,
+ const gchar *sess_id, PurpleMediaCodec *codec);
+};
+
+GType purple_media_backend_get_type(void);
+
+gboolean purple_media_backend_add_stream(PurpleMediaBackend *self,
+ const gchar *sess_id, const gchar *who,
+ PurpleMediaSessionType type, gboolean initiator,
+ const gchar *transmitter,
+ guint num_params, GParameter *params);
+void purple_media_backend_add_remote_candidates(PurpleMediaBackend *self,
+ const gchar *sess_id, const gchar *participant,
+ GList *remote_candidates);
+GList *purple_media_backend_get_codecs(PurpleMediaBackend *self,
+ const gchar *sess_id);
+GList *purple_media_backend_get_local_candidates(PurpleMediaBackend *self,
+ const gchar *sess_id, const gchar *participant);
+void purple_media_backend_set_remote_codecs(PurpleMediaBackend *self,
+ const gchar *sess_id, const gchar *participant,
+ GList *codecs);
+void purple_media_backend_set_send_codec(PurpleMediaBackend *self,
+ const gchar *sess_id, PurpleMediaCodec *codec);
+
+G_END_DECLS
+
+#endif /* _MEDIA_BACKEND_IFACE_H_ */
============================================================
--- libpurple/Makefile.am 9bf2cad78a6e6fc01a316b4b11d9e3add5f8b680
+++ libpurple/Makefile.am 4bfa01fbb62716a99d6e3a6c10a0e204689ea491
@@ -53,6 +53,7 @@ purple_coresources = \
idle.c \
imgstore.c \
log.c \
+ media/backend-iface.c \
media/candidate.c \
media/codec.c \
media/enum-types.c \
@@ -119,6 +120,7 @@ purple_coreheaders = \
idle.h \
imgstore.h \
log.h \
+ media/backend-iface.h \
media/candidate.h \
media/codec.h \
media/enum-types.h \
============================================================
--- libpurple/Makefile.mingw b37f9b7081dd2dd5dba90b06adbdbb140b04b2f8
+++ libpurple/Makefile.mingw b94d8fa275b7bb1063f1e304ad27bf9b16df0d4b
@@ -48,6 +48,7 @@ C_SRC = \
idle.c \
imgstore.c \
log.c \
+ media/backend-iface.c \
media/candidate.c \
media/codec.c \
media/enum-types.c \
============================================================
--- libpurple/marshallers.list e352c4710f2a1aceebca7afd075b7cb4d4b82ca1
+++ libpurple/marshallers.list a6761e1bff1b512191f8126a3d3fdd38b3fb93a6
@@ -5,3 +5,4 @@ VOID:FLAGS,FLAGS
VOID:ENUM,STRING,STRING
VOID:ENUM,STRING,STRING,BOOLEAN
VOID:FLAGS,FLAGS
+VOID:STRING,STRING,OBJECT,OBJECT
More information about the Commits
mailing list