Mercurial > pidgin.yaz

comparison libpurple/media.c @ 26122:5d9a97a23d6e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove some of the deprecated API.
author Mike Ruprecht <maiku@soc.pidgin.im>
date Tue, 13 Jan 2009 13:43:13 +0000
parents 4ae228cf119f
children f09107a80608
comparison
equal deleted inserted replaced
26121:4ae228cf119f 26122:5d9a97a23d6e
1213 1213
1214 g_free(message); 1214 g_free(message);
1215 } 1215 }
1216 1216
1217 void 1217 void
1218 purple_media_ready(PurpleMedia *media)
1219 {
1220
1221 }
1222
1223 void
1224 purple_media_wait(PurpleMedia *media)
1225 {
1226
1227 }
1228
1229 void
1230 purple_media_accept(PurpleMedia *media) 1218 purple_media_accept(PurpleMedia *media)
1231 { 1219 {
1232 GList *sessions; 1220 GList *sessions;
1233 GList *streams; 1221 GList *streams;
1234 1222
1236 1224
1237 for (; sessions; sessions = g_list_delete_link(sessions, sessions)) { 1225 for (; sessions; sessions = g_list_delete_link(sessions, sessions)) {
1238 PurpleMediaSession *session = sessions->data; 1226 PurpleMediaSession *session = sessions->data;
1239 session->accepted = TRUE; 1227 session->accepted = TRUE;
1240 1228
1241 purple_media_emit_ready(media, session, NULL); 1229 if (media->priv->initiator == FALSE)
1230 purple_media_emit_ready(media, session, NULL);
1242 } 1231 }
1243 1232
1244 streams = media->priv->streams; 1233 streams = media->priv->streams;
1245 1234
1246 for (; streams; streams = g_list_next(streams)) { 1235 for (; streams; streams = g_list_next(streams)) {
1269 0, PURPLE_MEDIA_STATE_CHANGED_END, 1258 0, PURPLE_MEDIA_STATE_CHANGED_END,
1270 NULL, NULL); 1259 NULL, NULL);
1271 } 1260 }
1272 1261
1273 void 1262 void
1274 purple_media_got_request(PurpleMedia *media)
1275 {
1276
1277 }
1278
1279 void
1280 purple_media_got_hangup(PurpleMedia *media) 1263 purple_media_got_hangup(PurpleMedia *media)
1281 { 1264 {
1282 g_signal_emit(media, purple_media_signals[STATE_CHANGED], 1265 g_signal_emit(media, purple_media_signals[STATE_CHANGED],
1283 0, PURPLE_MEDIA_STATE_CHANGED_END, 1266 0, PURPLE_MEDIA_STATE_CHANGED_END,
1284 NULL, NULL); 1267 NULL, NULL);
1285 }
1286
1287 void
1288 purple_media_got_accept(PurpleMedia *media)
1289 {
1290 GList *sessions;
1291 GList *streams;
1292
1293 sessions = g_hash_table_get_values(media->priv->sessions);
1294
1295 for (; sessions; sessions = g_list_delete_link(sessions, sessions)) {
1296 PurpleMediaSession *session = sessions->data;
1297 session->accepted = TRUE;
1298 }
1299
1300 streams = media->priv->streams;
1301
1302 for (; streams; streams = g_list_next(streams)) {
1303 purple_media_set_remote_candidates(streams->data);
1304 }
1305 } 1268 }
1306 1269
1307 GList* 1270 GList*
1308 purple_media_get_devices(const gchar *plugin) 1271 purple_media_get_devices(const gchar *plugin)
1309 { 1272 {
1541 FsCandidate *remote_candidate, 1504 FsCandidate *remote_candidate,
1542 PurpleMediaSession *session) 1505 PurpleMediaSession *session)
1543 { 1506 {
1544 gchar *name; 1507 gchar *name;
1545 FsParticipant *participant; 1508 FsParticipant *participant;
1546 PurpleMediaCandidate *local =
1547 purple_media_candidate_from_fs(native_candidate);
1548 PurpleMediaCandidate *remote =
1549 purple_media_candidate_from_fs(remote_candidate);
1550 PurpleMediaStream *stream; 1509 PurpleMediaStream *stream;
1551 1510
1552 g_object_get(fsstream, "participant", &participant, NULL); 1511 g_object_get(fsstream, "participant", &participant, NULL);
1553 g_object_get(participant, "cname", &name, NULL); 1512 g_object_get(participant, "cname", &name, NULL);
1554 g_object_unref(participant); 1513 g_object_unref(participant);
1557 1516
1558 stream->local_candidate = fs_candidate_copy(native_candidate); 1517 stream->local_candidate = fs_candidate_copy(native_candidate);
1559 stream->remote_candidate = fs_candidate_copy(remote_candidate); 1518 stream->remote_candidate = fs_candidate_copy(remote_candidate);
1560 1519
1561 purple_debug_info("media", "candidate pair established\n"); 1520 purple_debug_info("media", "candidate pair established\n");
1562
1563 purple_media_candidate_free(local);
1564 purple_media_candidate_free(remote);
1565 } 1521 }
1566 1522
1567 static gboolean 1523 static gboolean
1568 purple_media_connected_cb(PurpleMediaStream *stream) 1524 purple_media_connected_cb(PurpleMediaStream *stream)
1569 { 1525 {