Imported Upstream version 0.14.2+dfsg1

This commit is contained in:
Sebastian Ramacher 2016-05-24 21:53:01 +02:00
parent fb3990e9e5
commit 41a01dbf05
529 changed files with 25112 additions and 2336 deletions

View file

@ -108,6 +108,13 @@ private:
QPointer<QLabel> advOutRecWarning;
QPointer<QLabel> simpleOutRecWarning;
QString curPreset;
QString curQSVPreset;
QString curNVENCPreset;
QString curAdvStreamEncoder;
QString curAdvRecordEncoder;
using AudioSource_t =
std::tuple<OBSWeakSource,
QPointer<QCheckBox>, QPointer<QSpinBox>,
@ -231,6 +238,7 @@ private:
void UpdateAdvOutStreamDelayEstimate();
void FillSimpleRecordingValues();
void FillSimpleStreamingValues();
void RecalcOutputResPixels(const char *resText);
@ -253,6 +261,7 @@ private slots:
void on_colorFormat_currentIndexChanged(const QString &text);
void on_filenameFormatting_textEdited(const QString &text);
void on_outputResolution_editTextChanged(const QString &text);
void on_baseResolution_editTextChanged(const QString &text);
@ -280,6 +289,8 @@ private slots:
void SimpleRecordingEncoderChanged();
void SimpleRecordingQualityLosslessWarning(int idx);
void SimpleStreamingEncoderChanged();
protected:
virtual void closeEvent(QCloseEvent *event);