Mercurial > pidgin.yaz
changeset 26099:b6457b2a8e14
Make FsStreamDirection and FsMediaType conversion functions static.
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Sat, 10 Jan 2009 01:24:49 +0000 |
| parents | 5c3976757e50 |
| children | 5a3d1a3ae9f3 |
| files | libpurple/media.c libpurple/media.h libpurple/protocols/jabber/jingle/rtp.c |
| diffstat | 3 files changed, 13 insertions(+), 50 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/media.c Sat Jan 10 01:11:29 2009 +0000 +++ b/libpurple/media.c Sat Jan 10 01:24:49 2009 +0000 @@ -413,7 +413,7 @@ } -FsMediaType +static FsMediaType purple_media_to_fs_media_type(PurpleMediaSessionType type) { if (type & PURPLE_MEDIA_AUDIO) @@ -424,7 +424,7 @@ return 0; } -FsStreamDirection +static FsStreamDirection purple_media_to_fs_stream_direction(PurpleMediaSessionType type) { if ((type & PURPLE_MEDIA_AUDIO) == PURPLE_MEDIA_AUDIO || @@ -440,7 +440,7 @@ return FS_DIRECTION_NONE; } -PurpleMediaSessionType +static PurpleMediaSessionType purple_media_from_fs(FsMediaType type, FsStreamDirection direction) { PurpleMediaSessionType result = PURPLE_MEDIA_NONE;
--- a/libpurple/media.h Sat Jan 10 01:11:29 2009 +0000 +++ b/libpurple/media.h Sat Jan 10 01:24:49 2009 +0000 @@ -109,41 +109,6 @@ */ GType purple_media_state_changed_get_type(void); -/**************************************************************************/ -/** @name Media Utility Functions */ -/**************************************************************************/ -/*@{*/ - -/** - * Converts a PurpleMediaSessionType to an FsMediaType. - * - * @param type The type to derive FsMediaType from - * - * @return The FsMediaType derived from type - */ -FsMediaType purple_media_to_fs_media_type(PurpleMediaSessionType type); - -/** - * Converts a PurpleMediaSessionType to an FsStreamDirection. - * - * @param type The type to derive FsMediaType from - * - * @return The FsMediaDirection derived from type - */ -FsStreamDirection purple_media_to_fs_stream_direction(PurpleMediaSessionType type); - -/** - * Converts an FsMediaType and FsStreamDirection into a PurpleMediaSessionType. - * - * @param type The type used to construct PurpleMediaSessionType - * @param direction The direction used to construct PurpleMediaSessionType - * - * @return The PurpleMediaSessionType constructed - */ -PurpleMediaSessionType purple_media_from_fs(FsMediaType type, FsStreamDirection direction); - -/*@}*/ - /** * Combines all the separate session types into a single PurpleMediaSessionType. *
--- a/libpurple/protocols/jabber/jingle/rtp.c Sat Jan 10 01:11:29 2009 +0000 +++ b/libpurple/protocols/jabber/jingle/rtp.c Sat Jan 10 01:24:49 2009 +0000 @@ -372,8 +372,8 @@ gchar *senders; gchar *name; const gchar *transmitter; - FsMediaType type; - FsStreamDirection direction; + gboolean is_audio; + PurpleMediaSessionType type; JingleTransport *transport; /* maybe this create ought to just be in initiate and handle initiate */ @@ -396,23 +396,21 @@ else transmitter = "notransmitter"; - if (!strcmp(media_type, "audio")) - type = FS_MEDIA_TYPE_AUDIO; - else - type = FS_MEDIA_TYPE_VIDEO; + is_audio = !strcmp(media_type, "audio"); if (!strcmp(senders, "both")) - direction = FS_DIRECTION_BOTH; + type = is_audio == TRUE ? PURPLE_MEDIA_AUDIO + : PURPLE_MEDIA_VIDEO; else if (!strcmp(senders, "initiator") && jingle_session_is_initiator(session)) - direction = FS_DIRECTION_SEND; + type = is_audio == TRUE ? PURPLE_MEDIA_SEND_AUDIO + : PURPLE_MEDIA_SEND_VIDEO; else - direction = FS_DIRECTION_RECV; + type = is_audio == TRUE ? PURPLE_MEDIA_RECV_AUDIO + : PURPLE_MEDIA_RECV_VIDEO; purple_media_add_stream(media, name, remote_jid, - purple_media_from_fs(type, direction), - transmitter, 0, NULL); - + type, transmitter, 0, NULL); g_free(name); g_free(media_type);