Changeset 176 for smplayer/trunk/src/core.cpp

Timestamp:

May 3, 2016, 5:25:45 PM (10 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.4

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/core.cpp (modified) (157 diffs)

smplayer/trunk/src/core.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <[email protected]>
+    Copyright (C) 2006-201 Ricardo Villalba <[email protected]>
 
     This program is free software; you can redistribute it and/or modify
@@ -23 +23 @@
 #include <QTextStream>
 #include <QUrl>
+
 
 #ifdef Q_OS_OS2
@@ -42 +43 @@
 #include "discname.h"
 #include "filters.h"
+
 
 #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
@@ -61 +63 @@
 #ifdef YOUTUBE_SUPPORT
 #include "retrieveyoutubeurl.h"
-  #ifdef YT_USE_SCRIPT
+  #ifdef YT_USE_
   #include "ytsig.h"
   #endif
+
+
 #endif
 
@@ -95 +99 @@
 #endif
 
-    proc = new MplayerProcess(this);
+);
 
         // Do this the first
@@ -138 +142 @@
         */
 
+
+
+
+
+
+
         connect( proc, SIGNAL(receivedCacheEmptyMessage(QString)),
                          this, SIGNAL(buffering()));
@@ -185 +195 @@
         connect( proc, SIGNAL(receivedStartingTime(double)),
              this, SLOT(gotStartingTime(double)) );
+
+
+
 
         connect( proc, SIGNAL(receivedStreamTitle(QString)),
@@ -209 +222 @@
              this, SLOT(initAudioTrack(const Tracks &)), Qt::QueuedConnection );
 #endif
+
+
+
+
+
+
+
+
+
 #if DVDNAV_SUPPORT
         connect( proc, SIGNAL(receivedDVDTitle(int)), 
@@ -271 +293 @@
         yt->setUseHttpsVi(pref->yt_use_https_vi);
 
-        connect(yt, SIGNAL(gotPreferredUrl(const QString &)), this, SLOT(openYT(const QString &)));
+        #ifdef YT_USE_SIG
+        QSettings * sigset = new QSettings(Paths::configPath() + "/sig.ini", QSettings::IniFormat, this);
+        yt->setSettings(sigset);
+        #endif
+
+        connect(yt, SIGNAL(gotPreferredUrl(const QString &, int)), this, SLOT(openYT(const QString &)));
         connect(yt, SIGNAL(connecting(QString)), this, SLOT(connectingToYT(QString)));
         connect(yt, SIGNAL(errorOcurred(int,QString)), this, SLOT(YTFailed(int,QString)));
-        /* connect(yt, SIGNAL(signatureNotFound()), this, SLOT(YTNoSignature())); */
+        
         connect(yt, SIGNAL(signatureNotFound(const QString&)), this, SIGNAL(signatureNotFound(const QString&)));
         connect(yt, SIGNAL(gotEmptyList()), this, SLOT(YTNoVideoUrl()));
@@ -288 +315 @@
 #endif
 
-    if (proc->isRunning()) stopMplayer();
-    proc->terminate();
-    delete proc;
+if (proc->isRunning()) stopMplayer();
+proc->terminate();
+delete proc;
 
 #ifndef NO_USE_INI_FILES
@@ -321 +348 @@
 
 void Core::setState(State s) {
+
         if (s != _state) {
                 _state = s;
@@ -366 +394 @@
 
         if ( (mdat.type == TYPE_FILE) && (!mdat.filename.isEmpty()) ) {
-                file_settings->saveSettingsFor(mdat.filename, mset);
+                file_settings->saveSettingsFor(mdat.filename, mset);
         }
         else
         if ( (mdat.type == TYPE_TV) && (!mdat.filename.isEmpty()) ) {
-                tv_settings->saveSettingsFor(mdat.filename, mset);
+                tv_settings->saveSettingsFor(mdat.filename, mset);
         }
 }
@@ -389 +417 @@
 
 
-void Core::tellmp(const QString & command) {
-        qDebug("Core::tellmp: '%s'", command.toUtf8().data());
-
-    //qDebug("Command: '%s'", command.toUtf8().data());
-    if (proc->isRunning()) {
-                proc->writeToStdin( command );
-    } else {
-                qWarning(" tellmp: no process running: %s", command.toUtf8().data());
-    }
+void Core::changeFullscreenMode(bool b) {
+        proc->setFullscreen(b);
 }
 
@@ -404 +425 @@
 
         if (proc->isRunning()) {
-                QString str = QString("osd_show_text \"%1\" %2 %3\n").arg(text.toUtf8().constData()).arg(duration).arg(level);
-                if (!prefix.isEmpty()) str = prefix + " " + str;
-                qDebug("Core::displayTextOnOSD: command: '%s'", str.toUtf8().constData());
-                proc->write(str.toLatin1());
+                proc->setPausingPrefix(prefix);
+                proc->showOSDText(text, duration, level);
         }
 }
@@ -427 +446 @@
                 openDVD( DiscName::joinDVD(0, file, pref->use_dvdnav) );
 #else
-                openDVD( DiscName::joinDVD(1, file, false) );
+                openDVD( DiscName::joinDVD(, file, false) );
 #endif
         }
@@ -446 +465 @@
                         qDebug("Core::open: * directory contains a dvd");
 #if DVDNAV_SUPPORT
-                        openDVD( DiscName::joinDVD(1, file, pref->use_dvdnav) );
+                        openDVD( DiscName::joinDVD(, file, pref->use_dvdnav) );
 #else
-                        openDVD( DiscName::joinDVD(1, file, false) );
+                        openDVD( DiscName::joinDVD(, file, false) );
 #endif
                 } else {
@@ -544 +563 @@
 }
 
-/*
-void Core::YTNoSignature() {
-        emit showMessage( tr("Video protected. It can't be played."), 5000 );
-}
-*/
-
 void Core::YTNoVideoUrl() {
         emit showMessage( tr("Unable to locate the URL of the video") );
@@ -580 +593 @@
 
                 QFileInfo fi(sub);
-                if ((pref->fast_load_sub) && (fi.suffix().toLower() != "idx") && (mset.external_subtitles_fps == MediaSettings::SFPS_None)) {
+                bool is_idx = (fi.suffix().toLower() == "idx");
+                if (proc->isMPV()) is_idx = false; // Hack to ignore the idx extension with mpv
+
+                if ((pref->fast_load_sub) && (!is_idx) && (mset.external_subtitles_fps == MediaSettings::SFPS_None)) {
                         QString sub_file = sub;
                         #ifdef Q_OS_WIN
@@ -590 +606 @@
                         }
                         #endif
-                        tellmp( "sub_load \""+ sub_file +"\"" );
+                        );
                 } else {
                         restartPlay();
@@ -670 +686 @@
 
         mset.current_title_id = title;
-        mset.current_chapter_id = 1;
         mset.current_angle_id = 1;
 
@@ -700 +715 @@
 
         mset.current_title_id = title;
-        mset.current_chapter_id = -1;
         mset.current_angle_id = -1;
 
@@ -729 +743 @@
 
         mset.current_title_id = title;
-        mset.current_chapter_id = -1;
         mset.current_angle_id = -1;
 
@@ -777 +790 @@
 
         mset.current_title_id = title;
-        mset.current_chapter_id = firstChapter();
         mset.current_angle_id = 1;
 
@@ -826 +838 @@
 
         mset.current_title_id = title;
-        mset.current_chapter_id = firstChapter();
         mset.current_angle_id = 1;
 
@@ -878 +889 @@
 
                         // In this case we read info from config
-                        tv_settings->loadSettingsFor(channel_id, mset);
+                        tv_settings->loadSettingsFor(channel_id, mset);
                         qDebug("Core::openTV: media settings read");
                 }
@@ -893 +904 @@
 
 #ifdef YOUTUBE_SUPPORT
-        // Check if the stream is a youtube url
-        QString yt_full_url = yt->fullUrl(name);
-        if (!yt_full_url.isEmpty()) {
-                qDebug("Core::openStream: youtube url detected: %s", yt_full_url.toLatin1().constData());
-                name = yt_full_url;
-                yt->setPreferredQuality( (RetrieveYoutubeUrl::Quality) pref->yt_quality );
-                qDebug("Core::openStream: user_agent: '%s'", pref->yt_user_agent.toUtf8().constData());
-                /*if (!pref->yt_user_agent.isEmpty()) yt->setUserAgent(pref->yt_user_agent); */
-                yt->setUserAgent(pref->yt_user_agent);
-                #ifdef YT_USE_SCRIPT
-                YTSig::setScriptFile( Paths::configPath() + "/yt.js" );
-                #endif
-                yt->fetchPage(name);
-                return;
+        if (PREF_YT_ENABLED) {
+                // Check if the stream is a youtube url
+                QString yt_full_url = yt->fullUrl(name);
+                if (!yt_full_url.isEmpty()) {
+                        qDebug("Core::openStream: youtube url detected: %s", yt_full_url.toLatin1().constData());
+                        name = yt_full_url;
+                        yt->setPreferredQuality( (RetrieveYoutubeUrl::Quality) pref->yt_quality );
+                        qDebug("Core::openStream: user_agent: '%s'", pref->yt_user_agent.toUtf8().constData());
+                        /*if (!pref->yt_user_agent.isEmpty()) yt->setUserAgent(pref->yt_user_agent); */
+                        yt->setUserAgent(pref->yt_user_agent);
+                        #ifdef YT_USE_YTSIG
+                        YTSig::setScriptFile( Paths::configPath() + "/yt.js" );
+                        #endif
+                        yt->fetchPage(name);
+                        return;
+                }
         }
 #endif
@@ -959 +972 @@
                 // In this case we read info from config
                 if (!pref->dont_remember_media_settings) {
-                        file_settings->loadSettingsFor(file, mset);
+                        file_settings->loadSettingsFor(file, mset);
                         qDebug("Core::playNewFile: Media settings read");
 
@@ -1025 +1038 @@
 
 #ifdef YOUTUBE_SUPPORT
-        // Avoid to pass to mplayer the youtube page url
-        if (mdat.type == TYPE_STREAM) {
-                if (mdat.filename == yt->origUrl()) {
-                        mdat.filename = yt->latestPreferredUrl();
+        if (PREF_YT_ENABLED) {
+                // Avoid to pass to mplayer the youtube page url
+                if (mdat.type == TYPE_STREAM) {
+                        if (mdat.filename == yt->origUrl()) {
+                                mdat.filename = yt->latestPreferredUrl();
+                        }
                 }
         }
@@ -1048 +1063 @@
 
         initializeMenus(); // Old
+
+
+
 
         // Video
@@ -1097 +1115 @@
 #endif
 
-        if (mdat.n_chapters > 0) {
-                // Just to show the first chapter checked in the menu
-                mset.current_chapter_id = firstChapter();
-        }
-
         mdat.initialized = true;
 
@@ -1139 +1152 @@
         }
 
+
+
+
+
 #ifdef YOUTUBE_SUPPORT
-        // Change the real url with the youtube page url and set the title
-        if (mdat.type == TYPE_STREAM) {
-                if (mdat.filename == yt->latestPreferredUrl()) {
-                        mdat.filename = yt->origUrl();
-                        mdat.stream_title = yt->urlTitle();
+        if (PREF_YT_ENABLED) {
+                // Change the real url with the youtube page url and set the title
+                if (mdat.type == TYPE_STREAM) {
+                        if (mdat.filename == yt->latestPreferredUrl()) {
+                                mdat.filename = yt->origUrl();
+                                mdat.stream_title = yt->urlTitle();
+                        }
                 }
         }
@@ -1201 +1220 @@
                 // Recover current subtitle
                 changeSubtitle( mset.current_sub_id );
+
         }
 #endif
@@ -1211 +1231 @@
                 qDebug("Core::finishRestart: don't set volume since -volume is used");
         } else {
+
+
                 if (pref->global_volume) {
                         bool was_muted = pref->mute;
@@ -1217 +1239 @@
                 } else {
                         bool was_muted = mset.mute;
-                         setVolume( mset.volume, true );
+                        setVolume( mset.volume, true );
                         if (was_muted) mute(true);
                 }
-        }
-
+                */
+                int vol = (pref->global_volume ? pref->volume : mset.volume);
+                volumeChanged(vol);
+
+                if (proc->isMPlayer() && pref->mute) {
+                        // Set mute here because mplayer doesn't have an option to set mute from the command line
+                        mute(true);
+                }
+        }
+
+#if 0
+// Old. Gamma already set with option -gamma
         if (pref->change_video_equalizer_on_startup && (mset.gamma != 0)) {
                 int gamma = mset.gamma;
@@ -1227 +1259 @@
                 setGamma( gamma );
         }
+
         // Hack to be sure that the equalizers are up to date
         emit videoEqualizerNeedsUpdate();
@@ -1244 +1277 @@
         emit mediaLoaded();
         emit mediaInfoChanged();
+
 
         updateWidgets(); // New
@@ -1292 +1326 @@
 
         if ((proc->isRunning()) && (state()==Paused)) {
-                tellmp("pause"); // Unpauses
+                
         }
         else
@@ -1319 +1353 @@
         if (proc->isRunning()) {
                 if (state() == Paused) {
-                        tellmp("frame_step");
-                }
-                else {
-                        tellmp("pause");
+                        proc->frameStep();
+                } else {
+                        proc->setPause(true);
                 }
         }
@@ -1328 +1361 @@
 
 void Core::pause() {
-        qDebug("Core::pause");
         qDebug("Core::pause: current state: %s", stateToString().toUtf8().data());
 
         if (proc->isRunning()) {
                 // Pauses and unpauses
-                tellmp("pause");
+                );
         }
 }
@@ -1349 +1381 @@
 
         if (proc->isRunning()) {
-                tellmp("frame_step");
+                proc->frameStep();
+        }
+}
+
+void Core::frameBackStep() {
+        qDebug("Core::frameBackStep");
+
+        if (proc->isRunning()) {
+                proc->frameBackStep();
         }
 }
@@ -1359 +1399 @@
          (QFileInfo(pref->screenshot_directory).isDir()) ) 
         {
-                tellmp( pausing_prefix() + " screenshot 0");
+                proc->setPausingPrefix(pausing_prefix());
+                proc->takeScreenshot(PlayerProcess::Single, pref->subtitles_on_screenshots);
                 qDebug("Core::screenshot: taken screenshot");
         } else {
@@ -1373 +1414 @@
          (QFileInfo(pref->screenshot_directory).isDir()) ) 
         {
-                tellmp( "screenshot 1");
+                );
         } else {
                 qDebug("Core::screenshots: error: directory for screenshots not valid");
@@ -1379 +1420 @@
         }
 }
+
+
+
+
+
+
+
 
 void Core::processFinished()
@@ -1396 +1444 @@
         qDebug("Core::processFinished: exit_code: %d", exit_code);
         if (exit_code != 0) {
+
+
                 emit mplayerFinishedWithError(exit_code);
         }
@@ -1433 +1483 @@
 void Core::goToPos(double perc) {
         qDebug("Core::goToPos: per: %f", perc);
-        tellmp( seek_cmd(perc, 1) );
+        );
 }
 #else
 void Core::goToPos(int perc) {
         qDebug("Core::goToPos: per: %d", perc);
-        tellmp( seek_cmd(perc, 1) );
+        );
 }
 #endif
@@ -1466 +1516 @@
         yt->close();
 #endif
-
-        bool is_mkv = (QFileInfo(file).suffix().toLower() == "mkv");
 
         // DVD
@@ -1478 +1526 @@
                 dvd_title = disc_data.title;
                 file = disc_data.protocol + "://";
-                if (dvd_title > 0) file += QString::number(dvd_title);
+                if (dvd_title > ) file += QString::number(dvd_title);
         }
 
@@ -1525 +1573 @@
         proc->clearArguments();
 
-        // Set working directory to screenshot directory
-        if (screenshot_enabled) {
-                qDebug("Core::startMplayer: setting working directory to '%s'", pref->screenshot_directory.toUtf8().data());
-                proc->setWorkingDirectory( pref->screenshot_directory );
-        }
+        // Set the screenshot directory
+        /* deleted (done later) */
 
         // Use absolute path, otherwise after changing to the screenshot directory
@@ -1536 +1581 @@
         QString mplayer_bin = pref->mplayer_bin;
         QFileInfo fi(mplayer_bin);
-    if (fi.exists() && fi.isExecutable() && !fi.isDir()) {
-        mplayer_bin = fi.absoluteFilePath();
-        }
-
+        if (fi.exists() && fi.isExecutable() && !fi.isDir()) {
+                mplayer_bin = fi.absoluteFilePath();
+        }
+
+#ifdef MPLAYER2_SUPPORT
         if (fi.baseName().toLower() == "mplayer2") {
                 if (!pref->mplayer_is_mplayer2) {
@@ -1546 +1592 @@
                 }
         }
-
-        proc->addArgument( mplayer_bin );
-
-        proc->addArgument("-noquiet");
+#endif
+
+        proc->setExecutable(mplayer_bin);
+        proc->);
 
 #ifdef LOG_MPLAYER
         if (pref->verbose_log) {
-                proc->addArgument("-v");
+                proc->");
         }
 #endif
 
         if (pref->fullscreen && pref->use_mplayer_window) {
-                proc->addArgument("-fs");
+                proc->);
         } else {
                 // No mplayer fullscreen mode
-#if !USE_MPLAYER_PANSCAN
-                proc->addArgument("-nofs");
+                proc->setOption("fs", false);
+        }
+
+#if !ALLOW_DEMUXER_CODEC_CHANGE
+        if (pref->use_lavf_demuxer) {
+                proc->setOption("demuxer", "lavf");
+        }
 #else
-                // The command 'panscan' requires -fs
-                proc->addArgument("-fs");
-#endif
-        }
-
-        proc->addArgument("-nomouseinput");
-
         // Demuxer and audio and video codecs:
         if (!mset.forced_demuxer.isEmpty()) {
-                proc->addArgument("-demuxer");
-                proc->addArgument(mset.forced_demuxer);
+                proc->setOption("demuxer", mset.forced_demuxer);
         }
         if (!mset.forced_audio_codec.isEmpty()) {
-                proc->addArgument("-ac");
-                proc->addArgument(mset.forced_audio_codec);
+                proc->setOption("ac", mset.forced_audio_codec);
         }
         if (!mset.forced_video_codec.isEmpty()) {
-                proc->addArgument("-vc");
-                proc->addArgument(mset.forced_video_codec);
-        }
-#ifndef Q_OS_WIN
-        else {
+                proc->setOption("vc", mset.forced_video_codec);
+        }
+        else
+#endif
+        {
+                #ifndef Q_OS_WIN
                 /* if (pref->vo.startsWith("x11")) { */ // My card doesn't support vdpau, I use x11 to test
                 if (pref->vo.startsWith("vdpau")) {
@@ -1595 +1638 @@
                         if (pref->vdpau.ffodivxvdpau) c += "ffodivxvdpau,";
                         if (!c.isEmpty()) {
-                                proc->addArgument("-vc");
-                                proc->addArgument(c);
+                                proc->setOption("vc", c);
                         }
                 }
-#endif  
                 else {
+
                         if (pref->coreavc) {
-                                proc->addArgument("-vc");
-                                proc->addArgument("coreserve,");
+                                proc->setOption("vc", "coreserve,");
                         }
-                }
-#ifndef Q_OS_WIN
-        }
-#endif
+                
+                }
+        
+        }
 
         if (pref->use_hwac3) {
-                proc->addArgument("-afm");
-                proc->addArgument("hwac3");
-        }
-
-
-        QString lavdopts;
-
-        if ( (pref->h264_skip_loop_filter == Preferences::LoopDisabled) || 
-         ((pref->h264_skip_loop_filter == Preferences::LoopDisabledOnHD) && 
-          (mset.is264andHD)) )
-        {
-                if (!lavdopts.isEmpty()) lavdopts += ":";
-                lavdopts += "skiploopfilter=all";
-        }
-
-        if (pref->threads > 1) {
-                if (!lavdopts.isEmpty()) lavdopts += ":";
-                lavdopts += "threads=" + QString::number(pref->threads);
-        }
-
-        if (!lavdopts.isEmpty()) {
-                proc->addArgument("-lavdopts");
-                proc->addArgument(lavdopts);
-        }
-
-        proc->addArgument("-sub-fuzziness");
-        proc->addArgument( QString::number(pref->subfuzziness) );
-
-        proc->addArgument("-identify");
-
-        if (MplayerVersion::isMplayerAtLeast(27667)) {
-                // From r27667 the number of chapters can be obtained from ID_CHAPTERS
-                mset.current_chapter_id = 0; // Reset chapters
-        } else {
-                // We need this to get info about mkv chapters
-                if (is_mkv) {
-                        proc->addArgument("-msglevel");
-                        proc->addArgument("demux=6");
-
-                        // **** Reset chapter *** 
-                        // Select first chapter, otherwise we cannot
-                        // resume playback at the same point
-                        // (time would be relative to chapter)
-                        mset.current_chapter_id = 0;
-                }
-        }
-
-        proc->addArgument("-slave");
-
-        if (!pref->vo.isEmpty()) {
-                proc->addArgument( "-vo");
-                proc->addArgument( pref->vo );
-        } else {
-                proc->addArgument("-vo");
-#ifdef Q_OS_WIN
-                if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA) {
-                        proc->addArgument("direct3d,");
+                proc->setOption("afm", "hwac3");
+        }
+
+
+        if (proc->isMPlayer()) {
+                // MPlayer
+                QString lavdopts;
+
+                if ( (pref->h264_skip_loop_filter == Preferences::LoopDisabled) || 
+                 ((pref->h264_skip_loop_filter == Preferences::LoopDisabledOnHD) && 
+                  (mset.is264andHD)) )
+                {
+                        if (!lavdopts.isEmpty()) lavdopts += ":";
+                        lavdopts += "skiploopfilter=all";
+                }
+
+                if (pref->threads > 1) {
+                        if (!lavdopts.isEmpty()) lavdopts += ":";
+                        lavdopts += "threads=" + QString::number(pref->threads);
+                }
+
+                if (!lavdopts.isEmpty()) {
+                        proc->setOption("lavdopts", lavdopts);
+                }
+        }
+        else {
+                // MPV
+                if ( (pref->h264_skip_loop_filter == Preferences::LoopDisabled) || 
+                 ((pref->h264_skip_loop_filter == Preferences::LoopDisabledOnHD) && 
+                  (mset.is264andHD)) )
+                {
+                        proc->setOption("skiploopfilter");
+                }
+
+                if (pref->threads > 1) {
+                        proc->setOption("threads", QString::number(pref->threads));
+                }
+        }
+
+        if (!pref->hwdec.isEmpty()) proc->setOption("hwdec", pref->hwdec);
+
+        proc->setOption("sub-fuzziness", pref->subfuzziness);
+
+        if (pref->vo != "player_default") {
+                if (!pref->vo.isEmpty()) {
+                        proc->setOption("vo", pref->vo );
                 } else {
-                        proc->addArgument("directx,");
-                }
-#else
-                proc->addArgument("xv,");
-#endif
+                        #ifdef Q_OS_WIN
+                        if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA) {
+                                proc->setOption("vo", "direct3d,");
+                        } else {
+                                proc->setOption("vo", "directx,");
+                        }
+                        #else
+                        proc->setOption("vo", "xv,");
+                        #endif
+                }
         }
 
 #if USE_ADAPTER
         if (pref->adapter > -1) {
-                proc->addArgument("-adapter");
-                proc->addArgument(QString::number(pref->adapter));
-        }
-#endif
-
-        if (!pref->ao.isEmpty()) {
-                proc->addArgument( "-ao");
-                proc->addArgument( pref->ao );
+                proc->);
+        
+#endif
+
+        if (pref->ao != "player_default") {
+        if (!pref->ao.isEmpty()) {
+                );
+                
         }
 
 #if !defined(Q_OS_WIN) && !defined(Q_OS_OS2)
         if (pref->vo.startsWith("x11")) {
-                proc->addArgument( "-zoom");
-        }
-#endif
-        proc->addArgument("-nokeepaspect");
+                proc->setOption("zoom");
+        }
+#endif
 
         // Performance options
@@ -1716 +1750 @@
                 default:                                                p = "normal";
         }
-        proc->addArgument("-priority");
-        proc->addArgument( p );
+        proc->setOption("priority", p);
         /*
         SetPriorityClass(GetCurrentProcess(), app_p);
@@ -1724 +1757 @@
         #endif
 
+
+
+
+
         if (pref->frame_drop) {
-                proc->addArgument("-framedrop");
-        }
-
+                proc->");
+        }
+        else
         if (pref->hard_frame_drop) {
-                proc->addArgument("-hardframedrop");
+                proc->");
         }
 
         if (pref->autosync) {
-                proc->addArgument("-autosync");
-                proc->addArgument( QString::number( pref->autosync_factor ) );
+                proc->setOption("autosync", QString::number(pref->autosync_factor));
         }
 
         if (pref->use_mc) {
-                proc->addArgument("-mc");
-                proc->addArgument( QString::number( pref->mc_value ) );
-        }
-
-        if (pref->use_direct_rendering) {
-                proc->addArgument("-dr");
-        } else {
-                proc->addArgument("-nodr");
-        }
-
-        if (pref->use_double_buffer) {
-                proc->addArgument("-double");
-        } else {
-                proc->addArgument("-nodouble");
-        }
-
-#if !defined(Q_OS_WIN) && !defined(Q_OS_OS2)
+                proc->setOption("mc", QString::number(pref->mc_value));
+        }
+
+        proc->setOption("dr", pref->use_direct_rendering);
+        proc->setOption("double", pref->use_double_buffer);
+
+#ifdef Q_WS_X11
+        proc->setOption("stop-xscreensaver", pref->disable_screensaver);
+#endif
+
         if (!pref->use_mplayer_window) {
-                proc->addArgument( "-input" );
-                if (MplayerVersion::isMplayerAtLeast(29058)) {
-                        proc->addArgument( "nodefault-bindings:conf=/dev/null" );
-                } else {
-                        proc->addArgument( "conf=" + Paths::dataPath() +"/input.conf" );
-                }
-        }
-#endif
-
-#ifdef Q_WS_X11
-        if (pref->disable_screensaver) {
-                proc->addArgument("-stop-xscreensaver");
-        } else {
-                proc->addArgument("-nostop-xscreensaver");
-        }
-#endif
-
-        if (!pref->use_mplayer_window) {
-                proc->addArgument("-wid");
+                proc->disableInput();
+                proc->setOption("keepaspect", false);
+
 #if defined(Q_OS_OS2)
                 #define WINIDFROMHWND(hwnd) ( ( hwnd ) - 0x80000000UL )
-                proc->addArgument( QString::number( WINIDFROMHWND( (int) mplayerwindow->videoLayer()->winId() ) ));
+                proc-> QString::number( WINIDFROMHWND( (int) mplayerwindow->videoLayer()->winId() ) ));
 #else
-                proc->addArgument( QString::number( (qint64) mplayerwindow->videoLayer()->winId() ) );
+                proc-> QString::number( (qint64) mplayerwindow->videoLayer()->winId() ) );
 #endif
 
@@ -1785 +1798 @@
                 #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
                 if ((pref->vo.startsWith("directx")) || (pref->vo.startsWith("kva")) || (pref->vo.isEmpty())) {
-                        proc->addArgument("-colorkey");
-                        //proc->addArgument( "0x"+QString::number(pref->color_key, 16) );
-                        proc->addArgument( ColorUtils::colorToRGB(pref->color_key) );
+                        proc->setOption("colorkey", ColorUtils::colorToRGB(pref->color_key));
                 } else {
                 #endif
+
                         qDebug("Core::startMplayer: * not using -colorkey for %s", pref->vo.toUtf8().data());
                         qDebug("Core::startMplayer: * report if you can't see the video"); 
+
                 #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
                 }
@@ -1798 +1811 @@
 
                 // Square pixels
-                proc->addArgument("-monitorpixelaspect");
-                proc->addArgument("1");
+                proc->setOption("monitorpixelaspect", "1");
         } else {
                 // no -wid
+
                 if (!pref->monitor_aspect.isEmpty()) {
-                        proc->addArgument("-monitoraspect");
-                        proc->addArgument( pref->monitor_aspect );
-                }
-        }
+                        proc->setOption("monitoraspect", pref->monitor_aspect);
+                }
+        }
+
+        // OSD
+        proc->setOption("osd-scale", proc->isMPlayer() ? pref->subfont_osd_scale : pref->osd_scale);
 
         // Subtitles fonts
         if ((pref->use_ass_subtitles) && (pref->freetype_support)) {
                 // ASS:
-                proc->addArgument("-ass");
-                proc->addArgument("-embeddedfonts");
-
-                proc->addArgument("-ass-line-spacing");
-                proc->addArgument(QString::number(pref->ass_line_spacing));
-
-                proc->addArgument( "-ass-font-scale");
-                proc->addArgument( QString::number(mset.sub_scale_ass) );
+                proc->setOption("ass");
+                proc->setOption("embeddedfonts");
+
+                proc->setOption("ass-line-spacing", QString::number(pref->ass_line_spacing));
+
+                proc->setOption("ass-font-scale", QString::number(mset.sub_scale_ass));
 
 #if !defined(Q_OS_OS2)
-                if (!pref->mplayer_is_mplayer2) {
-                        proc->addArgument( "-noflip-hebrew" ); // It seems to be necessary to display arabic subtitles correctly when using -ass
-                }
-#endif
-
-                if (!pref->force_ass_styles) {
-                        // Load the styles.ass file
-                        if (!QFile::exists(Paths::subtitleStyleFile())) {
-                                // If file doesn't exist, create it
-                                pref->ass_styles.exportStyles(Paths::subtitleStyleFile());
+                #ifdef MPLAYER2_SUPPORT
+                if (!pref->mplayer_is_mplayer2)
+                #endif
+                {
+                        proc->setOption("flip-hebrew",false); // It seems to be necessary to display arabic subtitles correctly when using -ass
+                }
+#endif
+
+                if (pref->enable_ass_styles) {
+                        QString ass_force_style;
+                        if (!pref->user_forced_ass_style.isEmpty()) {
+                                ass_force_style = pref->user_forced_ass_style;
+                        } else {
+                                ass_force_style = pref->ass_styles.toString();
                         }
-                        if (QFile::exists(Paths::subtitleStyleFile())) {
-                                proc->addArgument("-ass-styles");
-                                proc->addArgument( Paths::subtitleStyleFile() );
+
+                        if (proc->isMPV()) {
+                                // MPV
+                                proc->setSubStyles(pref->ass_styles);
+                                if (pref->force_ass_styles) {
+                                        proc->setOption("ass-force-style", ass_force_style);
+                                }
                         } else {
-                                qWarning("Core::startMplayer: '%s' doesn't exist", Paths::subtitleStyleFile().toUtf8().constData());
+                                // MPlayer
+                                if (!pref->force_ass_styles) {
+                                        proc->setSubStyles(pref->ass_styles, Paths::subtitleStyleFile());
+                                } else {
+                                        proc->setOption("ass-force-style", ass_force_style);
+                                }
                         }
-                } else {
-                        // Force styles for ass subtitles too
-                        proc->addArgument("-ass-force-style");
-                        if (!pref->user_forced_ass_style.isEmpty()) {
-                                proc->addArgument(pref->user_forced_ass_style);
-                        } else {
-                                proc->addArgument(pref->ass_styles.toString());
-                        }
-                }
+                }
+
                 // Use the same font for OSD
-#if !defined(Q_OS_OS2)
-                if ((pref->use_fontconfig) && (!pref->ass_styles.fontname.isEmpty())) {
-                        #ifdef USE_FONTCONFIG_OPTIONS
-                        if (!pref->mplayer_is_mplayer2) { // -fontconfig removed from mplayer2
-                                proc->addArgument("-fontconfig");
-                        }
-                        #endif
-                        proc->addArgument("-font");
-                        proc->addArgument( pref->ass_styles.fontname );
-                }
-#endif
+                // deleted
+
                 // Set the size of OSD
-                if (pref->freetype_support) {
-                        proc->addArgument("-subfont-autoscale");
-                        proc->addArgument("0");
-                        if (!pref->mplayer_is_mplayer2) { // Prevent huge OSD in mplayer2
-                                proc->addArgument("-subfont-osd-scale");
-                                proc->addArgument(QString::number(pref->ass_styles.fontsize));
-                        }
-                        proc->addArgument("-subfont-text-scale"); // Old versions (like 1.0rc2) need this
-                        proc->addArgument(QString::number(pref->ass_styles.fontsize));
-                }
+                // deleted
         } else {
                 // NO ASS:
-                if (pref->freetype_support) proc->addArgument("-noass");
-#if !defined(Q_OS_OS2)
-                if ( (pref->use_fontconfig) && (!pref->font_name.isEmpty()) ) {
-                        #ifdef USE_FONTCONFIG_OPTIONS
-                        if (!pref->mplayer_is_mplayer2) { // -fontconfig removed from mplayer2
-                                proc->addArgument("-fontconfig");
-                        }
-                        #endif
-                        proc->addArgument("-font");
-                        proc->addArgument( pref->font_name );
-                }
-#endif
-                if ( (!pref->use_fontconfig) && (!pref->font_file.isEmpty()) ) {
-                        #ifdef USE_FONTCONFIG_OPTIONS
-                        if (!pref->mplayer_is_mplayer2) { // -nofontconfig removed from mplayer2
-                                proc->addArgument("-nofontconfig");
-                        }
-                        #endif
-                        proc->addArgument("-font");
-                        proc->addArgument( pref->font_file );
-                }
-
-                if (pref->freetype_support) {
-                        proc->addArgument( "-subfont-autoscale");
-                        proc->addArgument( QString::number( pref->font_autoscale ) );
-
-                        proc->addArgument( "-subfont-text-scale");
-                        proc->addArgument( QString::number(mset.sub_scale) );
-                }
+                if (pref->freetype_support) proc->setOption("noass");
+                proc->setOption("subfont-text-scale", QString::number(mset.sub_scale));
         }
 
@@ -1918 +1892 @@
 
                 if (!encoding.isEmpty()) {
-                        proc->addArgument("-subcp");
-                        proc->addArgument( encoding );
+                        proc->setOption("subcp", encoding);
                 }
         }
 
         if (mset.closed_caption_channel > 0) {
-                proc->addArgument("-subcc");
-                if (MplayerVersion::isMplayerAtLeast(32607)) {
-                        proc->addArgument( QString::number( mset.closed_caption_channel ) );
-                }
+                proc->setOption("subcc", QString::number(mset.closed_caption_channel));
         }
 
         if (pref->use_forced_subs_only) {
-                proc->addArgument("-forcedsubsonly");
+                proc->forcedsubsonly");
         }
 
@@ -1939 +1909 @@
          (mset.current_audio_id == MediaSettings::NoneSelected)*/ )
         {
-                proc->addArgument("-tsprog");
-                proc->addArgument( QString::number( mset.current_program_id ) );
+                proc->setOption("tsprog", QString::number(mset.current_program_id));
         }
         // Don't set video and audio track if using -tsprog
@@ -1946 +1915 @@
 #endif
 
+
         if (mset.current_video_id != MediaSettings::NoneSelected) {
-                proc->addArgument("-vid");
-                proc->addArgument( QString::number( mset.current_video_id ) );
+                proc->setOption("vid", QString::number(mset.current_video_id));
         }
 
@@ -1955 +1924 @@
                         // Workaround for MPlayer bug #1321 (http://bugzilla.mplayerhq.hu/show_bug.cgi?id=1321)
                         if (mdat.audios.numItems() != 1) {
-                                proc->addArgument("-aid");
-                                proc->addArgument( QString::number( mset.current_audio_id ) );
+                                proc->setOption("aid", QString::number(mset.current_audio_id));
                         }
                 }
         }
+
 
 #if PROGRAM_SWITCH
@@ -1971 +1940 @@
         }
         if (!mset.external_subtitles.isEmpty()) {
-                if (QFileInfo(mset.external_subtitles).suffix().toLower()=="idx") {
+                bool is_idx = (QFileInfo(mset.external_subtitles).suffix().toLower()=="idx");
+                if (proc->isMPV()) is_idx = false; // Hack to ignore the idx extension with mpv
+
+                if (is_idx) {
                         // sub/idx subtitles
                         QFileInfo fi;
@@ -1984 +1956 @@
                         QString s = fi.path() +"/"+ fi.completeBaseName();
                         qDebug("Core::startMplayer: subtitle file without extension: '%s'", s.toUtf8().data());
-                        proc->addArgument("-vobsub");
-                        proc->addArgument( s );
+                        proc->setOption("vobsub", s);
                 } else {
-                        proc->addArgument("-sub");
                         #ifdef Q_OS_WIN
                         if (pref->use_short_pathnames)
-                                proc->addArgument(Helper::shortPathName(mset.external_subtitles));
+                                proc->Helper::shortPathName(mset.external_subtitles));
                         else
                         #endif
-                        proc->addArgument( mset.external_subtitles );
+                        {
+                                proc->setOption("sub", mset.external_subtitles);
+                        }
                 }
                 if (mset.external_subtitles_fps != MediaSettings::SFPS_None) {
@@ -2006 +1978 @@
                                 default: fps = "25";
                         }
-                        proc->addArgument("-subfps");
-                        proc->addArgument( fps );
+                        proc->setOption("subfps", fps);
                 }
         }
 
         if (!mset.external_audio.isEmpty()) {
-                proc->addArgument("-audiofile");
                 #ifdef Q_OS_WIN
                 if (pref->use_short_pathnames)
-                        proc->addArgument(Helper::shortPathName(mset.external_audio));
+                        proc->Helper::shortPathName(mset.external_audio));
                 else
                 #endif
-                proc->addArgument( mset.external_audio );
-        }
-
-        proc->addArgument("-subpos");
-        proc->addArgument( QString::number(mset.sub_pos) );
-
-        if (mset.audio_delay!=0) {
-                proc->addArgument("-delay");
-                proc->addArgument( QString::number( (double) mset.audio_delay/1000 ) );
-        }
-
-        if (mset.sub_delay!=0) {
-                proc->addArgument("-subdelay");
-                proc->addArgument( QString::number( (double) mset.sub_delay/1000 ) );
+                {
+                        proc->setOption("audiofile", mset.external_audio);
+                }
+        }
+
+        proc->setOption("subpos", QString::number(mset.sub_pos));
+
+        if (mset.audio_delay != 0) {
+                proc->setOption("delay", QString::number((double) mset.audio_delay/1000));
+        }
+
+        if (mset.sub_delay != 0) {
+                proc->setOption("subdelay", QString::number((double) mset.sub_delay/1000));
         }
 
@@ -2037 +2006 @@
         if (pref->change_video_equalizer_on_startup) {
                 if (mset.contrast != 0) {
-                        proc->addArgument("-contrast");
-                        proc->addArgument( QString::number( mset.contrast ) );
+                        proc->setOption("contrast", QString::number(mset.contrast));
                 }
         
                 if (mset.brightness != 0) {
-                        proc->addArgument("-brightness");
-                        proc->addArgument( QString::number( mset.brightness ) );
+                        proc->setOption("brightness", QString::number(mset.brightness));
                 }
 
                 if (mset.hue != 0) {
-                        proc->addArgument("-hue");
-                        proc->addArgument( QString::number( mset.hue ) );
+                        proc->setOption("hue", QString::number(mset.hue));
                 }
 
                 if (mset.saturation != 0) {
-                        proc->addArgument("-saturation");
-                        proc->addArgument( QString::number( mset.saturation ) );
-                }
-        }
-
-        // Set volume, requires mplayer svn r27872
-        bool use_volume_option = (MplayerVersion::isMplayerAtLeast(27872));
+                        proc->setOption("saturation", QString::number(mset.saturation));
+                }
+
+                if (mset.gamma != 0) {
+                        proc->setOption("gamma", QString::number(mset.gamma));
+                }
+        }
+
 
         if (pref->mplayer_additional_options.contains("-volume")) {
                 qDebug("Core::startMplayer: don't set volume since -volume is used");
         } else {
-                if (pref->global_volume) {
-                        if (use_volume_option) {
-                                proc->addArgument("-volume");
-                                proc->addArgument( QString::number( pref->volume ) );
-                        }
-                } else {
-                        if (use_volume_option) {
-                                proc->addArgument("-volume");
-                                // Note: mset.volume may not be right, it can be the volume of the previous video if
-                                // playing a new one, but I think it's better to use anyway the current volume on
-                                // startup than set it to 0 or something.
-                                // The right volume will be set later, when the video starts to play.
-                                proc->addArgument( QString::number( mset.volume ) );
-                        }
-                }
+                int vol = (pref->global_volume ? pref->volume : mset.volume);
+                if (proc->isMPV()) {
+                        vol = adjustVolume(vol, pref->use_soft_vol ? pref->softvol_max : 100);
+                }
+                proc->setOption("volume", QString::number(vol));
+        }
+
+        if (pref->mute) {
+                proc->setOption("mute");
         }
 
@@ -2083 +2044 @@
         if (mdat.type==TYPE_DVD) {
                 if (!dvd_folder.isEmpty()) {
-                        proc->addArgument("-dvd-device");
-                        proc->addArgument( dvd_folder );
+                        #ifdef Q_OS_WIN
+                        if (pref->use_short_pathnames) {
+                                proc->setOption("dvd-device", Helper::shortPathName(dvd_folder));
+                        }
+                        else
+                        #endif
+                        proc->setOption("dvd-device", dvd_folder);
                 } else {
                         qWarning("Core::startMplayer: dvd device is empty!");
@@ -2092 +2058 @@
         if ((mdat.type==TYPE_VCD) || (mdat.type==TYPE_AUDIO_CD)) {
                 if (!pref->cdrom_device.isEmpty()) {
-                        proc->addArgument("-cdrom-device");
-                        proc->addArgument( pref->cdrom_device );
-                }
-        }
-
-        if (mset.current_chapter_id > 0) {
-                proc->addArgument("-chapter");
-                int chapter = mset.current_chapter_id;
-                // Fix for older versions of mplayer:
-                if ((mdat.type == TYPE_DVD) && (firstChapter() == 0)) chapter++;
-                proc->addArgument( QString::number( chapter ) );
+                        proc->setOption("cdrom-device", pref->cdrom_device);
+                }
         }
 
         if (mset.current_angle_id > 0) {
-                proc->addArgument("-dvdangle");
-                proc->addArgument( QString::number( mset.current_angle_id ) );
+                proc->setOption("dvdangle", QString::number( mset.current_angle_id));
         }
 
@@ -2129 +2085 @@
         }
 
-        if (cache > 31) { // Minimum value for cache = 32
-                proc->addArgument("-cache");
-                proc->addArgument( QString::number( cache ) );
-        } else {
-                proc->addArgument("-nocache");
-        }
+        proc->setOption("cache", QString::number(cache));
 
         if (mset.speed != 1.0) {
-                proc->addArgument("-speed");
-                proc->addArgument( QString::number( mset.speed ) );
+                proc->setOption("speed", QString::number(mset.speed));
         }
 
@@ -2144 +2094 @@
                 // Play A - B
                 if ((mset.A_marker > -1) && (mset.B_marker > mset.A_marker)) {
-                        proc->addArgument("-ss");
-                        proc->addArgument( QString::number( mset.A_marker ) );
-                        proc->addArgument("-endpos");
-                        proc->addArgument( QString::number( mset.B_marker - mset.A_marker ) );
+                        proc->setOption("ss", QString::number(mset.A_marker));
+                        proc->setOption("endpos", QString::number(mset.B_marker - mset.A_marker));
                 }
                 else
                 // If seek < 5 it's better to allow the video to start from the beginning
                 if ((seek >= 5) && (!mset.loop)) {
-                        proc->addArgument("-ss");
-                        proc->addArgument( QString::number( seek ) );
+                        proc->setOption("ss", QString::number(seek));
                 }
         }
@@ -2159 +2106 @@
         // Enable the OSD later, to avoid a lot of messages to be
         // printed on startup
-        proc->addArgument("-osdlevel");
-        proc->addArgument( "0" );
+        proc->setOption("osdlevel", "0");
 
         if (pref->use_idx) {
-                proc->addArgument("-idx");
+                proc->idx");
         }
 
         if (mdat.type == TYPE_STREAM) {
                 if (pref->prefer_ipv4) {
-                        proc->addArgument("-prefer-ipv4");
+                        proc->prefer-ipv4");
                 } else {
-                        proc->addArgument("-prefer-ipv6");
+                        proc->prefer-ipv6");
                 }
         }
 
         if (pref->use_correct_pts != Preferences::Detect) {
-                if (pref->use_correct_pts == Preferences::Enabled) {
-                        proc->addArgument("-correct-pts");
-                } else {
-                        if (pref->mplayer_detected_version > 0) {
-                                if (MplayerVersion::isMplayerAtLeast(26842)) {
-                                        proc->addArgument("-nocorrect-pts");
-                                } else {
-                                        proc->addArgument("-no-correct-pts");
-                                }
-                        } else {
-                                qDebug("Core::startMplayer: unknown version of mplayer, not passing -no(-)correct-pts");
-                        }
-                }
+                proc->setOption("correct-pts", (pref->use_correct_pts == Preferences::Enabled));
         }
 
@@ -2193 +2127 @@
 
 #ifndef Q_OS_WIN
-        if ((pref->vdpau.disable_video_filters) && (pref->vo.startsWith("vdpau"))) {
-                qDebug("Core::startMplayer: using vdpau, video filters are ignored");
-                goto end_video_filters;
+        if (proc->isMPlayer()) {
+                if ((pref->vdpau.disable_video_filters) && (pref->vo.startsWith("vdpau"))) {
+                        qDebug("Core::startMplayer: using vdpau, video filters are ignored");
+                        goto end_video_filters;
+                }
+        } else {
+                // MPV
+                if (!pref->hwdec.isEmpty() && pref->hwdec != "no") {
+                        qDebug("Core::startMplayer: hardware decoding is enabled. The video filters will be ignored");
+                        goto end_video_filters;
+                }
         }
 #endif
@@ -2202 +2144 @@
         // Phase
         if (mset.phase_filter) {
-                proc->addArgument("-vf-add");
-                proc->addArgument( "phase=A" );
+                proc->addVF("phase", "A");
         }
 
         // Deinterlace
         if (mset.current_deinterlacer != MediaSettings::NoDeinterlace) {
-                proc->addArgument("-vf-add");
                 switch (mset.current_deinterlacer) {
-                        case MediaSettings::L5:                 proc->addArgument("pp=l5"); break;
-                        case MediaSettings::Yadif:              proc->addArgument("yadif"); break;
-                        case MediaSettings::LB:                 proc->addArgument("pp=lb"); break;
-                        case MediaSettings::Yadif_1:    proc->addArgument("yadif=1"); break;
-                        case MediaSettings::Kerndeint:  proc->addArgument("kerndeint=5"); break;
-                }
+                        case MediaSettings::L5:                 proc->addVF("l5"); break;
+                        case MediaSettings::Yadif:              proc->addVF("yadif"); break;
+                        case MediaSettings::LB:                 proc->addVF("lb"); break;
+                        case MediaSettings::Yadif_1:    proc->addVF("yadif", "1"); break;
+                        case MediaSettings::Kerndeint:  proc->addVF("kerndeint", "5"); break;
+                }
+        }
+
+        // 3D stereo
+        if (mset.stereo3d_in != "none" && !mset.stereo3d_out.isEmpty()) {
+                proc->addStereo3DFilter(mset.stereo3d_in, mset.stereo3d_out);
         }
 
         // Denoise
         if (mset.current_denoiser != MediaSettings::NoDenoise) {
-                proc->addArgument("-vf-add");
                 if (mset.current_denoiser==MediaSettings::DenoiseSoft) {
-                        proc->addArgument( pref->filters->item("denoise_soft").filter() );
+                        proc->add);
                 } else {
-                        proc->addArgument( pref->filters->item("denoise_normal").filter() );
+                        proc->add);
                 }
         }
@@ -2230 +2174 @@
         // Unsharp
         if (mset.current_unsharp != 0) {
-                proc->addArgument("-vf-add");
                 if (mset.current_unsharp == 1) {
-                        proc->addArgument( pref->filters->item("blur").filter() );
+                        proc->add);
                 } else {
-                        proc->addArgument( pref->filters->item("sharpen").filter() );
+                        proc->add);
                 }
         }
@@ -2240 +2183 @@
         // Deblock
         if (mset.deblock_filter) {
-                proc->addArgument("-vf-add");
-                proc->addArgument( pref->filters->item("deblock").filter() );
+                proc->addVF("deblock", pref->filters->item("deblock").options());
         }
 
         // Dering
         if (mset.dering_filter) {
-                proc->addArgument("-vf-add");
-                proc->addArgument( "pp=dr" );
+                proc->addVF("dering");
         }
 
         // Gradfun
         if (mset.gradfun_filter) {
-                proc->addArgument("-vf-add");
-                proc->addArgument( pref->filters->item("gradfun").filter() );
+                proc->addVF("gradfun", pref->filters->item("gradfun").options());
         }
 
@@ -2259 +2199 @@
         if (mset.upscaling_filter) {
                 int width = DesktopInfo::desktop_size(mplayerwindow).width();
-                proc->addArgument("-sws");
-                proc->addArgument("9");
-                proc->addArgument("-vf-add");
-                proc->addArgument("scale="+QString::number(width)+":-2");
+                proc->setOption("sws", "9");
+                proc->addVF("scale", QString::number(width) + ":-2");
         }
 
         // Addnoise
         if (mset.noise_filter) {
-                proc->addArgument("-vf-add");
-                proc->addArgument( pref->filters->item("noise").filter() );
+                proc->addVF("noise", pref->filters->item("noise").options());
         }
 
         // Postprocessing
         if (mset.postprocessing_filter) {
-                proc->addArgument("-vf-add");
-                proc->addArgument("pp");
-                proc->addArgument("-autoq");
-                proc->addArgument( QString::number(pref->autoq) );
+                proc->addVF("postprocessing");
+                proc->setOption("autoq", QString::number(pref->autoq));
         }
 
@@ -2282 +2217 @@
         // Letterbox (expand)
         if ((mset.add_letterbox) || (pref->fullscreen && pref->add_blackborders_on_fullscreen)) {
-                proc->addArgument("-vf-add");
-                proc->addArgument( QString("expand=:::::%1,harddup").arg( DesktopInfo::desktop_aspectRatio(mplayerwindow)) );
-                // Note: on some videos (h264 for instance) the subtitles doesn't disappear, 
-                // appearing the new ones on top of the old ones. It seems adding another 
-                // filter after expand fixes the problem. I chose harddup 'cos I think 
-                // it will be harmless in mplayer. 
-                // Anyway, if you know a proper way to fix the problem, please tell me.
+                proc->addVF("expand", QString("aspect=%1").arg( DesktopInfo::desktop_aspectRatio(mplayerwindow)));
         }
 
         // Software equalizer
         if ( (pref->use_soft_video_eq) ) {
-                proc->addArgument("-vf-add");
-                QString eq_filter = "eq2,hue";
+                proc->add");
+                ;
                 if ( (pref->vo == "gl") || (pref->vo == "gl2") || (pref->vo == "gl_tiled")
 #ifdef Q_OS_WIN
              || (pref->vo == "directx:noaccel")
 #endif
-                    ) eq_filter += ",scale";
-                proc->addArgument(eq_filter);
+                    )
+                {
+                        proc->addVF("scale");
+                }
         }
 
@@ -2306 +2237 @@
         // File
         if ( !mset.mplayer_additional_video_filters.isEmpty() ) {
-                proc->addArgument("-vf-add");
-                proc->addArgument( mset.mplayer_additional_video_filters );
+                proc->setOption("vf-add", mset.mplayer_additional_video_filters);
         }
         // Global
         if ( !pref->mplayer_additional_video_filters.isEmpty() ) {
-                proc->addArgument("-vf-add");
-                proc->addArgument( pref->mplayer_additional_video_filters );
+                proc->setOption("vf-add", pref->mplayer_additional_video_filters);
         }
 
@@ -2319 +2248 @@
         {
                 if (pref->use_ass_subtitles) {
-                        proc->addArgument("-vf-add");
-                        proc->addArgument("ass");
+                        proc->addVF("subs_on_screenshots", "ass");
                 } else {
-                        proc->addArgument("-vf-add");
-                        proc->addArgument("expand=osd=1");
-                        //proc->addArgument("-noslices");
+                        proc->addVF("subs_on_screenshots");
                         force_noslices = true;
                 }
@@ -2331 +2257 @@
         // Rotate
         if (mset.rotate != MediaSettings::NoRotate) {
-                proc->addArgument( "-vf-add" );
-                proc->addArgument( QString("rotate=%1").arg(mset.rotate) );
+                proc->addVF("rotate", QString::number(mset.rotate));
         }
 
         // Flip
         if (mset.flip) {
-                proc->addArgument( "-vf-add" );
-                // expand + flip doesn't work well, a workaround is to add another
-                // filter between them, so that's why harddup is here
-                proc->addArgument("harddup,flip");
+                proc->addVF("flip");
         }
 
         // Mirror
         if (mset.mirror) {
-                proc->addArgument( "-vf-add" );
-                proc->addArgument("mirror");
+                proc->addVF("mirror");
         }
 
         // Screenshots
-        if (screenshot_enabled) {
-                proc->addArgument("-vf-add");
-                proc->addArgument("screenshot");
-        }
+        #ifdef MPLAYER_SUPPORT
+        if (screenshot_enabled && proc->isMPlayer()) {
+                QString dir = pref->screenshot_directory;
+                #ifdef Q_OS_WIN
+                if (pref->use_short_pathnames) dir = Helper::shortPathName(pref->screenshot_directory);
+                #endif
+                proc->enableScreenshots(dir);
+        }
+        #endif
 
 #ifndef Q_OS_WIN
@@ -2359 +2285 @@
 #endif
 
+
+
+
+
+
+
+
+
+
+
         // slices
         if ((pref->use_slices) && (!force_noslices)) {
-                proc->addArgument("-slices");
+                proc->);
         } else {
-                proc->addArgument("-noslices");
+                proc->);
         }
 
@@ -2369 +2305 @@
         // Audio channels
         if (mset.audio_use_channels != 0) {
-                proc->addArgument("-channels");
-                proc->addArgument( QString::number( mset.audio_use_channels ) );
-        }
-
-        // Audio filters
-        QString af="";
-        if (mset.karaoke_filter) {
-                af="karaoke";
-        }
-
-        // Stereo mode
-        if (mset.stereo_mode != 0) {
-                switch (mset.stereo_mode) {
-                        case MediaSettings::Left: af += "channels=2:2:0:1:0:0"; break;
-                        case MediaSettings::Right: af += "channels=2:2:1:0:1:1"; break;
-                        case MediaSettings::Mono: af += "pan=1:0.5:0.5"; break;
-                        case MediaSettings::Reverse: af += "channels=2:2:0:1:1:0"; break;
-                }
-        }
-
-        if (mset.extrastereo_filter) {
-                if (!af.isEmpty()) af += ",";
-                af += "extrastereo";
-        }
-
-        if (mset.volnorm_filter) {
-                if (!af.isEmpty()) af += ",";
-                af += pref->filters->item("volnorm").filter();
-        }
-
-        bool use_scaletempo = (pref->use_scaletempo == Preferences::Enabled);
-        if (pref->use_scaletempo == Preferences::Detect) {
-                use_scaletempo = (MplayerVersion::isMplayerAtLeast(24924));
-        }
-        if (use_scaletempo) {
-                if (!af.isEmpty()) af += ",";
-                af += "scaletempo";
-        }
-
-        // Audio equalizer
-        if (pref->use_audio_equalizer) {
-                if (!af.isEmpty()) af += ",";
-                AudioEqualizerList l = pref->global_audio_equalizer ? pref->audio_equalizer : mset.audio_equalizer;
-                af += "equalizer=" + Helper::equalizerListToString(l);
-        }
-
-
-        // Additional audio filters, supplied by user
-        // File
-        if ( !pref->mplayer_additional_audio_filters.isEmpty() ) {
-                if (!af.isEmpty()) af += ",";
-                af += pref->mplayer_additional_audio_filters;
-        }
-        // Global
-        if ( !mset.mplayer_additional_audio_filters.isEmpty() ) {
-                if (!af.isEmpty()) af += ",";
-                af += mset.mplayer_additional_audio_filters;
-        }
-
-        if (!af.isEmpty()) {
+                proc->setOption("channels", QString::number(mset.audio_use_channels));
+        }
+
+        if (!pref->use_hwac3) {
+
+                // Audio filters
+                #ifdef MPLAYER_SUPPORT
+                if (mset.karaoke_filter) {
+                        proc->addAF("karaoke");
+                }
+                #endif
+
+                // Stereo mode
+                if (mset.stereo_mode != 0) {
+                        switch (mset.stereo_mode) {
+                                case MediaSettings::Left: proc->addAF("channels", "2:2:0:1:0:0"); break;
+                                case MediaSettings::Right: proc->addAF("channels", "2:2:1:0:1:1"); break;
+                                case MediaSettings::Mono: proc->addAF("pan", "1:0.5:0.5"); break;
+                                case MediaSettings::Reverse: proc->addAF("channels", "2:2:0:1:1:0"); break;
+                        }
+                }
+
+                if (mset.extrastereo_filter) {
+                        proc->addAF("extrastereo");
+                }
+
+                if (mset.volnorm_filter) {
+                        proc->addAF("volnorm", pref->filters->item("volnorm").options());
+                }
+
+                bool use_scaletempo = (pref->use_scaletempo == Preferences::Enabled);
+                if (pref->use_scaletempo == Preferences::Detect) {
+                        use_scaletempo = (MplayerVersion::isMplayerAtLeast(24924));
+                }
+                if (use_scaletempo) {
+                        proc->addAF("scaletempo");
+                }
+
+                // Audio equalizer
+                if (pref->use_audio_equalizer) {
+                        AudioEqualizerList l = pref->global_audio_equalizer ? pref->audio_equalizer : mset.audio_equalizer;
+                        proc->addAF("equalizer", Helper::equalizerListToString(l));
+                }
+
+                // Additional audio filters, supplied by user
+                // File
+                if ( !pref->mplayer_additional_audio_filters.isEmpty() ) {
+                        proc->setOption("af-add", pref->mplayer_additional_audio_filters);
+                }
+                // Global
+                if ( !mset.mplayer_additional_audio_filters.isEmpty() ) {
+                        proc->setOption("af-add", mset.mplayer_additional_audio_filters);
+                }
+        } else {
                 // Don't use audio filters if using the S/PDIF output
-                if (pref->use_hwac3) {
                         qDebug("Core::startMplayer: audio filters are disabled when using the S/PDIF output!");
-                } else {
-                        proc->addArgument("-af");
-                        proc->addArgument( af );
-                }
         }
 
         if (pref->use_soft_vol) {
-                proc->addArgument("-softvol");
-                proc->addArgument("-softvol-max");
-                proc->addArgument( QString::number(pref->softvol_max) );
-        }
+                proc->setOption("softvol");
+                proc->setOption("softvol-max", QString::number(pref->softvol_max));
+        }
+
+#ifdef MPV_SUPPORT
+        if (pref->streaming_type == Preferences::StreamingAuto) {
+                bool is_youtube = false;
+                #ifdef YOUTUBE_SUPPORT
+                if (PREF_YT_ENABLED) is_youtube = (file == yt->latestPreferredUrl());
+                #endif
+                qDebug() << "Core::startMplayer: is_youtube:" << is_youtube;
+                proc->setOption("enable_streaming_sites_support", !is_youtube);
+        } else {
+                proc->setOption("enable_streaming_sites_support", pref->streaming_type == Preferences::StreamingYTDL);
+        }
+#endif
+
+#ifndef Q_OS_WIN
+        if (proc->isMPV() && file.startsWith("dvb:")) {
+                QString channels_file = TVList::findChannelsFile();
+                qDebug("Core::startMplayer: channels_file: %s", channels_file.toUtf8().constData());
+                if (!channels_file.isEmpty()) proc->setChannelsFile(channels_file);
+        }
+#endif
+
+#ifdef CAPTURE_STREAM
+        // Set the capture directory
+        proc->setCaptureDirectory(pref->capture_directory);
+#endif
 
         // Load edl file
@@ -2460 +2410 @@
                 qDebug("Core::startMplayer: edl file: '%s'", edl_f.toUtf8().data());
                 if (!edl_f.isEmpty()) {
-                        proc->addArgument("-edl");
-                        proc->addArgument(edl_f);
+                        proc->setOption("edl", edl_f);
                 }
         }
@@ -2469 +2418 @@
         if (!mset.mplayer_additional_options.isEmpty()) {
                 QStringList args = MyProcess::splitArguments(mset.mplayer_additional_options);
-        QStringList::Iterator it = args.begin();
-        while( it != args.end() ) {
-                        proc->addArgument( (*it) );
-                        ++it;
-                }
-        }
+                for (int n = 0; n < args.count(); n++) {
+                        QString arg = args[n].simplified();
+                        if (!arg.isEmpty()) {
+                                proc->addUserOption(arg);
+                        }
+                }
+        }
+
         // Global
         if (!pref->mplayer_additional_options.isEmpty()) {
                 QString additional_options = pref->mplayer_additional_options;
+
                 // mplayer2 doesn't support -fontconfig and -nofontconfig
                 if (pref->mplayer_is_mplayer2) {
@@ -2483 +2435 @@
                         additional_options.replace("-nofontconfig", "");
                 }
+
                 QStringList args = MyProcess::splitArguments(additional_options);
                 for (int n = 0; n < args.count(); n++) {
@@ -2488 +2441 @@
                         if (!arg.isEmpty()) {
                                 qDebug("arg %d: %s", n, arg.toUtf8().constData());
-                                proc->addArgument(arg);
+                                proc->add(arg);
                         }
                 }
-        }
-
-        // File to play
-        if (url_is_playlist) {
-                proc->addArgument("-playlist");
-        }
+
+        }
+
+        // Last checks for the file
+
+        // Open https URLs with ffmpeg
+        #if 0
+        // It doesn't seem necessary anymore
+        if (proc->isMPlayer() && file.startsWith("https")) {
+                file = "ffmpeg://" + file;
+        }
+        #endif
+
+#if DVDNAV_SUPPORT
+        if (proc->isMPV() && file.startsWith("dvdnav:")) {
+                // Hack to open the DVD menu with MPV
+                file = "dvd://menu";
+        }
+#endif
 
 #ifdef Q_OS_WIN
-        if (pref->use_short_pathnames)
-                proc->addArgument(Helper::shortPathName(file));
-        else
-#endif
-        proc->addArgument( file );
+        if (pref->use_short_pathnames) {
+                file = Helper::shortPathName(file);
+        }
+#endif
+
+#ifdef MPLAYER_SUPPORT
+        if (proc->isMPlayer()) {
+                proc->setMedia(file, pref->use_playlist_option ? url_is_playlist : false);
+        } else
+#endif
+        {
+                proc->setMedia(file, false); // Don't use playlist with mpv
+        }
 
         // It seems the loop option must be after the filename
         if (mset.loop) {
-                proc->addArgument("-loop");
-                proc->addArgument("0");
+                proc->setOption("loop", "0");
         }
 
@@ -2520 +2493 @@
         emit logLineAvailable(line_for_log);
 
-#ifdef Q_OS_WIN
         QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+
+
+
+
+
+
         if (!pref->use_windowsfontdir) {
                 env.insert("FONTCONFIG_FILE", Paths::configPath() + "/fonts.conf");
         }
+
         proc->setProcessEnvironment(env);
-#endif
+
         if ( !proc->start() ) {
             // error handling
@@ -2538 +2517 @@
 
         if (!proc->isRunning()) {
-                qWarning("Core::stopMplayer: mplayer in not running!");
+                qWarning("Core::stopMplayer: mplayer i not running!");
                 return;
         }
@@ -2547 +2526 @@
         connect(proc, SIGNAL(processExited()), &eventLoop, SLOT(quit()));
 
-        tellmp("quit");
+        );
 
         QTimer::singleShot(5000, &eventLoop, SLOT(quit()));
@@ -2557 +2536 @@
         }
 #else
-    tellmp("quit");
-    
+);
+
         qDebug("Core::stopMplayer: Waiting mplayer to finish...");
         if (!proc->waitForFinished(pref->time_to_kill_mplayer)) {
@@ -2573 +2552 @@
         qDebug("Core::goToSec: %f", sec);
 
-    if (sec < 0) sec = 0;
-    if (sec > mdat.duration ) sec = mdat.duration - 20;
-    tellmp( seek_cmd(sec, 2) );
+if (sec < 0) sec = 0;
+if (sec > mdat.duration ) sec = mdat.duration - 20;
+);
 }
 
@@ -2582 +2561 @@
         qDebug("Core::seek: %d", secs);
         if ( (proc->isRunning()) && (secs!=0) ) {
-                tellmp( seek_cmd(secs, 0) );
-        }
-}
-
-QString Core::seek_cmd(double secs, int mode) {
-        QString s = QString("seek %1 %2").arg(secs).arg(mode);
-        if (MplayerVersion::isMplayer2()) {
-                //hr-seek
-                if (pref->precise_seeking) s += " 1"; else s += " -1";
-        }
-        return s;
+                seek_cmd(secs, 0);
+        }
+}
+
+void Core::seek_cmd(double secs, int mode) {
+        proc->seek(secs, mode, pref->precise_seeking);
 }
 
@@ -2638 +2612 @@
         seek(-secs);
 }
+
+
+
+
+
+
+
+
+
+
+
+
 
 void Core::wheelUp() {
@@ -2721 +2707 @@
                         int v = -1; // no loop
                         if (mset.loop) v = 0; // infinite loop
-                        tellmp( QString("loop %1 1").arg(v) );
+                        );
                 } else {
                         // Restart mplayer
@@ -2730 +2716 @@
 
 
-void Core::toggleFlip() {
-        qDebug("Core::toggleFlip");
-        toggleFlip( !mset.flip );
-}
-
-void Core::toggleFlip(bool b) {
-        qDebug("Core::toggleFlip: %d", b);
-
-        if (mset.flip != b) {
-                mset.flip = b;
-                if (proc->isRunning()) restartPlay();
-        }
-}
-
-void Core::toggleMirror() {
-        qDebug("Core::toggleMirror");
-        toggleMirror( !mset.mirror );
-}
-
-void Core::toggleMirror(bool b) {
-        qDebug("Core::toggleMirror: %d", b);
-
-        if (mset.mirror != b) {
-                mset.mirror = b;
-                if (proc->isRunning()) restartPlay();
-        }
-}
-
 // Audio filters
+
 void Core::toggleKaraoke() {
         toggleKaraoke( !mset.karaoke_filter );
@@ -2769 +2728 @@
                 if (MplayerVersion::isMplayerAtLeast(31030)) {
                         // Change filter without restarting
-                        if (b) tellmp("af_add karaoke"); else tellmp("af_del karaoke");
+                        );
                 } else {
                         restartPlay();
@@ -2775 +2734 @@
         }
 }
+
 
 void Core::toggleExtrastereo() {
@@ -2786 +2746 @@
                 if (MplayerVersion::isMplayerAtLeast(31030)) {
                         // Change filter without restarting
-                        if (b) tellmp("af_add extrastereo"); else tellmp("af_del extrastereo");
+                        );
                 } else {
                         restartPlay();
@@ -2804 +2764 @@
                         // Change filter without restarting
                         QString f = pref->filters->item("volnorm").filter();
-                        if (b) tellmp("af_add " + f); else tellmp("af_del volnorm");
+                        );
                 } else {
                         restartPlay();
@@ -2829 +2789 @@
 
 // Video filters
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 void Core::toggleAutophase() {
         toggleAutophase( !mset.phase_filter );
@@ -2837 +2831 @@
         if ( b != mset.phase_filter) {
                 mset.phase_filter = b;
-                restartPlay();
+                );
         }
 }
@@ -2849 +2843 @@
         if ( b != mset.deblock_filter ) {
                 mset.deblock_filter = b;
-                restartPlay();
+                );
         }
 }
@@ -2861 +2855 @@
         if ( b != mset.dering_filter) {
                 mset.dering_filter = b;
-                restartPlay();
+                );
         }
 }
@@ -2873 +2867 @@
         if ( b != mset.gradfun_filter) {
                 mset.gradfun_filter = b;
-                restartPlay();
+                );
         }
 }
@@ -2883 +2877 @@
 void Core::toggleNoise(bool b) {
         qDebug("Core::toggleNoise: %d", b);
-        if ( b!= mset.noise_filter ) {
+        if ( b!= mset.noise_filter ) {
                 mset.noise_filter = b;
-                restartPlay();
+                );
         }
 }
@@ -2897 +2891 @@
         if ( b != mset.postprocessing_filter ) {
                 mset.postprocessing_filter = b;
-                restartPlay();
+                );
         }
 }
@@ -2904 +2898 @@
         qDebug( "Core::changeDenoise: %d", id );
         if (id != mset.current_denoiser) {
-                mset.current_denoiser = id;
-                restartPlay();
+                if (proc->isMPlayer()) {
+                        mset.current_denoiser = id;
+                        restartPlay();
+                } else {
+                        // MPV
+                        QString dsoft = pref->filters->item("denoise_soft").options();
+                        QString dnormal = pref->filters->item("denoise_normal").options();
+                        // Remove previous filter
+                        switch (mset.current_denoiser) {
+                                case MediaSettings::DenoiseSoft: proc->changeVF("hqdn3d", false, dsoft); break;
+                                case MediaSettings::DenoiseNormal: proc->changeVF("hqdn3d", false, dnormal); break;
+                        }
+                        // New filter
+                        mset.current_denoiser = id;
+                        switch (mset.current_denoiser) {
+                                case MediaSettings::DenoiseSoft: proc->changeVF("hqdn3d", true, dsoft); break;
+                                case MediaSettings::DenoiseNormal: proc->changeVF("hqdn3d", true, dnormal); break;
+                        }
+                }
         }
 }
@@ -2912 +2923 @@
         qDebug( "Core::changeUnsharp: %d", id );
         if (id != mset.current_unsharp) {
-                mset.current_unsharp = id;
-                restartPlay();
+                if (proc->isMPlayer()) {
+                        mset.current_unsharp = id;
+                        restartPlay();
+                } else {
+                        // MPV
+                        // Remove previous filter
+                        switch (mset.current_unsharp) {
+                                // Current is blur
+                                case 1: proc->changeVF("blur", false); break;
+                                // Current if sharpen
+                                case 2: proc->changeVF("sharpen", false); break;
+                        }
+                        // New filter
+                        mset.current_unsharp = id;
+                        switch (mset.current_unsharp) {
+                                case 1: proc->changeVF("blur", true); break;
+                                case 2: proc->changeVF("sharpen", true); break;
+                        }
+                }
         }
 }
@@ -2921 +2949 @@
         if (mset.upscaling_filter != b) {
                 mset.upscaling_filter = b;
-                restartPlay();
+                int width = DesktopInfo::desktop_size(mplayerwindow).width();
+                CHANGE_VF("scale", b, QString::number(width) + ":-2");
+        }
+}
+
+void Core::changeStereo3d(const QString & in, const QString & out) {
+        qDebug("Core::changeStereo3d: in: %s out: %s", in.toUtf8().constData(), out.toUtf8().constData());
+
+        if ((mset.stereo3d_in != in) || (mset.stereo3d_out != out)) {
+                if (proc->isMPlayer()) {
+                        mset.stereo3d_in = in;
+                        mset.stereo3d_out = out;
+                        restartPlay();
+                } else {
+                        // Remove previous filter
+                        if (mset.stereo3d_in != "none" && !mset.stereo3d_out.isEmpty()) {
+                                proc->changeStereo3DFilter(false, mset.stereo3d_in, mset.stereo3d_out);
+                        }
+
+                        // New filter
+                        mset.stereo3d_in = in;
+                        mset.stereo3d_out = out;
+                        if (mset.stereo3d_in != "none" && !mset.stereo3d_out.isEmpty()) {
+                                proc->changeStereo3DFilter(true, mset.stereo3d_in, mset.stereo3d_out);
+                        }
+                }
         }
 }
@@ -2932 +2985 @@
 
         if (value != mset.brightness) {
-                tellmp(pausing_prefix() + " brightness " + QString::number(value) + " 1");
+                proc->setPausingPrefix(pausing_prefix());
+                proc->setBrightness(value);
                 mset.brightness = value;
                 displayMessage( tr("Brightness: %1").arg(value) );
@@ -2947 +3001 @@
 
         if (value != mset.contrast) {
-                tellmp(pausing_prefix() + " contrast " + QString::number(value) + " 1");
+                proc->setPausingPrefix(pausing_prefix());
+                proc->setContrast(value);
                 mset.contrast = value;
                 displayMessage( tr("Contrast: %1").arg(value) );
@@ -2961 +3016 @@
 
         if (value != mset.gamma) {
-                tellmp(pausing_prefix() + " gamma " + QString::number(value) + " 1");
+                proc->setPausingPrefix(pausing_prefix());
+                proc->setGamma(value);
                 mset.gamma= value;
                 displayMessage( tr("Gamma: %1").arg(value) );
@@ -2975 +3031 @@
 
         if (value != mset.hue) {
-                tellmp(pausing_prefix() + " hue " + QString::number(value) + " 1");
+                proc->setPausingPrefix(pausing_prefix());
+                proc->setHue(value);
                 mset.hue = value;
                 displayMessage( tr("Hue: %1").arg(value) );
@@ -2989 +3046 @@
 
         if (value != mset.saturation) {
-                tellmp(pausing_prefix() + " saturation " + QString::number(value) + " 1");
+                proc->setPausingPrefix(pausing_prefix());
+                proc->setSaturation(value);
                 mset.saturation = value;
                 displayMessage( tr("Saturation: %1").arg(value) );
@@ -3043 +3101 @@
 
         mset.speed = value;
-        tellmp( "speed_set " + QString::number( value ) );
+        );
 
         displayMessage( tr("Speed: %1").arg(value) );
@@ -3092 +3150 @@
 }
 
+
+
+
+
+
+
+
 void Core::setVolume(int volume, bool force) {
         qDebug("Core::setVolume: %d", volume);
@@ -3103 +3168 @@
         if (current_volume < 0) current_volume = 0;
 
-        if (state() == Paused) {
-                // Change volume later, after quiting pause
-                change_volume_after_unpause = true;
+        if (proc->isMPV()) {
+                // MPV
+                int vol = adjustVolume(current_volume, pref->use_soft_vol ? pref->softvol_max : 100);
+                proc->setVolume(vol);
         } else {
-                tellmp("volume " + QString::number(current_volume) + " 1");
+                // MPlayer
+                if (state() == Paused) {
+                        // Change volume later, after quiting pause
+                        change_volume_after_unpause = true;
+                } else {
+                        proc->setVolume(current_volume);
+                }
         }
 
@@ -3134 +3206 @@
         qDebug("Core::mute");
 
-        int v = (b ? 1 : 0);
-        tellmp( pausing_prefix() + " mute " + QString::number(v) );
+        );
+        );
 
         if (pref->global_volume) {
@@ -3146 +3218 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
 void Core::incVolume() {
         qDebug("Core::incVolume");
-        int new_vol = (pref->global_volume ? pref->volume + pref->min_step : mset.volume + pref->min_step);
-        setVolume(new_vol);
+        incVolume(pref->min_step);
 }
 
 void Core::decVolume() {
         qDebug("Core::incVolume");
-        int new_vol = (pref->global_volume ? pref->volume - pref->min_step : mset.volume - pref->min_step);
-        setVolume(new_vol);
+        decVolume(pref->min_step);
 }
 
@@ -3161 +3243 @@
         qDebug("Core::setSubDelay: %d", delay);
         mset.sub_delay = delay;
-        tellmp( pausing_prefix() + " sub_delay " + QString::number( (double) mset.sub_delay/1000 ) +" 1");
+        proc->setPausingPrefix(pausing_prefix());
+        proc->setSubDelay((double) mset.sub_delay/1000);
         displayMessage( tr("Subtitle delay: %1 ms").arg(delay) );
 }
@@ -3178 +3261 @@
         qDebug("Core::setAudioDelay: %d", delay);
         mset.audio_delay = delay;
-        tellmp( pausing_prefix() + " audio_delay " + QString::number( (double) mset.audio_delay/1000 ) +" 1");
+        proc->setPausingPrefix(pausing_prefix());
+        proc->setAudioDelay((double) mset.audio_delay/1000);
         displayMessage( tr("Audio delay: %1 ms").arg(delay) );
 }
@@ -3197 +3281 @@
         mset.sub_pos++;
         if (mset.sub_pos > 100) mset.sub_pos = 100;
-        tellmp("sub_pos " + QString::number( mset.sub_pos ) + " 1");
+        );
 }
 
@@ -3205 +3289 @@
         mset.sub_pos--;
         if (mset.sub_pos < 0) mset.sub_pos = 0;
-        tellmp("sub_pos " + QString::number( mset.sub_pos ) + " 1");
+        );
 }
 
@@ -3234 +3318 @@
                                 restartPlay();
                         } else {
-                                tellmp("sub_scale " + QString::number( mset.sub_scale_ass ) + " 1");
+                                );
                         }
                         displayMessage( tr("Font scale: %1").arg(mset.sub_scale_ass) );
@@ -3245 +3329 @@
                                 restartPlay();
                         } else {
-                                tellmp("sub_scale " + QString::number( mset.sub_scale ) + " 1");
-                                
+                                proc->setSubScale(mset.sub_scale);
                         }
                         displayMessage( tr("Font scale: %1").arg(mset.sub_scale) );
@@ -3275 +3358 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 void Core::incSubStep() {
         qDebug("Core::incSubStep");
-        tellmp("sub_step +1");
+        );
 }
 
 void Core::decSubStep() {
         qDebug("Core::decSubStep");
-        tellmp("sub_step -1");
+        );
 }
 
@@ -3288 +3405 @@
         qDebug("Core::changeSubVisilibity: %d", visible);
         pref->sub_visibility = visible;
-        tellmp(QString("sub_visibility %1").arg(pref->sub_visibility ? 1 : 0));
+        );
 
         if (pref->sub_visibility) 
@@ -3313 +3430 @@
 
         if (!restart) {
-                const char *command = "af_cmdline equalizer ";
-                if (!MplayerVersion::isMplayerAtLeast(32505))
-                        command = "af_eq_set_bands ";
-                tellmp( command + Helper::equalizerListToString(values) );
+                proc->setAudioEqualizer(Helper::equalizerListToString(values));
         } else {
                 restartPlay();
         }
 
-        emit audioEqualizerNeedsUpdate();
+        // Infinite recursion
+        //emit audioEqualizerNeedsUpdate();
 }
 
@@ -3384 +3499 @@
         if (mset.starting_time != -1) {
                 mset.current_sec -= mset.starting_time;
+
+
+
+
+
         }
         
@@ -3429 +3549 @@
 }
 
+
+
+
+
+
+
+
 
 void Core::changePause() {
@@ -3440 +3567 @@
         qDebug("Core::changeDeinterlace: %d", ID);
 
-        if (ID!=mset.current_deinterlacer) {
-                mset.current_deinterlacer = ID;
-                restartPlay();
+        if (ID != mset.current_deinterlacer) {
+                if (proc->isMPlayer()) {
+                        mset.current_deinterlacer = ID;
+                        restartPlay();
+                } else {
+                        // MPV
+                        // Remove previous filter
+                        switch (mset.current_deinterlacer) {
+                                case MediaSettings::L5:                 proc->changeVF("l5", false); break;
+                                case MediaSettings::Yadif:              proc->changeVF("yadif", false); break;
+                                case MediaSettings::LB:                 proc->changeVF("lb", false); break;
+                                case MediaSettings::Yadif_1:    proc->changeVF("yadif", false, "1"); break;
+                                case MediaSettings::Kerndeint:  proc->changeVF("kerndeint", false, "5"); break;
+                        }
+                        mset.current_deinterlacer = ID;
+                        // New filter
+                        switch (mset.current_deinterlacer) {
+                                case MediaSettings::L5:                 proc->changeVF("l5", true); break;
+                                case MediaSettings::Yadif:              proc->changeVF("yadif", true); break;
+                                case MediaSettings::LB:                 proc->changeVF("lb", true); break;
+                                case MediaSettings::Yadif_1:    proc->changeVF("yadif", true, "1"); break;
+                                case MediaSettings::Kerndeint:  proc->changeVF("kerndeint", true, "5"); break;
+                        }
+                }
         }
 }
@@ -3463 +3611 @@
         qDebug("Core::changeSubtitle: ID: %d", ID);
 
-        bool use_new_commands = (pref->use_new_sub_commands == Preferences::Enabled);
-        if (pref->use_new_sub_commands == Preferences::Detect) {
-                use_new_commands = (MplayerVersion::isMplayerAtLeast(25158));
-        }
-
-        if (!use_new_commands) {
-                // Old command sub_select
-                tellmp( "sub_select " + QString::number(ID) );
+        int real_id = -1;
+        if (ID == -1) {
+                proc->disableSubtitles();
         } else {
-                // New commands
-                int real_id = -1;
-                if (ID == -1) {
-                        tellmp( "sub_source -1" );
+                bool valid_item = ( (ID >= 0) && (ID < mdat.subs.numItems()) );
+                if (!valid_item) qWarning("Core::changeSubtitle: ID: %d is not valid!", ID);
+                if ( (mdat.subs.numItems() > 0) && (valid_item) ) {
+                        real_id = mdat.subs.itemAt(ID).ID();
+                        proc->setSubtitle(mdat.subs.itemAt(ID).type(), real_id);
                 } else {
-                        bool valid_item = ( (ID >= 0) && (ID < mdat.subs.numItems()) );
-                        if (!valid_item) qWarning("Core::changeSubtitle: ID: %d is not valid!", ID);
-                        if ( (mdat.subs.numItems() > 0) && (valid_item) ) {
-                                real_id = mdat.subs.itemAt(ID).ID();
-                                switch (mdat.subs.itemAt(ID).type()) {
-                                        case SubData::Vob:
-                                                tellmp( "sub_vob " + QString::number(real_id) );
-                                                break;
-                                        case SubData::Sub:
-                                                tellmp( "sub_demux " + QString::number(real_id) );
-                                                break;
-                                        case SubData::File:
-                                                tellmp( "sub_file " + QString::number(real_id) );
-                                                break;
-                                        default: {
-                                                qWarning("Core::changeSubtitle: unknown type!");
-                                        }
-                                }
-                        } else {
-                                qWarning("Core::changeSubtitle: subtitle list is empty!");
-                        }
+                        qWarning("Core::changeSubtitle: subtitle list is empty!");
                 }
         }
@@ -3521 +3645 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 void Core::changeAudio(int ID, bool allow_restart) {
         qDebug("Core::changeAudio: ID: %d, allow_restart: %d", ID, allow_restart);
@@ -3529 +3680 @@
 
                 bool need_restart = false;
+
                 if (allow_restart) {
                         need_restart = (pref->fast_audio_change == Preferences::Disabled);
@@ -3535 +3687 @@
                         }
                 }
+
 
                 if (need_restart) {
-                        restartPlay(); 
+                        restartPlay();
                 } else {
-                        tellmp("switch_audio " + QString::number(ID) );
+                        );
                         // Workaround for a mplayer problem in windows,
                         // volume is too loud after changing audio.
@@ -3546 +3699 @@
                         // the volume is reduced if using -softvol-max.
 
-                        if (pref->mplayer_additional_options.contains("-volume")) {
-                                qDebug("Core::changeAudio: don't set volume since -volume is used");
-                        } else {
-                                if (pref->global_volume) {
-                                        setVolume( pref->volume, true);
-                                        if (pref->mute) mute(true);
+                        if (proc->isMPlayer()) {
+                                if (pref->mplayer_additional_options.contains("-volume")) {
+                                        qDebug("Core::changeAudio: don't set volume since -volume is used");
                                 } else {
-                                        setVolume( mset.volume, true );
-                                        if (mset.mute) mute(true); // if muted, mute again
+                                        if (pref->global_volume) {
+                                                setVolume( pref->volume, true);
+                                                if (pref->mute) mute(true);
+                                        } else {
+                                                setVolume( mset.volume, true );
+                                                if (mset.mute) mute(true); // if muted, mute again
+                                        }
                                 }
                         }
@@ -3596 +3751 @@
                         if (mdat.demuxer == "nsv") {
                                 // Workaround a problem with the nsv demuxer
-                                qWarning("Core::changeVideo: not calling set_property switch_video with nsv to prevent mplayer go crazy");
+                                qWarning("Core::changeVideo: not cvideo with nsv to prevent mplayer go crazy");
                         } else {
-                                tellmp("set_property switch_video " + QString::number(ID) );
+                                );
                         }
                 }
@@ -3626 +3781 @@
         if (ID != mset.current_program_id) {
                 mset.current_program_id = ID;
-                tellmp("set_property switch_program " + QString::number(ID) );
-
-                tellmp("get_property switch_audio");
-                tellmp("get_property switch_video");
+                proc->setTSProgram(ID);
 
                 /*
@@ -3661 +3813 @@
                 #if DVDNAV_SUPPORT
                 if (mdat.filename.startsWith("dvdnav:")) {
-                        tellmp("switch_title " + QString::number(ID));
+                        );
                 } else {
                 #endif
@@ -3689 +3841 @@
 void Core::changeChapter(int ID) {
         qDebug("Core::changeChapter: ID: %d", ID);
-
-        if (mdat.type != TYPE_DVD) {
-                /*
-                if (mdat.chapters.find(ID) > -1) {
-                        double start = mdat.chapters.item(ID).start();
-                        qDebug("Core::changeChapter: start: %f", start);
-                        goToSec(start);
-                        mset.current_chapter_id = ID;
-                } else {
-                */
-                        tellmp("seek_chapter " + QString::number(ID) +" 1");
-                        mset.current_chapter_id = ID;
-                        //updateWidgets();
-                /*
-                }
-                */
-        } else {
-#if SMART_DVD_CHAPTERS
-                if (pref->cache_for_dvds == 0) {
-#else
-                if (pref->fast_chapter_change) {
-#endif
-                        tellmp("seek_chapter " + QString::number(ID) +" 1");
-                        mset.current_chapter_id = ID;
-                        updateWidgets();
-                } else {
-                        stopMplayer();
-                        mset.current_chapter_id = ID;
-                        //goToPos(0);
-                        mset.current_sec = 0;
-                        restartPlay();
-                }
-        }
+        proc->setChapter(ID);
 }
 
@@ -3732 +3852 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 void Core::prevChapter() {
         qDebug("Core::prevChapter");
-
-        int last_chapter = 0;
-        int first_chapter = firstChapter();
-
-        int ID = mdat.chapters.itemBeforeTime(mset.current_sec).ID();
-
-        if (ID == -1) {
-                last_chapter = mdat.n_chapters + firstChapter() - 1;
-
-                ID = mset.current_chapter_id - 1;
-                if (ID < first_chapter) {
-                        ID = last_chapter;
-                }
-        }
-
-        changeChapter(ID);
+        proc->previousChapter();
 }
 
 void Core::nextChapter() {
         qDebug("Core::nextChapter");
-
-        int last_chapter = mdat.n_chapters + firstChapter() - 1;
-
-        int ID = mdat.chapters.itemAfterTime(mset.current_sec).ID();
-
-        if (ID == -1) {
-                ID = mset.current_chapter_id + 1;
-                if (ID > last_chapter) {
-                        ID = firstChapter();
-                }
-        }
-
-        changeChapter(ID);
+        proc->nextChapter();
 }
 
@@ -3786 +3895 @@
 
         if (!pref->use_mplayer_window) {
-                mplayerwindow->setAspect( asp );
+                mplayerwindow->setAspect();
         } else {
                 // Using mplayer own window
                 if (!mdat.novideo) {
-                        tellmp("switch_ratio " + QString::number(asp));
+                        if (ID == MediaSettings::AspectAuto) {
+                                asp = mdat.video_aspect;
+                        }
+                        proc->setAspect(asp);
                 }
         }
@@ -3863 +3975 @@
         if (mset.add_letterbox != b) {
                 mset.add_letterbox = b;
-                restartPlay();
-        }
+                CHANGE_VF("letterbox", b, DesktopInfo::desktop_aspectRatio(mplayerwindow));
+        }
+}
+
+void Core::changeLetterboxOnFullscreen(bool b) {
+        qDebug("Core::changeLetterboxOnFullscreen: %d", b);
+        CHANGE_VF("letterbox", b, DesktopInfo::desktop_aspectRatio(mplayerwindow));
 }
 
@@ -3871 +3988 @@
 
         pref->osd = v;
-        tellmp( pausing_prefix() + " osd " + QString::number( pref->osd ) );
+
+        proc->setPausingPrefix(pausing_prefix());
+        proc->setOSD(pref->osd);
+
         updateWidgets();
 }
@@ -3887 +4007 @@
 
         if (mset.rotate != r) {
-                mset.rotate = r;
-                restartPlay();
+                if (proc->isMPlayer()) {
+                        mset.rotate = r;
+                        restartPlay();
+                } else {
+                        // MPV
+                        // Remove previous filter
+                        switch (mset.rotate) {
+                                case MediaSettings::Clockwise_flip: proc->changeVF("rotate", false, MediaSettings::Clockwise_flip); break;
+                                case MediaSettings::Clockwise: proc->changeVF("rotate", false, MediaSettings::Clockwise); break;
+                                case MediaSettings::Counterclockwise: proc->changeVF("rotate", false, MediaSettings::Counterclockwise); break;
+                                case MediaSettings::Counterclockwise_flip: proc->changeVF("rotate", false, MediaSettings::Counterclockwise_flip); break;
+                        }
+                        mset.rotate = r;
+                        // New filter
+                        switch (mset.rotate) {
+                                case MediaSettings::Clockwise_flip: proc->changeVF("rotate", true, MediaSettings::Clockwise_flip); break;
+                                case MediaSettings::Clockwise: proc->changeVF("rotate", true, MediaSettings::Clockwise); break;
+                                case MediaSettings::Counterclockwise: proc->changeVF("rotate", true, MediaSettings::Counterclockwise); break;
+                                case MediaSettings::Counterclockwise_flip: proc->changeVF("rotate", true, MediaSettings::Counterclockwise_flip); break;
+                        }
+                }
         }
 }
@@ -4013 +4152 @@
 }
 
-#if USE_MPLAYER_PANSCAN
-void Core::changePanscan(double p) {
-         qDebug("Core::changePanscan: %f", p);
-
-        if (p < 0.1) p = 0;
-        if (p > 1) p = 1;
-
-        mset.panscan_factor = p;
-        tellmp(QString("panscan %1 1").arg(mset.panscan_factor));
-        displayMessage( QString("Panscan: %1").arg(mset.panscan_factor) );
-}
-
-void Core::incPanscan() {
-        changePanscan(mset.panscan_factor + .1);
-}
-
-void Core::decPanscan() {
-        changePanscan(mset.panscan_factor - .1);
-}
-#endif
-
 void Core::showFilenameOnOSD() {
-        tellmp("osd_show_property_text \"${filename}\" 5000 0");
+        proc->showFilenameOnOSD();
+}
+
+void Core::showTimeOnOSD() {
+        proc->showTimeOnOSD();
 }
 
 void Core::toggleDeinterlace() {
         qDebug("Core::toggleDeinterlace");
-
-        tellmp("step_property deinterlace");
-}
-
-void Core::changeUseAss(bool b) {
-        qDebug("Core::changeUseAss: %d", b);
-
-        if (pref->use_ass_subtitles != b) {
-                pref->use_ass_subtitles = b;
+        proc->toggleDeinterlace();
+}
+
+void Core::changeUseCustomSubStyle(bool b) {
+        qDebug("Core::changeUseCustomSubStyle: %d", b);
+
+        if (pref->enable_ass_styles != b) {
+                pref->enable_ass_styles = b;
                 if (proc->isRunning()) restartPlay();
         }
@@ -4059 +4180 @@
                 pref->use_forced_subs_only = b;
                 //if (proc->isRunning()) restartPlay();
-                int v = 0;
-                if (b) v = 1;
-                tellmp( QString("forced_subs_only %1").arg(v) );
+                proc->setSubForcedOnly(b);
         }
 }
@@ -4093 +4212 @@
 void Core::dvdnavUp() {
         qDebug("Core::dvdnavUp");
-        tellmp("dvdnav up");
+        up");
 }
 
 void Core::dvdnavDown() {
         qDebug("Core::dvdnavDown");
-        tellmp("dvdnav down");
+        down");
 }
 
 void Core::dvdnavLeft() {
         qDebug("Core::dvdnavLeft");
-        tellmp("dvdnav left");
+        left");
 }
 
 void Core::dvdnavRight() {
         qDebug("Core::dvdnavRight");
-        tellmp("dvdnav right");
+        right");
 }
 
 void Core::dvdnavMenu() {
         qDebug("Core::dvdnavMenu");
-        tellmp("dvdnav menu");
+        menu");
 }
 
 void Core::dvdnavSelect() {
         qDebug("Core::dvdnavSelect");
-        tellmp("dvdnav select");
+        select");
 }
 
 void Core::dvdnavPrev() {
         qDebug("Core::dvdnavPrev");
-        tellmp("dvdnav prev");
+        prev");
 }
 
@@ -4130 +4249 @@
 
         if ((state() == Playing) && (mdat.filename.startsWith("dvdnav:"))) {
-                //QPoint p = mplayerwindow->videoLayer()->mapFromGlobal(QCursor::pos());
-                //tellmp(QString("set_mouse_pos %1 %2").arg(p.x()).arg(p.y()));
-                tellmp("dvdnav mouse");
+                proc->discButtonPressed("mouse");
         }
 }
@@ -4147 +4264 @@
 
 void Core::displayScreenshotName(QString filename) {
-        qDebug("Core::displayScreenshotName");
-        //QString text = tr("Screenshot saved as %1").arg(filename);
-        QString text = QString("Screenshot saved as %1").arg(filename);
-
+        qDebug("Core::displayScreenshotName: %s", filename.toUtf8().constData());
+
+        QFileInfo fi(filename);
+
+        QString text = tr("Screenshot saved as %1").arg(fi.fileName());
+        //QString text = QString("Screenshot saved as %1").arg(fi.fileName());
+
+#ifdef MPLAYER2_SUPPORT
         if (MplayerVersion::isMplayer2()) {
                 displayTextOnOSD(text, 3000, 1, "");
         }
         else
+
         if (MplayerVersion::isMplayerAtLeast(27665)) {
                 displayTextOnOSD(text, 3000, 1, "pausing_keep_force");
@@ -4174 +4296 @@
 
 void Core::displayBuffering() {
-        emit showMessage(tr("Buffering..."));
+        setState(Buffering);
+//      emit showMessage(tr("Buffering..."));
+}
+
+void Core::displayPlaying() {
+        qDebug("Core::displayPlaying");
+        setState(Buffering);
+        emit showMessage(tr("Starting..."), 60000);
 }
 
@@ -4264 +4393 @@
 #endif
 
-        if ((state == Playing) && (change_volume_after_unpause)) {
+        if ((state == Playing) && (change_volume_after_unpause)) {
                 // Delayed volume change
                 qDebug("Core::watchState: delayed volume change");
                 int volume = (pref->global_volume ? pref->volume : mset.volume);
-                tellmp("volume " + QString::number(volume) + " 1");
+                );
                 change_volume_after_unpause = false;
         }
@@ -4324 +4453 @@
 #endif
 
+
+
+
+
+
+
+
+
+
 #if NOTIFY_AUDIO_CHANGES
 void Core::initAudioTrack(const Tracks & audios) {
@@ -4406 +4544 @@
                 restore_subs = false;
                 just_loaded_external_subs = false;
-                
+
                 QFileInfo fi(mset.external_subtitles);
-                if (fi.suffix().toLower() != "idx") {
+                bool is_idx = (fi.suffix().toLower() == "idx");
+                if (proc->isMPV()) is_idx = false; // Hack to ignore the idx extension with mpv
+
+                if (!is_idx) {
                         // The loaded subtitle file is the last one, so
                         // try to select that one.
@@ -4466 +4607 @@
         }
 end:
+
+
+
+
         updateWidgets();
 }
@@ -4472 +4617 @@
         qDebug("Core::setSubtitleTrackAgain");
         changeSubtitle( mset.current_sub_id );
+
+
+
+
+
+
+
+
+
 }
 #endif
@@ -4489 +4643 @@
 
 void Core::askForInfo() {
-        if ((state() == Playing) && (mdat.filename.startsWith("dvdnav:"))) {
-                tellmp( pausing_prefix() + " get_property length");
+        if (proc->isMPlayer()) {
+                if ((state() == Playing) && (mdat.filename.startsWith("dvdnav:"))) {
+                        proc->setPausingPrefix(pausing_prefix());
+                        proc->askForLength();
+                }
         }
 }
 
 void Core::dvdnavUpdateMousePos(QPoint pos) {
-        //qDebug("Core::dvdnavUpdateMousePos");
+#if 0
+        bool under_mouse = mplayerwindow->videoLayer()->underMouse();
+
+        qDebug("Core::dvdnavUpdateMousePos: %d %d", pos.x(), pos.y());
+        qDebug("Core::dvdnavUpdateMousePos: state: %d", state());
+        qDebug("Core::dvdnavUpdateMousePos: filename: %s", mdat.filename.toUtf8().constData());
+        qDebug("Core::dvdnavUpdateMousePos: dvdnav_title_is_menu: %d", dvdnav_title_is_menu);
+        qDebug("Core::dvdnavUpdateMousePos: under mouse: %d", under_mouse);
+#endif
         if ((state() == Playing) && (mdat.filename.startsWith("dvdnav:")) && (dvdnav_title_is_menu)) {
-                if (mplayerwindow->videoLayer()->underMouse()) {
-                        tellmp(QString("set_mouse_pos %1 %2").arg(pos.x()).arg(pos.y()));
-                }
+                ) {
+                        ));
+                }
         }
 }
@@ -4511 +4676 @@
         qDebug("Core::dvdTitleIsMovie");
         dvdnav_title_is_menu = false;
-
 }
 #endif
@@ -4518 +4682 @@
         qDebug("Core::pausing_prefix");
 
+
         if (MplayerVersion::isMplayer2()) {
                 return QString::null;
         }
         else
+
         if ( (pref->use_pausing_keep_force) && 
          (MplayerVersion::isMplayerAtLeast(27665)) ) 
@@ -4531 +4697 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 #include "moc_core.cpp"