Mercurial > pidgin
diff libpurple/mediamanager.h @ 23797:e1c8ec1259de
Updates voice and video to use Farsight 2, gets XMPP voice conferences
closer to XEP-0167, and fixes a lot of bugs.
author | Mike Ruprecht <maiku@soc.pidgin.im> |
---|---|
date | Fri, 23 May 2008 02:42:32 +0000 |
parents | 1fefd8340821 |
children | cbe97caec684 |
line wrap: on
line diff
--- a/libpurple/mediamanager.h Sun Apr 13 17:53:46 2008 +0000 +++ b/libpurple/mediamanager.h Fri May 23 02:42:32 2008 +0000 @@ -28,7 +28,7 @@ #ifdef USE_FARSIGHT -#include <farsight/farsight.h> +#include <gst/farsight/fs-session.h> #include <glib.h> #include <glib-object.h> @@ -61,12 +61,10 @@ GType purple_media_manager_get_type(void); PurpleMediaManager *purple_media_manager_get(void); - PurpleMedia *purple_media_manager_create_media(PurpleMediaManager *manager, - PurpleConnection *gc, - const char *screenname, - FarsightStream *audio_stream, - FarsightStream *video_stream); + PurpleConnection *gc, + const char *conference_type, + const char *remote_user); G_END_DECLS