Changeset 4360:d6ef435d3a07 in roaraudio


Ignore:
Timestamp:
09/14/10 14:38:45 (14 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

wrote some basic infrastructure

Location:
roard
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • roard/hwmixer.c

    r4359 r4360  
    2626#include "roard.h" 
    2727 
     28void print_hwmixerlist (void) { 
     29 printf("  Source   Flag Subsys - Description (devices)\n"); 
     30 printf("------------------------------------------------------\n"); 
     31} 
     32 
     33int hwmixer_open(int basestream, char * drv, char * dev, int fh, char * basename, char * subnames) { 
     34 return -1; 
     35} 
     36 
    2837//ll 
  • roard/include/hwmixer.h

    r4359 r4360  
    2929#include <roaraudio.h> 
    3030 
     31void print_hwmixerlist (void); 
     32int hwmixer_open(int basestream, char * drv, char * dev, int fh, char * basename, char * subnames); 
     33 
    3134#endif 
    3235 
  • roard/roard.c

    r4358 r4360  
    11901190#ifndef ROAR_WITHOUT_DCOMP_MIXER 
    11911191int add_hwmixer (char * drv, char * dev, char * opts, int prim, int count) { 
    1192  return -1; 
     1192 int basestream = streams_new(); 
     1193 int ret; 
     1194//int hwmixer_open(int basestream, char * drv, char * dev, int fh, char * basename, char * subnames) { 
     1195 
     1196 if ( prim ) { 
     1197  streams_mark_primary(basestream); 
     1198 } 
     1199 
     1200 ret = hwmixer_open(basestream, drv, dev, -1, NULL, NULL); 
     1201 
     1202 if ( ret == -1 ) { 
     1203  streams_delete(basestream); 
     1204 } 
     1205 
     1206 return ret == -1 ? -1 : 0; 
    11931207} 
    11941208#endif 
     
    18171831   return 1; 
    18181832#endif 
     1833  } else if ( strcmp(k, "--list-mixers") == 0 ) { 
     1834#ifndef ROAR_WITHOUT_DCOMP_MIXER 
     1835   print_hwmixerlist(); 
     1836   return 0; 
     1837#else 
     1838   ROAR_ERR("main(*): No support for mixer compiled in"); 
     1839   return 1; 
     1840#endif 
    18191841 
    18201842  } else if ( strcmp(k, "--light-channels") == 0 ) { 
Note: See TracChangeset for help on using the changeset viewer.