cpw.maiku.media_refactor: 389e6f32: Split the media API's enum types out int...
maiku at pidgin.im
maiku at pidgin.im
Wed Oct 21 20:31:08 EDT 2009
-----------------------------------------------------------------
Revision: 389e6f32add648d23b2c1a351ed4a470629c5b5d
Ancestor: ad8eb5cefa9ebddebdd795586aba65357d78f2be
Author: maiku at pidgin.im
Date: 2009-10-21T20:58:32
Branch: im.pidgin.cpw.maiku.media_refactor
URL: http://d.pidgin.im/viewmtn/revision/info/389e6f32add648d23b2c1a351ed4a470629c5b5d
Added files:
libpurple/media/enum-types.c libpurple/media/enum-types.h
Modified files:
libpurple/Makefile.am libpurple/Makefile.mingw
libpurple/media/media.c libpurple/media.h
ChangeLog:
Split the media API's enum types out into its own file.
-------------- next part --------------
============================================================
--- libpurple/media/enum-types.c 9961b72c17eba3d4d5d7bb160c89698637e214a5
+++ libpurple/media/enum-types.c 9961b72c17eba3d4d5d7bb160c89698637e214a5
@@ -0,0 +1,213 @@
+/**
+ * @file enum-types.c Enum types for Media API
+ * @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 "enum-types.h"
+
+/*
+ * PurpleMediaCandidateType
+ */
+
+GType
+purple_media_candidate_type_get_type()
+{
+ static GType type = 0;
+ if (type == 0) {
+ static const GEnumValue values[] = {
+ { PURPLE_MEDIA_CANDIDATE_TYPE_HOST,
+ "PURPLE_MEDIA_CANDIDATE_TYPE_HOST",
+ "host" },
+ { PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX,
+ "PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX",
+ "srflx" },
+ { PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX,
+ "PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX",
+ "prflx" },
+ { PURPLE_MEDIA_CANDIDATE_TYPE_RELAY,
+ "PURPLE_MEDIA_CANDIDATE_TYPE_RELAY",
+ "relay" },
+ { PURPLE_MEDIA_CANDIDATE_TYPE_MULTICAST,
+ "PURPLE_MEDIA_CANDIDATE_TYPE_MULTICAST",
+ "multicast" },
+ { 0, NULL, NULL }
+ };
+ type = g_enum_register_static("PurpleMediaCandidateType",
+ values);
+ }
+ return type;
+}
+
+/*
+ * PurpleMediaCaps
+ */
+
+GType
+purple_media_caps_get_type()
+{
+ static GType type = 0;
+ if (type == 0) {
+ static const GEnumValue values[] = {
+ { PURPLE_MEDIA_CAPS_NONE,
+ "PURPLE_MEDIA_CAPS_NONE", "none" },
+ { PURPLE_MEDIA_CAPS_AUDIO,
+ "PURPLE_MEDIA_CAPS_AUDIO", "audio" },
+ { PURPLE_MEDIA_CAPS_AUDIO_SINGLE_DIRECTION,
+ "PURPLE_MEDIA_CAPS_AUDIO_SINGLE_DIRECTION",
+ "audio-single-direction" },
+ { PURPLE_MEDIA_CAPS_VIDEO,
+ "PURPLE_MEDIA_CAPS_VIDEO", "video" },
+ { PURPLE_MEDIA_CAPS_VIDEO_SINGLE_DIRECTION,
+ "PURPLE_MEDIA_CAPS_VIDEO_SINGLE_DIRECTION",
+ "video-single-direction" },
+ { PURPLE_MEDIA_CAPS_AUDIO_VIDEO,
+ "PURPLE_MEDIA_CAPS_AUDIO_VIDEO",
+ "audio-video" },
+ { PURPLE_MEDIA_CAPS_MODIFY_SESSION,
+ "PURPLE_MEDIA_CAPS_MODIFY_SESSION",
+ "modify-session" },
+ { PURPLE_MEDIA_CAPS_CHANGE_DIRECTION,
+ "PURPLE_MEDIA_CAPS_CHANGE_DIRECTION",
+ "change-direction" },
+ { 0, NULL, NULL }
+ };
+ type = g_enum_register_static("PurpleMediaCaps", values);
+ }
+ return type;
+}
+
+/*
+ * PurpleMediaInfoType
+ */
+
+GType
+purple_media_info_type_get_type()
+{
+ static GType type = 0;
+ if (type == 0) {
+ static const GEnumValue values[] = {
+ { PURPLE_MEDIA_INFO_HANGUP,
+ "PURPLE_MEDIA_INFO_HANGUP", "hangup" },
+ { PURPLE_MEDIA_INFO_ACCEPT,
+ "PURPLE_MEDIA_INFO_ACCEPT", "accept" },
+ { PURPLE_MEDIA_INFO_REJECT,
+ "PURPLE_MEDIA_INFO_REJECT", "reject" },
+ { PURPLE_MEDIA_INFO_MUTE,
+ "PURPLE_MEDIA_INFO_MUTE", "mute" },
+ { PURPLE_MEDIA_INFO_UNMUTE,
+ "PURPLE_MEDIA_INFO_UNMUTE", "unmute" },
+ { PURPLE_MEDIA_INFO_PAUSE,
+ "PURPLE_MEDIA_INFO_PAUSE", "pause" },
+ { PURPLE_MEDIA_INFO_UNPAUSE,
+ "PURPLE_MEDIA_INFO_UNPAUSE", "unpause" },
+ { PURPLE_MEDIA_INFO_HOLD,
+ "PURPLE_MEDIA_INFO_HOLD", "hold" },
+ { PURPLE_MEDIA_INFO_UNHOLD,
+ "PURPLE_MEDIA_INFO_HOLD", "unhold" },
+ { 0, NULL, NULL }
+ };
+ type = g_enum_register_static("PurpleMediaInfoType", values);
+ }
+ return type;
+}
+
+/*
+ * PurpleMediaNetworkProtocol
+ */
+
+GType
+purple_media_network_protocol_get_type()
+{
+ static GType type = 0;
+ if (type == 0) {
+ static const GEnumValue values[] = {
+ { PURPLE_MEDIA_NETWORK_PROTOCOL_UDP,
+ "PURPLE_MEDIA_NETWORK_PROTOCOL_UDP",
+ "udp" },
+ { PURPLE_MEDIA_NETWORK_PROTOCOL_TCP,
+ "PURPLE_MEDIA_NETWORK_PROTOCOL_TCP",
+ "tcp" },
+ { 0, NULL, NULL }
+ };
+ type = g_enum_register_static("PurpleMediaNetworkProtocol",
+ values);
+ }
+ return type;
+}
+
+/*
+ * PurpleMediaSessionType
+ */
+
+GType
+purple_media_session_type_get_type()
+{
+ static GType type = 0;
+ if (type == 0) {
+ static const GFlagsValue values[] = {
+ { PURPLE_MEDIA_NONE,
+ "PURPLE_MEDIA_NONE", "none" },
+ { PURPLE_MEDIA_RECV_AUDIO,
+ "PURPLE_MEDIA_RECV_AUDIO", "recv-audio" },
+ { PURPLE_MEDIA_SEND_AUDIO,
+ "PURPLE_MEDIA_SEND_AUDIO", "send-audio" },
+ { PURPLE_MEDIA_RECV_VIDEO,
+ "PURPLE_MEDIA_RECV_VIDEO", "recv-video" },
+ { PURPLE_MEDIA_SEND_VIDEO,
+ "PURPLE_MEDIA_SEND_VIDEO", "send-audio" },
+ { PURPLE_MEDIA_AUDIO,
+ "PURPLE_MEDIA_AUDIO", "audio" },
+ { PURPLE_MEDIA_VIDEO,
+ "PURPLE_MEDIA_VIDEO", "video" },
+ { 0, NULL, NULL }
+ };
+ type = g_flags_register_static(
+ "PurpleMediaSessionType", values);
+ }
+ return type;
+}
+
+/*
+ * PurpleMediaState
+ */
+
+GType
+purple_media_state_changed_get_type()
+{
+ static GType type = 0;
+ if (type == 0) {
+ static const GEnumValue values[] = {
+ { PURPLE_MEDIA_STATE_NEW,
+ "PURPLE_MEDIA_STATE_NEW", "new" },
+ { PURPLE_MEDIA_STATE_CONNECTED,
+ "PURPLE_MEDIA_STATE_CONNECTED", "connected" },
+ { PURPLE_MEDIA_STATE_END,
+ "PURPLE_MEDIA_STATE_END", "end" },
+ { 0, NULL, NULL }
+ };
+ type = g_enum_register_static("PurpleMediaState", values);
+ }
+ return type;
+}
+
============================================================
--- libpurple/media/enum-types.h 47956e4afc314aa1048ee606584fcf8553c533c6
+++ libpurple/media/enum-types.h 47956e4afc314aa1048ee606584fcf8553c533c6
@@ -0,0 +1,162 @@
+/**
+ * @file enum-types.h Enum types for Media API
+ * @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 _PURPLE_MEDIA_ENUM_TYPES_H_
+#define _PURPLE_MEDIA_ENUM_TYPES_H_
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define PURPLE_TYPE_MEDIA_CANDIDATE_TYPE (purple_media_candidate_type_get_type())
+#define PURPLE_MEDIA_TYPE_CAPS (purple_media_caps_get_type())
+#define PURPLE_MEDIA_TYPE_INFO_TYPE (purple_media_info_type_get_type())
+#define PURPLE_TYPE_MEDIA_NETWORK_PROTOCOL (purple_media_network_protocol_get_type())
+#define PURPLE_TYPE_MEDIA_SESSION_TYPE (purple_media_session_type_get_type())
+#define PURPLE_MEDIA_TYPE_STATE (purple_media_state_changed_get_type())
+
+/** Media candidate types */
+typedef enum {
+ PURPLE_MEDIA_CANDIDATE_TYPE_HOST,
+ PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX,
+ PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX,
+ PURPLE_MEDIA_CANDIDATE_TYPE_RELAY,
+ PURPLE_MEDIA_CANDIDATE_TYPE_MULTICAST,
+} PurpleMediaCandidateType;
+
+/** Media caps */
+typedef enum {
+ PURPLE_MEDIA_CAPS_NONE = 0,
+ PURPLE_MEDIA_CAPS_AUDIO = 1,
+ PURPLE_MEDIA_CAPS_AUDIO_SINGLE_DIRECTION = 1 << 1,
+ PURPLE_MEDIA_CAPS_VIDEO = 1 << 2,
+ PURPLE_MEDIA_CAPS_VIDEO_SINGLE_DIRECTION = 1 << 3,
+ PURPLE_MEDIA_CAPS_AUDIO_VIDEO = 1 << 4,
+ PURPLE_MEDIA_CAPS_MODIFY_SESSION = 1 << 5,
+ PURPLE_MEDIA_CAPS_CHANGE_DIRECTION = 1 << 6,
+} PurpleMediaCaps;
+
+/** Media component types */
+typedef enum {
+ PURPLE_MEDIA_COMPONENT_NONE = 0,
+ PURPLE_MEDIA_COMPONENT_RTP = 1,
+ PURPLE_MEDIA_COMPONENT_RTCP = 2,
+} PurpleMediaComponentType;
+
+/** Media info types */
+typedef enum {
+ PURPLE_MEDIA_INFO_HANGUP = 0,
+ PURPLE_MEDIA_INFO_ACCEPT,
+ PURPLE_MEDIA_INFO_REJECT,
+ PURPLE_MEDIA_INFO_MUTE,
+ PURPLE_MEDIA_INFO_UNMUTE,
+ PURPLE_MEDIA_INFO_PAUSE,
+ PURPLE_MEDIA_INFO_UNPAUSE,
+ PURPLE_MEDIA_INFO_HOLD,
+ PURPLE_MEDIA_INFO_UNHOLD,
+} PurpleMediaInfoType;
+
+/** Media network protocols */
+typedef enum {
+ PURPLE_MEDIA_NETWORK_PROTOCOL_UDP,
+ PURPLE_MEDIA_NETWORK_PROTOCOL_TCP,
+} PurpleMediaNetworkProtocol;
+
+/** Media session types */
+typedef enum {
+ PURPLE_MEDIA_NONE = 0,
+ PURPLE_MEDIA_RECV_AUDIO = 1 << 0,
+ PURPLE_MEDIA_SEND_AUDIO = 1 << 1,
+ PURPLE_MEDIA_RECV_VIDEO = 1 << 2,
+ PURPLE_MEDIA_SEND_VIDEO = 1 << 3,
+ PURPLE_MEDIA_AUDIO = PURPLE_MEDIA_RECV_AUDIO | PURPLE_MEDIA_SEND_AUDIO,
+ PURPLE_MEDIA_VIDEO = PURPLE_MEDIA_RECV_VIDEO | PURPLE_MEDIA_SEND_VIDEO
+} PurpleMediaSessionType;
+
+/** Media state-changed types */
+typedef enum {
+ PURPLE_MEDIA_STATE_NEW = 0,
+ PURPLE_MEDIA_STATE_CONNECTED,
+ PURPLE_MEDIA_STATE_END,
+} PurpleMediaState;
+
+/**
+ * Gets the media candidate type's GType
+ *
+ * @return The media candidate type's GType.
+ *
+ * @since 2.6.0
+ */
+GType purple_media_candidate_type_get_type(void);
+
+/**
+ * Gets the type of the media caps flags
+ *
+ * @return The media caps flags' GType
+ *
+ * @since 2.7.0
+ */
+GType purple_media_caps_get_type(void);
+
+/**
+ * Gets the type of the info type enum
+ *
+ * @return The info type enum's GType
+ *
+ * @since 2.6.0
+ */
+GType purple_media_info_type_get_type(void);
+
+/**
+ * Gets the media network protocol's GType
+ *
+ * @return The media network protocol's GType.
+ *
+ * @since 2.6.0
+ */
+GType purple_media_network_protocol_get_type(void);
+
+/**
+ * Gets the media session type's GType
+ *
+ * @return The media session type's GType.
+ *
+ * @since 2.6.0
+ */
+GType purple_media_session_type_get_type(void);
+
+/**
+ * Gets the type of the state-changed enum
+ *
+ * @return The state-changed enum's GType
+ *
+ * @since 2.6.0
+ */
+GType purple_media_state_changed_get_type(void);
+
+G_END_DECLS
+
+#endif /* _PURPLE_MEDIA_ENUM_TYPES_ */
============================================================
--- libpurple/Makefile.am 810a6471e7e46f20fc9b592023fd1a707dfd4afa
+++ libpurple/Makefile.am 31ff16cac75c5aec76bb9e3b12777084018a64cd
@@ -53,6 +53,7 @@ purple_coresources = \
idle.c \
imgstore.c \
log.c \
+ media/enum-types.c \
media/media.c \
mediamanager.c \
mime.c \
@@ -116,6 +117,7 @@ purple_coreheaders = \
idle.h \
imgstore.h \
log.h \
+ media/enum-types.h \
media.h \
media-gst.h \
mediamanager.h \
============================================================
--- libpurple/Makefile.mingw 8354b074156fcfd07d419aecbd502a1fb9280d6e
+++ libpurple/Makefile.mingw 21bac8cd0faf3f3523a9b5b21c6d3019f60527d1
@@ -48,6 +48,7 @@ C_SRC = \
idle.c \
imgstore.c \
log.c \
+ media/enum-types.c \
media/media.c \
mediamanager.c \
mime.c \
============================================================
--- libpurple/media/media.c e2ed8f7b7fa778ccb78d99b10fd4e87b25224a9c
+++ libpurple/media/media.c 43c4ba27c402ebc98c4f225964a75d7302b549e4
@@ -180,39 +180,7 @@ enum {
#endif
-/*
- * PurpleMediaElementType
- */
-
GType
-purple_media_session_type_get_type()
-{
- static GType type = 0;
- if (type == 0) {
- static const GFlagsValue values[] = {
- { PURPLE_MEDIA_NONE,
- "PURPLE_MEDIA_NONE", "none" },
- { PURPLE_MEDIA_RECV_AUDIO,
- "PURPLE_MEDIA_RECV_AUDIO", "recv-audio" },
- { PURPLE_MEDIA_SEND_AUDIO,
- "PURPLE_MEDIA_SEND_AUDIO", "send-audio" },
- { PURPLE_MEDIA_RECV_VIDEO,
- "PURPLE_MEDIA_RECV_VIDEO", "recv-video" },
- { PURPLE_MEDIA_SEND_VIDEO,
- "PURPLE_MEDIA_SEND_VIDEO", "send-audio" },
- { PURPLE_MEDIA_AUDIO,
- "PURPLE_MEDIA_AUDIO", "audio" },
- { PURPLE_MEDIA_VIDEO,
- "PURPLE_MEDIA_VIDEO", "video" },
- { 0, NULL, NULL }
- };
- type = g_flags_register_static(
- "PurpleMediaSessionType", values);
- }
- return type;
-}
-
-GType
purple_media_get_type()
{
#ifdef USE_VV
@@ -239,90 +207,6 @@ purple_media_get_type()
#endif
}
-GType
-purple_media_state_changed_get_type()
-{
- static GType type = 0;
- if (type == 0) {
- static const GEnumValue values[] = {
- { PURPLE_MEDIA_STATE_NEW,
- "PURPLE_MEDIA_STATE_NEW", "new" },
- { PURPLE_MEDIA_STATE_CONNECTED,
- "PURPLE_MEDIA_STATE_CONNECTED", "connected" },
- { PURPLE_MEDIA_STATE_END,
- "PURPLE_MEDIA_STATE_END", "end" },
- { 0, NULL, NULL }
- };
- type = g_enum_register_static("PurpleMediaState", values);
- }
- return type;
-}
-
-GType
-purple_media_info_type_get_type()
-{
- static GType type = 0;
- if (type == 0) {
- static const GEnumValue values[] = {
- { PURPLE_MEDIA_INFO_HANGUP,
- "PURPLE_MEDIA_INFO_HANGUP", "hangup" },
- { PURPLE_MEDIA_INFO_ACCEPT,
- "PURPLE_MEDIA_INFO_ACCEPT", "accept" },
- { PURPLE_MEDIA_INFO_REJECT,
- "PURPLE_MEDIA_INFO_REJECT", "reject" },
- { PURPLE_MEDIA_INFO_MUTE,
- "PURPLE_MEDIA_INFO_MUTE", "mute" },
- { PURPLE_MEDIA_INFO_UNMUTE,
- "PURPLE_MEDIA_INFO_UNMUTE", "unmute" },
- { PURPLE_MEDIA_INFO_PAUSE,
- "PURPLE_MEDIA_INFO_PAUSE", "pause" },
- { PURPLE_MEDIA_INFO_UNPAUSE,
- "PURPLE_MEDIA_INFO_UNPAUSE", "unpause" },
- { PURPLE_MEDIA_INFO_HOLD,
- "PURPLE_MEDIA_INFO_HOLD", "hold" },
- { PURPLE_MEDIA_INFO_UNHOLD,
- "PURPLE_MEDIA_INFO_HOLD", "unhold" },
- { 0, NULL, NULL }
- };
- type = g_enum_register_static("PurpleMediaInfoType", values);
- }
- return type;
-}
-
-GType
-purple_media_caps_get_type()
-{
- static GType type = 0;
- if (type == 0) {
- static const GEnumValue values[] = {
- { PURPLE_MEDIA_CAPS_NONE,
- "PURPLE_MEDIA_CAPS_NONE", "none" },
- { PURPLE_MEDIA_CAPS_AUDIO,
- "PURPLE_MEDIA_CAPS_AUDIO", "audio" },
- { PURPLE_MEDIA_CAPS_AUDIO_SINGLE_DIRECTION,
- "PURPLE_MEDIA_CAPS_AUDIO_SINGLE_DIRECTION",
- "audio-single-direction" },
- { PURPLE_MEDIA_CAPS_VIDEO,
- "PURPLE_MEDIA_CAPS_VIDEO", "video" },
- { PURPLE_MEDIA_CAPS_VIDEO_SINGLE_DIRECTION,
- "PURPLE_MEDIA_CAPS_VIDEO_SINGLE_DIRECTION",
- "video-single-direction" },
- { PURPLE_MEDIA_CAPS_AUDIO_VIDEO,
- "PURPLE_MEDIA_CAPS_AUDIO_VIDEO",
- "audio-video" },
- { PURPLE_MEDIA_CAPS_MODIFY_SESSION,
- "PURPLE_MEDIA_CAPS_MODIFY_SESSION",
- "modify-session" },
- { PURPLE_MEDIA_CAPS_CHANGE_DIRECTION,
- "PURPLE_MEDIA_CAPS_CHANGE_DIRECTION",
- "change-direction" },
- { 0, NULL, NULL }
- };
- type = g_enum_register_static("PurpleMediaCaps", values);
- }
- return type;
-}
-
#ifdef USE_VV
static void
purple_media_class_init (PurpleMediaClass *klass)
@@ -630,63 +514,6 @@ purple_media_get_property (GObject *obje
#endif
/*
- * PurpleMediaCandidateType
- */
-
-GType
-purple_media_candidate_type_get_type()
-{
- static GType type = 0;
- if (type == 0) {
- static const GEnumValue values[] = {
- { PURPLE_MEDIA_CANDIDATE_TYPE_HOST,
- "PURPLE_MEDIA_CANDIDATE_TYPE_HOST",
- "host" },
- { PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX,
- "PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX",
- "srflx" },
- { PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX,
- "PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX",
- "prflx" },
- { PURPLE_MEDIA_CANDIDATE_TYPE_RELAY,
- "PPURPLE_MEDIA_CANDIDATE_TYPE_RELAY",
- "relay" },
- { PURPLE_MEDIA_CANDIDATE_TYPE_MULTICAST,
- "PURPLE_MEDIA_CANDIDATE_TYPE_MULTICAST",
- "multicast" },
- { 0, NULL, NULL }
- };
- type = g_enum_register_static("PurpleMediaCandidateType",
- values);
- }
- return type;
-}
-
-/*
- * PurpleMediaNetworkProtocol
- */
-
-GType
-purple_media_network_protocol_get_type()
-{
- static GType type = 0;
- if (type == 0) {
- static const GEnumValue values[] = {
- { PURPLE_MEDIA_NETWORK_PROTOCOL_UDP,
- "PURPLE_MEDIA_NETWORK_PROTOCOL_UDP",
- "udp" },
- { PURPLE_MEDIA_NETWORK_PROTOCOL_TCP,
- "PURPLE_MEDIA_NETWORK_PROTOCOL_TCP",
- "tcp" },
- { 0, NULL, NULL }
- };
- type = g_enum_register_static("PurpleMediaNetworkProtocol",
- values);
- }
- return type;
-}
-
-/*
* PurpleMediaCandidate
*/
============================================================
--- libpurple/media.h 671b17f8b4e6d252d8df620a296afa1bd64b69a7
+++ libpurple/media.h ae65b713f5ea5713b3e0ccb8b6c87c77db91f94e
@@ -27,6 +27,8 @@
#ifndef _PURPLE_MEDIA_H_
#define _PURPLE_MEDIA_H_
+#include "media/enum-types.h"
+
#include <glib.h>
#include <glib-object.h>
@@ -46,7 +48,6 @@ G_BEGIN_DECLS
#define PURPLE_IS_MEDIA_CODEC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), PURPLE_TYPE_MEDIA_CODEC))
#define PURPLE_MEDIA_CODEC_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), PURPLE_TYPE_MEDIA_CODEC, PurpleMediaCodec))
-#define PURPLE_TYPE_MEDIA_SESSION_TYPE (purple_media_session_type_get_type())
#define PURPLE_TYPE_MEDIA (purple_media_get_type())
#define PURPLE_MEDIA(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_MEDIA, PurpleMedia))
#define PURPLE_MEDIA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_MEDIA, PurpleMediaClass))
@@ -54,12 +55,6 @@ G_BEGIN_DECLS
#define PURPLE_IS_MEDIA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), PURPLE_TYPE_MEDIA))
#define PURPLE_MEDIA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), PURPLE_TYPE_MEDIA, PurpleMediaClass))
-#define PURPLE_TYPE_MEDIA_CANDIDATE_TYPE (purple_media_candidate_type_get_type())
-#define PURPLE_TYPE_MEDIA_NETWORK_PROTOCOL (purple_media_network_protocol_get_type())
-#define PURPLE_MEDIA_TYPE_STATE (purple_media_state_changed_get_type())
-#define PURPLE_MEDIA_TYPE_INFO_TYPE (purple_media_info_type_get_type())
-#define PURPLE_MEDIA_TYPE_CAPS (purple_media_caps_get_type())
-
/** An opaque structure representing a media call. */
typedef struct _PurpleMedia PurpleMedia;
/** An opaque structure representing a network candidate (IP Address and port pair). */
@@ -67,68 +62,6 @@ typedef struct _PurpleMediaCodec PurpleM
/** An opaque structure representing an audio or video codec. */
typedef struct _PurpleMediaCodec PurpleMediaCodec;
-/** Media caps */
-typedef enum {
- PURPLE_MEDIA_CAPS_NONE = 0,
- PURPLE_MEDIA_CAPS_AUDIO = 1,
- PURPLE_MEDIA_CAPS_AUDIO_SINGLE_DIRECTION = 1 << 1,
- PURPLE_MEDIA_CAPS_VIDEO = 1 << 2,
- PURPLE_MEDIA_CAPS_VIDEO_SINGLE_DIRECTION = 1 << 3,
- PURPLE_MEDIA_CAPS_AUDIO_VIDEO = 1 << 4,
- PURPLE_MEDIA_CAPS_MODIFY_SESSION = 1 << 5,
- PURPLE_MEDIA_CAPS_CHANGE_DIRECTION = 1 << 6,
-} PurpleMediaCaps;
-
-/** Media session types */
-typedef enum {
- PURPLE_MEDIA_NONE = 0,
- PURPLE_MEDIA_RECV_AUDIO = 1 << 0,
- PURPLE_MEDIA_SEND_AUDIO = 1 << 1,
- PURPLE_MEDIA_RECV_VIDEO = 1 << 2,
- PURPLE_MEDIA_SEND_VIDEO = 1 << 3,
- PURPLE_MEDIA_AUDIO = PURPLE_MEDIA_RECV_AUDIO | PURPLE_MEDIA_SEND_AUDIO,
- PURPLE_MEDIA_VIDEO = PURPLE_MEDIA_RECV_VIDEO | PURPLE_MEDIA_SEND_VIDEO
-} PurpleMediaSessionType;
-
-/** Media state-changed types */
-typedef enum {
- PURPLE_MEDIA_STATE_NEW = 0,
- PURPLE_MEDIA_STATE_CONNECTED,
- PURPLE_MEDIA_STATE_END,
-} PurpleMediaState;
-
-/** Media info types */
-typedef enum {
- PURPLE_MEDIA_INFO_HANGUP = 0,
- PURPLE_MEDIA_INFO_ACCEPT,
- PURPLE_MEDIA_INFO_REJECT,
- PURPLE_MEDIA_INFO_MUTE,
- PURPLE_MEDIA_INFO_UNMUTE,
- PURPLE_MEDIA_INFO_PAUSE,
- PURPLE_MEDIA_INFO_UNPAUSE,
- PURPLE_MEDIA_INFO_HOLD,
- PURPLE_MEDIA_INFO_UNHOLD,
-} PurpleMediaInfoType;
-
-typedef enum {
- PURPLE_MEDIA_CANDIDATE_TYPE_HOST,
- PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX,
- PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX,
- PURPLE_MEDIA_CANDIDATE_TYPE_RELAY,
- PURPLE_MEDIA_CANDIDATE_TYPE_MULTICAST,
-} PurpleMediaCandidateType;
-
-typedef enum {
- PURPLE_MEDIA_COMPONENT_NONE = 0,
- PURPLE_MEDIA_COMPONENT_RTP = 1,
- PURPLE_MEDIA_COMPONENT_RTCP = 2,
-} PurpleMediaComponentType;
-
-typedef enum {
- PURPLE_MEDIA_NETWORK_PROTOCOL_UDP,
- PURPLE_MEDIA_NETWORK_PROTOCOL_TCP,
-} PurpleMediaNetworkProtocol;
-
#include "signals.h"
#include "util.h"
@@ -137,33 +70,6 @@ extern "C" {
#endif
/**
- * Gets the media session type's GType
- *
- * @return The media session type's GType.
- *
- * @since 2.6.0
- */
-GType purple_media_session_type_get_type(void);
-
-/**
- * Gets the media candidate type's GType
- *
- * @return The media candidate type's GType.
- *
- * @since 2.6.0
- */
-GType purple_media_candidate_type_get_type(void);
-
-/**
- * Gets the media network protocol's GType
- *
- * @return The media network protocol's GType.
- *
- * @since 2.6.0
- */
-GType purple_media_network_protocol_get_type(void);
-
-/**
* Gets the media class's GType
*
* @return The media class's GType.
@@ -173,33 +79,6 @@ GType purple_media_get_type(void);
GType purple_media_get_type(void);
/**
- * Gets the type of the state-changed enum
- *
- * @return The state-changed enum's GType
- *
- * @since 2.6.0
- */
-GType purple_media_state_changed_get_type(void);
-
-/**
- * Gets the type of the info type enum
- *
- * @return The info type enum's GType
- *
- * @since 2.6.0
- */
-GType purple_media_info_type_get_type(void);
-
-/**
- * Gets the type of the media caps flags
- *
- * @return The media caps flags' GType
- *
- * @since 2.7.0
- */
-GType purple_media_caps_get_type(void);
-
-/**
* Gets the type of the media candidate structure.
*
* @return The media canditate's GType
More information about the Commits
mailing list