Changeset 186 for smplayer/vendor/current/src/mediasettings.cpp

Timestamp:

Jan 24, 2017, 12:24:46 PM (8 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update vendor to 17.1.0

File:

• smplayer/vendor/current/src/mediasettings.cpp (modified) (6 diffs)

smplayer/vendor/current/src/mediasettings.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2017 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -90 +90 @@
         current_deinterlacer = pref->initial_deinterlace;
 
+#ifdef INITIAL_BLACKBORDERS
+        add_letterbox = pref->initial_blackborders;
+#else
         add_letterbox = false;
+#endif
 
 #ifdef MPLAYER_SUPPORT
@@ -103 +107 @@
         zoom_factor = pref->initial_zoom_factor; // 1.0;
 
+#ifdef MSET_USE_STARTING_TIME
         starting_time = -1; // Not set yet.
+#endif
 
         rotate = NoRotate;
@@ -287 +293 @@
         qDebug("  win_aspect(): %f", win_aspect()); 
 
+#ifdef MSET_USE_STARTING_TIME
         qDebug("  starting_time: %f", starting_time);
+#endif
+
         qDebug("  is264andHD: %d", is264andHD);
 }
@@ -420 +429 @@
         set->setValue( "win_height", win_height );
 
+#ifdef MSET_USE_STARTING_TIME
         set->setValue( "starting_time", starting_time );
+#endif
 
         set->setValue( "is264andHD", is264andHD );
@@ -553 +564 @@
         win_height = set->value( "win_height", win_height ).toInt();
 
+#ifdef MSET_USE_STARTING_TIME
         starting_time = set->value( "starting_time", starting_time ).toDouble();
+#endif
 
         is264andHD = set->value( "is264andHD", is264andHD ).toBool();