[BACK]Return to sndio.h CVS log [TXT][DIR] Up to [local] / src / include

Diff for /src/include/sndio.h between version 1.9 and 1.10

version 1.9, 2015/12/20 11:29:29 version 1.10, 2020/02/26 13:53:58
Line 26 
Line 26 
 #define MIO_PORTANY     "default"  #define MIO_PORTANY     "default"
   
 /*  /*
    * limits
    */
   #define SIOCTL_NAMEMAX          12      /* max name length */
   
   /*
  * private ``handle'' structure   * private ``handle'' structure
  */   */
 struct sio_hdl;  struct sio_hdl;
 struct mio_hdl;  struct mio_hdl;
   struct sioctl_hdl;
   
 /*  /*
  * parameters of a full-duplex stream   * parameters of a full-duplex stream
Line 85 
Line 91 
 #define SIO_XSTRINGS { "ignore", "sync", "error" }  #define SIO_XSTRINGS { "ignore", "sync", "error" }
   
 /*  /*
    * controlled component of the device
    */
   struct sioctl_node {
           char name[SIOCTL_NAMEMAX];      /* ex. "spkr" */
           int unit;                       /* optional number or -1 */
   };
   
   /*
    * description of a control (index, value) pair
    */
   struct sioctl_desc {
           unsigned int addr;              /* control address */
   #define SIOCTL_NONE             0       /* deleted */
   #define SIOCTL_NUM              2       /* integer in the 0..127 range */
   #define SIOCTL_SW               3       /* on/off switch (0 or 1) */
   #define SIOCTL_VEC              4       /* number, element of vector */
   #define SIOCTL_LIST             5       /* switch, element of a list */
           unsigned int type;              /* one of above */
           char func[SIOCTL_NAMEMAX];      /* function name, ex. "level" */
           char group[SIOCTL_NAMEMAX];     /* group this control belongs to */
           struct sioctl_node node0;       /* affected node */
           struct sioctl_node node1;       /* dito for SIOCTL_{VEC,LIST} */
           unsigned int maxval;            /* max value for SIOCTL_{NUM,VEC} */
           int __pad[3];
   };
   
   /*
  * mode bitmap   * mode bitmap
  */   */
 #define SIO_PLAY        1  #define SIO_PLAY        1
 #define SIO_REC         2  #define SIO_REC         2
 #define MIO_OUT         4  #define MIO_OUT         4
 #define MIO_IN          8  #define MIO_IN          8
   #define SIOCTL_READ     0x100
   #define SIOCTL_WRITE    0x200
   
 /*  /*
  * default bytes per sample for the given bits per sample   * default bytes per sample for the given bits per sample
Line 144 
Line 179 
 int mio_revents(struct mio_hdl *, struct pollfd *);  int mio_revents(struct mio_hdl *, struct pollfd *);
 int mio_eof(struct mio_hdl *);  int mio_eof(struct mio_hdl *);
   
   struct sioctl_hdl *sioctl_open(const char *, unsigned int, int);
   void sioctl_close(struct sioctl_hdl *);
   int sioctl_ondesc(struct sioctl_hdl *,
       void (*)(void *, struct sioctl_desc *, int), void *);
   int sioctl_onval(struct sioctl_hdl *,
       void (*)(void *, unsigned int, unsigned int), void *);
   int sioctl_setval(struct sioctl_hdl *, unsigned int, unsigned int);
   int sioctl_nfds(struct sioctl_hdl *);
   int sioctl_pollfd(struct sioctl_hdl *, struct pollfd *, int);
   int sioctl_revents(struct sioctl_hdl *, struct pollfd *);
   int sioctl_eof(struct sioctl_hdl *);
   
 int mio_rmidi_getfd(const char *, unsigned int, int);  int mio_rmidi_getfd(const char *, unsigned int, int);
 struct mio_hdl *mio_rmidi_fdopen(int, unsigned int, int);  struct mio_hdl *mio_rmidi_fdopen(int, unsigned int, int);
 int sio_sun_getfd(const char *, unsigned int, int);  int sio_sun_getfd(const char *, unsigned int, int);
 struct sio_hdl *sio_sun_fdopen(int, unsigned int, int);  struct sio_hdl *sio_sun_fdopen(int, unsigned int, int);
   int sioctl_sun_getfd(const char *, unsigned int, int);
   struct sioctl_hdl *sioctl_sun_fdopen(int, unsigned int, int);
   
 #ifdef __cplusplus  #ifdef __cplusplus
 }  }

Legend:
Removed from v.1.9  
changed lines
  Added in v.1.10