New upstream version 18.0.1+dfsg1
This commit is contained in:
parent
6efda2859e
commit
f2cf6cce50
1337 changed files with 41178 additions and 84670 deletions
|
|
@ -38,6 +38,7 @@
|
|||
|
||||
#include <QPointer>
|
||||
|
||||
class QMessageBox;
|
||||
class QListWidgetItem;
|
||||
class VolControl;
|
||||
class QNetworkReply;
|
||||
|
|
@ -86,6 +87,7 @@ class OBSBasic : public OBSMainWindow {
|
|||
friend class OBSBasicPreview;
|
||||
friend class OBSBasicStatusBar;
|
||||
friend class OBSBasicSourceSelect;
|
||||
friend class OBSBasicSettings;
|
||||
friend struct OBSStudioAPI;
|
||||
|
||||
enum class MoveDir {
|
||||
|
|
@ -95,6 +97,13 @@ class OBSBasic : public OBSMainWindow {
|
|||
Right
|
||||
};
|
||||
|
||||
enum DropType {
|
||||
DropType_RawText,
|
||||
DropType_Text,
|
||||
DropType_Image,
|
||||
DropType_Media
|
||||
};
|
||||
|
||||
private:
|
||||
obs_frontend_callbacks *api = nullptr;
|
||||
|
||||
|
|
@ -102,6 +111,9 @@ private:
|
|||
|
||||
std::vector<OBSSignal> signalHandlers;
|
||||
|
||||
std::vector<std::string> projectorArray;
|
||||
std::vector<int> previewProjectorArray;
|
||||
|
||||
bool loaded = false;
|
||||
long disableSaving = 1;
|
||||
bool projectChanged = false;
|
||||
|
|
@ -123,6 +135,7 @@ private:
|
|||
std::unique_ptr<BasicOutputHandler> outputHandler;
|
||||
bool streamingStopping = false;
|
||||
bool recordingStopping = false;
|
||||
bool replayBufferStopping = false;
|
||||
|
||||
gs_vertbuffer_t *box = nullptr;
|
||||
gs_vertbuffer_t *boxLeft = nullptr;
|
||||
|
|
@ -144,14 +157,15 @@ private:
|
|||
|
||||
QPointer<QMenu> startStreamMenu;
|
||||
|
||||
QSystemTrayIcon *trayIcon;
|
||||
QMenu *trayMenu;
|
||||
QAction *sysTrayStream;
|
||||
QAction *sysTrayRecord;
|
||||
QAction *showHide;
|
||||
QAction *showPreview;
|
||||
QAction *exit;
|
||||
bool disableHiding = false;
|
||||
QPointer<QPushButton> replayBufferButton;
|
||||
|
||||
QPointer<QSystemTrayIcon> trayIcon;
|
||||
QPointer<QAction> sysTrayStream;
|
||||
QPointer<QAction> sysTrayRecord;
|
||||
QPointer<QAction> sysTrayReplayBuffer;
|
||||
QPointer<QAction> showHide;
|
||||
QPointer<QAction> exit;
|
||||
QPointer<QMenu> trayMenu;
|
||||
|
||||
void DrawBackdrop(float cx, float cy);
|
||||
|
||||
|
|
@ -186,7 +200,7 @@ private:
|
|||
bool QueryRemoveSource(obs_source_t *source);
|
||||
|
||||
void TimedCheckForUpdates();
|
||||
void CheckForUpdates();
|
||||
void CheckForUpdates(bool manualUpdate);
|
||||
|
||||
void GetFPSCommon(uint32_t &num, uint32_t &den) const;
|
||||
void GetFPSInteger(uint32_t &num, uint32_t &den) const;
|
||||
|
|
@ -194,6 +208,8 @@ private:
|
|||
void GetFPSNanoseconds(uint32_t &num, uint32_t &den) const;
|
||||
void GetConfigFPS(uint32_t &num, uint32_t &den) const;
|
||||
|
||||
void UpdatePreviewScalingMenu();
|
||||
|
||||
void UpdateSources(OBSScene scene);
|
||||
void InsertSceneItem(obs_sceneitem_t *item);
|
||||
|
||||
|
|
@ -236,7 +252,8 @@ private:
|
|||
|
||||
QListWidgetItem *GetTopSelectedSourceItem();
|
||||
|
||||
obs_hotkey_pair_id streamingHotkeys, recordingHotkeys;
|
||||
obs_hotkey_pair_id streamingHotkeys, recordingHotkeys,
|
||||
replayBufHotkeys;
|
||||
obs_hotkey_id forceStreamingStopHotkey;
|
||||
|
||||
void InitDefaultTransitions();
|
||||
|
|
@ -299,12 +316,31 @@ private:
|
|||
inline void OnActivate();
|
||||
inline void OnDeactivate();
|
||||
|
||||
void AddDropSource(const char *file, bool image);
|
||||
void AddDropSource(const char *file, DropType image);
|
||||
void dragEnterEvent(QDragEnterEvent *event) override;
|
||||
void dragLeaveEvent(QDragLeaveEvent *event) override;
|
||||
void dragMoveEvent(QDragMoveEvent *event) override;
|
||||
void dropEvent(QDropEvent *event) override;
|
||||
|
||||
void ReplayBufferClicked();
|
||||
|
||||
bool sysTrayMinimizeToTray();
|
||||
|
||||
void EnumDialogs();
|
||||
|
||||
QList<QDialog*> visDialogs;
|
||||
QList<QDialog*> modalDialogs;
|
||||
QList<QMessageBox*> visMsgBoxes;
|
||||
|
||||
QList<QPoint> visDlgPositions;
|
||||
|
||||
obs_data_array_t *SaveProjectors();
|
||||
void LoadSavedProjectors(obs_data_array_t *savedProjectors);
|
||||
|
||||
obs_data_array_t *SavePreviewProjectors();
|
||||
void LoadSavedPreviewProjectors(
|
||||
obs_data_array_t *savedPreviewProjectors);
|
||||
|
||||
public slots:
|
||||
void StartStreaming();
|
||||
void StopStreaming();
|
||||
|
|
@ -324,6 +360,13 @@ public slots:
|
|||
void RecordStopping();
|
||||
void RecordingStop(int code);
|
||||
|
||||
void StartReplayBuffer();
|
||||
void StopReplayBuffer();
|
||||
|
||||
void ReplayBufferStart();
|
||||
void ReplayBufferStopping();
|
||||
void ReplayBufferStop(int code);
|
||||
|
||||
void SaveProjectDeferred();
|
||||
void SaveProject();
|
||||
|
||||
|
|
@ -368,15 +411,7 @@ private slots:
|
|||
void IconActivated(QSystemTrayIcon::ActivationReason reason);
|
||||
void SetShowing(bool showing);
|
||||
|
||||
inline void ToggleShowHide()
|
||||
{
|
||||
bool showing = isVisible();
|
||||
if (disableHiding && showing)
|
||||
return;
|
||||
if (showing)
|
||||
CloseDialogs();
|
||||
SetShowing(!showing);
|
||||
}
|
||||
void ToggleShowHide();
|
||||
|
||||
private:
|
||||
/* OBS Callbacks */
|
||||
|
|
@ -457,6 +492,9 @@ public:
|
|||
void SystemTrayInit();
|
||||
void SystemTray(bool firstStarted);
|
||||
|
||||
void OpenSavedProjectors();
|
||||
void RemoveSavedProjectors(int monitor);
|
||||
|
||||
protected:
|
||||
virtual void closeEvent(QCloseEvent *event) override;
|
||||
virtual void changeEvent(QEvent *event) override;
|
||||
|
|
@ -475,6 +513,8 @@ private slots:
|
|||
void on_actionCheckForUpdates_triggered();
|
||||
|
||||
void on_actionEditTransform_triggered();
|
||||
void on_actionCopyTransform_triggered();
|
||||
void on_actionPasteTransform_triggered();
|
||||
void on_actionRotate90CW_triggered();
|
||||
void on_actionRotate90CCW_triggered();
|
||||
void on_actionRotate180_triggered();
|
||||
|
|
@ -508,6 +548,11 @@ private slots:
|
|||
|
||||
void on_actionLockPreview_triggered();
|
||||
|
||||
void on_scalingMenu_aboutToShow();
|
||||
void on_actionScaleWindow_triggered();
|
||||
void on_actionScaleCanvas_triggered();
|
||||
void on_actionScaleOutput_triggered();
|
||||
|
||||
void on_streamButton_clicked();
|
||||
void on_recordButton_clicked();
|
||||
void on_settingsButton_clicked();
|
||||
|
|
@ -522,11 +567,15 @@ private slots:
|
|||
void on_actionDupSceneCollection_triggered();
|
||||
void on_actionRenameSceneCollection_triggered();
|
||||
void on_actionRemoveSceneCollection_triggered();
|
||||
void on_actionImportSceneCollection_triggered();
|
||||
void on_actionExportSceneCollection_triggered();
|
||||
|
||||
void on_actionNewProfile_triggered();
|
||||
void on_actionDupProfile_triggered();
|
||||
void on_actionRenameProfile_triggered();
|
||||
void on_actionRemoveProfile_triggered();
|
||||
void on_actionImportProfile_triggered();
|
||||
void on_actionExportProfile_triggered();
|
||||
|
||||
void on_actionShowSettingsFolder_triggered();
|
||||
void on_actionShowProfileFolder_triggered();
|
||||
|
|
@ -546,7 +595,7 @@ private slots:
|
|||
|
||||
void logUploadFinished(const QString &text, const QString &error);
|
||||
|
||||
void updateFileFinished(const QString &text, const QString &error);
|
||||
void updateCheckFinished();
|
||||
|
||||
void AddSourceFromAction();
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue