griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Reverting Cam's audio code changes from revision 32517. Part of it has been reverted by Nathan already. Cam: next time please check, why a parameter is unused before you remove it!

Browse Source
This commit is contained in:
Joerg Mueller
2010-10-17 09:01:37 +00:00
parent 856389eac7
commit d6d1f3cb68
6 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,7 +62,7 @@ void sound_cache(struct bSound* sound, int ignore);
void sound_delete_cache(struct bSound* sound);
void sound_load(struct bSound* sound);
void sound_load(struct Main *main, struct bSound* sound);
void sound_free(struct bSound* sound);

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

@@ -486,7 +486,7 @@ int unpackSound(ReportList *reports, bSound *sound, int how)
freePackedFile(sound->packedfile);
sound->packedfile = 0;
sound_load(sound);
sound_load(NULL, sound);
ret_value = RET_OK;
}

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

@@ -143,7 +143,7 @@ struct bSound* sound_new_file(struct Main *bmain, char* filename)
BLI_strncpy(sound->name, filename, FILE_MAX);
// XXX unused currently sound->type = SOUND_TYPE_FILE;
sound_load(sound);
sound_load(bmain, sound);
if(!sound->playback_handle)
{
@@ -169,7 +169,7 @@ struct bSound* sound_new_buffer(struct bContext *C, struct bSound *source)
sound->child_sound = source;
sound->type = SOUND_TYPE_BUFFER;
sound_load(sound);
sound_load(CTX_data_main(C), sound);
if(!sound->playback_handle)
{
@@ -195,7 +195,7 @@ struct bSound* sound_new_limiter(struct bContext *C, struct bSound *source, floa
sound->end = end;
sound->type = SOUND_TYPE_LIMITER;
sound_load(sound);
sound_load(CTX_data_main(C), sound);
if(!sound->playback_handle)
{
@@ -236,7 +236,7 @@ void sound_delete_cache(struct bSound* sound)
}
}
void sound_load(struct bSound* sound)
void sound_load(struct Main *UNUSED(bmain), struct bSound* sound)
{
if(sound)
{
@@ -266,6 +266,7 @@ void sound_load(struct bSound* sound)
if(sound->id.lib)
path = sound->id.lib->filepath;
else
// XXX this should be fixed!
path = /*bmain ? bmain->name :*/ G.sce;
BLI_path_abs(fullpath, path);

2
source/blender/blenloader/intern/readfile.c
View File

@@ -5308,7 +5308,7 @@ static void lib_link_sound(FileData *fd, Main *main)
sound->id.flag -= LIB_NEEDLINK;
sound->ipo= newlibadr_us(fd, sound->id.lib, sound->ipo); // XXX depreceated - old animation system
sound_load(sound);
sound_load(main, sound);
if(sound->cache)
sound_cache(sound, 1);

2
source/blender/editors/sound/sound_ops.c
View File

@@ -180,7 +180,7 @@ static int pack_exec(bContext *C, wmOperator *op)
return OPERATOR_CANCELLED;
sound->packedfile= newPackedFile(op->reports, sound->name);
sound_load(sound);
sound_load(CTX_data_main(C), sound);
return OPERATOR_FINISHED;
}

2
source/blender/makesrna/intern/rna_sound.c
View File

@@ -38,7 +38,7 @@
static void rna_Sound_filepath_update(Main *bmain, Scene *scene, PointerRNA *ptr)
{
sound_load((bSound*)ptr->data);
sound_load(bmain, (bSound*)ptr->data);
}
static int rna_Sound_caching_get(PointerRNA *ptr)