Use var_Inherit* instead of var_CreateGet*.

[vlc] / src / stream_output / stream_output.h

diff --git a/src/stream_output/stream_output.h b/src/stream_output/stream_output.h
index 073de80334cb63526064b7effff98d4d5cd63d9c..40e5a05bc1df1e85b636d8d252b9a025157ba201 100644 (file)
--- a/src/stream_output/stream_output.h
+++ b/src/stream_output/stream_output.h
@@ -47,36 +47,15 @@ struct sout_packetizer_input_t
 };
 
 #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 * ) );
+sout_instance_t *  __sout_NewInstance( vlc_object_t *, const char * );
+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* ) );
+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* );
 
 /* 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 */
-};
-
 struct session_descriptor_t
 {
     struct sockaddr_storage orig;
@@ -85,20 +64,12 @@ struct session_descriptor_t
     socklen_t addrlen;
 
     char *psz_sdp;
-    vlc_bool_t b_ssm;
+    bool b_ssm;
 };
 
-/* The main announce handler object */
-struct announce_handler_t
-{
-    VLC_COMMON_MEMBERS
-
-    sap_handler_t *p_sap;
-};
-
-int announce_HandlerDestroy( announce_handler_t * );
-
-/* Release it with vlc_object_release() */
-sap_handler_t *announce_SAPHandlerCreate( announce_handler_t *p_announce );
+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 *);
 
 #endif