From 2b3718f5fd77dfb97dc339101cd9b1099e76367c Mon Sep 17 00:00:00 2001
From: amazing-username <kdeng02@aurora.edu>
Date: Sun, 9 Apr 2017 19:10:28 -0500
Subject: [PATCH] Functioning

---
 AudioDump.h           | 22 ++++++++++++++++++++++
 AudioInformation.cpp  |  6 +++---
 DecreaseVolume.cpp    | 17 +++++++++++++++++
 DecreaseVolume.h      |  1 +
 GetCurrentVolume.sh   |  4 ----
 IncreaseVolume.cpp    | 28 ++++++++++++++++++++++++++++
 IncreaseVolume.h      | 16 ++++++++++++++++
 MainVolumeControl.cpp |  6 ++----
 Volume.h              |  1 +
 9 files changed, 90 insertions(+), 11 deletions(-)
 create mode 100644 AudioDump.h
 delete mode 100755 GetCurrentVolume.sh
 create mode 100644 IncreaseVolume.cpp
 create mode 100644 IncreaseVolume.h

diff --git a/AudioDump.h b/AudioDump.h
new file mode 100644
index 0000000..e83b7a3
--- /dev/null
+++ b/AudioDump.h
@@ -0,0 +1,22 @@
+#ifndef AUDIODUMP_H
+#define AUDIODUMP_H
+
+#include"stdio.h"
+#include"stdlib.h"
+
+class AudioDump
+{
+public:	
+	AudioDump()
+	{
+	
+	}
+
+	void dump()
+	{
+		system("amixer -c 1 get DAC0 > audio.txt");
+	}
+
+};
+
+#endif
diff --git a/AudioInformation.cpp b/AudioInformation.cpp
index 79f515b..0041a58 100644
--- a/AudioInformation.cpp
+++ b/AudioInformation.cpp
@@ -4,9 +4,12 @@
 #include <string>
 
 #include"AudioInformation.h"
+#include"AudioDump.h"
 
 AudioInformation::AudioInformation()
 {
+	AudioDump ad;
+	ad.dump();
 	stripInformation();
 }
 
@@ -15,7 +18,6 @@ void AudioInformation::stripInformation()
 {
 	std::fstream readAudio;
 	readAudio.open("audio.txt", std::ios::in);
-	//std::cout << "In here" << std::endl;
 	
 	while (!readAudio.eof())
 	{
@@ -30,12 +32,10 @@ void AudioInformation::stripInformation()
 		if (count == 3)
 		{
 			readAudio >> data;
-			std::cout << data << " volume" << std::endl;
 			volume = atoi(data.c_str());
 			break;
 		}
 	}
-	//std::cout << std::endl;
 
 	readAudio.close();
 	readAudio.open("currentVolume.txt", std::ios::out);
diff --git a/DecreaseVolume.cpp b/DecreaseVolume.cpp
index 131b0c7..4c6e476 100644
--- a/DecreaseVolume.cpp
+++ b/DecreaseVolume.cpp
@@ -1,11 +1,28 @@
+#include"stdio.h"
+#include"stdlib.h"
+
+#include"AudioInformation.h"
 #include"DecreaseVolume.h"
 
 DecreaseVolume::DecreaseVolume()
 {
+	AudioInformation vol;
 
+	volume = vol.getVolume();
+
+	newVolume();
+	updateVolume();
+	updateTheCurrentVolume();
 }
 
 
+void DecreaseVolume::newVolume()
+{
+	volume = volume - AFFECTAMOUNT;
+}
 void DecreaseVolume::updateVolume()
 {
+	std::string command = "amixer -c 1 set DAC0 ";
+	command.append(std::to_string(volume));
+	system(command.c_str());
 }
diff --git a/DecreaseVolume.h b/DecreaseVolume.h
index ba0e134..eb9d8df 100644
--- a/DecreaseVolume.h
+++ b/DecreaseVolume.h
@@ -8,6 +8,7 @@ class DecreaseVolume : public Volume
 public:
 	DecreaseVolume();
 
+	void newVolume();
 	void updateVolume();
 };
 
diff --git a/GetCurrentVolume.sh b/GetCurrentVolume.sh
deleted file mode 100755
index d885f56..0000000
--- a/GetCurrentVolume.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#Volume Dump
-
-
-amixer -c 1 get DAC0 > audio.txt
diff --git a/IncreaseVolume.cpp b/IncreaseVolume.cpp
new file mode 100644
index 0000000..50d9e88
--- /dev/null
+++ b/IncreaseVolume.cpp
@@ -0,0 +1,28 @@
+#include"stdio.h"
+#include"stdlib.h"
+
+#include"IncreaseVolume.h"
+#include"AudioInformation.h"
+
+IncreaseVolume::IncreaseVolume()
+{
+	AudioInformation vol;
+
+	volume = vol.getVolume();
+	
+	newVolume();
+	updateVolume();
+	updateTheCurrentVolume();
+}
+
+
+void IncreaseVolume::newVolume()
+{
+	volume = volume + AFFECTAMOUNT;
+}
+void IncreaseVolume::updateVolume()
+{
+	std::string command = "amixer -c 1 set DAC0 ";
+	command.append(std::to_string(volume));
+	system(command.c_str());
+}
diff --git a/IncreaseVolume.h b/IncreaseVolume.h
new file mode 100644
index 0000000..1f1266f
--- /dev/null
+++ b/IncreaseVolume.h
@@ -0,0 +1,16 @@
+#ifndef INCREASEVOLUME_H
+#define INCREASEVOLUME_H
+
+#include"Volume.h"
+
+class IncreaseVolume : public Volume
+{
+public:
+	IncreaseVolume();
+
+	void newVolume();
+	void updateVolume();
+
+};
+
+#endif
diff --git a/MainVolumeControl.cpp b/MainVolumeControl.cpp
index b33ef69..15adc3e 100644
--- a/MainVolumeControl.cpp
+++ b/MainVolumeControl.cpp
@@ -14,15 +14,13 @@ int main(int argc, char* argv[])
 	if (action.compare("up") == 0)
 	{
 		IncreaseVolume iv;
-		//iv.setVolume(30);
 
-		std::cout << "Volume test: " << iv.getVolume() << std::endl;
+		//std::cout << "Volume test: " << iv.getVolume() << std::endl;
 	}
 	else if (action.compare("down") == 0)
 	{
 		DecreaseVolume dv;
-		//dv.setVolume(70);
-		std::cout << "Volume test: " << dv.getVolume() << std::endl;
+		//std::cout << "Volume test: " << dv.getVolume() << std::endl;
 	}
 	else
 	{
diff --git a/Volume.h b/Volume.h
index b321693..3dc6e8f 100644
--- a/Volume.h
+++ b/Volume.h
@@ -22,6 +22,7 @@ public:
 	}
 	void updateTheCurrentVolume();
 	virtual void updateVolume() = 0;
+	virtual void newVolume() = 0;
 
 protected: