Revision: 15814
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15814
Author: scourage
Date: 2008-07-27 19:50:52 +0200 (Sun, 27 Jul 2008)
Log Message:
-----------
windows build system. Wave drawing fix, game engine disabled, audio reload in
sequencer fix, audio load on start fix
Modified Paths:
--------------
branches/sound-branch/extern/tinySND/ffmpeg/ffmpegWriter.cpp
branches/sound-branch/extern/tinySND/make/msvc_7_0/tinySND.vcproj
branches/sound-branch/extern/tinySND/sndfile/sndfileReader.cpp
branches/sound-branch/extern/tinySND/sndfile/sndfileWriter.cpp
branches/sound-branch/intern/make/msvc_7_0/intern.sln
branches/sound-branch/intern/soundsystem/SND_GameWaveCache.h
branches/sound-branch/intern/soundsystem/SND_sound.cpp
branches/sound-branch/projectfiles_vc7/blender/blender.vcproj
branches/sound-branch/projectfiles_vc7/blender/src/BL_src.vcproj
branches/sound-branch/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj
branches/sound-branch/projectfiles_vc7/gameengine/converter/KX_converter.vcproj
branches/sound-branch/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
branches/sound-branch/source/blender/src/sequence.c
branches/sound-branch/source/blender/src/soundsystem.c
branches/sound-branch/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/sound-branch/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/sound-branch/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/sound-branch/source/gameengine/Ketsji/KX_CDActuator.cpp
branches/sound-branch/source/gameengine/Ketsji/KX_CDActuator.h
branches/sound-branch/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/sound-branch/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/sound-branch/source/gameengine/Ketsji/KX_Scene.cpp
branches/sound-branch/source/gameengine/Ketsji/KX_Scene.h
branches/sound-branch/source/gameengine/Ketsji/KX_SoundActuator.cpp
Added Paths:
-----------
branches/sound-branch/intern/soundsystem/make/
branches/sound-branch/intern/soundsystem/make/msvc_7_0/
branches/sound-branch/intern/soundsystem/make/msvc_7_0/soundsystem.vcproj
branches/sound-branch/source/blender/include/BAU_soundsystem.h
Modified: branches/sound-branch/extern/tinySND/ffmpeg/ffmpegWriter.cpp
===================================================================
--- branches/sound-branch/extern/tinySND/ffmpeg/ffmpegWriter.cpp
2008-07-27 16:44:12 UTC (rev 15813)
+++ branches/sound-branch/extern/tinySND/ffmpeg/ffmpegWriter.cpp
2008-07-27 17:50:52 UTC (rev 15814)
@@ -117,7 +117,9 @@
audio_enc->sample_rate = mSampleRate;
audio_enc->channels = mNumChannels;
//audio_enc->frame_size = acodecFrameSize;
- audio_enc->time_base = (AVRational){1, mSampleRate}; //??!??
+
+ AVRational temp={1, mSampleRate};
+ audio_enc->time_base = temp; //??!??
audio_enc->thread_count = 1;
mOutputFile->nb_streams = 1;
@@ -182,7 +184,7 @@
av_free( mAudioOutputBuf );
// write the trailer if needed and close file
- url_fclose( &mOutputFile->pb );
+ url_fclose( (ByteIOContext*)&mOutputFile->pb );
if( mAudioStreamIndex >= 0 )
{
av_free( mOutputFile->streams[mAudioStreamIndex]->codec );
Modified: branches/sound-branch/extern/tinySND/make/msvc_7_0/tinySND.vcproj
===================================================================
--- branches/sound-branch/extern/tinySND/make/msvc_7_0/tinySND.vcproj
2008-07-27 16:44:12 UTC (rev 15813)
+++ branches/sound-branch/extern/tinySND/make/msvc_7_0/tinySND.vcproj
2008-07-27 17:50:52 UTC (rev 15814)
@@ -19,6 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
+
AdditionalIncludeDirectories="..\..\core;..\..\ffmpeg;..\..\sdl;..\..\sndfile;..\..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\..\lib\windows\samplerate\include;..\..\..\..\..\lib\windows\sndfile\include;..\..\..\..\..\lib\windows\sdl\include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
Modified: branches/sound-branch/extern/tinySND/sndfile/sndfileReader.cpp
===================================================================
--- branches/sound-branch/extern/tinySND/sndfile/sndfileReader.cpp
2008-07-27 16:44:12 UTC (rev 15813)
+++ branches/sound-branch/extern/tinySND/sndfile/sndfileReader.cpp
2008-07-27 17:50:52 UTC (rev 15814)
@@ -69,7 +69,7 @@
assert( mSndFile != 0 );
assert( mIsSeekable );
- int offset = sf_seek( mSndFile, frameNum, SEEK_SET );
+ sf_count_t offset = sf_seek( mSndFile, frameNum, SEEK_SET );
int error = sf_error( mSndFile );
if( error != SF_ERR_NO_ERROR )
@@ -86,7 +86,7 @@
assert( mSndFile != 0 );
assert( buffer != 0 );
- int count = sf_readf_float( mSndFile, buffer, framesNum );
+ sf_count_t count = sf_readf_float( mSndFile, buffer, framesNum );
int error = sf_error( mSndFile );
if( error != SF_ERR_NO_ERROR )
Modified: branches/sound-branch/extern/tinySND/sndfile/sndfileWriter.cpp
===================================================================
--- branches/sound-branch/extern/tinySND/sndfile/sndfileWriter.cpp
2008-07-27 16:44:12 UTC (rev 15813)
+++ branches/sound-branch/extern/tinySND/sndfile/sndfileWriter.cpp
2008-07-27 17:50:52 UTC (rev 15814)
@@ -133,7 +133,7 @@
dataConsume = framesNum-dataDone;
(*mCallback)( dataConsume, mUserData1, mUserData2 );
- mInput->fillBuffer(
(char*)&mBuffer[mChannelsNum*dataDone], dataConsume );
+ mInput->fillBuffer(
(char*)&mBuffer[mNumChannels*dataDone], dataConsume );
dataDone += dataConsume;
}
}
@@ -144,7 +144,7 @@
mInput->setSampleFormat( oldFormat );
- int count = sf_writef_float( mSndFile, mBuffer, framesNum ) ;
+ sf_count_t count = sf_writef_float( mSndFile, mBuffer, framesNum ) ;
int error = sf_error( mSndFile );
if( error != SF_ERR_NO_ERROR )
Modified: branches/sound-branch/intern/make/msvc_7_0/intern.sln
===================================================================
--- branches/sound-branch/intern/make/msvc_7_0/intern.sln 2008-07-27
16:44:12 UTC (rev 15813)
+++ branches/sound-branch/intern/make/msvc_7_0/intern.sln 2008-07-27
17:50:52 UTC (rev 15814)
@@ -2,7 +2,6 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build_install_all",
"build_install_all.vcproj", "{02110D03-59DB-4571-8787-72B3C03B2F2D}"
ProjectSection(ProjectDependencies) = postProject
{A90C4918-4B21-4277-93BD-AF65F30951D9} =
{A90C4918-4B21-4277-93BD-AF65F30951D9}
- {98330220-47A6-42E0-9DE4-AD0FF5D204D6} =
{98330220-47A6-42E0-9DE4-AD0FF5D204D6}
{C66F722C-46BE-40C9-ABAE-2EAC7A697EB8} =
{C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}
{B093415D-C0F6-4E76-8F5A-6BC1917BCE9E} =
{B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}
{E784098D-3ED8-433A-9353-9679415DDDC5} =
{E784098D-3ED8-433A-9353-9679415DDDC5}
@@ -64,13 +63,6 @@
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundSystem",
"..\..\SoundSystem\make\msvc_7_0\SoundSystem.vcproj",
"{98330220-47A6-42E0-9DE4-AD0FF5D204D6}"
- ProjectSection(ProjectDependencies) = postProject
- {4B6AFCC5-968C-424A-8F20-76E41B3BEF74} =
{4B6AFCC5-968C-424A-8F20-76E41B3BEF74}
- {B789C2F3-279E-4A85-8F0A-7F7AC068E598} =
{B789C2F3-279E-4A85-8F0A-7F7AC068E598}
- {6B3229F4-2A37-47EE-8B89-9AA046B35193} =
{6B3229F4-2A37-47EE-8B89-9AA046B35193}
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opennl",
"..\..\opennl\make\msvc_7_0\opennl.vcproj",
"{8B8D4FC3-3234-4E54-8376-5AB83D00D164}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
@@ -86,12 +78,18 @@
{E86B7BDE-C33C-4E55-9433-E74C141D7538} =
{E86B7BDE-C33C-4E55-9433-E74C141D7538}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundSystem",
"..\..\soundsystem\make\msvc_7_0\soundsystem.vcproj",
"{98330220-47A6-42E0-9DE4-AD0FF5D204D6}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
3DPlugin Debug = 3DPlugin Debug
3DPlugin Release = 3DPlugin Release
Blender Debug = Blender Debug
Blender Release = Blender Release
+ Debug = Debug
+ Release = Release
EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution
EndGlobalSection
@@ -104,6 +102,10 @@
{02110D03-59DB-4571-8787-72B3C03B2F2D}.Blender Debug.Build.0 =
Blender Debug|Win32
{02110D03-59DB-4571-8787-72B3C03B2F2D}.Blender
Release.ActiveCfg = Blender Release|Win32
{02110D03-59DB-4571-8787-72B3C03B2F2D}.Blender Release.Build.0
= Blender Release|Win32
+ {02110D03-59DB-4571-8787-72B3C03B2F2D}.Debug.ActiveCfg =
3DPlugin Debug|Win32
+ {02110D03-59DB-4571-8787-72B3C03B2F2D}.Debug.Build.0 = 3DPlugin
Debug|Win32
+ {02110D03-59DB-4571-8787-72B3C03B2F2D}.Release.ActiveCfg =
3DPlugin Release|Win32
+ {02110D03-59DB-4571-8787-72B3C03B2F2D}.Release.Build.0 =
3DPlugin Release|Win32
{4B6AFCC5-968C-424A-8F20-76E41B3BEF74}.3DPlugin Debug.ActiveCfg
= 3DPlugin Debug|Win32
{4B6AFCC5-968C-424A-8F20-76E41B3BEF74}.3DPlugin Debug.Build.0 =
3DPlugin Debug|Win32
{4B6AFCC5-968C-424A-8F20-76E41B3BEF74}.3DPlugin
Release.ActiveCfg = 3DPlugin Release|Win32
@@ -112,6 +114,10 @@
{4B6AFCC5-968C-424A-8F20-76E41B3BEF74}.Blender Debug.Build.0 =
Blender Debug|Win32
{4B6AFCC5-968C-424A-8F20-76E41B3BEF74}.Blender
Release.ActiveCfg = Blender Release|Win32
{4B6AFCC5-968C-424A-8F20-76E41B3BEF74}.Blender Release.Build.0
= Blender Release|Win32
+ {4B6AFCC5-968C-424A-8F20-76E41B3BEF74}.Debug.ActiveCfg =
3DPlugin Debug|Win32
+ {4B6AFCC5-968C-424A-8F20-76E41B3BEF74}.Debug.Build.0 = 3DPlugin
Debug|Win32
+ {4B6AFCC5-968C-424A-8F20-76E41B3BEF74}.Release.ActiveCfg =
3DPlugin Release|Win32
+ {4B6AFCC5-968C-424A-8F20-76E41B3BEF74}.Release.Build.0 =
3DPlugin Release|Win32
{E784098D-3ED8-433A-9353-9679415DDDC5}.3DPlugin Debug.ActiveCfg
= 3DPlugin Debug|Win32
{E784098D-3ED8-433A-9353-9679415DDDC5}.3DPlugin Debug.Build.0 =
3DPlugin Debug|Win32
{E784098D-3ED8-433A-9353-9679415DDDC5}.3DPlugin
Release.ActiveCfg = 3DPlugin Release|Win32
@@ -120,6 +126,10 @@
{E784098D-3ED8-433A-9353-9679415DDDC5}.Blender Debug.Build.0 =
Blender Debug|Win32
{E784098D-3ED8-433A-9353-9679415DDDC5}.Blender
Release.ActiveCfg = Blender Release|Win32
{E784098D-3ED8-433A-9353-9679415DDDC5}.Blender Release.Build.0
= Blender Release|Win32
+ {E784098D-3ED8-433A-9353-9679415DDDC5}.Debug.ActiveCfg =
3DPlugin Debug|Win32
+ {E784098D-3ED8-433A-9353-9679415DDDC5}.Debug.Build.0 = 3DPlugin
Debug|Win32
+ {E784098D-3ED8-433A-9353-9679415DDDC5}.Release.ActiveCfg =
3DPlugin Release|Win32
+ {E784098D-3ED8-433A-9353-9679415DDDC5}.Release.Build.0 =
3DPlugin Release|Win32
{B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.3DPlugin Debug.ActiveCfg
= 3DPlugin Debug|Win32
{B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.3DPlugin Debug.Build.0 =
3DPlugin Debug|Win32
{B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.3DPlugin
Release.ActiveCfg = 3DPlugin Release|Win32
@@ -128,6 +138,10 @@
{B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.Blender Debug.Build.0 =
Blender Debug|Win32
{B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.Blender
Release.ActiveCfg = Blender Release|Win32
{B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.Blender Release.Build.0
= Blender Release|Win32
+ {B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.Debug.ActiveCfg =
3DPlugin Debug|Win32
+ {B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.Debug.Build.0 = 3DPlugin
Debug|Win32
+ {B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.Release.ActiveCfg =
3DPlugin Release|Win32
+ {B093415D-C0F6-4E76-8F5A-6BC1917BCE9E}.Release.Build.0 =
3DPlugin Release|Win32
{51A348C1-8684-4D67-B980-97B1FC74159B}.3DPlugin Debug.ActiveCfg
= 3DPlugin Debug|Win32
{51A348C1-8684-4D67-B980-97B1FC74159B}.3DPlugin Debug.Build.0 =
3DPlugin Debug|Win32
{51A348C1-8684-4D67-B980-97B1FC74159B}.3DPlugin
Release.ActiveCfg = 3DPlugin Release|Win32
@@ -136,6 +150,10 @@
{51A348C1-8684-4D67-B980-97B1FC74159B}.Blender Debug.Build.0 =
Blender Debug|Win32
{51A348C1-8684-4D67-B980-97B1FC74159B}.Blender
Release.ActiveCfg = Blender Release|Win32
{51A348C1-8684-4D67-B980-97B1FC74159B}.Blender Release.Build.0
= Blender Release|Win32
+ {51A348C1-8684-4D67-B980-97B1FC74159B}.Debug.ActiveCfg =
3DPlugin Debug|Win32
+ {51A348C1-8684-4D67-B980-97B1FC74159B}.Debug.Build.0 = 3DPlugin
Debug|Win32
+ {51A348C1-8684-4D67-B980-97B1FC74159B}.Release.ActiveCfg =
3DPlugin Release|Win32
+ {51A348C1-8684-4D67-B980-97B1FC74159B}.Release.Build.0 =
3DPlugin Release|Win32
{C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}.3DPlugin Debug.ActiveCfg
= 3DPlugin Debug|Win32
{C66F722C-46BE-40C9-ABAE-2EAC7A697EB8}.3DPlugin Debug.Build.0 =
3DPlugin Debug|Win32
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
