Changeset 4516:f2314a12d62a in roaraudio for include


Ignore:
Timestamp:
10/16/10 15:31:48 (14 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

removed the public struct define of struct roar_buffer

Location:
include/libroar
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • include/libroar/buffer.h

    r3764 r4516  
    4747#define ROAR_BUFFER_RESET                   1 
    4848 
    49 struct roar_buffer_ring { 
    50  size_t read_pos; 
    51  size_t write_pos; 
     49struct roar_buffer; 
     50 
     51struct roar_buffer_stats { 
     52 size_t parts; 
     53 size_t bytes; 
     54 size_t memory_usage; 
    5255}; 
    5356 
    54 struct roar_buffer { 
    55  size_t               len; 
    56  size_t               user_len; 
    57  int                  flags; 
    58  void               * data; 
    59  void               * user_data; 
    60  union { 
    61   void                    * vp; 
    62   int32_t                   i32; 
    63   struct roar_buffer_ring   ring; 
    64  }                    meta; 
    65  struct roar_buffer * next; 
    66 }; 
     57#define roar_buffer_next(a)    roar_buffer_delete(*(a), (a)) 
    6758 
    68 struct roar_buffer_stats { 
    69  int parts; 
    70  int bytes; 
    71  int memory_usage; 
    72 }; 
     59#define roar_buffer_new(a,len) roar_buffer_new_data((a), (len), NULL) 
    7360 
    74 #define roar_buffer_next(a) roar_buffer_delete(*(a), (a)) 
    75  
    76 int roar_buffer_new      (struct roar_buffer ** buf, size_t len); 
    7761int roar_buffer_new_no_ma(struct roar_buffer ** buf, size_t len, void * data); // no internal malloc 
    7862int roar_buffer_free     (struct roar_buffer *  buf); 
    … …  
    8468int roar_buffer_ring_new (struct roar_buffer ** buf, size_t len, int free_running); 
    8569 
    86 int roar_buffer_get_next (struct roar_buffer *  buf, struct roar_buffer ** next); 
     70int roar_buffer_clear_next (struct roar_buffer *  buf); 
     71int roar_buffer_get_next   (struct roar_buffer *  buf, struct roar_buffer ** next); 
    8772 
    8873int roar_buffer_get_data (struct roar_buffer *  buf, void   ** data); 

  • include/libroar/vio_magic.h

    r3811 r4516  
    4040 
    4141struct roar_vio_magic { 
    42  struct roar_buffer inp; 
    43  struct roar_stack  vios; 
     42 struct roar_buffer * inp; 
     43 struct roar_stack    vios; 
    4444}; 
    4545 
Note: See TracChangeset for help on using the changeset viewer.