From 58ce3d8eb9eacdf8df8bd5e74db4aa25d75527b3 Mon Sep 17 00:00:00 2001
From: amazing-username <kdeng02@aurora.edu>
Date: Sun, 9 Apr 2017 19:24:12 -0500
Subject: [PATCH] Added range for increasing and decreasing volume and changed
 volume datatype from unsigned short to short

---
 DecreaseVolume.cpp    | 9 ++++++++-
 IncreaseVolume.cpp    | 9 ++++++++-
 MainVolumeControl.cpp | 8 +-------
 Volume.cpp            | 3 ---
 Volume.h              | 4 +++-
 5 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/DecreaseVolume.cpp b/DecreaseVolume.cpp
index 4c6e476..9dc743e 100644
--- a/DecreaseVolume.cpp
+++ b/DecreaseVolume.cpp
@@ -18,7 +18,14 @@ DecreaseVolume::DecreaseVolume()
 
 void DecreaseVolume::newVolume()
 {
-	volume = volume - AFFECTAMOUNT;
+	if ((volume - AFFECTAMOUNT) > playBackOrigin)
+	{
+		volume = volume - AFFECTAMOUNT;		
+	}
+	else
+	{
+		volume = 0;	
+	}
 }
 void DecreaseVolume::updateVolume()
 {
diff --git a/IncreaseVolume.cpp b/IncreaseVolume.cpp
index 50d9e88..f291312 100644
--- a/IncreaseVolume.cpp
+++ b/IncreaseVolume.cpp
@@ -18,7 +18,14 @@ IncreaseVolume::IncreaseVolume()
 
 void IncreaseVolume::newVolume()
 {
-	volume = volume + AFFECTAMOUNT;
+	if ((volume + AFFECTAMOUNT) < playBackEnd)
+	{
+		volume = volume + AFFECTAMOUNT;	
+	}
+	else
+	{
+		volume = playBackEnd;
+	}
 }
 void IncreaseVolume::updateVolume()
 {
diff --git a/MainVolumeControl.cpp b/MainVolumeControl.cpp
index 15adc3e..68b4efa 100644
--- a/MainVolumeControl.cpp
+++ b/MainVolumeControl.cpp
@@ -1,8 +1,4 @@
 #include<iostream>
-#include<string>
-
-#include"stdio.h"
-#include"stdlib.h"
 
 #include"IncreaseVolume.h"
 #include"DecreaseVolume.h"
@@ -15,16 +11,14 @@ int main(int argc, char* argv[])
 	{
 		IncreaseVolume iv;
 
-		//std::cout << "Volume test: " << iv.getVolume() << std::endl;
 	}
 	else if (action.compare("down") == 0)
 	{
 		DecreaseVolume dv;
-		//std::cout << "Volume test: " << dv.getVolume() << std::endl;
 	}
 	else
 	{
-		std::cout << "Not the same" << std::endl;
+		std::cout << "Choose correct action, up or down" << std::endl;
 	}
 
 	return 0;
diff --git a/Volume.cpp b/Volume.cpp
index d829b5f..8918bbf 100644
--- a/Volume.cpp
+++ b/Volume.cpp
@@ -1,9 +1,6 @@
 #include<iostream>
 #include<fstream>
-#include<string>
 
-#include"stdio.h"
-#include"stdlib.h"
 
 #include"Volume.h"
 
diff --git a/Volume.h b/Volume.h
index 3dc6e8f..242dd12 100644
--- a/Volume.h
+++ b/Volume.h
@@ -26,7 +26,9 @@ public:
 
 protected:
 
-	unsigned short volume;
+	short volume;
+	unsigned short playBackOrigin = 0;
+	unsigned short playBackEnd = 127;
 	const unsigned short AFFECTAMOUNT = 20;
 
 private: