Changeset 543

Show
Ignore:
Timestamp:
03/10/01 14:54:48 (13 years ago)
Author:
ucacoxh
Message:

- Import skeleton of documentation set up (a lot of files, not much

content thus far).

- Add toplevel Makefile (just does make, clean, distclean).

- Tweaks to callback typedefs in rtp.h for gtkdoc.

Location:
common/trunk
Files:
44 added
7 modified

Legend:

Unmodified
Added
Removed
  • common/trunk

    • Property svn:ignore
      •  

        old new  
        88.pure 
        99.devel 
         10*.bak 
  • common/trunk/.cvsignore

    r301 r543  
    88.pure 
    99.devel 
     10*.bak 
  • common/trunk/README

    r541 r543  
    11UCL Common Code Library 
    22 
    3 Routines common to a number of multimedia tools. This library is required 
    4 to build RAT v3.2.7 or later, and may be needed for other UCL tools. 
     3Routines common to a number of multimedia tools.  The library 
     4originates from work on the RAT project: these are portions that are 
     5not directly related to an audio tool and potentially useful 
     6elsewhere.   
    57 
    6 To build library on UNIX: 
    7         ./configure 
    8         cd src && gmake  
     8This library is required to build RAT v3.2.7 or later, and may be 
     9needed for other UCL tools. 
    910 
    10 To build library on Win32 open common.dsw and click "build". 
     11-- 
     12Comments and contributions welcome, please email to mm-tools@cs.ucl.ac.uk. 
  • common/trunk/configure

    r538 r543  
    23842384ac_given_srcdir=$srcdir 
    23852385 
    2386 trap 'rm -fr `echo "src/Makefile tests/Makefile src/uclconf.h:src/config.h.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 
     2386trap 'rm -fr `echo "Makefile doc/Makefile src/Makefile tests/Makefile src/uclconf.h:src/config.h.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 
    23872387EOF 
    23882388cat >> $CONFIG_STATUS <<EOF 
     
    24662466cat >> $CONFIG_STATUS <<EOF 
    24672467 
    2468 CONFIG_FILES=\${CONFIG_FILES-"src/Makefile tests/Makefile"} 
     2468CONFIG_FILES=\${CONFIG_FILES-"Makefile doc/Makefile src/Makefile tests/Makefile"} 
    24692469EOF 
    24702470cat >> $CONFIG_STATUS <<\EOF 
  • common/trunk/configure.in

    r538 r543  
    239239# Done, create the output files.... 
    240240AC_CONFIG_HEADER(src/uclconf.h:src/config.h.in) 
    241 AC_OUTPUT(src/Makefile tests/Makefile) 
     241AC_OUTPUT(Makefile doc/Makefile src/Makefile tests/Makefile) 
  • common/trunk/src/rtp.c

    r540 r543  
    225225        uint32_t         rtp_bcount; 
    226226        char            *encryption_key; 
    227         rtp_callback    *callback; 
     227        rtp_callback     callback; 
    228228        uint32_t         magic;                         /* For debugging...  */ 
    229229}; 
     
    892892                     uint16_t rx_port, uint16_t tx_port,  
    893893                     int ttl, double rtcp_bw,  
    894                      rtp_callback *callback, 
     894                     rtp_callback callback, 
    895895                     void *userdata) 
    896896{ 
     
    901901                        uint16_t rx_port, uint16_t tx_port,  
    902902                        int ttl, double rtcp_bw,  
    903                         rtp_callback *callback, 
     903                        rtp_callback callback, 
    904904                        void *userdata) 
    905905{ 
     
    10011001 * should not be used otherwise. 
    10021002 * 
    1003  * Returns: TRUE on success, FALSE otherwise.  */ 
    1004  
     1003 * Returns: TRUE on success, FALSE otherwise.   
     1004 */ 
    10051005int rtp_set_my_ssrc(struct rtp *session, uint32_t ssrc) 
    10061006{ 
    10071007        source *s; 
    10081008        uint32_t h; 
    1009         /* Sets my_ssrc when called immediately after rtp_init. */ 
    1010         /* Returns TRUE on success, FALSE otherwise.  Needed to */ 
    1011         /* co-ordinate SSRC's between LAYERED SESSIONS, SHOULD  */ 
    1012         /* NOT BE USED OTHERWISE.                               */ 
     1009 
    10131010        if (session->ssrc_count != 1 && session->sender_count != 0) { 
    10141011                return FALSE; 
     
    21842181 
    21852182static void send_rtcp(struct rtp *session, uint32_t rtp_ts, 
    2186                      rtcp_app_callback *appcallback) 
     2183                     rtcp_app_callback appcallback) 
    21872184{ 
    21882185        /* Construct and send an RTCP packet. The order in which packets are packed into a */ 
     
    22742271 
    22752272void rtp_send_ctrl(struct rtp *session, uint32_t rtp_ts, 
    2276                    rtcp_app_callback *appcallback) 
     2273                   rtcp_app_callback appcallback) 
    22772274{ 
    22782275        /* Send an RTCP packet, if one is due... */ 
  • common/trunk/src/rtp.h

    r540 r543  
    135135} rtcp_app; 
    136136 
    137 typedef rtcp_app* rtcp_app_callback(struct rtp *session, uint32_t rtp_ts, int max_size); 
     137typedef rtcp_app* (*rtcp_app_callback)(struct rtp *session, uint32_t rtp_ts, int max_size); 
    138138 
    139139/* rtp_event type values. */ 
     
    160160} rtp_event; 
    161161 
    162 typedef void rtp_callback(struct rtp *session, rtp_event *e); 
     162typedef void (*rtp_callback)(struct rtp *session, rtp_event *e); 
    163163 
    164164/* RTP options */ 
     
    185185                          uint16_t rx_port, uint16_t tx_port,  
    186186                          int ttl, double rtcp_bw,  
    187                           rtp_callback *callback, 
     187                          rtp_callback callback, 
    188188                          void *user_data); 
    189189struct rtp      *rtp_init_if(const char *addr, char *iface,  
    190190                             uint16_t rx_port, uint16_t tx_port,  
    191191                             int ttl, double rtcp_bw,  
    192                              rtp_callback *callback, 
     192                             rtp_callback callback, 
    193193                             void *user_data); 
    194194 
     
    207207                               char *extn, uint16_t extn_len, uint16_t extn_type); 
    208208void             rtp_send_ctrl(struct rtp *session, uint32_t rtp_ts,  
    209                                rtcp_app_callback *callback); 
     209                               rtcp_app_callback callback); 
    210210void             rtp_update(struct rtp *session); 
    211211