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/windowmanager | |
| parent | d97b97460ca9a28027041e5666dbfeb3a5295155 (diff) | |
sound module: Append functions with BKE (makes it easier to make them
out from local functions)
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 4 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index f1a46826435..e8004297011 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -2223,7 +2223,7 @@ void wm_event_do_handlers(bContext *C) Scene *scene = win->screen->scene; if (scene) { - int is_playing_sound = sound_scene_playing(win->screen->scene); + int is_playing_sound = BKE_sound_scene_playing(win->screen->scene); if (is_playing_sound != -1) { bool is_playing_screen; @@ -2240,7 +2240,7 @@ void wm_event_do_handlers(bContext *C) } if (is_playing_sound == 0) { - const float time = sound_sync_scene(scene); + const float time = BKE_sound_sync_scene(scene); if (finite(time)) { int ncfra = time * (float)FPS + 0.5f; if (ncfra != scene->r.cfra) { diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index f5a7ad164d6..697a798ed3c 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -301,7 +301,7 @@ static void wm_init_userdef(bContext *C, const bool from_memory) UI_init_userdef(); MEM_CacheLimiter_set_maximum(((size_t)U.memcachelimit) * 1024 * 1024); - sound_init(bmain); + BKE_sound_init(bmain); /* needed so loading a file from the command line respects user-pref [#26156] */ BKE_BIT_TEST_SET(G.fileflags, U.flag & USER_FILENOUI, G_FILE_NO_UI); diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 32a49b6e160..f1f73563dec 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -328,7 +328,7 @@ bool WM_init_game(bContext *C) WM_operator_name_call(C, "VIEW3D_OT_game_start", WM_OP_EXEC_DEFAULT, NULL); - sound_exit(); + BKE_sound_exit(); return true; } @@ -398,7 +398,7 @@ void WM_exit_ext(bContext *C, const bool do_python) { wmWindowManager *wm = C ? CTX_wm_manager(C) : NULL; - sound_exit(); + BKE_sound_exit(); /* first wrap up running stuff, we assume only the active WM is running */ /* modal handlers are on window level freed, others too? */ |