Revision 2e526a15 server/src/AudioPlayerLibAO.cpp
| server/src/AudioPlayerLibAO.cpp | ||
|---|---|---|
| 52 | 52 |
|
| 53 | 53 |
|
| 54 | 54 |
//this will return once we start playing |
| 55 |
void AudioPlayerLibAO::play(AudioData audio){
|
|
| 55 |
void AudioPlayerLibAO::play(boost::shared_ptr<AudioData> audio){
|
|
| 56 | 56 |
audio_data = audio; |
| 57 | 57 |
|
| 58 |
printf("> AudioPlayerLibAO: play() %d samples requested\n",(int)audio_data.samples.size());
|
|
| 58 |
printf("> AudioPlayerLibAO: play() %d samples requested\n",(int)audio_data->samples.size());
|
|
| 59 | 59 |
|
| 60 | 60 |
//skip empty audio data |
| 61 |
if (audio_data.samples.size() == 0){
|
|
| 61 |
if (audio_data->samples.size() == 0){
|
|
| 62 | 62 |
printf("> warning: empty audio data - skipped.\n");
|
| 63 | 63 |
return; |
| 64 | 64 |
} |
| ... | ... | |
| 82 | 82 |
} |
| 83 | 83 |
|
| 84 | 84 |
|
| 85 |
ao_sample_format AudioPlayerLibAO::extract_ao_format(AudioData audio){
|
|
| 85 |
ao_sample_format AudioPlayerLibAO::extract_ao_format(boost::shared_ptr<AudioData> audio){
|
|
| 86 | 86 |
ao_sample_format ao_format; |
| 87 | 87 |
|
| 88 | 88 |
//get bits per sample |
| 89 |
ao_format.bits = audio.sample_bit;
|
|
| 89 |
ao_format.bits = audio->sample_bit;
|
|
| 90 | 90 |
//bitrate |
| 91 |
ao_format.rate = audio.sample_rate;
|
|
| 91 |
ao_format.rate = audio->sample_rate;
|
|
| 92 | 92 |
//endianess |
| 93 |
ao_format.byte_format = audio.sample_big_endian?AO_FMT_BIG:AO_FMT_LITTLE;
|
|
| 93 |
ao_format.byte_format = audio->sample_big_endian?AO_FMT_BIG:AO_FMT_LITTLE;
|
|
| 94 | 94 |
//number of channels |
| 95 |
ao_format.channels = audio.sample_channels;
|
|
| 95 |
ao_format.channels = audio->sample_channels;
|
|
| 96 | 96 |
|
| 97 | 97 |
//format matrix: |
| 98 | 98 |
if (ao_format.channels == 1){
|
| ... | ... | |
| 156 | 156 |
playback_state = PLAYING; |
| 157 | 157 |
playback_active = true; |
| 158 | 158 |
|
| 159 |
ao_play(device, audio_data.samples.data(), audio_data.samples.size());
|
|
| 159 |
ao_play(device, audio_data->samples.data(), audio_data->samples.size());
|
|
| 160 | 160 |
printf("> AudioPlayer: finished playback\n");
|
| 161 | 161 |
} |
| 162 | 162 |
break; |
Also available in: Unified diff