Skip to content

refactor(WWAudio): Qualify audio and debug header includes #2875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
CryoTheRenegade wants to merge 1 commit into from
Closed

refactor(WWAudio): Qualify audio and debug header includes #2875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Core/Libraries/Source/WWVegas/WWAudio/AABTreeSoundCullClass.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

#pragma once

#include "aabtreecull.h"
#include "WWMath/aabtreecull.h"


/////////////////////////////////////////////////////////////////////////////////
Expand Down
8 changes: 4 additions & 4 deletions Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,17 @@

#include "AudibleSound.h"
#include "WWAudio.h"
#include "wwdebug.h"
#include "WWDebug/wwdebug.h"
#include "SoundBuffer.h"
#include "Utils.h"
#include "SoundScene.h"
#include "FilteredSound.h"
#include "Threads.h"
#include "SoundChunkIDs.h"
#include "simpledefinitionfactory.h"
#include "persistfactory.h"
#include "WWSaveLoad/simpledefinitionfactory.h"
#include "WWSaveLoad/persistfactory.h"
#include "LogicalSound.h"
#include "definitionclassids.h"
#include "WWSaveLoad/definitionclassids.h"
#include "soundstreamhandle.h"
#include "sound2dhandle.h"

Expand Down
14 changes: 7 additions & 7 deletions Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@
#pragma warning (pop)

//#include <malloc.h>
#include "always.h"
#include "vector3.h"
#include "matrix3d.h"
#include "RAWFILE.h"
#include "WWLib/always.h"
#include "WWMath/vector3.h"
#include "WWMath/matrix3d.h"
#include "WWLib/RAWFILE.h"
#include "SoundSceneObj.h"
#include "Vector.h"
#include "wwstring.h"
#include "definition.h"
#include "WWLib/Vector.h"
#include "WWLib/wwstring.h"
#include "WWSaveLoad/definition.h"


/////////////////////////////////////////////////////////////////////////////////
Expand Down
4 changes: 2 additions & 2 deletions Core/Libraries/Source/WWVegas/WWAudio/AudioEvents.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@

#pragma once

#include "simplevec.h"
#include "bittype.h"
#include "WWLib/simplevec.h"
#include "WWLib/bittype.h"


/////////////////////////////////////////////////////////////////////////////////
Expand Down
12 changes: 6 additions & 6 deletions Core/Libraries/Source/WWVegas/WWAudio/AudioSaveLoad.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@
* Functions: *
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */

#include "always.h"
#include "WWLib/always.h"
#include "AudioSaveLoad.h"
#include "persist.h"
#include "persistfactory.h"
#include "definition.h"
#include "WWSaveLoad/persist.h"
#include "WWSaveLoad/persistfactory.h"
#include "WWSaveLoad/definition.h"
#include "SoundChunkIDs.h"
#include "chunkio.h"
#include "WWLib/chunkio.h"
#include "SoundScene.h"
#include "wwmemlog.h"
#include "WWDebug/wwmemlog.h"


///////////////////////////////////////////////////////////////////////
Expand Down
6 changes: 3 additions & 3 deletions Core/Libraries/Source/WWVegas/WWAudio/AudioSaveLoad.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@

#pragma once

#include "saveloadsubsystem.h"
#include "Vector.h"
#include "bittype.h"
#include "WWSaveLoad/saveloadsubsystem.h"
#include "WWLib/Vector.h"
#include "WWLib/bittype.h"


// Singleton instances
Expand Down
2 changes: 1 addition & 1 deletion Core/Libraries/Source/WWVegas/WWAudio/FilteredSound.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#include "WWAudio.h"
#include "SoundScene.h"
#include "SoundChunkIDs.h"
#include "persistfactory.h"
#include "WWSaveLoad/persistfactory.h"
#include "soundhandle.h"


Expand Down
2 changes: 1 addition & 1 deletion Core/Libraries/Source/WWVegas/WWAudio/LogicalListener.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include "WWAudio.h"
#include "SoundScene.h"
#include "SoundChunkIDs.h"
#include "persistfactory.h"
#include "WWSaveLoad/persistfactory.h"


//////////////////////////////////////////////////////////////////////////////////
Expand Down
6 changes: 3 additions & 3 deletions Core/Libraries/Source/WWVegas/WWAudio/LogicalListener.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
#pragma once

#include "SoundSceneObj.h"
#include "bittype.h"
#include "vector3.h"
#include "matrix3d.h"
#include "WWLib/bittype.h"
#include "WWMath/vector3.h"
#include "WWMath/matrix3d.h"

/////////////////////////////////////////////////////////////////////////////////
//
Expand Down
2 changes: 1 addition & 1 deletion Core/Libraries/Source/WWVegas/WWAudio/LogicalSound.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "WWAudio.h"
#include "SoundScene.h"
#include "SoundChunkIDs.h"
#include "persistfactory.h"
#include "WWSaveLoad/persistfactory.h"


//////////////////////////////////////////////////////////////////////////////////
Expand Down
6 changes: 3 additions & 3 deletions Core/Libraries/Source/WWVegas/WWAudio/LogicalSound.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
#pragma once

#include "SoundSceneObj.h"
#include "bittype.h"
#include "vector3.h"
#include "matrix3d.h"
#include "WWLib/bittype.h"
#include "WWMath/vector3.h"
#include "WWMath/matrix3d.h"

/////////////////////////////////////////////////////////////////////////////////
//
Expand Down
2 changes: 1 addition & 1 deletion Core/Libraries/Source/WWVegas/WWAudio/PriorityVector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#pragma once

#include "Vector.h"
#include "WWLib/Vector.h"

////////////////////////////////////////////////////////////////////
//
Expand Down
4 changes: 2 additions & 2 deletions Core/Libraries/Source/WWVegas/WWAudio/Sound3D.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
#include "SoundScene.h"
#include "Utils.h"
#include "SoundChunkIDs.h"
#include "persistfactory.h"
#include "chunkio.h"
#include "WWSaveLoad/persistfactory.h"
#include "WWLib/chunkio.h"
#include "sound3dhandle.h"


Expand Down
2 changes: 1 addition & 1 deletion Core/Libraries/Source/WWVegas/WWAudio/Sound3D.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#pragma once

#include "AudibleSound.h"
#include "mempool.h"
#include "WWLib/mempool.h"



Expand Down
8 changes: 4 additions & 4 deletions Core/Libraries/Source/WWVegas/WWAudio/SoundBuffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@


#include "SoundBuffer.h"
#include "RAWFILE.h"
#include "wwdebug.h"
#include "WWLib/RAWFILE.h"
#include "WWDebug/wwdebug.h"
#include "Utils.h"
#include "ffactory.h"
#include "win.h"
#include "WWLib/ffactory.h"
#include "WWLib/win.h"



Expand Down
2 changes: 1 addition & 1 deletion Core/Libraries/Source/WWVegas/WWAudio/SoundBuffer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#include "mss.h"
#pragma warning (pop)

#include "always.h"
#include "WWLib/always.h"


// Forward declarations
Expand Down
4 changes: 2 additions & 2 deletions Core/Libraries/Source/WWVegas/WWAudio/SoundChunkIDs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@

#pragma once

#include "saveloadids.h"
#include "definitionclassids.h"
#include "WWSaveLoad/saveloadids.h"
#include "WWSaveLoad/definitionclassids.h"


//////////////////////////////////////////////////////////////////////////////////
Expand Down
8 changes: 4 additions & 4 deletions Core/Libraries/Source/WWVegas/WWAudio/SoundCullObj.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@

#pragma once

#include "always.h"
#include "WWLib/always.h"
#include "SoundSceneObj.h"
#include "cullsys.h"
#include "mempool.h"
#include "multilist.h"
#include "WWMath/cullsys.h"
#include "WWLib/mempool.h"
#include "WWLib/multilist.h"


/////////////////////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion Core/Libraries/Source/WWVegas/WWAudio/SoundPseudo3D.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#include "SoundScene.h"
#include "Utils.h"
#include "SoundChunkIDs.h"
#include "persistfactory.h"
#include "WWSaveLoad/persistfactory.h"
#include "soundhandle.h"


Expand Down
8 changes: 4 additions & 4 deletions Core/Libraries/Source/WWVegas/WWAudio/SoundScene.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
#include "SoundCullObj.h"
#include "LogicalSound.h"
#include "LogicalListener.h"
#include "chunkio.h"
#include "persistfactory.h"
#include "wwprofile.h"
#include "WWLib/chunkio.h"
#include "WWSaveLoad/persistfactory.h"
#include "WWDebug/wwprofile.h"
#include "Threads.h"
#include "wwmemlog.h"
#include "WWDebug/wwmemlog.h"


DEFINE_AUTO_POOL(SoundSceneClass::AudibleInfoClass, 64);
Expand Down
8 changes: 4 additions & 4 deletions Core/Libraries/Source/WWVegas/WWAudio/SoundScene.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@

#pragma once

#include "aabtreecull.h"
#include "gridcull.h"
#include "WWMath/aabtreecull.h"
#include "WWMath/gridcull.h"
#include "Listener.h"
#include "Vector.h"
#include "WWLib/Vector.h"
#include "PriorityVector.h"
#include "SoundCullObj.h"
#include "LogicalListener.h"
#include "multilist.h"
#include "WWLib/multilist.h"

// Forward declarations
class RenderObjClass;
Expand Down
6 changes: 3 additions & 3 deletions Core/Libraries/Source/WWVegas/WWAudio/SoundSceneObj.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@


#include "SoundSceneObj.h"
#include "camera.h"
#include "rendobj.h"
#include "persistfactory.h"
#include "WW3D2/camera.h"
#include "WW3D2/rendobj.h"
#include "WWSaveLoad/persistfactory.h"
#include "SoundChunkIDs.h"
#include "Utils.h"

Expand Down
10 changes: 5 additions & 5 deletions Core/Libraries/Source/WWVegas/WWAudio/SoundSceneObj.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@

#pragma once

#include "always.h"
#include "WWLib/always.h"
#include "WWAudio.h"
#include "bittype.h"
#include "persist.h"
#include "multilist.h"
#include "mutex.h"
#include "WWLib/bittype.h"
#include "WWSaveLoad/persist.h"
#include "WWLib/multilist.h"
#include "WWLib/mutex.h"

/////////////////////////////////////////////////////////////////////////////////
// Forward declarations
Expand Down
2 changes: 1 addition & 1 deletion Core/Libraries/Source/WWVegas/WWAudio/Threads.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
* Functions: *
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */

#include "always.h"
#include "WWLib/always.h"
#include "Threads.h"
#include "Utils.h"
#include <process.h>
Expand Down
4 changes: 2 additions & 2 deletions Core/Libraries/Source/WWVegas/WWAudio/Threads.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
#pragma once

#include "windows.h"
#include "Vector.h"
#include "mutex.h"
#include "WWLib/Vector.h"
#include "WWLib/mutex.h"

// Forward declarations
class RefCountClass;
Expand Down
18 changes: 9 additions & 9 deletions Core/Libraries/Source/WWVegas/WWAudio/WWAudio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,26 +35,26 @@
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */


#include "always.h"
#include "WWLib/always.h"
#include <windows.h>
#include "WWAudio.h"
#include "wwdebug.h"
#include "WWDebug/wwdebug.h"
#include "Utils.h"
#include "realcrc.h"
#include "WWLib/realcrc.h"
#include "SoundBuffer.h"
#include "AudibleSound.h"
#include "Sound3D.h"
#include "RAWFILE.h"
#include "WWLib/RAWFILE.h"
#include "SoundScene.h"
#include "SoundPseudo3D.h"
#include "ffactory.h"
#include "registry.h"
#include "WWLib/ffactory.h"
#include "WWLib/registry.h"
#include "Threads.h"
#include "LogicalSound.h"
#include "LogicalListener.h"
#include "definitionclassids.h"
#include "wwmemlog.h"
#include "wwprofile.h"
#include "WWSaveLoad/definitionclassids.h"
#include "WWDebug/wwmemlog.h"
#include "WWDebug/wwprofile.h"


#ifdef G_CODE_BASE
Expand Down
6 changes: 3 additions & 3 deletions Core/Libraries/Source/WWVegas/WWAudio/WWAudio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@

#pragma once

#include "always.h"
#include "WWLib/always.h"
#pragma warning (push, 3)
#include "mss.h"
#pragma warning (pop)

#include "Vector.h"
#include "WWLib/Vector.h"
#include "SoundBuffer.h"
#include "AudioEvents.h"
#include "wwstring.h"
#include "WWLib/wwstring.h"

/////////////////////////////////////////////////////////////////////////////////
// Forward declaration
Expand Down
2 changes: 1 addition & 1 deletion Core/Libraries/Source/WWVegas/WWDebug/wwdebug.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
#include <Utility/stdio_adapter.h>
#include <assert.h>
#include <signal.h>
#include "Except.h"
#include "WWLib/Except.h"

#ifdef _WIN32
#include <windows.h>
Expand Down
Loading
Loading