diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-03-26 13:35:41 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-03-26 13:35:41 +0300 |
| commit | 828c85a1bf6045dc76d1197635a4b71d897206c3 (patch) | |
| tree | 5c297f307a2139425e8cb4824ccf898994ecfd71 /source/blender/blenloader | |
| parent | d97b97460ca9a28027041e5666dbfeb3a5295155 (diff) | |
sound module: Append functions with BKE (makes it easier to make them
out from local functions)
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 8 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/versioning_250.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 639ee646a67..b8c3bffae0f 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5333,7 +5333,7 @@ static void lib_link_scene(FileData *fd, Main *main) if (seq->scene) { seq->scene = newlibadr(fd, sce->id.lib, seq->scene); if (seq->scene) { - seq->scene_sound = sound_scene_add_scene_sound_defaults(sce, seq); + seq->scene_sound = BKE_sound_scene_add_scene_sound_defaults(sce, seq); } } if (seq->clip) { @@ -5361,7 +5361,7 @@ static void lib_link_scene(FileData *fd, Main *main) } if (seq->sound) { seq->sound->id.us++; - seq->scene_sound = sound_add_scene_sound_defaults(sce, seq); + seq->scene_sound = BKE_sound_add_scene_sound_defaults(sce, seq); } } seq->anim = NULL; @@ -5536,7 +5536,7 @@ static void direct_link_scene(FileData *fd, Scene *sce) sce->customdata_mask_modal = 0; sce->lay_updated = 0; - sound_create_scene(sce); + BKE_sound_create_scene(sce); /* set users to one by default, not in lib-link, this will increase it for compo nodes */ sce->id.us = 1; @@ -6963,7 +6963,7 @@ static void lib_link_sound(FileData *fd, Main *main) sound->id.flag -= LIB_NEED_LINK; sound->ipo = newlibadr_us(fd, sound->id.lib, sound->ipo); // XXX deprecated - old animation system - sound_load(main, sound); + BKE_sound_load(main, sound); } } } diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c index 7c148f1a2e9..2094aeb1485 100644 --- a/source/blender/blenloader/intern/versioning_250.c +++ b/source/blender/blenloader/intern/versioning_250.c @@ -795,7 +795,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *main) char str[FILE_MAX]; BLI_join_dirfile(str, sizeof(str), seq->strip->dir, seq->strip->stripdata->name); BLI_path_abs(str, main->name); - seq->sound = sound_new_file(main, str); + seq->sound = BKE_sound_new_file(main, str); } #define SEQ_USE_PROXY_CUSTOM_DIR (1 << 19) #define SEQ_USE_PROXY_CUSTOM_FILE (1 << 21) |