Mercurial > pidgin
comparison libpurple/media.c @ 24960:a5f1804fcb4b
Combine get_*_codecs functions to mirror Farsight 2.
author | Mike Ruprecht <maiku@soc.pidgin.im> |
---|---|
date | Thu, 13 Nov 2008 03:46:28 +0000 |
parents | 94224a5563db |
children | aa50b1f05145 |
comparison
equal
deleted
inserted
replaced
24959:e5da7110bec9 | 24960:a5f1804fcb4b |
---|---|
1247 PurpleMediaSession *session = purple_media_get_session(media, sess_id); | 1247 PurpleMediaSession *session = purple_media_get_session(media, sess_id); |
1248 return session->type; | 1248 return session->type; |
1249 } | 1249 } |
1250 /* XXX: Should wait until codecs-ready is TRUE before using this function */ | 1250 /* XXX: Should wait until codecs-ready is TRUE before using this function */ |
1251 GList * | 1251 GList * |
1252 purple_media_get_local_codecs(PurpleMedia *media, const gchar *sess_id) | 1252 purple_media_get_codecs(PurpleMedia *media, const gchar *sess_id) |
1253 { | 1253 { |
1254 GList *codecs; | 1254 GList *codecs; |
1255 g_object_get(G_OBJECT(purple_media_get_session(media, sess_id)->session), | 1255 g_object_get(G_OBJECT(purple_media_get_session(media, sess_id)->session), |
1256 "codecs", &codecs, NULL); | 1256 "codecs", &codecs, NULL); |
1257 return codecs; | 1257 return codecs; |
1261 purple_media_get_local_candidates(PurpleMedia *media, const gchar *sess_id, const gchar *name) | 1261 purple_media_get_local_candidates(PurpleMedia *media, const gchar *sess_id, const gchar *name) |
1262 { | 1262 { |
1263 PurpleMediaSession *session = purple_media_get_session(media, sess_id); | 1263 PurpleMediaSession *session = purple_media_get_session(media, sess_id); |
1264 return fs_candidate_list_copy( | 1264 return fs_candidate_list_copy( |
1265 purple_media_session_get_local_candidates(session, name)); | 1265 purple_media_session_get_local_candidates(session, name)); |
1266 } | |
1267 /* XXX: Should wait until codecs-ready is TRUE before using this function */ | |
1268 GList * | |
1269 purple_media_get_negotiated_codecs(PurpleMedia *media, const gchar *sess_id) | |
1270 { | |
1271 PurpleMediaSession *session = purple_media_get_session(media, sess_id); | |
1272 GList *codec_intersection; | |
1273 g_object_get(session->session, "codecs", &codec_intersection, NULL); | |
1274 return codec_intersection; | |
1275 } | 1266 } |
1276 | 1267 |
1277 void | 1268 void |
1278 purple_media_add_remote_candidates(PurpleMedia *media, const gchar *sess_id, | 1269 purple_media_add_remote_candidates(PurpleMedia *media, const gchar *sess_id, |
1279 const gchar *name, GList *remote_candidates) | 1270 const gchar *name, GList *remote_candidates) |