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

Timestamp:

May 23, 2013, 5:06:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update vendor to 0.8.5'

File:

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

smplayer/vendor/current/src/core.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2012 Ricardo Villalba <[email protected]>
+    Copyright (C) 2006-201 Ricardo Villalba <[email protected]>
 
     This program is free software; you can redistribute it and/or modify
@@ -130 +130 @@
                          this, SLOT(displayMessage(QString)) );
 
+
+
+
+
+
+
+
+
         connect( proc, SIGNAL(receivedCreatingIndex(QString)),
                          this, SLOT(displayMessage(QString)) );
 
+
+
+
         connect( proc, SIGNAL(receivedConnectingToMessage(QString)),
                          this, SLOT(displayMessage(QString)) );
 
+
+
+
         connect( proc, SIGNAL(receivedResolvingMessage(QString)),
                          this, SLOT(displayMessage(QString)) );
 
+
+
+
         connect( proc, SIGNAL(receivedScreenshot(QString)),
              this, SLOT(displayScreenshotName(QString)) );
@@ -144 +161 @@
         connect( proc, SIGNAL(receivedUpdatingFontCache()),
              this, SLOT(displayUpdatingFontCache()) );
-        
+
         connect( proc, SIGNAL(receivedScanningFont(QString)),
                          this, SLOT(displayMessage(QString)) );
-        
+
         connect( proc, SIGNAL(receivedWindowResolution(int,int)),
              this, SLOT(gotWindowResolution(int,int)) );
@@ -252 +269 @@
         connect(yt, SIGNAL(gotEmptyList()), this, SLOT(YTNoVideoUrl()));
 #endif
+
+
 }
 
@@ -521 +540 @@
 
                 QFileInfo fi(sub);
-                if ((pref->fast_load_sub) && (fi.suffix().toLower() != "idx")) {
+                if ((pref->fast_load_sub) && (fi.suffix().toLower() != "idx")) {
                         QString sub_file = sub;
                         #ifdef Q_OS_WIN
@@ -1152 +1171 @@
                 qDebug("Core::stop: mset.current_sec set to 0");
                 emit showTime( mset.current_sec );
-#ifdef SEEKBAR_RESOLUTION
+#ifdef SEEKBAR_RESOLUTION
                 emit positionChanged( 0 );
-#else
+#else
                 emit posChanged( 0 );
-#endif
+#endif
                 //updateWidgets();
         }
@@ -1162 +1181 @@
         stopMplayer();
         emit mediaStoppedByUser();
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -1408 +1437 @@
     if (fi.exists() && fi.isExecutable() && !fi.isDir()) {
         mplayer_bin = fi.absoluteFilePath();
+
+
+
+
+
+
+
         }
 
@@ -1707 +1743 @@
 #if !defined(Q_OS_OS2)
                 if (!pref->ass_styles.fontname.isEmpty()) {
+
                         if (!pref->mplayer_is_mplayer2) { // -fontconfig removed from mplayer2
                                 proc->addArgument("-fontconfig");
                         }
+
                         proc->addArgument("-font");
                         proc->addArgument( pref->ass_styles.fontname );
@@ -1718 +1756 @@
                         proc->addArgument("-subfont-autoscale");
                         proc->addArgument("0");
-                        proc->addArgument("-subfont-osd-scale");
-                        proc->addArgument(QString::number(pref->ass_styles.fontsize));
+                        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));
@@ -1728 +1768 @@
 #if !defined(Q_OS_OS2)
                 if ( (pref->use_fontconfig) && (!pref->font_name.isEmpty()) ) {
+
                         if (!pref->mplayer_is_mplayer2) { // -fontconfig removed from mplayer2
                                 proc->addArgument("-fontconfig");
                         }
+
                         proc->addArgument("-font");
                         proc->addArgument( pref->font_name );
@@ -1736 +1778 @@
 #endif
                 if ( (!pref->use_fontconfig) && (!pref->font_file.isEmpty()) ) {
+
+
+
+
+
                         proc->addArgument("-font");
                         proc->addArgument( pref->font_file );
@@ -1838 +1885 @@
                         #endif
                         proc->addArgument( mset.external_subtitles );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                 }
         }
@@ -2204 +2265 @@
         // Stereo mode
         if (mset.stereo_mode != 0) {
-                if (mset.stereo_mode == MediaSettings::Left) 
-                        af += "channels=2:2:0:1:0:0";
-                else
-                        af += "channels=2:2:1:0:1:1";
+                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;
+                }
         }
 
@@ -3099 +3162 @@
         else
                 displayMessage( tr("Subtitles off") );
+
+
+
+
+
+
+
+
 }
 
@@ -3680 +3751 @@
 #endif
 
+
 void Core::changeSize(int n) {
         if ( /*(n != pref->size_factor) &&*/ (!pref->use_mplayer_window) ) {
@@ -3695 +3767 @@
                 changeSize(200);
 }
+
 
 void Core::changeZoom(double p) {
@@ -3946 +4019 @@
         qDebug("Core::displayUpdatingFontCache");
         emit showMessage( tr("Updating the font cache. This may take some seconds...") );
+
+
+
+
 }