* change hotkeys OSD message from 0-100% to 0-400%

[vlc] / include / stream_output.h

diff --git a/include/stream_output.h b/include/stream_output.h
index 5be60619d1e7d476fa4a348a41c71b45dd02b441..846fd7e6ff1f4fd23bb883c03422342616194fe9 100644 (file)
--- a/include/stream_output.h
+++ b/include/stream_output.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * stream_output.h : stream output module
  *****************************************************************************
- * Copyright (C) 2002 VideoLAN
+ * Copyright (C) 2002 the VideoLAN team
  * $Id$
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -245,6 +245,8 @@ struct session_descriptor_t
     int i_ttl;
     int i_payload;   /* SAP Payload type */
 
+    char *psz_group;
+
     sap_session_t *p_sap; /* If we have a sap session, remember it */
     char *psz_sdp;
 };
@@ -257,44 +259,16 @@ struct announce_method_t
     int i_type;
 
     /* For SAP */
-    int i_ip_version;
-    char *psz_ipv6_scope;
     char *psz_address; /* If we use a custom address */
 };
 
 
-/* SAP Specific structures */
-
-/* 100ms */
-#define SAP_IDLE ((mtime_t)(0.100*CLOCK_FREQ))
-#define SAP_MAX_BUFFER 65534
-#define MIN_INTERVAL 2
-#define MAX_INTERVAL 300
-
-/* A SAP announce address. For each of these, we run the
- * control flow algorithm */
-struct sap_address_t
-{
-    char *psz_address;
-    int i_port;
-    int i_rfd; /* Read socket */
-    int i_wfd; /* Write socket */
-
-    /* Used for flow control */
-    mtime_t t1;
-    vlc_bool_t b_enabled;
-    vlc_bool_t b_ready;
-    int i_interval;
-    int i_buff;
-    int i_limit;
-};
-
 /* A SAP session descriptor, enqueued in the SAP handler queue */
 struct sap_session_t
 {
     char          *psz_sdp;
-    char          *psz_data;
-    int            i_length;
+    uint8_t       *psz_data;
+    unsigned      i_length;
     sap_address_t *p_address;
 
     /* Last and next send */
@@ -319,6 +293,9 @@ struct sap_handler_t
 
     int (*pf_add)  ( sap_handler_t*, session_descriptor_t *,announce_method_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 */
+    vlc_iconv_t iconvHandle;
 };
 
 /* The main announce handler object */
@@ -362,7 +339,7 @@ VLC_EXPORT( int,                sout_AnnounceRegister, (sout_instance_t *,sessio
 VLC_EXPORT(session_descriptor_t*,sout_AnnounceRegisterSDP, (sout_instance_t *,char *, announce_method_t* ) );
 VLC_EXPORT( int,                sout_AnnounceUnRegister, (sout_instance_t *,session_descriptor_t* ) );
 
-VLC_EXPORT(session_descriptor_t*,sout_AnnounceSessionCreate, () );
+VLC_EXPORT(session_descriptor_t*,sout_AnnounceSessionCreate, (void) );
 VLC_EXPORT(void,                 sout_AnnounceSessionDestroy, (session_descriptor_t *) );
 VLC_EXPORT(announce_method_t*,   sout_AnnounceMethodCreate, (int) );