New upstream version 17.8.0~ds0

1 files changed, 26 insertions, 2 deletions

diff --git a/src/basegui.cpp b/src/basegui.cpp
index 3239cf1..19ba486 100644
--- a/src/basegui.cpp
+++ b/src/basegui.cpp
@@ -764,6 +764,12 @@ void BaseGui::createActions() {
 	connect( volnormAct, SIGNAL(toggled(bool)),
              core, SLOT(toggleVolnorm(bool)) );
 
+#ifdef MPV_SUPPORT
+	earwaxAct = new MyAction( this, "earwax_filter" );
+	earwaxAct->setCheckable( true );
+	connect( earwaxAct, SIGNAL(toggled(bool)),
+             core, SLOT(toggleEarwax(bool)) );
+#endif
 
 	// Menu Subtitles
 	loadSubsAct = new MyAction( this, "load_subs" );
@@ -1137,7 +1143,7 @@ void BaseGui::createActions() {
 
 	// Audio channels
 	channelsGroup = new MyActionGroup(this);
-	/* channelsDefaultAct = new MyActionGroupItem(this, channelsGroup, "channels_default", MediaSettings::ChDefault); */
+	channelsDefaultAct = new MyActionGroupItem(this, channelsGroup, "channels_default", MediaSettings::ChDefault);
 	channelsStereoAct = new MyActionGroupItem(this, channelsGroup, "channels_stereo", MediaSettings::ChStereo);
 	channelsSurroundAct = new MyActionGroupItem(this, channelsGroup, "channels_surround", MediaSettings::ChSurround);
 	channelsFull51Act = new MyActionGroupItem(this, channelsGroup, "channels_ful51", MediaSettings::ChFull51);
@@ -1397,6 +1403,9 @@ void BaseGui::setActionsEnabled(bool b) {
 	karaokeAct->setEnabled(b);
 #endif
 	volnormAct->setEnabled(b);
+#ifdef MPV_SUPPORT
+	earwaxAct->setEnabled(b);
+#endif
 	loadAudioAct->setEnabled(b);
 	//unloadAudioAct->setEnabled(b);
 
@@ -1517,6 +1526,9 @@ void BaseGui::enableActionsOnPlaying() {
 		karaokeAct->setEnabled(false);
 #endif
 		volnormAct->setEnabled(false);
+#ifdef MPV_SUPPORT
+		earwaxAct->setEnabled(false);
+#endif
 		channelsGroup->setActionsEnabled(false);
 		stereoGroup->setActionsEnabled(false);
 	}
@@ -1777,6 +1789,9 @@ void BaseGui::retranslateStrings() {
 	karaokeAct->change( tr("&Karaoke") );
 #endif
 	volnormAct->change( tr("Volume &normalization") );
+#ifdef MPV_SUPPORT
+	earwaxAct->change( tr("&Headphone optimization") + " (earwax)" );
+#endif
 
 	// Menu Subtitles
 	loadSubsAct->change( Images::icon("open"), tr("&Load...") );
@@ -2070,7 +2085,7 @@ void BaseGui::retranslateStrings() {
 	stereomode_menu->menuAction()->setText( tr("&Stereo mode") );
 	stereomode_menu->menuAction()->setIcon( Images::icon("stereo_mode") );
 
-	/* channelsDefaultAct->change( tr("&Default") ); */
+	channelsDefaultAct->change( tr("&Default") );
 	channelsStereoAct->change( tr("&Stereo") );
 	channelsSurroundAct->change( tr("&4.0 Surround") );
 	channelsFull51Act->change( tr("&5.1 Surround") );
@@ -2638,6 +2653,9 @@ void BaseGui::createMenus() {
 	#ifdef MPLAYER_SUPPORT
 	audiofilter_menu->addAction(karaokeAct);
 	#endif
+	#ifdef MPV_SUPPORT
+	audiofilter_menu->addAction(earwaxAct);
+	#endif
 	audiofilter_menu->addAction(volnormAct);
 
 	// Audio channels submenu
@@ -3902,6 +3920,11 @@ void BaseGui::updateWidgets() {
 	// Volnorm menu option
 	volnormAct->setChecked( core->mset.volnorm_filter );
 
+#ifdef MPV_SUPPORT
+	// Earwax menu option
+	earwaxAct->setChecked( core->mset.earwax_filter );
+#endif
+
 	// Repeat menu option
 	repeatAct->setChecked( core->mset.loop );
 
@@ -3978,6 +4001,7 @@ void BaseGui::updateWidgets() {
 		secondary_subtitles_track_menu->setEnabled(false);
 		frameBackStepAct->setEnabled(false);
 		OSDFractionsAct->setEnabled(false);
+		earwaxAct->setEnabled(false);
 	} else {
 		karaokeAct->setEnabled(false);
 	}