Changeset 4363:e90f4a304e99 in roaraudio


Ignore:
Timestamp:
09/14/10 17:52:08 (14 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

move things to where they should be

Location:
roard
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • roard/hwmixer.c

    r4361 r4363  
    2929#define FLAG_FHSEC    0x0001 
    3030 
    31 struct hwmixer; 
    32  
    33 struct hwmixer_stream { 
    34  struct hwmixer * hwmixer; 
    35  int basestream; 
    36  int stream; 
    37  void * baseud; 
    38  void * ud; 
    39 }; 
    40  
    4131struct hwmixer { 
    4232 const char * name; 
    … …  
    5545 {"oss",  "OSS Mixer", "/dev/mixer*", FLAG_FHSEC, NULL, NULL, NULL, NULL}, 
    5646 {"file", "Write to plain file", "/some/file", FLAG_FHSEC, NULL, NULL, NULL, NULL}, 
    57  {"dstr", "Write to DSTR",       "/some/file", FLAG_NONE,  NULL, NULL, NULL, NULL}, 
     47 {"dstr", "Write to DSTR",       "/some/file", FLAG_NONE,  hwmixer_dstr_open, hwmixer_dstr_close, hwmixer_dstr_set_vol, NULL}, 
    5848 {"null", "Null Mixer",          NULL, FLAG_NONE,  __true, __true, __true, __true}, 
    5949 {NULL,   NULL, NULL, FLAG_NONE, NULL, NULL, NULL, NULL} 
    … …  
    135125 } 
    136126 
     127 hwmixer_setup_info(stream); 
     128 
    137129 ret = mixer->open(stream, drv, dev, fh, basename, subnamekv, subnamekvlen); 
    138130 
    … …  
    141133  return -1; 
    142134 } 
    143  
    144  hwmixer_setup_info(stream); 
    145135 
    146136 streams_set_mixerstream(basestream, stream); 

  • roard/include/hwmixer.h

    r4362 r4363  
    2929#include <roaraudio.h> 
    3030 
    31 struct hwmixer_stream; 
     31struct hwmixer; 
     32 
     33struct hwmixer_stream { 
     34 struct hwmixer * hwmixer; 
     35 int basestream; 
     36 int stream; 
     37 void * baseud; 
     38 void * ud; 
     39}; 
    3240 
    3341void print_hwmixerlist (void); 
Note: See TracChangeset for help on using the changeset viewer.