Imported Upstream version 14.9.0.6690~ds0

1 files changed, 28 insertions, 17 deletions

diff --git a/src/core.h b/src/core.h
index c9430d2..8907a43 100644
--- a/src/core.h
+++ b/src/core.h
@@ -1,5 +1,5 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2015 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
@@ -23,14 +23,15 @@
 #include <QProcess> // For QProcess::ProcessError
 #include "mediadata.h"
 #include "mediasettings.h"
-#include "mplayerprocess.h"
+#include "playerprocess.h"
+
 #include "config.h"
 
 #ifndef NO_USE_INI_FILES
 class FileSettingsBase;
 #endif
 
-class MplayerProcess;
+class PlayerProcess;
 class MplayerWindow;
 class QSettings;
 
@@ -107,6 +108,7 @@ public slots:
     void pause_and_frame_step();
 	void pause();
 	void frameStep();
+	void frameBackStep();
 	void screenshot();	//!< Take a screenshot of current frame
 	void screenshots();	//!< Start/stop taking screenshot of each frame
 
@@ -231,6 +233,10 @@ public slots:
 	void incSubScale();
 	void decSubScale();
 
+	void changeOSDScale(double value);
+	void incOSDScale();
+	void decOSDScale();
+
 	//! Select next line in subtitle file
 	void incSubStep();
 	//! Select previous line in subtitle file
@@ -258,8 +264,9 @@ public slots:
 	void setAudioEq9(int value);
 
 	void changeDeinterlace(int);
-    void changeSubtitle(int);
+	void changeSubtitle(int);
 	void nextSubtitle();
+	void changeSecondarySubtitle(int);
 	void changeAudio(int ID, bool allow_restart = true);
 	void nextAudio();
 	void changeVideo(int ID, bool allow_restart = true);
@@ -299,16 +306,10 @@ public slots:
 	void autoZoomFor169();
 	void autoZoomFor235();
 
-#if USE_MPLAYER_PANSCAN
-	void changePanscan(double);
-	void incPanscan();
-	void decPanscan();
-#endif
-
 	void showFilenameOnOSD();
 	void toggleDeinterlace();
 
-	void changeUseAss(bool);
+	void changeUseCustomSubStyle(bool);
 	void toggleForcedSubsOnly(bool);
 
 	void changeClosedCaptionChannel(int);
@@ -329,8 +330,8 @@ public slots:
 	void dvdnavMouse();
 #endif
 
-    // Pass a command to mplayer by stdin:
-    void tellmp(const QString & command);
+	//! Change fullscreen when using the player own window
+	void changeFullscreenMode(bool b);
 
 	//! Wrapper for the osd_show_text slave command
 	void displayTextOnOSD(QString text, int duration = 3000, int level = 1, 
@@ -340,6 +341,8 @@ public:
 	//! Returns the number of the first chapter in 
 	//! files. In some versions of mplayer is 0, in others 1
 	static int firstChapter();
+	int firstDVDTitle();
+	int firstBlurayTitle();
 
 #ifndef NO_USE_INI_FILES
 	void changeFileSettingsMethod(QString method);
@@ -348,7 +351,7 @@ public:
 protected:
 	//! Returns the prefix to keep pausing on slave commands
 	QString pausing_prefix();
-	QString seek_cmd(double secs, int mode);
+	void seek_cmd(double secs, int mode);
 
 protected slots:
     void changeCurrentSec(double sec);
@@ -367,6 +370,7 @@ protected slots:
 	void displayScreenshotName(QString filename);
 	void displayUpdatingFontCache();
 	void displayBuffering();
+	void displayPlaying();
 
 	void streamTitleChanged(QString);
 	void streamTitleAndUrlChanged(QString,QString);
@@ -387,10 +391,17 @@ protected slots:
 #if NOTIFY_AUDIO_CHANGES
 	void initAudioTrack(const Tracks &);
 #endif
+#if NOTIFY_VIDEO_CHANGES
+	void initVideoTrack(const Tracks &);
+#endif
 #if NOTIFY_SUB_CHANGES
 	void initSubtitleTrack(const SubTracks &);
 	void setSubtitleTrackAgain(const SubTracks &);
 #endif
+#if NOTIFY_CHAPTER_CHANGES
+	void updateChapterInfo(const Chapters &);
+#endif
+
 #if DVDNAV_SUPPORT
 	void dvdTitleChanged(int);
 	void durationChanged(double);
@@ -405,7 +416,6 @@ protected slots:
 #ifdef YOUTUBE_SUPPORT
 	void connectingToYT(QString host);
 	void YTFailed(int error_number, QString error_str);
-	/* void YTNoSignature(); */
 	void YTNoVideoUrl();
 #endif
 
@@ -485,13 +495,14 @@ signals:
 
 #ifdef YOUTUBE_SUPPORT
 	void signatureNotFound(const QString &);
+	void noSslSupport();
 #endif
 
 	void receivedForbidden();
 
 protected:
-    MplayerProcess * proc;
-    MplayerWindow * mplayerwindow;
+	PlayerProcess * proc;
+	MplayerWindow * mplayerwindow;
 
 #ifndef NO_USE_INI_FILES
 	FileSettingsBase * file_settings;