[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22386] branches/soundsystem: Useless final sound system branch update.

[Joerg Mueller]

Revision: 22386
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22386
Author:   nexyon
Date:     2009-08-11 22:48:19 +0200 (Tue, 11 Aug 2009)

Log Message:
-----------
Useless final sound system branch update.

Modified Paths:
--------------
    branches/soundsystem/config/linux2-config.py
    branches/soundsystem/config/win32-mingw-config.py
    branches/soundsystem/config/win64-vc-config.py
    branches/soundsystem/source/blender/blenkernel/CMakeLists.txt
    branches/soundsystem/source/blender/blenloader/intern/writefile.c
    branches/soundsystem/source/blender/editors/space_file/filelist.c
    branches/soundsystem/tools/Blender.py

Modified: branches/soundsystem/config/linux2-config.py
===================================================================
--- branches/soundsystem/config/linux2-config.py	2009-08-11 19:20:31 UTC (rev 22385)
+++ branches/soundsystem/config/linux2-config.py	2009-08-11 20:48:19 UTC (rev 22386)
@@ -14,7 +14,7 @@
 WITH_BF_OPENAL = True
 WITH_BF_STATICOPENAL = False
 BF_OPENAL = '/usr'
-BF_OPENAL_INC = '${BF_OPENAL}/include/AL'
+BF_OPENAL_INC = '${BF_OPENAL}/include'
 BF_OPENAL_LIB = 'openal'
 BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
 

Modified: branches/soundsystem/config/win32-mingw-config.py
===================================================================
--- branches/soundsystem/config/win32-mingw-config.py	2009-08-11 19:20:31 UTC (rev 22385)
+++ branches/soundsystem/config/win32-mingw-config.py	2009-08-11 20:48:19 UTC (rev 22386)
@@ -21,7 +21,7 @@
 BF_OPENAL_LIB = 'wrap_oal'
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
-WITH_BF_FFMPEG = True
+WITH_BF_FFMPEG = False
 BF_FFMPEG_LIB = 'avformat swscale avcodec avutil avdevice xvidcore x264'
 BF_FFMPEG_LIBPATH = LIBDIR + '/gcc/ffmpeg/lib'
 BF_FFMPEG_INC =  LIBDIR + '/gcc/ffmpeg/include'

Modified: branches/soundsystem/config/win64-vc-config.py
===================================================================
--- branches/soundsystem/config/win64-vc-config.py	2009-08-11 19:20:31 UTC (rev 22385)
+++ branches/soundsystem/config/win64-vc-config.py	2009-08-11 20:48:19 UTC (rev 22386)
@@ -2,7 +2,7 @@
 LIBDIR = '${LCGDIR}'
 
 # enable ffmpeg  support
-WITH_BF_FFMPEG = True # -DWITH_FFMPEG
+WITH_BF_FFMPEG = False # -DWITH_FFMPEG
 BF_FFMPEG = LIBDIR +'/ffmpeg'
 BF_FFMPEG_INC = '${BF_FFMPEG}/include'
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'

Modified: branches/soundsystem/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- branches/soundsystem/source/blender/blenkernel/CMakeLists.txt	2009-08-11 19:20:31 UTC (rev 22385)
+++ branches/soundsystem/source/blender/blenkernel/CMakeLists.txt	2009-08-11 20:48:19 UTC (rev 22386)
@@ -35,7 +35,6 @@
   ../nodes ../../../extern/glew/include ../gpu ../makesrna ../../../intern/smoke/extern
   ../../../intern/bsp/extern
   ../../../intern/audaspace
-  ${SDL_INC}
   ${ZLIB_INC}
 )
 

Modified: branches/soundsystem/source/blender/blenloader/intern/writefile.c
===================================================================
--- branches/soundsystem/source/blender/blenloader/intern/writefile.c	2009-08-11 19:20:31 UTC (rev 22385)
+++ branches/soundsystem/source/blender/blenloader/intern/writefile.c	2009-08-11 20:48:19 UTC (rev 22386)
@@ -2140,8 +2140,6 @@
 
 	PackedFile * pf;
 
-	// set all samples to unsaved status
-
 	sound= idbase->first;
 	while(sound) {
 		if(sound->id.us>0 || wd->current) {

Modified: branches/soundsystem/source/blender/editors/space_file/filelist.c
===================================================================
--- branches/soundsystem/source/blender/editors/space_file/filelist.c	2009-08-11 19:20:31 UTC (rev 22385)
+++ branches/soundsystem/source/blender/editors/space_file/filelist.c	2009-08-11 20:48:19 UTC (rev 22386)
@@ -848,6 +848,7 @@
 				||	BLI_testextensie(file->relname, ".ac3")
 				||	BLI_testextensie(file->relname, ".aac")
 				||	BLI_testextensie(file->relname, ".flac")
+				||	BLI_testextensie(file->relname, ".wma")
 				||	BLI_testextensie(file->relname, ".eac3")) {
 				file->flags |= SOUNDFILE;
 			}
@@ -891,6 +892,7 @@
 				||	BLI_testextensie(file->relname, ".ac3")
 				||	BLI_testextensie(file->relname, ".aac")
 				||	BLI_testextensie(file->relname, ".flac")
+				||	BLI_testextensie(file->relname, ".wma")
 				||	BLI_testextensie(file->relname, ".eac3")) {
 				file->flags |= SOUNDFILE;
 			}

Modified: branches/soundsystem/tools/Blender.py
===================================================================
--- branches/soundsystem/tools/Blender.py	2009-08-11 19:20:31 UTC (rev 22385)
+++ branches/soundsystem/tools/Blender.py	2009-08-11 20:48:19 UTC (rev 22386)
@@ -198,6 +198,7 @@
 	if lenv['WITH_BF_LCMS']:
 		syslibs.append(lenv['BF_LCMS_LIB'])
 
+
 	syslibs += lenv['LLIBS']
 
 	return syslibs