Fix the most common strerror() usages (threads, network, input) - refs #1297

[vlc] / src / stream_output / stream_output.h

diff --git a/src/stream_output/stream_output.h b/src/stream_output/stream_output.h
index 41129d7deecc5d223ffa3f8f7575f81ab588910b..d91db30f47c0a4b2c79423780c2b6cf0f95bf712 100644 (file)
--- a/src/stream_output/stream_output.h
+++ b/src/stream_output/stream_output.h
@@ -21,9 +21,14 @@
  *
  * 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. ***************************************************************************/
+ * 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
@@ -70,23 +75,12 @@ struct sap_handler_t
 
 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;
 
-    int i_payload;   /* SAP Payload type */
-
     char *psz_sdp;
-    vlc_bool_t b_rtp;
     vlc_bool_t b_ssm;
 };
 
@@ -98,22 +92,9 @@ struct announce_handler_t
     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 );
 
-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);
-
+#endif