Imported Upstream version 0.14.2+dfsg1
This commit is contained in:
parent
fb3990e9e5
commit
41a01dbf05
529 changed files with 25112 additions and 2336 deletions
|
|
@ -49,6 +49,8 @@ class QNetworkReply;
|
|||
|
||||
#define SIMPLE_ENCODER_X264 "x264"
|
||||
#define SIMPLE_ENCODER_X264_LOWCPU "x264_lowcpu"
|
||||
#define SIMPLE_ENCODER_QSV "qsv"
|
||||
#define SIMPLE_ENCODER_NVENC "nvenc"
|
||||
|
||||
#define PREVIEW_EDGE_SIZE 10
|
||||
|
||||
|
|
@ -113,6 +115,10 @@ private:
|
|||
std::unique_ptr<BasicOutputHandler> outputHandler;
|
||||
|
||||
gs_vertbuffer_t *box = nullptr;
|
||||
gs_vertbuffer_t *boxLeft = nullptr;
|
||||
gs_vertbuffer_t *boxTop = nullptr;
|
||||
gs_vertbuffer_t *boxRight = nullptr;
|
||||
gs_vertbuffer_t *boxBottom = nullptr;
|
||||
gs_vertbuffer_t *circle = nullptr;
|
||||
|
||||
bool sceneChanging = false;
|
||||
|
|
@ -220,6 +226,8 @@ private:
|
|||
obs_source_t *FindTransition(const char *name);
|
||||
void SetTransition(obs_source_t *transition);
|
||||
OBSSource GetCurrentTransition();
|
||||
obs_data_array_t *SaveTransitions();
|
||||
void LoadTransitions(obs_data_array_t *transitions);
|
||||
|
||||
obs_source_t *fadeTransition;
|
||||
|
||||
|
|
@ -314,10 +322,15 @@ private slots:
|
|||
|
||||
void ProcessHotkey(obs_hotkey_id id, bool pressed);
|
||||
|
||||
void AddTransition();
|
||||
void RenameTransition();
|
||||
void TransitionClicked();
|
||||
void TransitionStopped();
|
||||
void TriggerQuickTransition(int id);
|
||||
|
||||
void SetDeinterlacingMode();
|
||||
void SetDeinterlacingOrder();
|
||||
|
||||
private:
|
||||
/* OBS Callbacks */
|
||||
static void SceneReordered(void *data, calldata_t *params);
|
||||
|
|
@ -325,7 +338,7 @@ private:
|
|||
static void SceneItemRemoved(void *data, calldata_t *params);
|
||||
static void SceneItemSelected(void *data, calldata_t *params);
|
||||
static void SceneItemDeselected(void *data, calldata_t *params);
|
||||
static void SourceLoaded(void *data, calldata_t *params);
|
||||
static void SourceLoaded(void *data, obs_source_t *source);
|
||||
static void SourceRemoved(void *data, calldata_t *params);
|
||||
static void SourceActivated(void *data, calldata_t *params);
|
||||
static void SourceDeactivated(void *data, calldata_t *params);
|
||||
|
|
@ -384,6 +397,7 @@ public:
|
|||
|
||||
void ReorderSceneItem(obs_sceneitem_t *item, size_t idx);
|
||||
|
||||
QMenu *AddDeinterlacingMenu(obs_source_t *source);
|
||||
void CreateSourcePopupMenu(QListWidgetItem *item, bool preview);
|
||||
|
||||
void UpdateTitleBar();
|
||||
|
|
@ -465,6 +479,8 @@ private slots:
|
|||
void on_actionAlwaysOnTop_triggered();
|
||||
|
||||
void on_transitions_currentIndexChanged(int index);
|
||||
void on_transitionAdd_clicked();
|
||||
void on_transitionRemove_clicked();
|
||||
void on_transitionProps_clicked();
|
||||
|
||||
void on_modeSwitch_clicked();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue