Imported Upstream version 15.11.0~ds0

1 files changed, 24 insertions, 0 deletions

diff --git a/src/preferences.cpp b/src/preferences.cpp
index 411e8a4..d414fa1 100644
--- a/src/preferences.cpp
+++ b/src/preferences.cpp
@@ -90,6 +90,7 @@ void Preferences::reset() {
 	use_screenshot = true;
 #ifdef MPV_SUPPORT
 	screenshot_template = "cap_%F_%p_%02n";
+	screenshot_format = "jpg";
 #endif
 	screenshot_directory="";
 #ifdef PORTABLE_APP
@@ -103,6 +104,10 @@ void Preferences::reset() {
 	#endif
 #endif
 
+#ifdef CAPTURE_STREAM
+	capture_directory = "";
+#endif
+
 	dont_remember_media_settings = false;
 	dont_remember_time_pos = false;
 
@@ -324,6 +329,8 @@ void Preferences::reset() {
 
 	use_edl_files = true;
 
+	use_playlist_option = false;
+
 	prefer_ipv4 = true;
 
 	use_short_pathnames = false;
@@ -362,6 +369,7 @@ void Preferences::reset() {
 #endif
 
 	move_when_dragging = true;
+	center_window = false;
 
 
 #if DVDNAV_SUPPORT
@@ -587,6 +595,7 @@ void Preferences::save() {
 	set->setValue("use_screenshot", use_screenshot);
 	#ifdef MPV_SUPPORT
 	set->setValue("screenshot_template", screenshot_template);
+	set->setValue("screenshot_format", screenshot_format);
 	#endif
 	#if QT_VERSION >= 0x040400
 	set->setValue("screenshot_folder", screenshot_directory);
@@ -594,6 +603,10 @@ void Preferences::save() {
 	set->setValue("screenshot_directory", screenshot_directory);
 	#endif
 
+	#ifdef CAPTURE_STREAM
+	set->setValue("capture_directory", capture_directory);
+	#endif
+
 	set->setValue("dont_remember_media_settings", dont_remember_media_settings);
 	set->setValue("dont_remember_time_pos", dont_remember_time_pos);
 
@@ -813,6 +826,8 @@ void Preferences::save() {
 
 	set->setValue("use_edl_files", use_edl_files);
 
+	set->setValue("use_playlist_option", use_playlist_option);
+
 	set->setValue("prefer_ipv4", prefer_ipv4);
 
 	set->setValue("use_short_pathnames", use_short_pathnames);
@@ -855,6 +870,7 @@ void Preferences::save() {
 #endif
 
 	set->setValue("move_when_dragging", move_when_dragging);
+	set->setValue("center_window", center_window);
 
 	set->setValue("mouse_left_click_function", mouse_left_click_function);
 	set->setValue("mouse_right_click_function", mouse_right_click_function);
@@ -1108,6 +1124,7 @@ void Preferences::load() {
 	use_screenshot = set->value("use_screenshot", use_screenshot).toBool();
 	#ifdef MPV_SUPPORT
 	screenshot_template = set->value("screenshot_template", screenshot_template).toString();
+	screenshot_format = set->value("screenshot_format", screenshot_format).toString();
 	#endif
 	#if QT_VERSION >= 0x040400
 	screenshot_directory = set->value("screenshot_folder", screenshot_directory).toString();
@@ -1116,6 +1133,10 @@ void Preferences::load() {
 	screenshot_directory = set->value("screenshot_directory", screenshot_directory).toString();
 	#endif
 
+	#ifdef CAPTURE_STREAM
+	capture_directory = set->value("capture_directory", capture_directory).toString();
+	#endif
+
 	dont_remember_media_settings = set->value("dont_remember_media_settings", dont_remember_media_settings).toBool();
 	dont_remember_time_pos = set->value("dont_remember_time_pos", dont_remember_time_pos).toBool();
 
@@ -1341,6 +1362,8 @@ void Preferences::load() {
 
 	use_edl_files = set->value("use_edl_files", use_edl_files).toBool();
 
+	use_playlist_option = set->value("use_playlist_option", use_playlist_option).toBool();
+
 	prefer_ipv4 = set->value("prefer_ipv4", prefer_ipv4).toBool();
 
 	use_short_pathnames = set->value("use_short_pathnames", use_short_pathnames).toBool();
@@ -1381,6 +1404,7 @@ void Preferences::load() {
 #endif
 
 	move_when_dragging = set->value("move_when_dragging", move_when_dragging).toBool();
+	center_window = set->value("center_window", center_window).toBool();
 
 	mouse_left_click_function = set->value("mouse_left_click_function", mouse_left_click_function).toString();
 	mouse_right_click_function = set->value("mouse_right_click_function", mouse_right_click_function).toString();