[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22770] branches/blender2.5/blender: Replaced G.sce by Main.name in sound.c.

[Joerg Mueller]

Revision: 22770
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22770
Author:   nexyon
Date:     2009-08-25 17:30:04 +0200 (Tue, 25 Aug 2009)

Log Message:
-----------
Replaced G.sce by Main.name in sound.c.
I hoped for it to resolve the bug of loading sounds with relative paths didn't work, but Main.name isn't set before the sounds are loaded, so the bug resists!
Someone who is into file loading should please fix this!

Modified Paths:
--------------
    branches/blender2.5/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
    branches/blender2.5/blender/source/blender/blenkernel/BKE_sound.h
    branches/blender2.5/blender/source/blender/blenkernel/intern/packedFile.c
    branches/blender2.5/blender/source/blender/blenkernel/intern/sound.c
    branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c

Modified: branches/blender2.5/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
===================================================================
--- branches/blender2.5/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp	2009-08-25 14:26:27 UTC (rev 22769)
+++ branches/blender2.5/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp	2009-08-25 15:30:04 UTC (rev 22770)
@@ -334,7 +334,6 @@
 	// read packages and decode them
 	AVPacket packet;
 	int data_size = 0;
-	int pkgbuf_size = m_pkgbuf->getSize();
 	int pkgbuf_pos;
 	int left = length;
 	int sample_size = AUD_SAMPLE_SIZE(m_specs);

Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_sound.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_sound.h	2009-08-25 14:26:27 UTC (rev 22769)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_sound.h	2009-08-25 15:30:04 UTC (rev 22770)
@@ -54,7 +54,7 @@
 
 void sound_cache(struct bSound* sound, int ignore);
 
-void sound_load(struct bSound* sound);
+void sound_load(struct Main *main, struct bSound* sound);
 
 void sound_free(struct bSound* sound);
 

Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/packedFile.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/packedFile.c	2009-08-25 14:26:27 UTC (rev 22769)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/packedFile.c	2009-08-25 15:30:04 UTC (rev 22770)
@@ -473,7 +473,7 @@
 			freePackedFile(sound->packedfile);
 			sound->packedfile = 0;
 
-			sound_load(sound);
+			sound_load(NULL, sound);
 
 			ret_value = RET_OK;
 		}

Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/sound.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/sound.c	2009-08-25 14:26:27 UTC (rev 22769)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/sound.c	2009-08-25 15:30:04 UTC (rev 22770)
@@ -78,7 +78,7 @@
 	int len;
 
 	strcpy(str, filename);
-	BLI_convertstringcode(str, G.sce);
+	BLI_convertstringcode(str, main->name);
 
 	len = strlen(filename);
 	while(len > 0 && filename[len-1] != '/' && filename[len-1] != '\\')
@@ -88,7 +88,7 @@
 	strcpy(sound->name, filename);
 	sound->type = SOUND_TYPE_FILE;
 
-	sound_load(sound);
+	sound_load(main, sound);
 
 	if(!sound->snd_sound)
 	{
@@ -114,7 +114,7 @@
 	sound->child_sound = source;
 	sound->type = SOUND_TYPE_BUFFER;
 
-	sound_load(sound);
+	sound_load(CTX_data_main(C), sound);
 
 	if(!sound->snd_sound)
 	{
@@ -140,7 +140,7 @@
 	sound->end = end;
 	sound->type = SOUND_TYPE_LIMITER;
 
-	sound_load(sound);
+	sound_load(CTX_data_main(C), sound);
 
 	if(!sound->snd_sound)
 	{
@@ -172,7 +172,7 @@
 	sound->cache = AUD_bufferSound(sound->snd_sound);
 }
 
-void sound_load(struct bSound* sound)
+void sound_load(struct Main *main, struct bSound* sound)
 {
 	if(sound)
 	{
@@ -198,7 +198,7 @@
 			if(sound->id.lib)
 				path = sound->id.lib->filename;
 			else
-				path = G.sce;
+				path = main ? main->name : NULL;
 
 			BLI_convertstringcode(fullpath, path);
 

Modified: branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c	2009-08-25 14:26:27 UTC (rev 22769)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c	2009-08-25 15:30:04 UTC (rev 22770)
@@ -5075,7 +5075,7 @@
 			sound->ipo= newlibadr_us(fd, sound->id.lib, sound->ipo); // XXX depreceated - old animation system
 			sound->stream = 0;
 
-			sound_load(sound);
+			sound_load(main, sound);
 		}
 		sound= sound->id.next;
 	}