lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New upstream version 23.2.1+dfsg1

Browse source
This commit is contained in:
Simon Chopin 2019-07-27 14:47:10 +02:00
parent cdc9a9fc87
commit b14f9eae6d
1017 changed files with 37232 additions and 11111 deletions
Download patch file Download diff file Expand all files Collapse all files

52
UI/window-basic-settings.hpp
View file

@ -20,12 +20,15 @@
#include <util/util.hpp>
#include <QDialog>
#include <QPointer>
#include <memory>
#include <string>
#include <libff/ff-util.h>
#include <obs.h>
#include <obs.hpp>
#include "auth-base.hpp"
class OBSBasic;
class QAbstractButton;
@ -84,12 +87,28 @@ using OBSFFFormatDesc = std::unique_ptr<const ff_format_desc,
class OBSBasicSettings : public QDialog {
Q_OBJECT
Q_PROPERTY(QIcon generalIcon WRITE SetGeneralIcon
NOTIFY SetGeneralIcon)
Q_PROPERTY(QIcon streamIcon WRITE SetStreamIcon
NOTIFY SetStreamIcon)
Q_PROPERTY(QIcon outputIcon WRITE SetOutputIcon
NOTIFY SetOutputIcon)
Q_PROPERTY(QIcon audioIcon WRITE SetAudioIcon
NOTIFY SetAudioIcon)
Q_PROPERTY(QIcon videoIcon WRITE SetVideoIcon
NOTIFY SetVideoIcon)
Q_PROPERTY(QIcon hotkeysIcon WRITE SetHotkeysIcon
NOTIFY SetHotkeysIcon)
Q_PROPERTY(QIcon advancedIcon WRITE SetAdvancedIcon
NOTIFY SetAdvancedIcon)
private:
OBSBasic *main;
std::unique_ptr<Ui::OBSBasicSettings> ui;
std::shared_ptr<Auth> auth;
bool generalChanged = false;
bool stream1Changed = false;
bool outputsChanged = false;
@ -185,7 +204,6 @@ private:
bool QueryChanges();
void LoadServiceTypes();
void LoadEncoderTypes();
void LoadColorRanges();
void LoadFormats();
@ -207,6 +225,24 @@ private:
void LoadLanguageList();
void LoadThemeList();
/* stream */
void InitStreamPage();
inline bool IsCustomService() const;
void LoadServices(bool showAll);
void OnOAuthStreamKeyConnected();
void OnAuthConnected();
QString lastService;
private slots:
void UpdateServerList();
void UpdateKeyLink();
void on_show_clicked();
void on_authPwShow_clicked();
void on_connectAccount_clicked();
void on_disconnectAccount_clicked();
void on_useStreamKey_clicked();
void on_useAuth_toggled();
private:
/* output */
void LoadSimpleOutputSettings();
void LoadAdvOutputStreamingSettings();
@ -255,7 +291,7 @@ private slots:
void on_listWidget_itemSelectionChanged();
void on_buttonBox_clicked(QAbstractButton *button);
void on_streamType_currentIndexChanged(int idx);
void on_service_currentIndexChanged(int idx);
void on_simpleOutputBrowse_clicked();
void on_advOutRecPathBrowse_clicked();
void on_advOutFFPathBrowse_clicked();
@ -306,6 +342,16 @@ private slots:
void SimpleStreamingEncoderChanged();
OBSService SpawnTempService();
void SetGeneralIcon(const QIcon &icon);
void SetStreamIcon(const QIcon &icon);
void SetOutputIcon(const QIcon &icon);
void SetAudioIcon(const QIcon &icon);
void SetVideoIcon(const QIcon &icon);
void SetHotkeysIcon(const QIcon &icon);
void SetAdvancedIcon(const QIcon &icon);
protected:
virtual void closeEvent(QCloseEvent *event);