Changeset 4288:8346a61bd6a5 in roaraudio
- Timestamp:
- 08/29/10 01:20:06 (14 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- roard
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/streams.c
r4286 r4288 1951 1951 } 1952 1952 1953 streams_ltm_calc(id, &(s->info), ip, (ROAR_OUTPUT_BUFFER_SAMPLES*g_sa->channels*g_sa->bits)/8); 1954 1953 1955 if ( !is_the_same ) { 1954 1956 if ( roar_conv(obuf, ip, ROAR_OUTPUT_BUFFER_SAMPLES*g_sa->channels, g_sa, &(s->info)) == -1 ) { -
roard/waveform.c
r3811 r4288 67 67 } 68 68 69 if ( !need_vol_change(ROAR_STREAM(g_waveform_mixer.ss)->info.channels, &(g_waveform_mixer.ss->mixer)) ) 70 return 0; 69 if ( need_vol_change(ROAR_STREAM(g_waveform_mixer.ss)->info.channels, &(g_waveform_mixer.ss->mixer)) ) { 70 roar_amp_pcm(g_output_buffer, g_sa->bits, g_output_buffer, 71 ROAR_OUTPUT_BUFFER_SAMPLES*g_sa->channels, g_sa->channels, 72 &(g_waveform_mixer.ss->mixer)); 73 } 71 74 72 roar_amp_pcm(g_output_buffer, g_sa->bits, g_output_buffer, 73 ROAR_OUTPUT_BUFFER_SAMPLES*g_sa->channels, g_sa->channels, 74 &(g_waveform_mixer.ss->mixer)); 75 streams_ltm_calc(g_waveform_mixer.stream, &(ROAR_STREAM(g_waveform_mixer.ss)->info), g_output_buffer, (g_sa->bits*ROAR_OUTPUT_BUFFER_SAMPLES*g_sa->channels)/8); 75 76 76 77 return 0;
Note: See TracChangeset
for help on using the changeset viewer.