comparison: libpurple/mediamanager.c
libpurple/mediamanager.c
- changeset 38365
- 2ee19fb5fb0d
- parent 38027
- bd088b2700cd
- child 38367
- 55d38999c2fb
equal
deleted
inserted
replaced
| 38364:9918b8ed5203 | 38365:2ee19fb5fb0d |
|---|---|
| 25 #include "debug.h" | 25 #include "debug.h" |
| 26 #include "media.h" | 26 #include "media.h" |
| 27 #include "mediamanager.h" | 27 #include "mediamanager.h" |
| 28 | 28 |
| 29 #ifdef USE_GSTREAMER | 29 #ifdef USE_GSTREAMER |
| 30 #include "marshallers.h" | |
| 31 #include "media-gst.h" | 30 #include "media-gst.h" |
| 32 #include <media/backend-fs2.h> | 31 #include <media/backend-fs2.h> |
| 33 #endif /* USE_GSTREAMER */ | 32 #endif /* USE_GSTREAMER */ |
| 34 | 33 |
| 35 #ifdef USE_VV | 34 #ifdef USE_VV |
| 170 gobject_class->finalize = purple_media_manager_finalize; | 169 gobject_class->finalize = purple_media_manager_finalize; |
| 171 | 170 |
| 172 purple_media_manager_signals[INIT_MEDIA] = g_signal_new ("init-media", | 171 purple_media_manager_signals[INIT_MEDIA] = g_signal_new ("init-media", |
| 173 G_TYPE_FROM_CLASS (klass), | 172 G_TYPE_FROM_CLASS (klass), |
| 174 G_SIGNAL_RUN_LAST, | 173 G_SIGNAL_RUN_LAST, |
| 175 0, NULL, NULL, | 174 0, NULL, NULL, NULL, |
| 176 purple_smarshal_BOOLEAN__OBJECT_POINTER_STRING, | |
| 177 G_TYPE_BOOLEAN, 3, PURPLE_TYPE_MEDIA, | 175 G_TYPE_BOOLEAN, 3, PURPLE_TYPE_MEDIA, |
| 178 G_TYPE_POINTER, G_TYPE_STRING); | 176 G_TYPE_POINTER, G_TYPE_STRING); |
| 179 | 177 |
| 180 purple_media_manager_signals[INIT_PRIVATE_MEDIA] = | 178 purple_media_manager_signals[INIT_PRIVATE_MEDIA] = |
| 181 g_signal_new ("init-private-media", | 179 g_signal_new ("init-private-media", |
| 182 G_TYPE_FROM_CLASS (klass), | 180 G_TYPE_FROM_CLASS (klass), |
| 183 G_SIGNAL_RUN_LAST, | 181 G_SIGNAL_RUN_LAST, |
| 184 0, NULL, NULL, | 182 0, NULL, NULL, NULL, |
| 185 purple_smarshal_BOOLEAN__OBJECT_POINTER_STRING, | |
| 186 G_TYPE_BOOLEAN, 3, PURPLE_TYPE_MEDIA, | 183 G_TYPE_BOOLEAN, 3, PURPLE_TYPE_MEDIA, |
| 187 G_TYPE_POINTER, G_TYPE_STRING); | 184 G_TYPE_POINTER, G_TYPE_STRING); |
| 188 | 185 |
| 189 purple_media_manager_signals[UI_CAPS_CHANGED] = g_signal_new ("ui-caps-changed", | 186 purple_media_manager_signals[UI_CAPS_CHANGED] = g_signal_new ("ui-caps-changed", |
| 190 G_TYPE_FROM_CLASS (klass), | 187 G_TYPE_FROM_CLASS (klass), |
| 191 G_SIGNAL_RUN_LAST, | 188 G_SIGNAL_RUN_LAST, |
| 192 0, NULL, NULL, | 189 0, NULL, NULL, NULL, |
| 193 purple_smarshal_VOID__FLAGS_FLAGS, | |
| 194 G_TYPE_NONE, 2, PURPLE_MEDIA_TYPE_CAPS, | 190 G_TYPE_NONE, 2, PURPLE_MEDIA_TYPE_CAPS, |
| 195 PURPLE_MEDIA_TYPE_CAPS); | 191 PURPLE_MEDIA_TYPE_CAPS); |
| 196 | 192 |
| 197 purple_media_manager_signals[ELEMENTS_CHANGED] = | 193 purple_media_manager_signals[ELEMENTS_CHANGED] = |
| 198 g_signal_new("elements-changed", | 194 g_signal_new("elements-changed", |
| 199 G_TYPE_FROM_CLASS(klass), | 195 G_TYPE_FROM_CLASS(klass), |
| 200 G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, | 196 G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, |
| 201 0, NULL, NULL, | 197 0, NULL, NULL, NULL, |
| 202 g_cclosure_marshal_VOID__VOID, | |
| 203 G_TYPE_NONE, 0); | 198 G_TYPE_NONE, 0); |
| 204 | 199 |
| 205 g_type_class_add_private(klass, sizeof(PurpleMediaManagerPrivate)); | 200 g_type_class_add_private(klass, sizeof(PurpleMediaManagerPrivate)); |
| 206 } | 201 } |
| 207 | 202 |
