1 files changed, 28 insertions, 8 deletions

diff --git a/src/core.cpp b/src/core.cpp
index 564e127..7f3f19b 100644
--- a/src/core.cpp
+++ b/src/core.cpp
@@ -1398,8 +1398,8 @@ void Core::frameBackStep() {
 void Core::screenshot() {
 	qDebug("Core::screenshot");
 
-	if ( (!pref->screenshot_directory.isEmpty()) && 
-         (QFileInfo(pref->screenshot_directory).isDir()) ) 
+	if (!pref->screenshot_directory.isEmpty()
+        /* && QFileInfo(pref->screenshot_directory).isDir() */)
 	{
 		proc->setPausingPrefix(pausing_prefix());
 		proc->takeScreenshot(PlayerProcess::Single, pref->subtitles_on_screenshots);
@@ -1413,8 +1413,8 @@ void Core::screenshot() {
 void Core::screenshots() {
 	qDebug("Core::screenshots");
 
-	if ( (!pref->screenshot_directory.isEmpty()) && 
-         (QFileInfo(pref->screenshot_directory).isDir()) ) 
+	if (!pref->screenshot_directory.isEmpty()
+        /* && QFileInfo(pref->screenshot_directory).isDir() */)
 	{
 		proc->takeScreenshot(PlayerProcess::Multiple, pref->subtitles_on_screenshots);
 	} else {
@@ -1577,9 +1577,8 @@ void Core::startMplayer( QString file, double seek ) {
 	}
 
 
-	bool screenshot_enabled = ( (pref->use_screenshot) && 
-                                (!pref->screenshot_directory.isEmpty()) && 
-                                (QFileInfo(pref->screenshot_directory).isDir()) );
+	bool screenshot_enabled = (pref->use_screenshot && !pref->screenshot_directory.isEmpty()
+                               /* && QFileInfo(pref->screenshot_directory).isDir() */);
 
 	proc->clearArguments();
 
@@ -2110,6 +2109,7 @@ void Core::startMplayer( QString file, double seek ) {
 					proc->setOption("ab-loop-a", QString::number(mset.A_marker));
 					proc->setOption("ab-loop-b", QString::number(mset.B_marker));
 				}
+				proc->setOption("ss", QString::number(seek));
 			} else {
 				proc->setOption("ss", QString::number(mset.A_marker));
 				proc->setOption("endpos", QString::number(mset.B_marker - mset.A_marker));
@@ -3485,12 +3485,19 @@ void Core::changeExternalSubFPS(int fps_id) {
 
 // Audio equalizer functions
 void Core::setAudioEqualizer(AudioEqualizerList values, bool restart) {
+	qDebug("Core::setAudioEqualizer");
+
 	if (pref->global_audio_equalizer) {
 		pref->audio_equalizer = values;
 	} else {
 		mset.audio_equalizer = values;
 	}
 
+	if (!pref->use_audio_equalizer) {
+		qDebug("Core::setAudioEqualizer: the audio equalizer is disabled. Ignoring.");
+		return;
+	}
+
 	if (!restart) {
 		proc->setAudioEqualizer(Helper::equalizerListToString(values));
 	} else {
@@ -3561,6 +3568,7 @@ void Core::changeCurrentSec(double sec) {
 
 	mset.current_sec = sec;
 
+#ifdef MSET_USE_STARTING_TIME
 	if (mset.starting_time != -1) {
 		mset.current_sec -= mset.starting_time;
 
@@ -3569,7 +3577,8 @@ void Core::changeCurrentSec(double sec) {
 			mset.current_sec += 8589934592.0 / 90000.0;	// 2^33 / 90 kHz
 		}
 	}
-	
+#endif
+
 	if (state() != Playing) {
 		setState(Playing);
 		qDebug("Core::changeCurrentSec: mplayer reports that now it's playing");
@@ -3607,10 +3616,13 @@ void Core::changeCurrentSec(double sec) {
 void Core::gotStartingTime(double time) {
 	qDebug("Core::gotStartingTime: %f", time);
 	qDebug("Core::gotStartingTime: current_sec: %f", mset.current_sec);
+
+#ifdef MSET_USE_STARTING_TIME
 	if ((mset.starting_time == -1.0) && (mset.current_sec == 0)) {
 		mset.starting_time = time;
 		qDebug("Core::gotStartingTime: starting time set to %f", time);
 	}
+#endif
 }
 
 void Core::gotVideoBitrate(int b) {
@@ -4106,6 +4118,14 @@ void Core::changeAdapter(int n) {
 }
 #endif
 
+void Core::changeAO(const QString & new_ao) {
+	qDebug() << "Core::changeAO:" << new_ao;
+	if (pref->ao != new_ao) {
+		pref->ao = new_ao;
+		if (proc->isRunning()) restartPlay();
+	}
+}
+
 #if 0
 void Core::changeSize(int n) {
 	if ( /*(n != pref->size_factor) &&*/ (!pref->use_mplayer_window) ) {