Changeset 168 for smplayer/vendor/current/src/core.cpp

Timestamp:

Oct 9, 2014, 11:54:00 AM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update vendor to 14.9.0

File:

• smplayer/vendor/current/src/core.cpp (modified) (4 diffs)

smplayer/vendor/current/src/core.cpp

@@ -268 +268 @@
 #ifdef YOUTUBE_SUPPORT
         yt = new RetrieveYoutubeUrl(this);
+
+
+
         connect(yt, SIGNAL(gotPreferredUrl(const QString &)), this, SLOT(openYT(const QString &)));
         connect(yt, SIGNAL(connecting(QString)), this, SLOT(connectingToYT(QString)));
@@ -897 +900 @@
                 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);
+                /*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" );
@@ -2515 +2519 @@
 
 #ifdef Q_OS_WIN
+
         if (!pref->use_windowsfontdir) {
-                QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
                 env.insert("FONTCONFIG_FILE", Paths::configPath() + "/fonts.conf");
-                proc->setProcessEnvironment(env);
-        }
+        
+        
 #endif
         if ( !proc->start() ) {
@@ -4245 +4249 @@
 //!  Called when the state changes
 void Core::watchState(Core::State state) {
-        if ((state == Playing) && (change_volume_after_unpause)) 
-        {
+#ifdef SCREENSAVER_OFF
+        #if 0
+        qDebug("Core::watchState: %d", state);
+        //qDebug("Core::watchState: has video: %d", !mdat.novideo);
+
+        if ((state == Playing) /* && (!mdat.novideo) */) {
+                disableScreensaver();
+        } else {
+                enableScreensaver();
+        }
+        #endif
+#endif
+
+        if ((state == Playing) && (change_volume_after_unpause)) {
                 // Delayed volume change
                 qDebug("Core::watchState: delayed volume change");