New upstream version 18.1.0~ds0

1 files changed, 44 insertions, 26 deletions

diff --git a/src/basegui.cpp b/src/basegui.cpp
index 4cd1cb5..2906461 100644
--- a/src/basegui.cpp
+++ b/src/basegui.cpp
@@ -1,5 +1,5 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2017 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2018 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -295,14 +295,14 @@ void BaseGui::setupNetworkProxy() {
 
 #ifdef SINGLE_INSTANCE
 void BaseGui::handleMessageFromOtherInstances(const QString& message) {
-	qDebug("BaseGui::handleMessageFromOtherInstances: '%s'", message.toUtf8().constData());
+	qDebug() << "BaseGui::handleMessageFromOtherInstances:" << message;
 
 	int pos = message.indexOf(' ');
 	if (pos > -1) {
 		QString command = message.left(pos);
 		QString arg = message.mid(pos+1);
-		qDebug("command: '%s'", command.toUtf8().constData());
-		qDebug("arg: '%s'", arg.toUtf8().constData());
+		qDebug() << "command:" << command;
+		qDebug() << "arg:" << arg;
 
 		if (command == "open_file") {
 			emit openFileRequested();
@@ -619,6 +619,14 @@ void BaseGui::createActions() {
 	connect( screenshotAct, SIGNAL(triggered()),
              core, SLOT(screenshot()) );
 
+	screenshotWithSubsAct = new MyAction( QKeySequence("Ctrl+Shift+S"), this, "screenshot_with_subtitles" );
+	connect( screenshotWithSubsAct, SIGNAL(triggered()),
+             core, SLOT(screenshotWithSubtitles()) );
+
+	screenshotWithNoSubsAct = new MyAction( QKeySequence("Ctrl+Alt+S"), this, "screenshot_without_subtitles" );
+	connect( screenshotWithNoSubsAct, SIGNAL(triggered()),
+             core, SLOT(screenshotWithoutSubtitles()) );
+
 	// Multiple screenshots
 	screenshotsAct = new MyAction( QKeySequence("Shift+D"), this, "multiple_screenshots" );
 	connect( screenshotsAct, SIGNAL(triggered()),
@@ -1074,9 +1082,12 @@ void BaseGui::createActions() {
 	connect( nextWheelFunctionAct, SIGNAL(triggered()),
 			 core, SLOT(nextWheelFunction()) );
 
-	showFilenameAct = new MyAction(Qt::SHIFT | Qt::Key_I, this, "show_info_osd");
+	showFilenameAct = new MyAction(Qt::SHIFT | Qt::Key_O, this, "show_filename_osd");
 	connect( showFilenameAct, SIGNAL(triggered()), core, SLOT(showFilenameOnOSD()) );
 
+	showMediaInfoAct = new MyAction(Qt::SHIFT | Qt::Key_I, this, "show_info_osd");
+	connect( showMediaInfoAct, SIGNAL(triggered()), core, SLOT(showMediaInfoOnOSD()) );
+
 	showTimeAct = new MyAction(Qt::Key_I, this, "show_time");
 	connect( showTimeAct, SIGNAL(triggered()), core, SLOT(showTimeOnOSD()) );
 
@@ -1373,6 +1384,8 @@ void BaseGui::setActionsEnabled(bool b) {
 	videoEqualizerAct->setEnabled(b);
 	screenshotAct->setEnabled(b);
 	screenshotsAct->setEnabled(b);
+	screenshotWithSubsAct->setEnabled(b);
+	screenshotWithNoSubsAct->setEnabled(b);
 #ifdef CAPTURE_STREAM
 	capturingAct->setEnabled(b);
 #endif
@@ -1509,7 +1522,7 @@ void BaseGui::enableActionsOnPlaying() {
 	audioEqualizerAct->setEnabled(pref->use_audio_equalizer);
 
 	// Disable audio actions if there's not audio track
-	if ((core->mdat.audios.numItems()==0) && (core->mset.external_audio.isEmpty())) {
+	if ((core->mset.audios.numItems()==0) && (core->mset.external_audio.isEmpty())) {
 		audioEqualizerAct->setEnabled(false);
 		muteAct->setEnabled(false);
 		decVolumeAct->setEnabled(false);
@@ -1532,6 +1545,8 @@ void BaseGui::enableActionsOnPlaying() {
 		videoEqualizerAct->setEnabled(false);
 		screenshotAct->setEnabled(false);
 		screenshotsAct->setEnabled(false);
+		screenshotWithSubsAct->setEnabled(false);
+		screenshotWithNoSubsAct->setEnabled(false);
 #ifdef CAPTURE_STREAM
 		capturingAct->setEnabled(false);
 #endif
@@ -1732,6 +1747,8 @@ void BaseGui::retranslateStrings() {
 	compactAct->change( Images::icon("compact"), tr("&Compact mode") );
 	videoEqualizerAct->change( Images::icon("equalizer"), tr("&Equalizer") );
 	screenshotAct->change( Images::icon("screenshot"), tr("&Screenshot") );
+	screenshotWithSubsAct->change( Images::icon("screenshot"), tr("Screenshot with subtitles") );
+	screenshotWithNoSubsAct->change( Images::icon("screenshot"), tr("Screenshot without subtitles") );
 	screenshotsAct->change( Images::icon("screenshots"), tr("Start/stop takin&g screenshots") );
 #ifdef CAPTURE_STREAM
 	capturingAct->change(Images::icon("record"), tr("Start/stop capturing stream"));
@@ -1918,7 +1935,8 @@ void BaseGui::retranslateStrings() {
 	nextAspectAct->change( Images::icon("next_aspect"), tr("Next aspect ratio") );
 	nextWheelFunctionAct->change( Images::icon("next_wheel_function"), tr("Next wheel function") );
 
-	showFilenameAct->change( tr("Show &info on OSD") );
+	showFilenameAct->change( tr("Show filename on OSD") );
+	showMediaInfoAct->change( tr("Show &info on OSD") );
 	showTimeAct->change( tr("Show playback time on OSD") );
 
 	toggleDeinterlaceAct->change( tr("Toggle deinterlacing") );
@@ -2720,7 +2738,7 @@ void BaseGui::createMenus() {
 	osd_menu->menuAction()->setObjectName("osd_menu");
 	osd_menu->addActions(osdGroup->actions());
 	osd_menu->addSeparator();
-	osd_menu->addAction(showFilenameAct);
+	osd_menu->addAction(showMediaInfoAct);
 	osd_menu->addSeparator();
 	osd_menu->addAction(decOSDScaleAct);
 	osd_menu->addAction(incOSDScaleAct);
@@ -3337,7 +3355,7 @@ void BaseGui::setDataToFileProperties() {
 	file_dialog->setMplayerAdditionalVideoFilters( core->mset.mplayer_additional_video_filters );
 	file_dialog->setMplayerAdditionalAudioFilters( core->mset.mplayer_additional_audio_filters );
 
-	file_dialog->setMediaData( core->mdat );
+	file_dialog->setMediaData( core->mdat, core->mset.videos, core->mset.audios, core->mset.subs);
 }
 
 void BaseGui::applyFileProperties() {
@@ -3362,7 +3380,7 @@ void BaseGui::applyFileProperties() {
 		// Demuxer changed
 		demuxer_changed = true;
 		core->mset.current_audio_id = MediaSettings::NoneSelected;
-		core->mset.current_sub_id = MediaSettings::NoneSelected;
+		core->mset.current_subtitle_track = MediaSettings::NoneSelected;
 	}
 
 	QString ac = file_dialog->audioCodec();
@@ -3550,10 +3568,10 @@ void BaseGui::initializeMenus() {
 	QAction * subNoneAct = subtitleTrackGroup->addAction( tr("&None") );
 	subNoneAct->setData(MediaSettings::SubNone);
 	subNoneAct->setCheckable(true);
-	for (n=0; n < core->mdat.subs.numItems(); n++) {
+	for (n=0; n < core->mset.subs.numItems(); n++) {
 		QAction *a = new QAction(subtitleTrackGroup);
 		a->setCheckable(true);
-		a->setText(core->mdat.subs.itemAt(n).displayName());
+		a->setText(core->mset.subs.itemAt(n).displayName());
 		a->setData(n);
 	}
 	subtitles_track_menu->addActions( subtitleTrackGroup->actions() );
@@ -3564,10 +3582,10 @@ void BaseGui::initializeMenus() {
 	QAction * subSecNoneAct = secondarySubtitleTrackGroup->addAction( tr("&None") );
 	subSecNoneAct->setData(MediaSettings::SubNone);
 	subSecNoneAct->setCheckable(true);
-	for (n=0; n < core->mdat.subs.numItems(); n++) {
+	for (n=0; n < core->mset.subs.numItems(); n++) {
 		QAction *a = new QAction(secondarySubtitleTrackGroup);
 		a->setCheckable(true);
-		a->setText(core->mdat.subs.itemAt(n).displayName());
+		a->setText(core->mset.subs.itemAt(n).displayName());
 		a->setData(n);
 	}
 	secondary_subtitles_track_menu->addActions( secondarySubtitleTrackGroup->actions() );
@@ -3583,15 +3601,15 @@ void BaseGui::initializeMenus() {
 		a->setChecked(true);
 	}
 	else
-	if (core->mdat.audios.numItems()==0) {
+	if (core->mset.audios.numItems()==0) {
 		QAction * a = audioTrackGroup->addAction( tr("<empty>") );
 		a->setEnabled(false);
 	} else {
-		for (n=0; n < core->mdat.audios.numItems(); n++) {
+		for (n=0; n < core->mset.audios.numItems(); n++) {
 			QAction *a = new QAction(audioTrackGroup);
 			a->setCheckable(true);
-			a->setText(core->mdat.audios.itemAt(n).displayName());
-			a->setData(core->mdat.audios.itemAt(n).ID());
+			a->setText(core->mset.audios.itemAt(n).displayName());
+			a->setData(core->mset.audios.itemAt(n).ID());
 		}
 	}
 	audiotrack_menu->addActions( audioTrackGroup->actions() );
@@ -3615,15 +3633,15 @@ void BaseGui::initializeMenus() {
 
 	// Video
 	videoTrackGroup->clear(true);
-	if (core->mdat.videos.numItems()==0) {
+	if (core->mset.videos.numItems()==0) {
 		QAction * a = videoTrackGroup->addAction( tr("<empty>") );
 		a->setEnabled(false);
 	} else {
-		for (n=0; n < core->mdat.videos.numItems(); n++) {
+		for (n=0; n < core->mset.videos.numItems(); n++) {
 			QAction *a = new QAction(videoTrackGroup);
 			a->setCheckable(true);
-			a->setText(core->mdat.videos.itemAt(n).displayName());
-			a->setData(core->mdat.videos.itemAt(n).ID());
+			a->setText(core->mset.videos.itemAt(n).displayName());
+			a->setData(core->mset.videos.itemAt(n).ID());
 		}
 	}
 	videotrack_menu->addActions( videoTrackGroup->actions() );
@@ -3788,11 +3806,11 @@ void BaseGui::updateWidgets() {
 	qDebug("BaseGui::updateWidgets");
 
 	// Subtitles menu
-	subtitleTrackGroup->setChecked( core->mset.current_sub_id );
+	subtitleTrackGroup->setChecked( core->mset.current_subtitle_track );
 
 #ifdef MPV_SUPPORT
 	// Secondary subtitles menu
-	secondarySubtitleTrackGroup->setChecked( core->mset.current_secondary_sub_id );
+	secondarySubtitleTrackGroup->setChecked( core->mset.current_secondary_subtitle_track );
 #endif
 
 	// Disable the unload subs action if there's no external subtitles
@@ -3963,8 +3981,8 @@ void BaseGui::updateWidgets() {
 	subVisibilityAct->setChecked(pref->sub_visibility);
 
 	// Enable or disable subtitle options
-	bool e = ((core->mset.current_sub_id != MediaSettings::SubNone) &&
-              (core->mset.current_sub_id != MediaSettings::NoneSelected));
+	bool e = ((core->mset.current_subtitle_track != MediaSettings::SubNone) &&
+              (core->mset.current_subtitle_track != MediaSettings::NoneSelected));
 
 	if (core->mset.closed_caption_channel !=0 ) e = true; // Enable if using closed captions