1 files changed, 15 insertions, 7 deletions

diff --git a/src/core.cpp b/src/core.cpp
index 0e73584..d2648d1 100644
--- a/src/core.cpp
+++ b/src/core.cpp
@@ -2000,6 +2000,7 @@ void Core::startMplayer( QString file, double seek ) {
 
 	// Contrast, brightness...
 	if (pref->change_video_equalizer_on_startup) {
+		/*
 		if (mset.contrast != 0) {
 			proc->setOption("contrast", QString::number(mset.contrast));
 		}
@@ -2019,6 +2020,8 @@ void Core::startMplayer( QString file, double seek ) {
 		if (mset.gamma != 0) {
 			proc->setOption("gamma", QString::number(mset.gamma));
 		}
+		*/
+		proc->setVideoEqualizerOptions(mset.contrast, mset.brightness, mset.hue, mset.saturation, mset.gamma, pref->use_soft_video_eq);
 	}
 
 
@@ -2231,22 +2234,24 @@ void Core::startMplayer( QString file, double seek ) {
          || (pref->fullscreen && pref->add_blackborders_on_fullscreen)
          #endif
     ) {
-		proc->addVF("letterbox", QString::number(DesktopInfo::desktop_aspectRatio(mplayerwindow)));
+		proc->addVF("letterbox", DesktopInfo::desktop_size(mplayerwindow));
 	}
 
 	// Software equalizer
+	/*
 	if ( (pref->use_soft_video_eq) ) {
 		proc->addVF("eq2");
 		proc->addVF("hue");
 		if ( (pref->vo == "gl") || (pref->vo == "gl2") || (pref->vo == "gl_tiled")
-#ifdef Q_OS_WIN
+		#ifdef Q_OS_WIN
              || (pref->vo == "directx:noaccel")
-#endif
+		#endif
 		    )
 		{
 			proc->addVF("scale");
 		}
 	}
+	*/
 
 	// Additional video filters, supplied by user
 	// File
@@ -2415,8 +2420,11 @@ void Core::startMplayer( QString file, double seek ) {
 			}
 			qDebug() << "Core::startMplayer: enable_sites:" << enable_sites;
 			proc->setOption("enable_streaming_sites_support", enable_sites);
+			if (enable_sites) proc->setOption("ytdl_quality", pref->ytdl_quality);
 		} else {
-			proc->setOption("enable_streaming_sites_support", pref->streaming_type == Preferences::StreamingYTDL);
+			bool enable_sites = pref->streaming_type == Preferences::StreamingYTDL;
+			proc->setOption("enable_streaming_sites_support", enable_sites);
+			if (enable_sites) proc->setOption("ytdl_quality", pref->ytdl_quality);
 		}
 	}
 #endif
@@ -4114,14 +4122,14 @@ void Core::changeLetterbox(bool b) {
 
 	if (mset.add_letterbox != b) {
 		mset.add_letterbox = b;
-		CHANGE_VF("letterbox", b, DesktopInfo::desktop_aspectRatio(mplayerwindow));
+		CHANGE_VF("letterbox", b, DesktopInfo::desktop_size(mplayerwindow));
 	}
 }
 
 #ifdef ADD_BLACKBORDERS_FS
 void Core::changeLetterboxOnFullscreen(bool b) {
 	qDebug("Core::changeLetterboxOnFullscreen: %d", b);
-	CHANGE_VF("letterbox", b, DesktopInfo::desktop_aspectRatio(mplayerwindow));
+	CHANGE_VF("letterbox", b, DesktopInfo::desktop_size(mplayerwindow));
 }
 #endif
 
@@ -4280,7 +4288,7 @@ void Core::autoZoomFromLetterbox(double aspect) {
 	double zoom_factor = (double) desktop.height() / actual_video.height();
 
 	qDebug("Core::autoZoomFromLetterbox: calculated zoom factor: %f", zoom_factor);
-	changeZoom(zoom_factor);	
+	changeZoom(zoom_factor);
 }
 
 void Core::autoZoomFor169() {