Commit: 828c85a1bf6045dc76d1197635a4b71d897206c3
Author: Antony Riakiotakis
Date: Thu Mar 26 11:35:41 2015 +0100
Branches: master
https://developer.blender.org/rB828c85a1bf6045dc76d1197635a4b71d897206c3
sound module: Append functions with BKE (makes it easier to make them
out from local functions)
===================================================================
M intern/audaspace/intern/AUD_C-API.cpp
M source/blender/blenkernel/BKE_sound.h
M source/blender/blenkernel/intern/blender.c
M source/blender/blenkernel/intern/packedFile.c
M source/blender/blenkernel/intern/scene.c
M source/blender/blenkernel/intern/sequencer.c
M source/blender/blenkernel/intern/sound.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_250.c
M source/blender/editors/animation/anim_ops.c
M source/blender/editors/screen/screen_ops.c
M source/blender/editors/sound/sound_ops.c
M source/blender/editors/space_clip/clip_ops.c
M source/blender/editors/space_clip/tracking_ops.c
M source/blender/editors/space_graph/graph_ops.c
M source/blender/editors/space_image/image_ops.c
M source/blender/editors/space_sequencer/sequencer_add.c
M source/blender/editors/space_sequencer/sequencer_edit.c
M source/blender/editors/space_sequencer/sequencer_preview.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/makesrna/intern/rna_sequencer.c
M source/blender/makesrna/intern/rna_sequencer_api.c
M source/blender/makesrna/intern/rna_sound.c
M source/blender/makesrna/intern/rna_userdef.c
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/intern/wm_files.c
M source/blender/windowmanager/intern/wm_init_exit.c
M source/creator/creator.c
M source/gameengine/GamePlayer/ghost/GPG_Application.cpp
M source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
===================================================================
diff --git a/intern/audaspace/intern/AUD_C-API.cpp
b/intern/audaspace/intern/AUD_C-API.cpp
index 45d72cc..78b9279 100644
--- a/intern/audaspace/intern/AUD_C-API.cpp
+++ b/intern/audaspace/intern/AUD_C-API.cpp
@@ -222,7 +222,7 @@ static PyMethodDef meth_getcdevice[] = {
};
extern "C" {
-extern void *sound_get_factory(void *sound);
+extern void *BKE_sound_get_factory(void *sound);
}
static PyObject *AUD_getSoundFromPointer(PyObject *self, PyObject *args)
@@ -231,7 +231,7 @@ static PyObject *AUD_getSoundFromPointer(PyObject *self,
PyObject *args)
if (PyArg_Parse(args, "l:_sound_from_pointer", &lptr)) {
if (lptr) {
- boost::shared_ptr<AUD_IFactory>* factory =
(boost::shared_ptr<AUD_IFactory>*) sound_get_factory((void *) lptr);
+ boost::shared_ptr<AUD_IFactory>* factory =
(boost::shared_ptr<AUD_IFactory>*) BKE_sound_get_factory((void *) lptr);
if (factory) {
Factory *obj = (Factory *)Factory_empty();
diff --git a/source/blender/blenkernel/BKE_sound.h
b/source/blender/blenkernel/BKE_sound.h
index a4182b8..3570751 100644
--- a/source/blender/blenkernel/BKE_sound.h
+++ b/source/blender/blenkernel/BKE_sound.h
@@ -46,19 +46,19 @@ typedef struct SoundWaveform {
float *data;
} SoundWaveform;
-void sound_init_once(void);
-void sound_exit_once(void);
+void BKE_sound_init_once(void);
+void BKE_sound_exit_once(void);
-void sound_init(struct Main *main);
+void BKE_sound_init(struct Main *main);
-void sound_init_main(struct Main *bmain);
+void BKE_sound_init_main(struct Main *bmain);
-void sound_exit(void);
+void BKE_sound_exit(void);
-void sound_force_device(int device);
-int sound_define_from_str(const char *str);
+void BKE_sound_force_device(int device);
+int BKE_sound_define_from_str(const char *str);
-struct bSound *sound_new_file(struct Main *main, const char *filename);
+struct bSound *BKE_sound_new_file(struct Main *main, const char *filename);
// XXX unused currently
#if 0
@@ -67,13 +67,13 @@ struct bSound *sound_new_buffer(struct Main *bmain, struct
bSound *source);
struct bSound *sound_new_limiter(struct Main *bmain, struct bSound *source,
float start, float end);
#endif
-void sound_delete(struct Main *bmain, struct bSound *sound);
+void BKE_sound_delete(struct Main *bmain, struct bSound *sound);
-void sound_cache(struct bSound *sound);
+void BKE_sound_cache(struct bSound *sound);
-void sound_delete_cache(struct bSound *sound);
+void BKE_sound_delete_cache(struct bSound *sound);
-void sound_load(struct Main *main, struct bSound *sound);
+void BKE_sound_load(struct Main *main, struct bSound *sound);
void BKE_sound_free(struct bSound *sound);
@@ -81,63 +81,63 @@ void BKE_sound_free(struct bSound *sound);
AUD_Device *sound_mixdown(struct Scene *scene, AUD_DeviceSpecs specs, int
start, float volume);
#endif
-void sound_create_scene(struct Scene *scene);
+void BKE_sound_create_scene(struct Scene *scene);
-void sound_destroy_scene(struct Scene *scene);
+void BKE_sound_destroy_scene(struct Scene *scene);
-void sound_mute_scene(struct Scene *scene, int muted);
+void BKE_sound_mute_scene(struct Scene *scene, int muted);
-void sound_update_fps(struct Scene *scene);
+void BKE_sound_update_fps(struct Scene *scene);
-void sound_update_scene_listener(struct Scene *scene);
+void BKE_sound_update_scene_listener(struct Scene *scene);
-void *sound_scene_add_scene_sound(struct Scene *scene, struct Sequence
*sequence, int startframe, int endframe, int frameskip);
-void *sound_scene_add_scene_sound_defaults(struct Scene *scene, struct
Sequence *sequence);
+void *BKE_sound_scene_add_scene_sound(struct Scene *scene, struct Sequence
*sequence, int startframe, int endframe, int frameskip);
+void *BKE_sound_scene_add_scene_sound_defaults(struct Scene *scene, struct
Sequence *sequence);
-void *sound_add_scene_sound(struct Scene *scene, struct Sequence *sequence,
int startframe, int endframe, int frameskip);
-void *sound_add_scene_sound_defaults(struct Scene *scene, struct Sequence
*sequence);
+void *BKE_sound_add_scene_sound(struct Scene *scene, struct Sequence
*sequence, int startframe, int endframe, int frameskip);
+void *BKE_sound_add_scene_sound_defaults(struct Scene *scene, struct Sequence
*sequence);
-void sound_remove_scene_sound(struct Scene *scene, void *handle);
+void BKE_sound_remove_scene_sound(struct Scene *scene, void *handle);
-void sound_mute_scene_sound(void *handle, char mute);
+void BKE_sound_mute_scene_sound(void *handle, char mute);
-void sound_move_scene_sound(struct Scene *scene, void *handle, int startframe,
int endframe, int frameskip);
-void sound_move_scene_sound_defaults(struct Scene *scene, struct Sequence
*sequence);
+void BKE_sound_move_scene_sound(struct Scene *scene, void *handle, int
startframe, int endframe, int frameskip);
+void BKE_sound_move_scene_sound_defaults(struct Scene *scene, struct Sequence
*sequence);
-void sound_update_scene_sound(void *handle, struct bSound *sound);
+void BKE_sound_update_scene_sound(void *handle, struct bSound *sound);
-void sound_set_cfra(int cfra);
+void BKE_sound_set_cfra(int cfra);
-void sound_set_scene_volume(struct Scene *scene, float volume);
+void BKE_sound_set_scene_volume(struct Scene *scene, float volume);
-void sound_set_scene_sound_volume(void *handle, float volume, char animated);
+void BKE_sound_set_scene_sound_volume(void *handle, float volume, char
animated);
-void sound_set_scene_sound_pitch(void *handle, float pitch, char animated);
+void BKE_sound_set_scene_sound_pitch(void *handle, float pitch, char animated);
-void sound_set_scene_sound_pan(void *handle, float pan, char animated);
+void BKE_sound_set_scene_sound_pan(void *handle, float pan, char animated);
-void sound_update_sequencer(struct Main *main, struct bSound *sound);
+void BKE_sound_update_sequencer(struct Main *main, struct bSound *sound);
-void sound_play_scene(struct Scene *scene);
+void BKE_sound_play_scene(struct Scene *scene);
-void sound_stop_scene(struct Scene *scene);
+void BKE_sound_stop_scene(struct Scene *scene);
-void sound_seek_scene(struct Main *bmain, struct Scene *scene);
+void BKE_sound_seek_scene(struct Main *bmain, struct Scene *scene);
-float sound_sync_scene(struct Scene *scene);
+float BKE_sound_sync_scene(struct Scene *scene);
-int sound_scene_playing(struct Scene *scene);
+int BKE_sound_scene_playing(struct Scene *scene);
-void sound_free_waveform(struct bSound *sound);
+void BKE_sound_free_waveform(struct bSound *sound);
-void sound_read_waveform(struct bSound *sound, short *stop);
+void BKE_sound_read_waveform(struct bSound *sound, short *stop);
-void sound_update_scene(struct Main *bmain, struct Scene *scene);
+void BKE_sound_update_scene(struct Main *bmain, struct Scene *scene);
-void *sound_get_factory(void *sound);
+void *BKE_sound_get_factory(void *sound);
-float sound_get_length(struct bSound *sound);
+float BKE_sound_get_length(struct bSound *sound);
-bool sound_is_jack_supported(void);
+bool BKE_sound_is_jack_supported(void);
#endif /* __BKE_SOUND_H__ */
diff --git a/source/blender/blenkernel/intern/blender.c
b/source/blender/blenkernel/intern/blender.c
index b6ea780..c7b3065 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -305,7 +305,7 @@ static void setup_app_data(bContext *C, BlendFileData *bfd,
const char *filepath
CTX_data_main_set(C, G.main);
- sound_init_main(G.main);
+ BKE_sound_init_main(G.main);
if (bfd->user) {
diff --git a/source/blender/blenkernel/intern/packedFile.c
b/source/blender/blenkernel/intern/packedFile.c
index 8d56b12..9b429b3 100644
--- a/source/blender/blenkernel/intern/packedFile.c
+++ b/source/blender/blenkernel/intern/packedFile.c
@@ -553,7 +553,7 @@ int unpackSound(Main *bmain, ReportList *reports, bSound
*sound, int how)
freePackedFile(sound->packedfile);
sound->packedfile = NULL;
- sound_load(bmain, sound);
+ BKE_sound_load(bmain, sound);
ret_value = RET_OK;
}
diff --git a/source/blender/blenkernel/intern/scene.c
b/source/blender/blenkernel/intern/scene.c
index d2c3f47..f51dadf 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -293,7 +293,7 @@ Scene *BKE_scene_copy(Scene *sce, int type)
}
/* before scene copy */
- sound_create_scene(scen);
+ BKE_sound_create_scene(scen);
/* world */
if (type == SCE_COPY_FULL) {
@@ -426,7 +426,7 @@ void BKE_scene_free(Scene *sce)
if (sce->fps_info)
MEM_freeN(sce->fps_info);
- sound_destroy_scene(sce);
+ BKE_sound_destroy_scene(sce);
BKE_color_managed_view_settings_free(&sce->view_settings);
}
@@ -682,7 +682,7 @@ Scene *BKE_scene_add(Main *bmain, const char *name)
sce->gm.exitkey = 218; // Blender key code for ESC
- sound_create_scene(sce);
+ BKE_sound_create_scene(sce);
/* color management */
colorspace_name =
IMB_colormanagement_role_colorspace_name_get(COLOR_ROLE_DEFAULT_SEQUENCER);
@@ -1690,7 +1690,7 @@ void BKE_scene_update_tagged(EvaluationContext *eval_ctx,
Main *bmain, Scene *sc
* only objects and scenes. - brecht */
scene_update_tagged_recursive(eval_ctx, bmain, scene, scene);
/* update sound system animation (TODO, move to depsgraph) */
- sound_update_scene(bmain, scene);
+ BKE_sound_update_scene(bmain, scene);
/* extra call here to recalc scene animation (for sequencer) */
{
@@ -1769,7 +1769,7 @@ void BKE_scene_update_for_newframe_ex(EvaluationContext
*eval_ctx, Main *bmain,
*/
scene_rebuild_rbw_recursive(sce, ctime);
- sound_set_cfra(sce->r.cfra);
+ BKE_sound_set_cfra(sce->r.cfra);
/* clear animation overrides */
/* XXX TODO... */
@@ -1814,7 +1814,7 @@ void BKE_scene_update_for_newframe_ex(EvaluationContext
*eval_ctx, Main *bmain,
/* BKE_object_handle_update() on all objects, groups and sets */
scene_update_tagged_recursive(eval_ctx, bmain, sce, sce);
/* update sound system animation (TODO, move to depsgraph) */
- sound_update_scene(bmain, sce);
+ BKE_sound_update_scene(bmain, sce);
scene_depsgraph_hack(eval_ctx, sce, sce);
diff --git a/source/blender/blenkernel/intern/sequencer.c
b/source/blender/blenkernel/intern/sequencer.c
index eb7736f..6fa39e8 100644
--- a/source/blender
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
