From e6ca1cd502fe867a4a51be57f7cc3b606b851848 Mon Sep 17 00:00:00 2001
From: andreja6 <andrejaandjic@hotmail.com>
Date: Tue, 1 May 2018 12:14:54 -0700
Subject: [PATCH] changed AudioPlayer::PlaySound() to AudioPlayer::playSound()

---
 AudioPlayer.cpp |   2 +-
 AudioPlayer.h   |   2 +-
 G3DTest.vcproj  | 108 +++++++++++++++++++++++++++---------------------
 main.cpp        |  12 +++---
 4 files changed, 70 insertions(+), 54 deletions(-)

diff --git a/AudioPlayer.cpp b/AudioPlayer.cpp
index bfbc2c1..92556c1 100644
--- a/AudioPlayer.cpp
+++ b/AudioPlayer.cpp
@@ -58,7 +58,7 @@ void mixaudio(void *unused, Uint8 *stream, int len)
     }
 }
 
-void AudioPlayer::PlaySound(std::string fileString)
+void AudioPlayer::playSound(std::string fileString)
 {
 
 	if(initiated)
diff --git a/AudioPlayer.h b/AudioPlayer.h
index 772accc..7467064 100644
--- a/AudioPlayer.h
+++ b/AudioPlayer.h
@@ -6,6 +6,6 @@ class AudioPlayer
 public:
 	AudioPlayer(void);
 	~AudioPlayer(void);
-	static void PlaySound(std::string);
+	static void playSound(std::string);
 	static void init();
 };
diff --git a/G3DTest.vcproj b/G3DTest.vcproj
index 4839a34..5a94fc8 100644
--- a/G3DTest.vcproj
+++ b/G3DTest.vcproj
@@ -234,30 +234,14 @@
 				RelativePath=".\AudioPlayer.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\BaseButtonInstance.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\ButtonListener.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\DataModelInstance.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\Dialogs.rc"
 				>
 			</File>
-			<File
-				RelativePath=".\ImageButtonInstance.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Instance.cpp"
-				>
-			</File>
 			<File
 				RelativePath="main.cpp"
 				>
@@ -278,14 +262,38 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath=".\PhysicalInstance.cpp"
+			<Filter
+				Name="Instances"
 				>
-			</File>
-			<File
-				RelativePath=".\TextButtonInstance.cpp"
-				>
-			</File>
+				<File
+					RelativePath=".\BaseButtonInstance.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\DataModelInstance.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\ImageButtonInstance.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Instance.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\PhysicalInstance.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\TextButtonInstance.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\WorkspaceInstance.cpp"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -295,38 +303,46 @@
 				RelativePath=".\AudioPlayer.h"
 				>
 			</File>
-			<File
-				RelativePath=".\BaseButtonInstance.h"
-				>
-			</File>
 			<File
 				RelativePath=".\ButtonListener.h"
 				>
 			</File>
-			<File
-				RelativePath=".\DataModelInstance.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ImageButtonInstance.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Instance.h"
-				>
-			</File>
-			<File
-				RelativePath=".\PhysicalInstance.h"
-				>
-			</File>
 			<File
 				RelativePath=".\resource.h"
 				>
 			</File>
-			<File
-				RelativePath=".\TextButtonInstance.h"
+			<Filter
+				Name="Instances"
 				>
-			</File>
+				<File
+					RelativePath=".\BaseButtonInstance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\DataModelInstance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\ImageButtonInstance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\Instance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\PhysicalInstance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\TextButtonInstance.h"
+					>
+				</File>
+				<File
+					RelativePath=".\WorkspaceInstance.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/main.cpp b/main.cpp
index 3e5c58a..4250f63 100644
--- a/main.cpp
+++ b/main.cpp
@@ -255,7 +255,7 @@ public:
 
 void CameraButtonListener::onButton1MouseClick(BaseButtonInstance* button)
 {
-	AudioPlayer::PlaySound(cameraSound);
+	AudioPlayer::playSound(cameraSound);
 	CoordinateFrame frame = usableApp->debugCamera.getCoordinateFrame();
 	if(button->name == "CenterCam")
 		centerCam = true;
@@ -280,7 +280,7 @@ void GUDButtonListener::onButton1MouseClick(BaseButtonInstance* button)
 {
 	if(selectedInstance != NULL)
 	{
-		AudioPlayer::PlaySound(dingSound);
+		AudioPlayer::playSound(dingSound);
 		if(button->name == "Duplicate")
 		{
 
@@ -298,7 +298,7 @@ void RotateButtonListener::onButton1MouseClick(BaseButtonInstance* button)
 {
 	if(selectedInstance != NULL)
 	{
-		AudioPlayer::PlaySound(clickSound);
+		AudioPlayer::playSound(clickSound);
 		if(selectedInstance->getClassName() == "Part")
 		{
 			PhysicalInstance* part = (PhysicalInstance*) selectedInstance;
@@ -324,7 +324,7 @@ void deleteInstance()
 				instances.erase(instances.begin() + i);
 				delete deleting;
 				selectedInstance = NULL;
-				AudioPlayer::PlaySound(GetFileInPath("/content/sounds/pageturn.wav"));
+				AudioPlayer::playSound(GetFileInPath("/content/sounds/pageturn.wav"));
 			}
 		}
 	}
@@ -1049,13 +1049,13 @@ void Demo::onUserInput(UserInput* ui) {
 
 	if(ui->keyPressed(SDL_MOUSE_WHEEL_UP_KEY))
 	{
-		AudioPlayer::PlaySound(cameraSound);
+		AudioPlayer::playSound(cameraSound);
 		CoordinateFrame frame = app->debugCamera.getCoordinateFrame();
 		cameraPos = cameraPos + frame.lookVector()*2;
 	}
 	if(ui->keyPressed(SDL_MOUSE_WHEEL_DOWN_KEY))
 	{
-		AudioPlayer::PlaySound(cameraSound);
+		AudioPlayer::playSound(cameraSound);
 		CoordinateFrame frame = app->debugCamera.getCoordinateFrame();
 		cameraPos = cameraPos - frame.lookVector()*2;
 	}