From 63ff22973b024bf6b47d4f3faa145c8a4a28769d Mon Sep 17 00:00:00 2001 From: amazing-username Date: Sun, 24 Sep 2017 18:51:10 -0500 Subject: [PATCH] Changed from selecting DAC0 to Master and adjusted the volume change amount from 20 to 13 --- AudioDump.h | 2 +- DecreaseVolume.cpp | 2 +- IncreaseVolume.cpp | 2 +- Volume.h | 2 +- makefile | 2 ++ 5 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 makefile diff --git a/AudioDump.h b/AudioDump.h index e83b7a3..1f382ac 100644 --- a/AudioDump.h +++ b/AudioDump.h @@ -14,7 +14,7 @@ public: void dump() { - system("amixer -c 1 get DAC0 > audio.txt"); + system("amixer -c 1 get Master > audio.txt"); } }; diff --git a/DecreaseVolume.cpp b/DecreaseVolume.cpp index 9dc743e..1b62b57 100644 --- a/DecreaseVolume.cpp +++ b/DecreaseVolume.cpp @@ -29,7 +29,7 @@ void DecreaseVolume::newVolume() } void DecreaseVolume::updateVolume() { - std::string command = "amixer -c 1 set DAC0 "; + std::string command = "amixer -c 1 set Master "; command.append(std::to_string(volume)); system(command.c_str()); } diff --git a/IncreaseVolume.cpp b/IncreaseVolume.cpp index f291312..d86b997 100644 --- a/IncreaseVolume.cpp +++ b/IncreaseVolume.cpp @@ -29,7 +29,7 @@ void IncreaseVolume::newVolume() } void IncreaseVolume::updateVolume() { - std::string command = "amixer -c 1 set DAC0 "; + std::string command = "amixer -c 1 set Master "; command.append(std::to_string(volume)); system(command.c_str()); } diff --git a/Volume.h b/Volume.h index 242dd12..3c4188e 100644 --- a/Volume.h +++ b/Volume.h @@ -29,7 +29,7 @@ protected: short volume; unsigned short playBackOrigin = 0; unsigned short playBackEnd = 127; - const unsigned short AFFECTAMOUNT = 20; + const unsigned short AFFECTAMOUNT = 13; private: }; diff --git a/makefile b/makefile new file mode 100644 index 0000000..afd9d8f --- /dev/null +++ b/makefile @@ -0,0 +1,2 @@ +AudioVolume : AudioDump.h AudioInformation.cpp AudioInformation.h DecreaseVolume.cpp DecreaseVolume.h IncreaseVolume.cpp IncreaseVolume.h MainVolumeControl.cpp Volume.cpp Volume.h + g++ AudioDump.h AudioInformation.cpp AudioInformation.h DecreaseVolume.cpp DecreaseVolume.h IncreaseVolume.cpp IncreaseVolume.h MainVolumeControl.cpp Volume.cpp Volume.h -o AudioVolume