archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Missed those last commit

Browse Source
This commit is contained in:
Antonis Ryakiotakis
2015-03-26 11:39:08 +01:00
parent 828c85a1bf
commit dc3b869c9a
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/BKE_sound.h
View File

@@ -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);

6
source/blender/blenkernel/intern/sound.c
View File

@@ -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);
}

2
source/blender/blenkernel/intern/writeffmpeg.c
View File

@@ -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;