Changeset 4381:3b53768cfddd in roaraudio
- Timestamp:
- 09/14/10 22:44:26 (14 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/roard.c
r4369 r4381 1190 1190 #ifndef ROAR_WITHOUT_DCOMP_MIXER 1191 1191 int add_hwmixer (char * drv, char * dev, char * opts, int prim, int count) { 1192 char * basename = NULL; 1193 char * subnames = NULL; 1194 char * k, * v; 1192 1195 int basestream = streams_new(); 1193 1196 int ret; 1197 int error = 0; 1194 1198 //int hwmixer_open(int basestream, char * drv, char * dev, int fh, char * basename, char * subnames) { 1195 1199 … … 1199 1203 streams_set_client(basestream, g_self_client); 1200 1204 1205 if ( opts == NULL ) { 1206 k = NULL; 1207 } else { 1208 k = strtok(opts, ","); 1209 } 1210 1211 while (k != NULL) { 1212 // ROAR_WARN("add_output(*): opts: %s", k); 1213 1214 if ( (v = strstr(k, "=")) != NULL ) { 1215 *v++ = 0; 1216 } 1217 1218 if ( strcmp(k, "primary") == 0 ) { 1219 prim = 1; 1220 1221 } else if ( strcmp(k, "name") == 0 ) { 1222 basename = v; 1223 } else if ( strcmp(k, "subs") == 0 ) { 1224 subnames = v; 1225 1226 } else if ( strcmp(k, "autoconf") == 0 ) { 1227 streams_set_flag(basestream, ROAR_FLAG_AUTOCONF); 1228 } else if ( strcmp(k, "passmixer") == 0 ) { 1229 streams_set_flag(basestream, ROAR_FLAG_PASSMIXER); 1230 } else { 1231 ROAR_ERR("add_hwmixer(*): unknown option '%s'", k); 1232 error++; 1233 } 1234 1235 if ( error ) { 1236 streams_delete(basestream); 1237 if ( prim ) alive = 0; 1238 return -1; 1239 } 1240 1241 k = strtok(NULL, ","); 1242 } 1243 1201 1244 if ( prim ) { 1202 1245 streams_mark_primary(basestream); 1203 1246 } 1204 1247 1205 ret = hwmixer_open(basestream, drv, dev, -1, NULL, NULL);1248 ret = hwmixer_open(basestream, drv, dev, -1, basename, subnames); 1206 1249 1207 1250 if ( ret == -1 ) {
Note: See TracChangeset
for help on using the changeset viewer.