-#define announce_HandlerCreate(a) __announce_HandlerCreate(VLC_OBJECT(a))
-announce_handler_t* __announce_HandlerCreate( vlc_object_t *);
-
-/* Private functions for the announce handler */
-int announce_HandlerDestroy( announce_handler_t * );
-int announce_Register( announce_handler_t *p_announce,
- session_descriptor_t *p_session,
- announce_method_t *p_method );
-int announce_UnRegister( announce_handler_t *p_announce,
- session_descriptor_t *p_session );
-
-sap_handler_t *announce_SAPHandlerCreate( announce_handler_t *p_announce );
-void announce_SAPHandlerDestroy( sap_handler_t *p_sap );
-
-#include <stdarg.h>
-
-char *StartSDP (const char *name, const char *description, const char *url,
- const char *email, const char *phone,
- const struct sockaddr *orig, socklen_t origlen,
- const struct sockaddr *addr, socklen_t addrlen);
-
-char *vAddSDPMedia (char **sdp, const char *type, int dport, const char *prot,
- unsigned pt, const char *rtpmap,
- const char *fmtpfmt, va_list ap);
-char *AddSDPMedia (char **sdp, const char *type, int dport, const char *proto,
- unsigned pt, const char *rtpmap, const char *fmtpfmt, ...);
+struct sap_handler_t *SAP_Create (vlc_object_t *);
+void SAP_Destroy (struct sap_handler_t *);
+int SAP_Add (struct sap_handler_t *, session_descriptor_t *);
+void SAP_Del (struct sap_handler_t *, const session_descriptor_t *);