comparison libpurple/mediamanager.h @ 25647: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
comparison
equal deleted inserted replaced
25646:69d54f84350a 25647:e1c8ec1259de
26 #ifndef __MEDIA_MANAGER_H_ 26 #ifndef __MEDIA_MANAGER_H_
27 #define __MEDIA_MANAGER_H_ 27 #define __MEDIA_MANAGER_H_
28 28
29 #ifdef USE_FARSIGHT 29 #ifdef USE_FARSIGHT
30 30
31 #include <farsight/farsight.h> 31 #include <gst/farsight/fs-session.h>
32 #include <glib.h> 32 #include <glib.h>
33 #include <glib-object.h> 33 #include <glib-object.h>
34 34
35 #include "connection.h" 35 #include "connection.h"
36 #include "media.h" 36 #include "media.h"
59 PurpleMediaManagerPrivate *priv; 59 PurpleMediaManagerPrivate *priv;
60 }; 60 };
61 61
62 GType purple_media_manager_get_type(void); 62 GType purple_media_manager_get_type(void);
63 PurpleMediaManager *purple_media_manager_get(void); 63 PurpleMediaManager *purple_media_manager_get(void);
64
65 PurpleMedia *purple_media_manager_create_media(PurpleMediaManager *manager, 64 PurpleMedia *purple_media_manager_create_media(PurpleMediaManager *manager,
66 PurpleConnection *gc, 65 PurpleConnection *gc,
67 const char *screenname, 66 const char *conference_type,
68 FarsightStream *audio_stream, 67 const char *remote_user);
69 FarsightStream *video_stream);
70 68
71 G_END_DECLS 69 G_END_DECLS
72 70
73 #endif /* USE_FARSIGHT */ 71 #endif /* USE_FARSIGHT */
74 72