Changeset 4365:7502b11fcb8a in roaraudio
- Timestamp:
- 09/14/10 18:02:43 (14 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- roard
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/hwmixer.c
r4363 r4365 153 153 } 154 154 155 int hwmixer_set_volume(int id, struct roar_stream_server * ss, struct hwmixer_stream * mstream, struct roar_mixer_settings * 156 settings) { 157 if ( mstream->hwmixer->set_vol != NULL ) 158 return mstream->hwmixer->set_vol(mstream, ROAR_STREAM(ss)->info.channels, HWMIXER_MODE_SET, settings); 159 160 return 0; 161 } 162 155 163 //ll -
roard/include/hwmixer.h
r4363 r4365 29 29 #include <roaraudio.h> 30 30 31 #define HWMIXER_MODE_SET 1 32 31 33 struct hwmixer; 32 34 … … 43 45 int hwmixer_close(int stream); 44 46 47 int hwmixer_set_volume(int id, struct roar_stream_server * ss, struct hwmixer_stream * mstream, struct roar_mixer_settings * settings); 48 45 49 // Mixers: 46 50 -
roard/streams.c
r4361 r4365 1000 1000 return 0; 1001 1001 1002 if ( ss->driver_id == -1 ) 1003 return 0; 1004 1005 return driver_set_volume(id, &(ss->mixer)); 1002 if ( ss->driver_id != -1 ) { 1003 return driver_set_volume(id, &(ss->mixer)); 1004 } else if ( ss->mixerstream != NULL ) { 1005 return hwmixer_set_volume(id, ss, ss->mixerstream, &(ss->mixer)); 1006 } else { 1007 return 0; 1008 } 1006 1009 } 1007 1010
Note: See TracChangeset
for help on using the changeset viewer.