Changeset 5109:4f9fc788fe91 in roaraudio for include/libroar/ctl.h


Ignore:
Timestamp:
07/28/11 16:32:34 (13 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

Started to use compiler attributes (Also see: #130)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • include/libroar/ctl.h

    r4740 r5109  
    3939#include "libroar.h" 
    4040 
    41 int roar_get_clientid  (struct roar_connection * con); 
     41#define _LIBROAR_CTL_STDATTRS _LIBROAR_ATTR_USE_RESULT _LIBROAR_ATTR_NONNULL_ALL 
    4242 
    43 int roar_get_standby   (struct roar_connection * con); 
    44 int roar_set_standby   (struct roar_connection * con, int state); 
     43int roar_get_clientid  (struct roar_connection * con) _LIBROAR_CTL_STDATTRS; 
    4544 
    46 int roar_exit           (struct roar_connection * con); 
    47 int roar_terminate      (struct roar_connection * con, int terminate); 
    48 int roar_server_oinfo   (struct roar_connection * con, struct roar_stream * s); 
    49 int roar_server_oinfo2  (struct roar_connection * con, struct roar_stream * s, int dir); 
     45int roar_get_standby   (struct roar_connection * con) _LIBROAR_CTL_STDATTRS; 
     46int roar_set_standby   (struct roar_connection * con, int state) _LIBROAR_CTL_STDATTRS; 
     47 
     48int roar_exit           (struct roar_connection * con) _LIBROAR_CTL_STDATTRS _LIBROAR_ATTR_DEPRECATED; 
     49int roar_terminate      (struct roar_connection * con, int terminate) _LIBROAR_CTL_STDATTRS; 
     50int roar_server_oinfo   (struct roar_connection * con, struct roar_stream * s) _LIBROAR_CTL_STDATTRS _LIBROAR_ATTR_DEPRECATED; 
     51int roar_server_oinfo2  (struct roar_connection * con, struct roar_stream * s, int dir) _LIBROAR_CTL_STDATTRS; 
    5052 
    5153 
    52 int roar_list         (struct roar_connection * con, int * items,   int max, int cmd); 
    53 int roar_list_filtered(struct roar_connection * con, int * items,   int max, int cmd, unsigned char filter, unsigned char cmp, uint32_t id); 
     54int roar_list         (struct roar_connection * con, int * items,   int max, int cmd) _LIBROAR_CTL_STDATTRS; 
     55int roar_list_filtered(struct roar_connection * con, int * items,   int max, int cmd, unsigned char filter, unsigned char cmp, uint32_t id) _LIBROAR_CTL_STDATTRS; 
    5456 
    5557/* 
    … …  
    6062#define roar_list_streams(c,i,m) roar_list((c),(i),(m),ROAR_CMD_LIST_STREAMS) 
    6163 
    62 int roar_get_client   (struct roar_connection * con, struct roar_client * client, int id); 
    63 int roar_get_stream   (struct roar_connection * con, struct roar_stream * stream, int id); 
     64int roar_get_client   (struct roar_connection * con, struct roar_client * client, int id) _LIBROAR_CTL_STDATTRS; 
     65int roar_get_stream   (struct roar_connection * con, struct roar_stream * stream, int id) _LIBROAR_CTL_STDATTRS; 
    6466 
    65 int roar_kick         (struct roar_connection * con, int type, int id); 
     67int roar_kick         (struct roar_connection * con, int type, int id) _LIBROAR_CTL_STDATTRS; 
    6668 
    67 int roar_set_vol      (struct roar_connection * con, int id, struct roar_mixer_settings * mixer, int   channels); 
    68 int roar_set_vol2     (struct roar_connection * con, int id, struct roar_mixer_settings * mixer, int   channels, int mode); 
    69 int roar_get_vol      (struct roar_connection * con, int id, struct roar_mixer_settings * mixer, int * channels); 
     69int roar_set_vol      (struct roar_connection * con, int id, struct roar_mixer_settings * mixer, int   channels) _LIBROAR_CTL_STDATTRS _LIBROAR_ATTR_DEPRECATED; 
     70int roar_set_vol2     (struct roar_connection * con, int id, struct roar_mixer_settings * mixer, int   channels, int mode) _LIBROAR_CTL_STDATTRS; 
     71int roar_get_vol      (struct roar_connection * con, int id, struct roar_mixer_settings * mixer, int * channels) _LIBROAR_CTL_STDATTRS; 
    7072 
    7173// filter... 
    … …  
    7476#define roar_ctl_f2m_any(m) roar_ctl_f2m((m), ROAR_CTL_FILTER_ANY, ROAR_CTL_FILTER_ANY, ROAR_CTL_FILTER_ANY) 
    7577 
    76 int roar_filter_match (const unsigned cmp, const uint32_t a, const uint32_t b); 
     78int roar_filter_match (const unsigned cmp, const uint32_t a, const uint32_t b) _LIBROAR_ATTR_USE_RESULT _LIBROAR_ATTR_PURE; 
    7779 
    7880// int array 
    … …  
    8486int roar_ctl_m2c      (struct roar_message * m, struct roar_client * c); 
    8587 
    86 int    roar_str2proto (char * proto); 
    87 char * roar_proto2str (int    proto); 
     88int    roar_str2proto (char * proto) _LIBROAR_ATTR_USE_RESULT _LIBROAR_ATTR_PURE; 
     89char * roar_proto2str (int    proto) _LIBROAR_ATTR_USE_RESULT _LIBROAR_ATTR_PURE; 
    8890 
    89 int    roar_str2byteorder (char * byteorder); 
    90 char * roar_byteorder2str (int    byteorder); 
     91int    roar_str2byteorder (char * byteorder) _LIBROAR_ATTR_USE_RESULT _LIBROAR_ATTR_PURE; 
     92char * roar_byteorder2str (int    byteorder) _LIBROAR_ATTR_USE_RESULT _LIBROAR_ATTR_PURE; 
    9193 
    92 int    roar_str2ot        (const char * ot); 
    93 const char * roar_ot2str  (const int    ot); 
     94int    roar_str2ot        (const char * ot) _LIBROAR_ATTR_USE_RESULT _LIBROAR_ATTR_PURE; 
     95const char * roar_ot2str  (const int    ot) _LIBROAR_ATTR_USE_RESULT _LIBROAR_ATTR_PURE; 
    9496 
    95 int roar_conv_volume (struct roar_mixer_settings * dst, struct roar_mixer_settings * src, int dstchans, int srcchans); 
     97int roar_conv_volume (struct roar_mixer_settings * dst, struct roar_mixer_settings * src, int dstchans, int srcchans) _LIBROAR_CTL_STDATTRS; 
    9698 
    9799#endif 
Note: See TracChangeset for help on using the changeset viewer.