Removing old commented out code

Author: jonoomph

doc/HW-ACCEL.md

@@ -74,20 +74,19 @@ This information might be wrong, and we would love to continue improving
 our support for hardware acceleration in OpenShot. Please help us update
 this document if you find an error or discover some new information.
 
-**Desperately Needed:** a way to compile ffmpeg 4.0 and up with working nVidia
+**Desperately Needed:** A way to compile ffmpeg 4.0 and up with working nVidia
 hardware acceleration support on Ubuntu Linux!
 
-**BUG:** hardware supported decoding still has a bug. The speed gains with
+**BUG:** Hardware supported decoding still has a bug. The speed gains with
 decoding are by far not as great as with encoding. In case hardware accelerated
-decoding does not work disable it.
-Hardware acceleration might also break because of graphics drivers that have
-bugs.
+decoding does not work disable it. Hardware acceleration might also break 
+because of graphics drivers that have bugs.
 
-**Needed:** a way to get the options and limits of the GPU, like
+**Needed:** A way to get the options and limits of the GPU, like
 supported codecs and the supported dimensions (width and height).
 
 **Further improvement:** Right now the frame can be decoded on the GPU but the
-frame is then copied to CPU memory. Before encoding the frame the frame is then
+frame is then copied to CPU memory. Before encoding the frame is then
 copied to GPU memory for encoding. That is necessary because the modifications
 are done by the CPU. Using the GPU for that too will make it possible to do
 away with these two copies. A possible solution would be to use Vulkan compute

include/Settings.h

@@ -76,17 +76,9 @@ namespace openshot {
 		static Settings * m_pInstance;
 
 	public:
-		/// Use video card for faster video decoding (if supported)
-		// REMOVE_HW_OLD
-		//bool HARDWARE_DECODE = false;
-
 		/// Use video codec for faster video decoding (if supported)
 		int HARDWARE_DECODER = 0;
 
-		/// Use video card for faster video encoding (if supported)
-		// REMOVE_HW_OLD
-		//bool HARDWARE_ENCODE = false;
-
 		/// Scale mode used in FFmpeg decoding and encoding (used as an optimization for faster previews)
 		bool HIGH_QUALITY_SCALING = false;
 

src/Settings.cpp

@@ -40,11 +40,7 @@ Settings *Settings::Instance()
 	if (!m_pInstance) {
 		// Create the actual instance of logger only once
 		m_pInstance = new Settings;
-		// REMOVE_HW_OLD
-		//m_pInstance->HARDWARE_DECODE = false;
 		m_pInstance->HARDWARE_DECODER = 0;
-		// REMOVE_HW_OLD
-		//m_pInstance->HARDWARE_ENCODE = false;
 		m_pInstance->HIGH_QUALITY_SCALING = false;
 		m_pInstance->MAX_WIDTH = 0;
 		m_pInstance->MAX_HEIGHT = 0;

tests/Settings_Tests.cpp

@@ -37,8 +37,6 @@ TEST(Settings_Default_Constructor)
 	Settings *s = Settings::Instance();
 
 	CHECK_EQUAL(0, s->HARDWARE_DECODER);
-	// REMOVE_HW_OLD
-	//CHECK_EQUAL(false, s->HARDWARE_ENCODE);
 	CHECK_EQUAL(false, s->HIGH_QUALITY_SCALING);
 	CHECK_EQUAL(false, s->WAIT_FOR_VIDEO_PROCESSING_TASK);
 }
@@ -48,20 +46,14 @@ TEST(Settings_Change_Settings)
 	// Create an empty color
 	Settings *s = Settings::Instance();
 	s->HARDWARE_DECODER = 1;
-	// REMOVE_HW_OLD
-	//s->HARDWARE_ENCODE = true;
 	s->HIGH_QUALITY_SCALING = true;
 	s->WAIT_FOR_VIDEO_PROCESSING_TASK = true;
 
 	CHECK_EQUAL(1, s->HARDWARE_DECODER);
-	// REMOVE_HW_OLD
-	//CHECK_EQUAL(true, s->HARDWARE_ENCODE);
 	CHECK_EQUAL(true, s->HIGH_QUALITY_SCALING);
 	CHECK_EQUAL(true, s->WAIT_FOR_VIDEO_PROCESSING_TASK);
 
 	CHECK_EQUAL(1, s->HARDWARE_DECODER);
-	// REMOVE_HW_OLD
-	//CHECK_EQUAL(true, s->HARDWARE_ENCODE);
 	CHECK_EQUAL(true, Settings::Instance()->HIGH_QUALITY_SCALING);
 	CHECK_EQUAL(true, Settings::Instance()->WAIT_FOR_VIDEO_PROCESSING_TASK);
 }