Changeset 5289:ddb3677af4d0 in roaraudio for include


Ignore:
Timestamp:
11/22/11 14:47:44 (12 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

use support to set mixer ID up at least one API layer

Location:
include/libroar
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • include/libroar/cdrom.h

    r5241 r5289  
    5252 int fh; 
    5353 int stream; 
     54 int mixer; 
    5455 pid_t player; 
    5556 char device[ROAR_CDROM_MAX_DEVLEN]; 
    … …  
    6364}; 
    6465 
    65 int roar_cdrom_open (struct roar_connection * con, struct roar_cdrom * cdrom, const char * device); 
     66int roar_cdrom_open (struct roar_connection * con, struct roar_cdrom * cdrom, const char * device, int mixer); 
    6667int roar_cdrom_close(struct roar_cdrom * cdrom); 
    6768int roar_cdrom_stop (struct roar_cdrom * cdrom); 

  • include/libroar/simple.h

    r5226 r5289  
    4242int roar_simple_connect2(struct roar_connection * con, const char * server, const char * name, int flags, uint_least32_t timeout); 
    4343 
    44 int roar_simple_stream_obj  (struct roar_stream * s, int rate, int channels, int bits, int codec, const char * server, int dir, const char * name) _LIBROAR_ATTR_DEPRECATED; 
     44int roar_simple_new_stream_attachexeced_obj (struct roar_connection * con, struct roar_stream * s, uint32_t rate, uint32_t channels, uint32_t bits, uint32_t codec, int dir, int mixer); 
    4545 
    46 int roar_simple_new_stream_attachexeced_obj (struct roar_connection * con, struct roar_stream * s, int rate, int channels, int bits, int codec, int dir); 
    47  
    48 int roar_simple_new_stream_obj (struct roar_connection * con, struct roar_stream * s, int rate, int channels, int bits, int codec, int dir) _LIBROAR_ATTR_DEPRECATED; 
     46int roar_simple_new_stream_obj (struct roar_connection * con, struct roar_stream * s, uint32_t rate, uint32_t channels, uint32_t bits, uint32_t codec, int dir, int mixer) _LIBROAR_ATTR_DEPRECATED; 
    4947 
    5048int roar_simple_play_file(const char * file, const char * server, const char * name); 

  • include/libroar/vio.h

    r5278 r5289  
    8787int     roar_vio_open_socket_listen(struct roar_vio_calls * calls, int type, const char * host, int port) _LIBROAR_ATTR_USE_RESULT _LIBROAR_ATTR_NONNULL_ALL; 
    8888 
    89 int     roar_vio_simple_stream (struct roar_vio_calls * calls, int rate, int channels, int bits, int codec, 
    90                                                                const char * server, int dir, const char * name); 
     89int     roar_vio_simple_stream (struct roar_vio_calls * calls, 
     90                                uint32_t rate, uint32_t channels, uint32_t bits, uint32_t codec, 
     91                                const char * server, int dir, const char * name, int mixer); 
    9192 
    9293int     roar_vio_simple_new_stream_obj (struct roar_vio_calls * calls, 
    9394                                        struct roar_connection * con, 
    9495                                        struct roar_stream * s, 
    95                                         int rate, int channels, int bits, int codec, int dir); 
     96                                        uint32_t rate, uint32_t channels, uint32_t bits, uint32_t codec, 
     97                                        int dir, int mixer); 
    9698 
    9799// possible VIOs: 
Note: See TracChangeset for help on using the changeset viewer.