Mercurial > pidgin.yaz

comparison libpurple/media.c @ 26411:86bc2d34f689

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename state-changed enum and values.
author Mike Ruprecht <maiku@soc.pidgin.im>
date Sat, 21 Mar 2009 03:49:11 +0000
parents db9d2a760329
children 6cafb8e35032
comparison
equal deleted inserted replaced
26410:144802b7ed77 26411:86bc2d34f689
169 purple_media_state_changed_get_type() 169 purple_media_state_changed_get_type()
170 { 170 {
171 static GType type = 0; 171 static GType type = 0;
172 if (type == 0) { 172 if (type == 0) {
173 static const GEnumValue values[] = { 173 static const GEnumValue values[] = {
174 { PURPLE_MEDIA_STATE_CHANGED_NEW, "PURPLE_MEDIA_STATE_CHANGED_NEW", "new" }, 174 { PURPLE_MEDIA_STATE_NEW,
175 { PURPLE_MEDIA_STATE_CHANGED_CONNECTED, "PURPLE_MEDIA_STATE_CHANGED_CONNECTED", "connected" }, 175 "PURPLE_MEDIA_STATE_NEW", "new" },
176 { PURPLE_MEDIA_STATE_CHANGED_END, "PURPLE_MEDIA_STATE_CHANGED_END", "end" }, 176 { PURPLE_MEDIA_STATE_CONNECTED,
177 "PURPLE_MEDIA_STATE_CONNECTED", "connected" },
178 { PURPLE_MEDIA_STATE_END,
179 "PURPLE_MEDIA_STATE_END", "end" },
177 { 0, NULL, NULL } 180 { 0, NULL, NULL }
178 }; 181 };
179 type = g_enum_register_static("PurpleMediaStateChangedType", values); 182 type = g_enum_register_static("PurpleMediaState", values);
180 } 183 }
181 return type; 184 return type;
182 } 185 }
183 186
184 GType 187 GType
269 G_TYPE_NONE, 3, G_TYPE_POINTER, 272 G_TYPE_NONE, 3, G_TYPE_POINTER,
270 G_TYPE_POINTER, PURPLE_TYPE_MEDIA_CANDIDATE); 273 G_TYPE_POINTER, PURPLE_TYPE_MEDIA_CANDIDATE);
271 purple_media_signals[STATE_CHANGED] = g_signal_new("state-changed", G_TYPE_FROM_CLASS(klass), 274 purple_media_signals[STATE_CHANGED] = g_signal_new("state-changed", G_TYPE_FROM_CLASS(klass),
272 G_SIGNAL_RUN_LAST, 0, NULL, NULL, 275 G_SIGNAL_RUN_LAST, 0, NULL, NULL,
273 purple_smarshal_VOID__ENUM_STRING_STRING, 276 purple_smarshal_VOID__ENUM_STRING_STRING,
274 G_TYPE_NONE, 3, PURPLE_MEDIA_TYPE_STATE_CHANGED, 277 G_TYPE_NONE, 3, PURPLE_MEDIA_TYPE_STATE,
275 G_TYPE_STRING, G_TYPE_STRING); 278 G_TYPE_STRING, G_TYPE_STRING);
276 purple_media_signals[STREAM_INFO] = g_signal_new("stream-info", G_TYPE_FROM_CLASS(klass), 279 purple_media_signals[STREAM_INFO] = g_signal_new("stream-info", G_TYPE_FROM_CLASS(klass),
277 G_SIGNAL_RUN_LAST, 0, NULL, NULL, 280 G_SIGNAL_RUN_LAST, 0, NULL, NULL,
278 purple_smarshal_VOID__ENUM_STRING_STRING, 281 purple_smarshal_VOID__ENUM_STRING_STRING,
279 G_TYPE_NONE, 3, PURPLE_MEDIA_TYPE_INFO_TYPE, 282 G_TYPE_NONE, 3, PURPLE_MEDIA_TYPE_INFO_TYPE,
1448 const gchar *session_id, const gchar *participant) 1451 const gchar *session_id, const gchar *participant)
1449 { 1452 {
1450 g_return_if_fail(PURPLE_IS_MEDIA(media)); 1453 g_return_if_fail(PURPLE_IS_MEDIA(media));
1451 if (session_id == NULL && participant == NULL) { 1454 if (session_id == NULL && participant == NULL) {
1452 g_signal_emit(media, purple_media_signals[STATE_CHANGED], 1455 g_signal_emit(media, purple_media_signals[STATE_CHANGED],
1453 0, PURPLE_MEDIA_STATE_CHANGED_END, 1456 0, PURPLE_MEDIA_STATE_END,
1454 NULL, NULL); 1457 NULL, NULL);
1455 g_object_unref(media); 1458 g_object_unref(media);
1456 } 1459 }
1457 } 1460 }
1458 1461
1765 stream->session->media, 1768 stream->session->media,
1766 stream->session->id, stream->participant); 1769 stream->session->id, stream->participant);
1767 1770
1768 g_signal_emit(stream->session->media, 1771 g_signal_emit(stream->session->media,
1769 purple_media_signals[STATE_CHANGED], 1772 purple_media_signals[STATE_CHANGED],
1770 0, PURPLE_MEDIA_STATE_CHANGED_CONNECTED, 1773 0, PURPLE_MEDIA_STATE_CONNECTED,
1771 stream->session->id, stream->participant); 1774 stream->session->id, stream->participant);
1772 return FALSE; 1775 return FALSE;
1773 } 1776 }
1774 1777
1775 static void 1778 static void
1905 session->media = media; 1908 session->media = media;
1906 session->type = purple_media_from_fs(type, type_direction); 1909 session->type = purple_media_from_fs(type, type_direction);
1907 1910
1908 purple_media_add_session(media, session); 1911 purple_media_add_session(media, session);
1909 g_signal_emit(media, purple_media_signals[STATE_CHANGED], 1912 g_signal_emit(media, purple_media_signals[STATE_CHANGED],
1910 0, PURPLE_MEDIA_STATE_CHANGED_NEW, 1913 0, PURPLE_MEDIA_STATE_NEW,
1911 session->id, NULL); 1914 session->id, NULL);
1912 1915
1913 session_type = purple_media_from_fs(type, FS_DIRECTION_SEND); 1916 session_type = purple_media_from_fs(type, FS_DIRECTION_SEND);
1914 purple_media_set_src(media, session->id, 1917 purple_media_set_src(media, session->id,
1915 purple_media_manager_get_element( 1918 purple_media_manager_get_element(
1926 purple_media_remove_session(media, session); 1929 purple_media_remove_session(media, session);
1927 g_free(session); 1930 g_free(session);
1928 return FALSE; 1931 return FALSE;
1929 } else { 1932 } else {
1930 g_signal_emit(media, purple_media_signals[STATE_CHANGED], 1933 g_signal_emit(media, purple_media_signals[STATE_CHANGED],
1931 0, PURPLE_MEDIA_STATE_CHANGED_NEW, 1934 0, PURPLE_MEDIA_STATE_NEW,
1932 NULL, who); 1935 NULL, who);
1933 } 1936 }
1934 1937
1935 stream = purple_media_get_stream(media, sess_id, who); 1938 stream = purple_media_get_stream(media, sess_id, who);
1936 1939
2027 /* callback for source pad added (new stream source ready) */ 2030 /* callback for source pad added (new stream source ready) */
2028 g_signal_connect(G_OBJECT(fsstream), 2031 g_signal_connect(G_OBJECT(fsstream),
2029 "src-pad-added", G_CALLBACK(purple_media_src_pad_added_cb), stream); 2032 "src-pad-added", G_CALLBACK(purple_media_src_pad_added_cb), stream);
2030 2033
2031 g_signal_emit(media, purple_media_signals[STATE_CHANGED], 2034 g_signal_emit(media, purple_media_signals[STATE_CHANGED],
2032 0, PURPLE_MEDIA_STATE_CHANGED_NEW, 2035 0, PURPLE_MEDIA_STATE_NEW,
2033 session->id, who); 2036 session->id, who);
2034 } else if (*direction != type_direction) { 2037 } else if (*direction != type_direction) {
2035 /* change direction */ 2038 /* change direction */
2036 g_object_set(stream->stream, "direction", type_direction, NULL); 2039 g_object_set(stream->stream, "direction", type_direction, NULL);
2037 } 2040 }