Added range for increasing and decreasing volume and changed volume datatype from unsigned short to short

This commit is contained in:
amazing-username
2017-04-09 19:24:12 -05:00
parent 2b3718f5fd
commit 58ce3d8eb9
5 changed files with 20 additions and 13 deletions
+7
View File
@@ -18,7 +18,14 @@ DecreaseVolume::DecreaseVolume()
void DecreaseVolume::newVolume() void DecreaseVolume::newVolume()
{ {
if ((volume - AFFECTAMOUNT) > playBackOrigin)
{
volume = volume - AFFECTAMOUNT; volume = volume - AFFECTAMOUNT;
}
else
{
volume = 0;
}
} }
void DecreaseVolume::updateVolume() void DecreaseVolume::updateVolume()
{ {
+7
View File
@@ -18,7 +18,14 @@ IncreaseVolume::IncreaseVolume()
void IncreaseVolume::newVolume() void IncreaseVolume::newVolume()
{ {
if ((volume + AFFECTAMOUNT) < playBackEnd)
{
volume = volume + AFFECTAMOUNT; volume = volume + AFFECTAMOUNT;
}
else
{
volume = playBackEnd;
}
} }
void IncreaseVolume::updateVolume() void IncreaseVolume::updateVolume()
{ {
+1 -7
View File
@@ -1,8 +1,4 @@
#include<iostream> #include<iostream>
#include<string>
#include"stdio.h"
#include"stdlib.h"
#include"IncreaseVolume.h" #include"IncreaseVolume.h"
#include"DecreaseVolume.h" #include"DecreaseVolume.h"
@@ -15,16 +11,14 @@ int main(int argc, char* argv[])
{ {
IncreaseVolume iv; IncreaseVolume iv;
//std::cout << "Volume test: " << iv.getVolume() << std::endl;
} }
else if (action.compare("down") == 0) else if (action.compare("down") == 0)
{ {
DecreaseVolume dv; DecreaseVolume dv;
//std::cout << "Volume test: " << dv.getVolume() << std::endl;
} }
else else
{ {
std::cout << "Not the same" << std::endl; std::cout << "Choose correct action, up or down" << std::endl;
} }
return 0; return 0;
-3
View File
@@ -1,9 +1,6 @@
#include<iostream> #include<iostream>
#include<fstream> #include<fstream>
#include<string>
#include"stdio.h"
#include"stdlib.h"
#include"Volume.h" #include"Volume.h"
+3 -1
View File
@@ -26,7 +26,9 @@ public:
protected: protected:
unsigned short volume; short volume;
unsigned short playBackOrigin = 0;
unsigned short playBackEnd = 127;
const unsigned short AFFECTAMOUNT = 20; const unsigned short AFFECTAMOUNT = 20;
private: private: