So, scene editing was interesting (and by interesting I mean excruciating). I almost implemented 'manipulator' visuals (ala 3dsmax for example), and used 3 modes for controlling position/rotation/size, but in a 2D editing, it felt clunky, so I defaulted back to simply click-and-drag for movement, and then took a similar though slightly different looking approach for handling scaling and reszing. I also added a number of menu item helpers related to positioning, scaling, rotating, flipping, and resetting the transform back to default. There is also a new 'transform' dialog (accessible via menu) which will allow you to manually edit every single transform variable of a scene item directly if desired. If a scene item does not have bounds active, pulling on the sides of a source will cause it to resize it via base scale rather than by the bounding box system (if the source resizes that scale will apply). If bounds are active, it will modify the bounding box only instead. How a source scales when a bounding box is active depends on the type of bounds being used. You can set it to scale to the inner bounds, the outer bounds, scale to bounds width only, scale to bounds height only, and a setting to stretch to bounds (which forces a source to always draw at the bounding box size rather than be affected by its internal size). You can also set it to be used as a 'maximum' size, so that the source doesn't necessarily get scaled unless it extends beyond the bounds. Like in OBS1, objects will snap to the edges unless the control key is pressed. However, this will now happen even if the object is rotated or oriented in any strange way. Snapping will also occur when stretching or changing the bounding box size.
248 lines
7.2 KiB
C++
248 lines
7.2 KiB
C++
/******************************************************************************
|
|
Copyright (C) 2013-2014 by Hugh Bailey <obs.jim@gmail.com>
|
|
|
|
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
|
|
the Free Software Foundation, either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
******************************************************************************/
|
|
|
|
#pragma once
|
|
|
|
#include <QNetworkAccessManager>
|
|
#include <QBuffer>
|
|
#include <obs.hpp>
|
|
#include <unordered_map>
|
|
#include <vector>
|
|
#include <memory>
|
|
#include "window-main.hpp"
|
|
#include "window-basic-properties.hpp"
|
|
#include "window-basic-transform.hpp"
|
|
|
|
#include <util/util.hpp>
|
|
|
|
#include <QPointer>
|
|
|
|
class QListWidgetItem;
|
|
class VolControl;
|
|
class QNetworkReply;
|
|
|
|
#include "ui_OBSBasic.h"
|
|
|
|
#define DESKTOP_AUDIO_1 Str("DesktopAudioDevice1")
|
|
#define DESKTOP_AUDIO_2 Str("DesktopAudioDevice2")
|
|
#define AUX_AUDIO_1 Str("AuxAudioDevice1")
|
|
#define AUX_AUDIO_2 Str("AuxAudioDevice2")
|
|
#define AUX_AUDIO_3 Str("AuxAudioDevice3")
|
|
|
|
class OBSBasic : public OBSMainWindow {
|
|
Q_OBJECT
|
|
|
|
friend class OBSBasicPreview;
|
|
|
|
private:
|
|
std::unordered_map<obs_source_t, int> sourceSceneRefs;
|
|
|
|
std::vector<VolControl*> volumes;
|
|
|
|
QPointer<OBSBasicProperties> properties;
|
|
QPointer<OBSBasicTransform> transformWindow;
|
|
|
|
QNetworkAccessManager networkManager;
|
|
|
|
QBuffer logUploadPostData;
|
|
QNetworkReply *logUploadReply = nullptr;
|
|
QByteArray logUploadReturnData;
|
|
|
|
obs_output_t fileOutput = nullptr;
|
|
obs_output_t streamOutput = nullptr;
|
|
obs_service_t service = nullptr;
|
|
obs_encoder_t aac = nullptr;
|
|
obs_encoder_t x264 = nullptr;
|
|
|
|
vertbuffer_t box = nullptr;
|
|
vertbuffer_t circle = nullptr;
|
|
|
|
bool sceneChanging = false;
|
|
|
|
int previewX = 0, previewY = 0;
|
|
int previewCX = 0, previewCY = 0;
|
|
float previewScale = 0.0f;
|
|
int resizeTimer = 0;
|
|
|
|
ConfigFile basicConfig;
|
|
|
|
int activeRefs = 0;
|
|
|
|
void SetupEncoders();
|
|
|
|
void CreateDefaultScene();
|
|
|
|
void ClearVolumeControls();
|
|
|
|
void UploadLog(const char *file);
|
|
|
|
void Save(const char *file);
|
|
void Load(const char *file);
|
|
|
|
void SaveService();
|
|
bool LoadService();
|
|
|
|
bool InitOutputs();
|
|
bool InitEncoders();
|
|
bool InitService();
|
|
|
|
bool InitBasicConfigDefaults();
|
|
bool InitBasicConfig();
|
|
|
|
void InitOBSCallbacks();
|
|
|
|
void InitPrimitives();
|
|
|
|
OBSSceneItem GetCurrentSceneItem();
|
|
|
|
void GetFPSCommon(uint32_t &num, uint32_t &den) const;
|
|
void GetFPSInteger(uint32_t &num, uint32_t &den) const;
|
|
void GetFPSFraction(uint32_t &num, uint32_t &den) const;
|
|
void GetFPSNanoseconds(uint32_t &num, uint32_t &den) const;
|
|
void GetConfigFPS(uint32_t &num, uint32_t &den) const;
|
|
|
|
void UpdateSources(OBSScene scene);
|
|
void InsertSceneItem(obs_sceneitem_t item);
|
|
|
|
void TempFileOutput(const char *path, int vBitrate, int aBitrate);
|
|
void TempStreamOutput(const char *url, const char *key,
|
|
int vBitrate, int aBitrate);
|
|
|
|
public slots:
|
|
void StreamingStart();
|
|
void StreamingStop(int errorcode);
|
|
|
|
void RecordingStop();
|
|
|
|
private slots:
|
|
void AddSceneItem(OBSSceneItem item);
|
|
void RemoveSceneItem(OBSSceneItem item);
|
|
void AddScene(OBSSource source);
|
|
void RemoveScene(OBSSource source);
|
|
void UpdateSceneSelection(OBSSource source);
|
|
|
|
void MoveSceneItem(OBSSceneItem item, order_movement movement);
|
|
|
|
void ActivateAudioSource(OBSSource source);
|
|
void DeactivateAudioSource(OBSSource source);
|
|
|
|
private:
|
|
/* OBS Callbacks */
|
|
static void SceneItemAdded(void *data, calldata_t params);
|
|
static void SceneItemRemoved(void *data, calldata_t params);
|
|
static void SourceAdded(void *data, calldata_t params);
|
|
static void SourceRemoved(void *data, calldata_t params);
|
|
static void SourceActivated(void *data, calldata_t params);
|
|
static void SourceDeactivated(void *data, calldata_t params);
|
|
static void ChannelChanged(void *data, calldata_t params);
|
|
static void RenderMain(void *data, uint32_t cx, uint32_t cy);
|
|
|
|
static void SceneItemMoveUp(void *data, calldata_t params);
|
|
static void SceneItemMoveDown(void *data, calldata_t params);
|
|
static void SceneItemMoveTop(void *data, calldata_t params);
|
|
static void SceneItemMoveBottom(void *data, calldata_t params);
|
|
|
|
void ResizePreview(uint32_t cx, uint32_t cy);
|
|
|
|
void AddSource(const char *id);
|
|
void AddSourcePopupMenu(const QPoint &pos);
|
|
|
|
public:
|
|
OBSScene GetCurrentScene();
|
|
|
|
obs_service_t GetService();
|
|
void SetService(obs_service_t service);
|
|
|
|
bool ResetVideo();
|
|
bool ResetAudio();
|
|
|
|
void ResetAudioDevice(const char *sourceId, const char *deviceName,
|
|
const char *deviceDesc, int channel);
|
|
void ResetAudioDevices();
|
|
|
|
void NewProject();
|
|
void SaveProject();
|
|
void LoadProject();
|
|
|
|
inline void GetDisplayRect(int &x, int &y, int &cx, int &cy)
|
|
{
|
|
x = previewX;
|
|
y = previewY;
|
|
cx = previewCX;
|
|
cy = previewCY;
|
|
}
|
|
|
|
protected:
|
|
virtual void closeEvent(QCloseEvent *event) override;
|
|
virtual void changeEvent(QEvent *event) override;
|
|
virtual void resizeEvent(QResizeEvent *event) override;
|
|
virtual void timerEvent(QTimerEvent *event) override;
|
|
|
|
private slots:
|
|
void on_action_New_triggered();
|
|
void on_action_Open_triggered();
|
|
void on_action_Save_triggered();
|
|
void on_action_Settings_triggered();
|
|
void on_actionUploadCurrentLog_triggered();
|
|
void on_actionUploadLastLog_triggered();
|
|
|
|
void on_actionEditTransform_triggered();
|
|
void on_actionResetTransform_triggered();
|
|
void on_actionRotate90CW_triggered();
|
|
void on_actionRotate90CCW_triggered();
|
|
void on_actionRotate180_triggered();
|
|
void on_actionFlipHorizontal_triggered();
|
|
void on_actionFlipVertical_triggered();
|
|
void on_actionFitToScreen_triggered();
|
|
void on_actionStretchToScreen_triggered();
|
|
void on_actionCenterToScreen_triggered();
|
|
|
|
void on_scenes_currentItemChanged(QListWidgetItem *current,
|
|
QListWidgetItem *prev);
|
|
void on_scenes_customContextMenuRequested(const QPoint &pos);
|
|
void on_actionAddScene_triggered();
|
|
void on_actionRemoveScene_triggered();
|
|
void on_actionSceneProperties_triggered();
|
|
void on_actionSceneUp_triggered();
|
|
void on_actionSceneDown_triggered();
|
|
void on_sources_currentItemChanged(QListWidgetItem *current,
|
|
QListWidgetItem *prev);
|
|
void on_sources_customContextMenuRequested(const QPoint &pos);
|
|
void on_actionAddSource_triggered();
|
|
void on_actionRemoveSource_triggered();
|
|
void on_actionSourceProperties_triggered();
|
|
void on_actionSourceUp_triggered();
|
|
void on_actionSourceDown_triggered();
|
|
|
|
void on_streamButton_clicked();
|
|
void on_recordButton_clicked();
|
|
void on_settingsButton_clicked();
|
|
|
|
void logUploadRead();
|
|
void logUploadFinished();
|
|
|
|
public:
|
|
explicit OBSBasic(QWidget *parent = 0);
|
|
virtual ~OBSBasic();
|
|
|
|
virtual void OBSInit() override;
|
|
|
|
virtual config_t Config() const override;
|
|
|
|
private:
|
|
std::unique_ptr<Ui::OBSBasic> ui;
|
|
};
|