Changeset 175 for smplayer/vendor/current/src/mediasettings.h

Timestamp:

May 3, 2016, 2:14:41 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update vendor to version 16.4

File:

• smplayer/vendor/current/src/mediasettings.h (modified) (11 diffs)

smplayer/vendor/current/src/mediasettings.h

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -17 +17 @@
 */
 
-#ifndef _MEDIASETTINGS_H_
-#define _MEDIASETTINGS_H_
+#ifndef MEDIASETTINGS_H
+#define MEDIASETTINGS_H
 
 
@@ -59 +59 @@
         double current_sec;
         int current_sub_id;
+#ifdef MPV_SUPPORT
+        int current_secondary_sub_id;
+#endif
 
 #if PROGRAM_SWITCH
@@ -68 +71 @@
 
         int current_title_id;
-        int current_chapter_id;
         int current_angle_id;
 
@@ -114 +116 @@
         int current_unsharp;
 
+        QString stereo3d_in;
+        QString stereo3d_out;
+
+#ifdef MPLAYER_SUPPORT
         bool karaoke_filter;
+#endif
         bool extrastereo_filter;
         bool volnorm_filter;
@@ -122 +129 @@
 
         double zoom_factor; // mplayerwindow zoom
-
-#if USE_MPLAYER_PANSCAN
-        double panscan_factor;
-#endif
 
         int rotate;
@@ -135 +138 @@
         int B_marker;
 
+#ifdef BOOKMARKS
+        QMap<int, QString> bookmarks;
+#endif
+
         // This a property of the video and it should be
     // in mediadata, but we have to save it to preserve 
@@ -143 +150 @@
         bool is264andHD;
 
+        QString current_demuxer;
+
+#if ALLOW_DEMUXER_CODEC_CHANGE
         // Advanced settings
         QString forced_demuxer;
@@ -152 +162 @@
         QString original_video_codec;
         QString original_audio_codec;
+#endif
 
         // Options to mplayer (for this file only)
@@ -161 +172 @@
         // They can vary, because of filters, so better here
 
-        //Resolution used by mplayer
-    //Can be bigger that video resolution
-    //because of the aspect ratio or expand filter
-    int win_width;
-    int win_height;
-    double win_aspect();
+        // Resolution used by mplayer
+        // Can be bigger that video resolution
+        // because of the aspect ratio or expand filter
+        int win_width;
+        int win_height;
+        double win_aspect();
 
         //! Returns the aspect as a double. Returns 0 if aspect == AspectNone.
@@ -175 +186 @@
 
 #ifndef NO_USE_INI_FILES
-        void save(QSettings * set);
-        void load(QSettings * set);
+        void save(QSettings * set, int player_id);
+        void load(QSettings * set, int player_id);
 #endif
 };