diff options
| -rw-r--r-- | source/blender/blenkernel/BKE_sound.h | 6 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/sound.c | 6 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/writeffmpeg.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenkernel/BKE_sound.h b/source/blender/blenkernel/BKE_sound.h index 3570751165c..d3919a3a6c0 100644 --- a/source/blender/blenkernel/BKE_sound.h +++ b/source/blender/blenkernel/BKE_sound.h @@ -62,9 +62,9 @@ struct bSound *BKE_sound_new_file(struct Main *main, const char *filename); // XXX unused currently #if 0 -struct bSound *sound_new_buffer(struct Main *bmain, struct bSound *source); +struct bSound *BKE_sound_new_buffer(struct Main *bmain, struct bSound *source); -struct bSound *sound_new_limiter(struct Main *bmain, struct bSound *source, float start, float end); +struct bSound *BKE_sound_new_limiter(struct Main *bmain, struct bSound *source, float start, float end); #endif void BKE_sound_delete(struct Main *bmain, struct bSound *sound); @@ -78,7 +78,7 @@ void BKE_sound_load(struct Main *main, struct bSound *sound); void BKE_sound_free(struct bSound *sound); #ifdef __AUD_C_API_H__ -AUD_Device *sound_mixdown(struct Scene *scene, AUD_DeviceSpecs specs, int start, float volume); +AUD_Device *BKE_sound_mixdown(struct Scene *scene, AUD_DeviceSpecs specs, int start, float volume); #endif void BKE_sound_create_scene(struct Scene *scene); diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index cc0d0bdcfcc..89be80e5328 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -231,7 +231,7 @@ void BKE_sound_exit_once(void) /* XXX unused currently */ #if 0 -bSound *sound_new_buffer(struct Main *bmain, bSound *source) +bSound *BKE_sound_new_buffer(struct Main *bmain, bSound *source) { bSound *sound = NULL; @@ -255,7 +255,7 @@ bSound *sound_new_buffer(struct Main *bmain, bSound *source) return sound; } -bSound *sound_new_limiter(struct Main *bmain, bSound *source, float start, float end) +bSound *BKE_sound_new_limiter(struct Main *bmain, bSound *source, float start, float end) { bSound *sound = NULL; @@ -386,7 +386,7 @@ void BKE_sound_load(struct Main *bmain, bSound *sound) } } -AUD_Device *sound_mixdown(struct Scene *scene, AUD_DeviceSpecs specs, int start, float volume) +AUD_Device *BKE_sound_mixdown(struct Scene *scene, AUD_DeviceSpecs specs, int start, float volume) { return AUD_openMixdownDevice(specs, scene->sound_scene, volume, start / FPS); } diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index 128a5da9b68..57a4927e149 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -1111,7 +1111,7 @@ int BKE_ffmpeg_start(struct Scene *scene, RenderData *rd, int rectx, int recty, } specs.rate = rd->ffcodecdata.audio_mixrate; - audio_mixdown_device = sound_mixdown(scene, specs, rd->sfra, rd->ffcodecdata.audio_volume); + audio_mixdown_device = BKE_sound_mixdown(scene, specs, rd->sfra, rd->ffcodecdata.audio_volume); #ifdef FFMPEG_CODEC_TIME_BASE c->time_base.den = specs.rate; c->time_base.num = 1; |