Revision: 22262
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22262
Author: nexyon
Date: 2009-08-06 15:40:44 +0200 (Thu, 06 Aug 2009)
Log Message:
-----------
Code cleanup for the merge.
Modified Paths:
--------------
branches/soundsystem/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/soundsystem/source/blender/blenkernel/BKE_packedFile.h
branches/soundsystem/source/blender/blenkernel/BKE_sequence.h
branches/soundsystem/source/blender/blenkernel/BKE_sound.h
branches/soundsystem/source/blender/blenkernel/intern/blender.c
branches/soundsystem/source/blender/blenkernel/intern/library.c
branches/soundsystem/source/blender/blenkernel/intern/packedFile.c
branches/soundsystem/source/blender/blenkernel/intern/sequence.c
branches/soundsystem/source/blender/blenkernel/intern/sound.c
branches/soundsystem/source/blender/blenkernel/intern/writeffmpeg.c
branches/soundsystem/source/blender/blenlib/intern/bpath.c
branches/soundsystem/source/blender/blenloader/intern/readfile.c
branches/soundsystem/source/blender/blenloader/intern/writefile.c
branches/soundsystem/source/blender/editors/animation/anim_ops.c
branches/soundsystem/source/blender/editors/screen/screen_ops.c
branches/soundsystem/source/blender/editors/space_outliner/outliner.c
branches/soundsystem/source/blender/editors/space_sequencer/sequencer_add.c
branches/soundsystem/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soundsystem/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soundsystem/source/blender/editors/space_sequencer/sequencer_select.c
branches/soundsystem/source/blender/makesdna/DNA_actuator_types.h
branches/soundsystem/source/blender/makesdna/DNA_scene_types.h
branches/soundsystem/source/blender/makesdna/DNA_sequence_types.h
branches/soundsystem/source/blender/makesdna/DNA_sound_types.h
branches/soundsystem/source/blender/makesrna/intern/rna_sequence.c
branches/soundsystem/source/blender/makesrna/intern/rna_sound.c
branches/soundsystem/source/blender/makesrna/intern/rna_userdef.c
branches/soundsystem/source/blender/windowmanager/intern/wm_init_exit.c
branches/soundsystem/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soundsystem/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soundsystem/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soundsystem/source/gameengine/Ketsji/KX_CDActuator.cpp
branches/soundsystem/source/gameengine/Ketsji/KX_CDActuator.h
branches/soundsystem/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soundsystem/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/soundsystem/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soundsystem/source/gameengine/Ketsji/KX_Scene.cpp
branches/soundsystem/source/gameengine/Ketsji/KX_Scene.h
branches/soundsystem/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/soundsystem/source/gameengine/Ketsji/KX_SoundActuator.h
Modified: branches/soundsystem/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
===================================================================
--- branches/soundsystem/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
2009-08-06 13:30:23 UTC (rev 22261)
+++ branches/soundsystem/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
2009-08-06 13:40:44 UTC (rev 22262)
@@ -38,6 +38,8 @@
#include <unistd.h>
#endif
+#define AUD_OPENAL_CYCLE_BUFFERS 3
+
/// Saves the data for playback.
struct AUD_OpenALHandle : AUD_Handle
{
@@ -57,7 +59,7 @@
ALuint source;
/// OpenAL buffers.
- ALuint buffers[3];
+ ALuint buffers[AUD_OPENAL_CYCLE_BUFFERS];
/// The first buffer to be read next.
int current;
@@ -193,7 +195,8 @@
break;
}
- sound->current =
(sound->current+1) % 3;
+ sound->current =
(sound->current+1) %
+
AUD_OPENAL_CYCLE_BUFFERS;
}
else
break;
@@ -325,7 +328,7 @@
if(!sound->isBuffered)
{
delete sound->reader; AUD_DELETE("reader")
- alDeleteBuffers(3, sound->buffers);
+ alDeleteBuffers(AUD_OPENAL_CYCLE_BUFFERS,
sound->buffers);
}
delete sound; AUD_DELETE("handle")
m_playingSounds->erase(m_playingSounds->begin());
@@ -339,7 +342,7 @@
if(!sound->isBuffered)
{
delete sound->reader; AUD_DELETE("reader")
- alDeleteBuffers(3, sound->buffers);
+ alDeleteBuffers(AUD_OPENAL_CYCLE_BUFFERS,
sound->buffers);
}
delete sound; AUD_DELETE("handle")
m_pausedSounds->erase(m_pausedSounds->begin());
@@ -615,7 +618,7 @@
// OpenAL playback code
try
{
- alGenBuffers(3, sound->buffers);
+ alGenBuffers(AUD_OPENAL_CYCLE_BUFFERS, sound->buffers);
if(alGetError() != AL_NO_ERROR)
AUD_THROW(AUD_ERROR_OPENAL);
@@ -624,7 +627,7 @@
sample_t* buf;
int length;
- for(int i=0; i<3; i++)
+ for(int i = 0; i < AUD_OPENAL_CYCLE_BUFFERS; i++)
{
length = m_buffersize;
reader->read(length, buf);
@@ -640,7 +643,8 @@
try
{
- alSourceQueueBuffers(sound->source, 3,
sound->buffers);
+ alSourceQueueBuffers(sound->source,
AUD_OPENAL_CYCLE_BUFFERS,
+
sound->buffers);
if(alGetError() != AL_NO_ERROR)
AUD_THROW(AUD_ERROR_OPENAL);
}
@@ -652,7 +656,7 @@
}
catch(AUD_Exception e)
{
- alDeleteBuffers(3, sound->buffers);
+ alDeleteBuffers(AUD_OPENAL_CYCLE_BUFFERS,
sound->buffers);
throw;
}
}
@@ -734,7 +738,7 @@
if(!sound->isBuffered)
{
delete sound->reader; AUD_DELETE("reader")
- alDeleteBuffers(3, sound->buffers);
+ alDeleteBuffers(AUD_OPENAL_CYCLE_BUFFERS,
sound->buffers);
}
delete *i; AUD_DELETE("handle")
m_playingSounds->erase(i);
@@ -752,7 +756,7 @@
if(!sound->isBuffered)
{
delete sound->reader; AUD_DELETE("reader")
- alDeleteBuffers(3, sound->buffers);
+ alDeleteBuffers(AUD_OPENAL_CYCLE_BUFFERS,
sound->buffers);
}
delete *i; AUD_DELETE("handle")
m_pausedSounds->erase(i);
@@ -825,14 +829,16 @@
if(info != AL_STOPPED)
alSourceStop(alhandle->source);
- alSourceUnqueueBuffers(alhandle->source, 3,
alhandle->buffers);
+ alSourceUnqueueBuffers(alhandle->source,
+
AUD_OPENAL_CYCLE_BUFFERS,
+
alhandle->buffers);
if(alGetError() == AL_NO_ERROR)
{
sample_t* buf;
int length;
AUD_Specs specs =
alhandle->reader->getSpecs();
- for(int i=0; i<3; i++)
+ for(int i = 0; i <
AUD_OPENAL_CYCLE_BUFFERS; i++)
{
length = m_buffersize;
alhandle->reader->read(length,
buf);
@@ -844,7 +850,8 @@
break;
}
- alSourceQueueBuffers(alhandle->source,
3,
+ alSourceQueueBuffers(alhandle->source,
+
AUD_OPENAL_CYCLE_BUFFERS,
alhandle->buffers);
}
Modified: branches/soundsystem/source/blender/blenkernel/BKE_packedFile.h
===================================================================
--- branches/soundsystem/source/blender/blenkernel/BKE_packedFile.h
2009-08-06 13:30:23 UTC (rev 22261)
+++ branches/soundsystem/source/blender/blenkernel/BKE_packedFile.h
2009-08-06 13:40:44 UTC (rev 22262)
@@ -50,7 +50,6 @@
/* unpack */
char *unpackFile(struct ReportList *reports, char *abs_name, char *local_name,
struct PackedFile *pf, int how);
int unpackVFont(struct ReportList *reports, struct VFont *vfont, int how);
-// AUD_XXX int unpackSample(struct ReportList *reports, struct bSample
*sample, int how);
int unpackSound(struct ReportList *reports, struct bSound *sound, int how);
int unpackImage(struct ReportList *reports, struct Image *ima, int how);
void unpackAll(struct Main *bmain, struct ReportList *reports, int how);
Modified: branches/soundsystem/source/blender/blenkernel/BKE_sequence.h
===================================================================
--- branches/soundsystem/source/blender/blenkernel/BKE_sequence.h
2009-08-06 13:30:23 UTC (rev 22261)
+++ branches/soundsystem/source/blender/blenkernel/BKE_sequence.h
2009-08-06 13:40:44 UTC (rev 22262)
@@ -183,5 +183,4 @@
int shuffle_seq(struct ListBase * seqbasep, struct Sequence *test);
void free_imbuf_seq(struct ListBase * seqbasep, int check_mem_usage);
-// AUD_XXX
void seq_update_sound(struct Sequence *seq);
Modified: branches/soundsystem/source/blender/blenkernel/BKE_sound.h
===================================================================
--- branches/soundsystem/source/blender/blenkernel/BKE_sound.h 2009-08-06
13:30:23 UTC (rev 22261)
+++ branches/soundsystem/source/blender/blenkernel/BKE_sound.h 2009-08-06
13:40:44 UTC (rev 22262)
@@ -33,26 +33,10 @@
struct PackedFile;
struct bSound;
-// AUD_XXX struct bSample;
struct bContext;
struct ListBase;
struct Main;
-/* bad bad global... */
-// AUD_XXX
-/*extern struct ListBase *samples;
-
-void sound_free_all_samples(void);*/
-
-/* void *sound_get_listener(void); implemented in src!also declared there now
*/
-
-// AUD_XXX
-/*void sound_set_packedfile(struct bSample* sample, struct PackedFile* pf);
-struct PackedFile* sound_find_packedfile(struct bSound* sound);
-void sound_free_sample(struct bSample* sample);
-void sound_free_sound(struct bSound* sound);*/
-
-// AUD_XXX
void sound_init();
void sound_reinit(struct bContext *C);
@@ -61,7 +45,7 @@
struct bSound* sound_new_file(struct Main *main, char* filename);
-// AUD_XXX unused currently
+// XXX unused currently
#if 0
struct bSound* sound_new_buffer(struct bContext *C, struct bSound *source);
Modified: branches/soundsystem/source/blender/blenkernel/intern/blender.c
===================================================================
--- branches/soundsystem/source/blender/blenkernel/intern/blender.c
2009-08-06 13:30:23 UTC (rev 22261)
+++ branches/soundsystem/source/blender/blenkernel/intern/blender.c
2009-08-06 13:40:44 UTC (rev 22262)
@@ -176,8 +176,6 @@
void free_blender(void)
{
/* samples are in a global list..., also sets G.main->sound->sample
NULL */
-// AUD_XXX sound_free_all_samples();
-
free_main(G.main);
G.main= NULL;
@@ -330,9 +328,6 @@
MEM_freeN(bfd->user);
}
- /* samples is a global list... */
-// AUD_XXX sound_free_all_samples();
-
/* case G_FILE_NO_UI or no screens in file */
if(mode) {
/* leave entire context further unaltered? */
Modified: branches/soundsystem/source/blender/blenkernel/intern/library.c
===================================================================
--- branches/soundsystem/source/blender/blenkernel/intern/library.c
2009-08-06 13:30:23 UTC (rev 22261)
+++ branches/soundsystem/source/blender/blenkernel/intern/library.c
2009-08-06 13:40:44 UTC (rev 22262)
@@ -567,7 +567,6 @@
//XXX free_script((Script *)id);
break;
case ID_SO:
-// AUD_XXX sound_free_sound((bSound *)id);
sound_free((bSound*)id);
break;
case ID_GR:
Modified: branches/soundsystem/source/blender/blenkernel/intern/packedFile.c
===================================================================
--- branches/soundsystem/source/blender/blenkernel/intern/packedFile.c
2009-08-06 13:30:23 UTC (rev 22261)
+++ branches/soundsystem/source/blender/blenkernel/intern/packedFile.c
2009-08-06 13:40:44 UTC (rev 22262)
@@ -123,7 +123,6 @@
{
Image *ima;
VFont *vf;
-// AUD_XXX bSample *sample;
bSound *sound;
int count = 0;
@@ -136,14 +135,9 @@
if(vf->packedfile)
count++;
-// AUD_XXX
for(sound=bmain->sound.first; sound; sound=sound->id.next)
if(sound->packedfile)
count++;
-/* if(samples)
- for(sample=samples->first; sample; sample=sample->id.next)
- if(sample->packedfile)
- count++;*/
return count;
}
@@ -213,7 +207,6 @@
{
Image *ima;
VFont *vf;
-// AUD_XXX bSample *sample;
bSound *sound;
for(ima=bmain->image.first; ima; ima=ima->id.next)
@@ -224,14 +217,9 @@
if(vf->packedfile == NULL)
vf->packedfile = newPackedFile(reports, vf->name);
-// AUD_XXX
for(sound=bmain->sound.first; sound; sound=sound->id.next)
if(sound->packedfile == NULL)
sound->packedfile = newPackedFile(reports, sound->name);
-/* if(samples)
- for(sample=samples->first; sample; sample=sample->id.next)
- if(sample->packedfile == NULL)
- sound_set_packedfile(sample,
newPackedFile(reports, sample->name));*/
}
@@ -466,36 +454,6 @@
return (ret_value);
}
-/*int unpackSample(ReportList *reports, bSample *sample, int how)
-{
- char localname[FILE_MAXDIR + FILE_MAX], fi[FILE_MAX];
- char *newname;
- int ret_value = RET_ERROR;
- PackedFile *pf;
-
- if (sample != NULL) {
- strcpy(localname, sample->name);
- BLI_splitdirstring(localname, fi);
- sprintf(localname, "//samples/%s", fi);
-
- newname = unpackFile(reports, sample->name, localname,
sample->packedfile, how);
- if (newname != NULL) {
- strcpy(sample->name, newname);
- MEM_freeN(newname);
-
- pf = sample->packedfile;
- // because samples and sounds can point to the
- // same packedfile we have to check them all
-// AUD_XXX sound_set_packedfile(sample, NULL);
- freePackedFile(pf);
-
- ret_value = RET_OK;
- }
- }
-
- return(ret_value);
-}*/
-
int unpackSound(ReportList *reports, bSound *sound, int how)
{
char localname[FILE_MAXDIR + FILE_MAX], fi[FILE_MAX];
@@ -512,13 +470,9 @@
strcpy(sound->name, newname);
MEM_freeN(newname);
- // because samples and sounds can point to the
- // same packedfile we have to check them all
-// AUD_XXX sound_set_packedfile(sample, NULL);
freePackedFile(sound->packedfile);
sound->packedfile = 0;
-// AUD_XXX
sound_load(sound);
ret_value = RET_OK;
@@ -557,7 +511,6 @@
{
Image *ima;
VFont *vf;
-// AUD_XXX bSample *sample;
bSound *sound;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
