X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fstream_output%2Fstream_output.h;h=1e481511bcf606e4bfd97571d8c3a1a059a4dc4c;hb=becdb0b044fee3a5d10513d75e74ffb92075d235;hp=01b98592193b1a63a9b28163ea324475b7598540;hpb=23333fe28c426f606e9027ae2d30e4b14a245365;p=vlc

diff --git a/src/stream_output/stream_output.h b/src/stream_output/stream_output.h
index 01b9859219..1e481511bc 100644
--- a/src/stream_output/stream_output.h
+++ b/src/stream_output/stream_output.h
@@ -1,29 +1,34 @@
 /*****************************************************************************
  * stream_output.h : internal stream output
  *****************************************************************************
- * Copyright (C) 2002-2005 the VideoLAN team
- * $Id: stream_output.h 16916 2006-10-01 16:08:37Z dionoea $
+ * Copyright (C) 2002-2005 VLC authors and VideoLAN
+ * $Id$
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Laurent Aimar <fenrir@via.ecp.fr>
  *          Eric Petit <titer@videolan.org>
  *          Jean-Paul Saman <jpsaman #_at_# m2x.nl>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. ***************************************************************************/
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ ***************************************************************************/
 
-#include <vlc_sout.h>
+#ifndef VLC_SRC_STREAMOUT_H
+# define VLC_SRC_STREAMOUT_H 1
+
+# include <vlc_sout.h>
+# include <vlc_network.h>
 
 /****************************************************************************
  * sout_packetizer_input_t: p_sout <-> p_packetizer
@@ -34,84 +39,15 @@ struct sout_packetizer_input_t
 
     es_format_t         *p_fmt;
 
-    sout_stream_id_t    *id;
-};
-
-#define sout_NewInstance(a,b) __sout_NewInstance(VLC_OBJECT(a),b)
-VLC_EXPORT( sout_instance_t *,  __sout_NewInstance,  ( vlc_object_t *, char * ) );
-VLC_EXPORT( void,               sout_DeleteInstance, ( sout_instance_t * ) );
-
-VLC_EXPORT( sout_packetizer_input_t *, sout_InputNew,( sout_instance_t *, es_format_t * ) );
-VLC_EXPORT( int,                sout_InputDelete,      ( sout_packetizer_input_t * ) );
-VLC_EXPORT( int,                sout_InputSendBuffer,  ( sout_packetizer_input_t *, block_t* ) );
-
-/* Announce system */
-
-/* The SAP handler, running in a separate thread */
-struct sap_handler_t
-{
-    VLC_COMMON_MEMBERS /* needed to create a thread */
-
-    sap_session_t **pp_sessions;
-    sap_address_t **pp_addresses;
-
-    vlc_bool_t b_control;
-
-    int i_sessions;
-    int i_addresses;
-
-    int i_current_session;
-
-    int (*pf_add)  ( sap_handler_t*, session_descriptor_t *);
-    int (*pf_del)  ( sap_handler_t*, session_descriptor_t *);
-
-    /* private data, not in p_sys as there is one kind of sap_handler_t */
+    sout_stream_id_sys_t    *id;
 };
 
-struct session_descriptor_t
-{
-    char *psz_name;
-    char *psz_group;
-
-    char *description;
-    char *url; // meta URL for SAP, potentially real URL for other cases
-    char *email;
-    char *phone;
-
-    struct sockaddr_storage orig;
-    socklen_t origlen;
-    struct sockaddr_storage addr;
-    socklen_t addrlen;
-
-    char *sdpformat; // format suitable for SDP
-    char *psz_sdp;
-    vlc_bool_t b_ssm;
-};
-
-/* The main announce handler object */
-struct announce_handler_t
-{
-    VLC_COMMON_MEMBERS
-
-    sap_handler_t *p_sap;
-};
-
-#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 );
+sout_instance_t *sout_NewInstance( vlc_object_t *, const char * );
+#define sout_NewInstance(a,b) sout_NewInstance(VLC_OBJECT(a),b)
+void sout_DeleteInstance( sout_instance_t * );
 
-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);
+sout_packetizer_input_t *sout_InputNew( sout_instance_t *, es_format_t * );
+int sout_InputDelete( sout_packetizer_input_t * );
+int sout_InputSendBuffer( sout_packetizer_input_t *, block_t* );
 
+#endif