diff options
author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-09-15 22:01:18 +0400 |
---|---|---|
committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-09-15 22:01:18 +0400 |
commit | 816377cc02fe5dd4be945c0f3d415861114b4980 (patch) | |
tree | 306e9d1363aa66bc919e43b80b3380fab9f60ea9 /source/blender/makesrna/intern/rna_sound.c | |
parent | c8af263e5d8d9d41a757e8438cdcf3b64d57e0c0 (diff) | |
parent | ee768ada680ce0a8aa184c882005c0ef1c0140fb (diff) |
Undo revision 23130 which was a merge with 2.5, a messy one because I did something wrong (`svn status` output: http://www.pasteall.org/7887).soc-2009-kazanbas
The command: svn merge -r 23130:23129 https://svn.blender.org/svnroot/bf-blender/branches/soc-2009-kazanbas
Diffstat (limited to 'source/blender/makesrna/intern/rna_sound.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_sound.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/source/blender/makesrna/intern/rna_sound.c b/source/blender/makesrna/intern/rna_sound.c index 38e4d850c68..a029ef85544 100644 --- a/source/blender/makesrna/intern/rna_sound.c +++ b/source/blender/makesrna/intern/rna_sound.c @@ -34,29 +34,6 @@ #ifdef RNA_RUNTIME -#include "BKE_sound.h" -#include "BKE_context.h" - -static void rna_Sound_filename_update(bContext *C, PointerRNA *ptr) -{ - sound_load(CTX_data_main(C), (bSound*)ptr->data); -} - -static int rna_Sound_caching_get(PointerRNA *ptr) -{ - bSound *sound = (bSound*)(ptr->data); - return sound->cache != NULL; -} - -static void rna_Sound_caching_set(PointerRNA *ptr, const int value) -{ - bSound *sound = (bSound*)(ptr->data); - if(value) - sound_cache(sound, 0); - else - sound_delete_cache(sound); -} - #else static void rna_def_sound(BlenderRNA *brna) @@ -74,16 +51,10 @@ static void rna_def_sound(BlenderRNA *brna) prop= RNA_def_property(srna, "filename", PROP_STRING, PROP_FILEPATH); RNA_def_property_string_sdna(prop, NULL, "name"); RNA_def_property_ui_text(prop, "Filename", "Sound sample file used by this Sound datablock."); - RNA_def_property_update(prop, 0, "rna_Sound_filename_update"); prop= RNA_def_property(srna, "packed_file", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "packedfile"); RNA_def_property_ui_text(prop, "Packed File", ""); - - prop= RNA_def_property(srna, "caching", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_funcs(prop, "rna_Sound_caching_get", "rna_Sound_caching_set"); - RNA_def_property_ui_text(prop, "Caching", "The sound file is decoded and loaded into RAM."); - RNA_def_property_update(prop, 0, "rna_Sound_filename_update"); } void RNA_def_sound(BlenderRNA *brna) |