2013-11-07 15:45:03 -08:00
|
|
|
/******************************************************************************
|
2015-02-19 11:02:54 -08:00
|
|
|
Copyright (C) 2013-2015 by Hugh Bailey <obs.jim@gmail.com>
|
2014-05-15 14:04:18 -07:00
|
|
|
Zachary Lund <admin@computerquip.com>
|
2015-02-19 11:02:54 -08:00
|
|
|
Philippe Groarke <philippe.groarke@gmail.com>
|
2013-11-07 15:45:03 -08:00
|
|
|
|
|
|
|
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
|
2013-12-02 21:24:38 -08:00
|
|
|
the Free Software Foundation, either version 2 of the License, or
|
2013-11-07 15:45:03 -08:00
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
2013-11-08 23:19:38 -08:00
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
2013-11-07 15:45:03 -08:00
|
|
|
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/>.
|
|
|
|
******************************************************************************/
|
|
|
|
|
2014-07-13 23:56:28 -07:00
|
|
|
#include <time.h>
|
2013-12-22 16:42:02 -08:00
|
|
|
#include <obs.hpp>
|
2016-10-03 23:50:13 -07:00
|
|
|
#include <QGuiApplication>
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
#include <QMessageBox>
|
2014-01-25 08:08:56 -08:00
|
|
|
#include <QShowEvent>
|
2014-08-21 18:18:42 -07:00
|
|
|
#include <QDesktopServices>
|
2014-02-10 09:22:35 -08:00
|
|
|
#include <QFileDialog>
|
2016-07-04 22:34:56 -07:00
|
|
|
#include <QDesktopWidget>
|
2016-10-03 23:50:13 -07:00
|
|
|
#include <QRect>
|
|
|
|
#include <QScreen>
|
2013-12-29 08:17:00 -08:00
|
|
|
|
2014-05-18 17:44:10 -07:00
|
|
|
#include <util/dstr.h>
|
2014-03-06 20:08:12 -08:00
|
|
|
#include <util/util.hpp>
|
|
|
|
#include <util/platform.h>
|
2015-07-10 23:04:12 -07:00
|
|
|
#include <util/profiler.hpp>
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
#include <graphics/math-defs.h>
|
2014-03-06 20:08:12 -08:00
|
|
|
|
2013-11-23 22:38:52 -08:00
|
|
|
#include "obs-app.hpp"
|
2014-03-06 20:08:12 -08:00
|
|
|
#include "platform.hpp"
|
2015-03-22 20:51:21 -07:00
|
|
|
#include "visibility-item-widget.hpp"
|
2015-06-27 18:18:40 -07:00
|
|
|
#include "item-widget-helpers.hpp"
|
2014-01-24 20:19:50 -08:00
|
|
|
#include "window-basic-settings.hpp"
|
2013-12-29 07:54:06 -08:00
|
|
|
#include "window-namedialog.hpp"
|
2014-05-10 18:47:48 -07:00
|
|
|
#include "window-basic-source-select.hpp"
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
#include "window-basic-main.hpp"
|
2015-02-06 03:17:33 -08:00
|
|
|
#include "window-basic-main-outputs.hpp"
|
2014-03-23 01:07:54 -07:00
|
|
|
#include "window-basic-properties.hpp"
|
2014-05-18 17:44:10 -07:00
|
|
|
#include "window-log-reply.hpp"
|
2015-04-04 01:40:15 -07:00
|
|
|
#include "window-projector.hpp"
|
2014-09-02 19:11:55 -07:00
|
|
|
#include "window-remux.hpp"
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
#include "qt-wrappers.hpp"
|
2014-03-23 01:07:54 -07:00
|
|
|
#include "display-helpers.hpp"
|
2014-05-03 22:54:38 -07:00
|
|
|
#include "volume-control.hpp"
|
UI: Replace Qt5Network classes with libcurl
The Qt5Network classes seem to only support OpenSSL, and because OpenSSL
isn't available on windows, we would have to distribute it with the
program to get SSL access working. The problem with that is that
OpenSSL is not GPL-compatible, so we cannot distribute OpenSSL with the
program, which means we have to find a better (and preferably superior)
library for accessing remote files that can use the windows SSPI for our
SSL needs, which comes with the operating system.
Fortunately, libcurl is probably the best library out there, and can be
compiled with SSPI instead of OpenSSL, so we're just going to switch to
libcurl instead. Originally I thought it didn't support SSPI, otherwise
I would have implemented it sooner.
As a side note, this will make it so we'll able to get files from the
internet via plugins, which will be quite useful.
2015-05-23 23:39:39 -07:00
|
|
|
#include "remote-text.hpp"
|
2014-01-04 12:53:36 -08:00
|
|
|
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
#include "ui_OBSBasic.h"
|
2014-01-09 17:51:51 -08:00
|
|
|
|
2014-05-18 17:44:10 -07:00
|
|
|
#include <fstream>
|
Implement RTMP module (still needs drop code)
- Implement the RTMP output module. This time around, we just use a
simple FLV muxer, then just write to the stream with RTMP_Write.
Easy and effective.
- Fix the FLV muxer, the muxer now outputs proper FLV packets.
- Output API:
* When using encoders, automatically interleave encoded packets
before sending it to the output.
* Pair encoders and have them automatically wait for the other to
start to ensure sync.
* Change 'obs_output_signal_start_fail' to 'obs_output_signal_stop'
because it was a bit confusing, and doing this makes a lot more
sense for outputs that need to stop suddenly (disconnections/etc).
- Encoder API:
* Remove some unnecessary encoder functions from the actual API and
make them internal. Most of the encoder functions are handled
automatically by outputs anyway, so there's no real need to expose
them and end up inadvertently confusing plugin writers.
* Have audio encoders wait for the video encoder to get a frame, then
start at the exact data point that the first video frame starts to
ensure the most accrate sync of video/audio possible.
* Add a required 'frame_size' callback for audio encoders that
returns the expected number of frames desired to encode with. This
way, the libobs encoder API can handle the circular buffering
internally automatically for the encoder modules, so encoder
writers don't have to do it themselves.
- Fix a few bugs in the serializer interface. It was passing the wrong
variable for the data in a few cases.
- If a source has video, make obs_source_update defer the actual update
callback until the tick function is called to prevent threading
issues.
2014-04-07 22:00:10 -07:00
|
|
|
#include <sstream>
|
|
|
|
|
2014-04-16 13:35:01 -07:00
|
|
|
#include <QScreen>
|
|
|
|
#include <QWindow>
|
|
|
|
|
2013-12-29 07:54:06 -08:00
|
|
|
using namespace std;
|
2013-11-22 15:20:52 -08:00
|
|
|
|
2015-12-05 05:53:38 -08:00
|
|
|
namespace {
|
|
|
|
|
|
|
|
template <typename OBSRef>
|
|
|
|
struct SignalContainer {
|
|
|
|
OBSRef ref;
|
|
|
|
vector<shared_ptr<OBSSignal>> handlers;
|
|
|
|
};
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2014-02-02 13:26:23 -08:00
|
|
|
Q_DECLARE_METATYPE(OBSScene);
|
|
|
|
Q_DECLARE_METATYPE(OBSSceneItem);
|
2014-10-29 07:53:59 -07:00
|
|
|
Q_DECLARE_METATYPE(OBSSource);
|
2014-08-02 01:33:53 -07:00
|
|
|
Q_DECLARE_METATYPE(obs_order_movement);
|
2015-12-05 05:53:38 -08:00
|
|
|
Q_DECLARE_METATYPE(SignalContainer<OBSScene>);
|
2014-02-02 13:26:23 -08:00
|
|
|
|
2015-06-27 18:21:45 -07:00
|
|
|
template <typename T>
|
|
|
|
static T GetOBSRef(QListWidgetItem *item)
|
|
|
|
{
|
|
|
|
return item->data(static_cast<int>(QtDataRole::OBSRef)).value<T>();
|
|
|
|
}
|
|
|
|
|
|
|
|
template <typename T>
|
|
|
|
static void SetOBSRef(QListWidgetItem *item, T &&val)
|
|
|
|
{
|
|
|
|
item->setData(static_cast<int>(QtDataRole::OBSRef),
|
|
|
|
QVariant::fromValue(val));
|
|
|
|
}
|
|
|
|
|
2014-07-27 12:48:14 -07:00
|
|
|
static void AddExtraModulePaths()
|
|
|
|
{
|
2015-01-15 23:44:38 -08:00
|
|
|
char base_module_dir[512];
|
2016-07-06 01:35:12 -07:00
|
|
|
#if defined(_WIN32) || defined(__APPLE__)
|
|
|
|
int ret = GetProgramDataPath(base_module_dir, sizeof(base_module_dir),
|
|
|
|
"obs-studio/plugins/%module%");
|
|
|
|
#else
|
2015-06-01 16:11:57 -07:00
|
|
|
int ret = GetConfigPath(base_module_dir, sizeof(base_module_dir),
|
2015-01-15 23:44:38 -08:00
|
|
|
"obs-studio/plugins/%module%");
|
2016-07-06 01:35:12 -07:00
|
|
|
#endif
|
2014-08-31 07:28:36 -07:00
|
|
|
|
2015-01-15 23:44:38 -08:00
|
|
|
if (ret <= 0)
|
2014-07-27 12:48:14 -07:00
|
|
|
return;
|
|
|
|
|
|
|
|
string path = (char*)base_module_dir;
|
2015-07-14 18:05:26 -07:00
|
|
|
#if defined(__APPLE__)
|
2014-07-27 12:48:14 -07:00
|
|
|
obs_add_module_path((path + "/bin").c_str(), (path + "/data").c_str());
|
2015-07-14 18:05:26 -07:00
|
|
|
#elif ARCH_BITS == 64
|
|
|
|
obs_add_module_path((path + "/bin/64bit").c_str(),
|
|
|
|
(path + "/data").c_str());
|
|
|
|
#else
|
|
|
|
obs_add_module_path((path + "/bin/32bit").c_str(),
|
|
|
|
(path + "/data").c_str());
|
|
|
|
#endif
|
2014-07-27 12:48:14 -07:00
|
|
|
}
|
|
|
|
|
2014-10-15 13:00:43 -07:00
|
|
|
static QList<QKeySequence> DeleteKeys;
|
|
|
|
|
2014-02-02 14:23:38 -08:00
|
|
|
OBSBasic::OBSBasic(QWidget *parent)
|
2014-05-20 23:27:27 -07:00
|
|
|
: OBSMainWindow (parent),
|
2014-05-18 17:44:10 -07:00
|
|
|
ui (new Ui::OBSBasic)
|
2014-02-02 14:23:38 -08:00
|
|
|
{
|
2017-01-24 18:45:22 -08:00
|
|
|
setAttribute(Qt::WA_NativeWindow);
|
|
|
|
|
2016-12-29 07:21:53 -08:00
|
|
|
projectorArray.resize(10, "");
|
|
|
|
previewProjectorArray.resize(10, 0);
|
|
|
|
|
2016-09-26 12:40:23 -07:00
|
|
|
setAcceptDrops(true);
|
|
|
|
|
2014-02-02 14:23:38 -08:00
|
|
|
ui->setupUi(this);
|
2015-04-02 21:35:46 -07:00
|
|
|
ui->previewDisabledLabel->setVisible(false);
|
|
|
|
|
2015-02-16 23:45:34 -08:00
|
|
|
copyActionsDynamicProperties();
|
2014-04-16 13:35:01 -07:00
|
|
|
|
2015-03-22 20:51:21 -07:00
|
|
|
ui->sources->setItemDelegate(new VisibilityItemDelegate(ui->sources));
|
|
|
|
|
2016-08-11 03:24:10 -07:00
|
|
|
const char *geometry = config_get_string(App()->GlobalConfig(),
|
|
|
|
"BasicWindow", "geometry");
|
|
|
|
if (geometry != NULL) {
|
|
|
|
QByteArray byteArray = QByteArray::fromBase64(
|
|
|
|
QByteArray(geometry));
|
|
|
|
restoreGeometry(byteArray);
|
|
|
|
|
|
|
|
QRect windowGeometry = normalGeometry();
|
2016-09-28 22:26:28 -07:00
|
|
|
if (!WindowPositionValid(windowGeometry)) {
|
2016-10-20 06:29:43 -07:00
|
|
|
QRect rect = App()->desktop()->geometry();
|
2016-07-04 22:34:56 -07:00
|
|
|
setGeometry(QStyle::alignedRect(
|
|
|
|
Qt::LeftToRight,
|
|
|
|
Qt::AlignCenter,
|
|
|
|
size(), rect));
|
|
|
|
}
|
2015-02-12 20:49:23 -08:00
|
|
|
}
|
|
|
|
|
2015-01-16 00:06:54 -08:00
|
|
|
char styleSheetPath[512];
|
2015-06-23 19:38:01 -07:00
|
|
|
int ret = GetProfilePath(styleSheetPath, sizeof(styleSheetPath),
|
|
|
|
"stylesheet.qss");
|
2015-01-16 00:06:54 -08:00
|
|
|
if (ret > 0) {
|
2015-01-17 09:24:00 -08:00
|
|
|
if (QFile::exists(styleSheetPath)) {
|
|
|
|
QString path = QString("file:///") +
|
|
|
|
QT_UTF8(styleSheetPath);
|
|
|
|
App()->setStyleSheet(path);
|
|
|
|
}
|
2015-01-16 00:06:54 -08:00
|
|
|
}
|
|
|
|
|
2014-10-29 07:54:45 -07:00
|
|
|
qRegisterMetaType<OBSScene> ("OBSScene");
|
|
|
|
qRegisterMetaType<OBSSceneItem>("OBSSceneItem");
|
|
|
|
qRegisterMetaType<OBSSource> ("OBSSource");
|
2014-11-01 13:48:58 -07:00
|
|
|
qRegisterMetaType<obs_hotkey_id>("obs_hotkey_id");
|
2014-10-29 07:54:45 -07:00
|
|
|
|
2015-06-26 19:06:34 -07:00
|
|
|
qRegisterMetaTypeStreamOperators<
|
|
|
|
std::vector<std::shared_ptr<OBSSignal>>>(
|
|
|
|
"std::vector<std::shared_ptr<OBSSignal>>");
|
2015-06-27 01:48:58 -07:00
|
|
|
qRegisterMetaTypeStreamOperators<OBSScene>("OBSScene");
|
2015-06-26 18:39:39 -07:00
|
|
|
qRegisterMetaTypeStreamOperators<OBSSceneItem>("OBSSceneItem");
|
2015-06-27 01:48:58 -07:00
|
|
|
|
2014-10-29 09:18:00 -07:00
|
|
|
ui->scenes->setAttribute(Qt::WA_MacShowFocusRect, false);
|
|
|
|
ui->sources->setAttribute(Qt::WA_MacShowFocusRect, false);
|
|
|
|
|
2016-01-09 14:47:58 -08:00
|
|
|
auto displayResize = [this]() {
|
2014-04-16 13:35:01 -07:00
|
|
|
struct obs_video_info ovi;
|
|
|
|
|
|
|
|
if (obs_get_video_info(&ovi))
|
|
|
|
ResizePreview(ovi.base_width, ovi.base_height);
|
2016-01-09 14:47:58 -08:00
|
|
|
};
|
|
|
|
|
|
|
|
connect(windowHandle(), &QWindow::screenChanged, displayResize);
|
|
|
|
connect(ui->preview, &OBSQTDisplay::DisplayResized, displayResize);
|
2014-05-15 14:04:18 -07:00
|
|
|
|
2014-11-01 13:48:58 -07:00
|
|
|
installEventFilter(CreateShortcutFilter());
|
|
|
|
|
2015-07-05 23:41:36 -07:00
|
|
|
stringstream name;
|
2016-08-21 11:26:15 -07:00
|
|
|
name << "OBS " << App()->GetVersionString();
|
2015-07-05 23:41:36 -07:00
|
|
|
blog(LOG_INFO, "%s", name.str().c_str());
|
|
|
|
blog(LOG_INFO, "---------------------------------");
|
|
|
|
|
2015-07-03 17:55:55 -07:00
|
|
|
UpdateTitleBar();
|
2014-06-30 00:06:01 -07:00
|
|
|
|
|
|
|
connect(ui->scenes->itemDelegate(),
|
|
|
|
SIGNAL(closeEditor(QWidget*,
|
|
|
|
QAbstractItemDelegate::EndEditHint)),
|
|
|
|
this,
|
|
|
|
SLOT(SceneNameEdited(QWidget*,
|
|
|
|
QAbstractItemDelegate::EndEditHint)));
|
|
|
|
|
|
|
|
connect(ui->sources->itemDelegate(),
|
|
|
|
SIGNAL(closeEditor(QWidget*,
|
|
|
|
QAbstractItemDelegate::EndEditHint)),
|
|
|
|
this,
|
|
|
|
SLOT(SceneItemNameEdited(QWidget*,
|
|
|
|
QAbstractItemDelegate::EndEditHint)));
|
2014-07-06 16:18:16 -07:00
|
|
|
|
|
|
|
cpuUsageInfo = os_cpu_usage_info_start();
|
2014-07-06 16:19:27 -07:00
|
|
|
cpuUsageTimer = new QTimer(this);
|
|
|
|
connect(cpuUsageTimer, SIGNAL(timeout()),
|
|
|
|
ui->statusbar, SLOT(UpdateCPUUsage()));
|
|
|
|
cpuUsageTimer->start(3000);
|
2014-07-13 12:46:23 -07:00
|
|
|
|
2014-10-15 13:00:43 -07:00
|
|
|
DeleteKeys =
|
|
|
|
#ifdef __APPLE__
|
|
|
|
QList<QKeySequence>{{Qt::Key_Backspace}} <<
|
|
|
|
#endif
|
|
|
|
QKeySequence::keyBindings(QKeySequence::Delete);
|
|
|
|
|
2014-07-13 12:46:23 -07:00
|
|
|
#ifdef __APPLE__
|
2014-10-15 13:03:22 -07:00
|
|
|
ui->actionRemoveSource->setShortcuts(DeleteKeys);
|
|
|
|
ui->actionRemoveScene->setShortcuts(DeleteKeys);
|
2014-07-20 18:06:02 -07:00
|
|
|
|
|
|
|
ui->action_Settings->setMenuRole(QAction::PreferencesRole);
|
|
|
|
ui->actionE_xit->setMenuRole(QAction::QuitRole);
|
2014-07-13 12:46:23 -07:00
|
|
|
#endif
|
2015-04-02 23:09:13 -07:00
|
|
|
|
|
|
|
auto addNudge = [this](const QKeySequence &seq, const char *s)
|
|
|
|
{
|
|
|
|
QAction *nudge = new QAction(ui->preview);
|
|
|
|
nudge->setShortcut(seq);
|
|
|
|
nudge->setShortcutContext(Qt::WidgetShortcut);
|
|
|
|
ui->preview->addAction(nudge);
|
|
|
|
connect(nudge, SIGNAL(triggered()), this, s);
|
|
|
|
};
|
|
|
|
|
|
|
|
addNudge(Qt::Key_Up, SLOT(NudgeUp()));
|
|
|
|
addNudge(Qt::Key_Down, SLOT(NudgeDown()));
|
|
|
|
addNudge(Qt::Key_Left, SLOT(NudgeLeft()));
|
|
|
|
addNudge(Qt::Key_Right, SLOT(NudgeRight()));
|
2014-02-02 14:23:38 -08:00
|
|
|
}
|
|
|
|
|
2015-12-05 05:58:05 -08:00
|
|
|
static void SaveAudioDevice(const char *name, int channel, obs_data_t *parent,
|
|
|
|
vector<OBSSource> &audioSources)
|
2014-05-03 22:54:38 -07:00
|
|
|
{
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_source_t *source = obs_get_output_source(channel);
|
2014-05-03 22:54:38 -07:00
|
|
|
if (!source)
|
|
|
|
return;
|
|
|
|
|
2015-12-05 05:58:05 -08:00
|
|
|
audioSources.push_back(source);
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_data_t *data = obs_save_source(source);
|
2014-05-03 22:54:38 -07:00
|
|
|
|
2014-08-05 11:09:29 -07:00
|
|
|
obs_data_set_obj(parent, name, data);
|
2014-05-03 22:54:38 -07:00
|
|
|
|
|
|
|
obs_data_release(data);
|
|
|
|
obs_source_release(source);
|
|
|
|
}
|
|
|
|
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
static obs_data_t *GenerateSaveData(obs_data_array_t *sceneOrder,
|
|
|
|
obs_data_array_t *quickTransitionData, int transitionDuration,
|
2016-02-27 02:50:04 -08:00
|
|
|
obs_data_array_t *transitions,
|
2016-12-29 07:21:53 -08:00
|
|
|
OBSScene &scene, OBSSource &curProgramScene,
|
|
|
|
obs_data_array_t *savedProjectorList,
|
|
|
|
obs_data_array_t *savedPreviewProjectorList)
|
2014-04-26 23:47:50 -07:00
|
|
|
{
|
2015-12-05 05:58:05 -08:00
|
|
|
obs_data_t *saveData = obs_data_create();
|
|
|
|
|
|
|
|
vector<OBSSource> audioSources;
|
|
|
|
audioSources.reserve(5);
|
|
|
|
|
|
|
|
SaveAudioDevice(DESKTOP_AUDIO_1, 1, saveData, audioSources);
|
|
|
|
SaveAudioDevice(DESKTOP_AUDIO_2, 2, saveData, audioSources);
|
|
|
|
SaveAudioDevice(AUX_AUDIO_1, 3, saveData, audioSources);
|
|
|
|
SaveAudioDevice(AUX_AUDIO_2, 4, saveData, audioSources);
|
|
|
|
SaveAudioDevice(AUX_AUDIO_3, 5, saveData, audioSources);
|
|
|
|
|
|
|
|
auto FilterAudioSources = [&](obs_source_t *source)
|
|
|
|
{
|
|
|
|
return find(begin(audioSources), end(audioSources), source) ==
|
|
|
|
end(audioSources);
|
|
|
|
};
|
|
|
|
using FilterAudioSources_t = decltype(FilterAudioSources);
|
|
|
|
|
|
|
|
obs_data_array_t *sourcesArray = obs_save_sources_filtered(
|
|
|
|
[](void *data, obs_source_t *source)
|
|
|
|
{
|
|
|
|
return (*static_cast<FilterAudioSources_t*>(data))(source);
|
|
|
|
}, static_cast<void*>(&FilterAudioSources));
|
|
|
|
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
obs_source_t *transition = obs_get_output_source(0);
|
|
|
|
obs_source_t *currentScene = obs_scene_get_source(scene);
|
2015-12-05 05:58:05 -08:00
|
|
|
const char *sceneName = obs_source_get_name(currentScene);
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
const char *programName = obs_source_get_name(curProgramScene);
|
2014-04-26 23:47:50 -07:00
|
|
|
|
2015-06-23 19:29:07 -07:00
|
|
|
const char *sceneCollection = config_get_string(App()->GlobalConfig(),
|
|
|
|
"Basic", "SceneCollection");
|
|
|
|
|
2014-08-05 11:09:29 -07:00
|
|
|
obs_data_set_string(saveData, "current_scene", sceneName);
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
obs_data_set_string(saveData, "current_program_scene", programName);
|
2015-06-25 03:53:48 -07:00
|
|
|
obs_data_set_array(saveData, "scene_order", sceneOrder);
|
2015-06-23 19:29:07 -07:00
|
|
|
obs_data_set_string(saveData, "name", sceneCollection);
|
2014-08-05 11:09:29 -07:00
|
|
|
obs_data_set_array(saveData, "sources", sourcesArray);
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
obs_data_set_array(saveData, "quick_transitions", quickTransitionData);
|
2016-02-27 02:50:04 -08:00
|
|
|
obs_data_set_array(saveData, "transitions", transitions);
|
2016-12-29 07:21:53 -08:00
|
|
|
obs_data_set_array(saveData, "saved_projectors", savedProjectorList);
|
|
|
|
obs_data_set_array(saveData, "saved_preview_projectors",
|
|
|
|
savedPreviewProjectorList);
|
2014-04-26 23:47:50 -07:00
|
|
|
obs_data_array_release(sourcesArray);
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
|
|
|
|
obs_data_set_string(saveData, "current_transition",
|
|
|
|
obs_source_get_name(transition));
|
|
|
|
obs_data_set_int(saveData, "transition_duration", transitionDuration);
|
|
|
|
obs_source_release(transition);
|
2014-04-26 23:47:50 -07:00
|
|
|
|
|
|
|
return saveData;
|
|
|
|
}
|
|
|
|
|
2015-02-16 23:45:34 -08:00
|
|
|
void OBSBasic::copyActionsDynamicProperties()
|
|
|
|
{
|
|
|
|
// Themes need the QAction dynamic properties
|
|
|
|
for (QAction *x : ui->scenesToolbar->actions()) {
|
|
|
|
QWidget* temp = ui->scenesToolbar->widgetForAction(x);
|
|
|
|
|
|
|
|
for (QByteArray &y : x->dynamicPropertyNames()) {
|
|
|
|
temp->setProperty(y, x->property(y));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for (QAction *x : ui->sourcesToolbar->actions()) {
|
|
|
|
QWidget* temp = ui->sourcesToolbar->widgetForAction(x);
|
|
|
|
|
|
|
|
for (QByteArray &y : x->dynamicPropertyNames()) {
|
|
|
|
temp->setProperty(y, x->property(y));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-03 22:54:38 -07:00
|
|
|
void OBSBasic::ClearVolumeControls()
|
|
|
|
{
|
|
|
|
VolControl *control;
|
|
|
|
|
|
|
|
for (size_t i = 0; i < volumes.size(); i++) {
|
|
|
|
control = volumes[i];
|
|
|
|
delete control;
|
|
|
|
}
|
|
|
|
|
|
|
|
volumes.clear();
|
|
|
|
}
|
|
|
|
|
2015-06-25 03:53:48 -07:00
|
|
|
obs_data_array_t *OBSBasic::SaveSceneListOrder()
|
|
|
|
{
|
|
|
|
obs_data_array_t *sceneOrder = obs_data_array_create();
|
|
|
|
|
|
|
|
for (int i = 0; i < ui->scenes->count(); i++) {
|
|
|
|
obs_data_t *data = obs_data_create();
|
|
|
|
obs_data_set_string(data, "name",
|
|
|
|
QT_TO_UTF8(ui->scenes->item(i)->text()));
|
|
|
|
obs_data_array_push_back(sceneOrder, data);
|
|
|
|
obs_data_release(data);
|
|
|
|
}
|
|
|
|
|
|
|
|
return sceneOrder;
|
|
|
|
}
|
|
|
|
|
2016-12-29 07:21:53 -08:00
|
|
|
obs_data_array_t *OBSBasic::SaveProjectors()
|
|
|
|
{
|
|
|
|
obs_data_array_t *saveProjector = obs_data_array_create();
|
|
|
|
|
|
|
|
for (size_t i = 0; i < projectorArray.size(); i++) {
|
|
|
|
obs_data_t *data = obs_data_create();
|
|
|
|
obs_data_set_string(data, "saved_projectors",
|
|
|
|
projectorArray.at(i).c_str());
|
|
|
|
obs_data_array_push_back(saveProjector, data);
|
|
|
|
obs_data_release(data);
|
|
|
|
}
|
|
|
|
|
|
|
|
return saveProjector;
|
|
|
|
}
|
|
|
|
|
|
|
|
obs_data_array_t *OBSBasic::SavePreviewProjectors()
|
|
|
|
{
|
|
|
|
obs_data_array_t *saveProjector = obs_data_array_create();
|
|
|
|
|
|
|
|
for (size_t i = 0; i < previewProjectorArray.size(); i++) {
|
|
|
|
obs_data_t *data = obs_data_create();
|
|
|
|
obs_data_set_int(data, "saved_preview_projectors",
|
|
|
|
previewProjectorArray.at(i));
|
|
|
|
obs_data_array_push_back(saveProjector, data);
|
|
|
|
obs_data_release(data);
|
|
|
|
}
|
|
|
|
|
|
|
|
return saveProjector;
|
|
|
|
}
|
|
|
|
|
2014-04-26 23:47:50 -07:00
|
|
|
void OBSBasic::Save(const char *file)
|
|
|
|
{
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
OBSScene scene = GetCurrentScene();
|
|
|
|
OBSSource curProgramScene = OBSGetStrongRef(programScene);
|
|
|
|
if (!curProgramScene)
|
|
|
|
curProgramScene = obs_scene_get_source(scene);
|
|
|
|
|
2015-06-25 03:53:48 -07:00
|
|
|
obs_data_array_t *sceneOrder = SaveSceneListOrder();
|
2016-02-27 02:50:04 -08:00
|
|
|
obs_data_array_t *transitions = SaveTransitions();
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
obs_data_array_t *quickTrData = SaveQuickTransitions();
|
2016-12-29 07:21:53 -08:00
|
|
|
obs_data_array_t *savedProjectorList = SaveProjectors();
|
|
|
|
obs_data_array_t *savedPreviewProjectorList = SavePreviewProjectors();
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
obs_data_t *saveData = GenerateSaveData(sceneOrder, quickTrData,
|
2016-02-27 02:50:04 -08:00
|
|
|
ui->transitionDuration->value(), transitions,
|
2016-12-29 07:21:53 -08:00
|
|
|
scene, curProgramScene, savedProjectorList,
|
|
|
|
savedPreviewProjectorList);
|
2015-08-21 17:56:37 -07:00
|
|
|
|
2016-07-26 01:32:43 -07:00
|
|
|
obs_data_set_bool(saveData, "preview_locked", ui->preview->Locked());
|
2016-11-05 09:48:46 -07:00
|
|
|
obs_data_set_int(saveData, "scaling_mode",
|
|
|
|
static_cast<uint32_t>(ui->preview->GetScalingMode()));
|
2016-07-26 01:32:43 -07:00
|
|
|
|
2016-08-28 14:24:14 -07:00
|
|
|
if (api) {
|
|
|
|
obs_data_t *moduleObj = obs_data_create();
|
|
|
|
api->on_save(moduleObj);
|
|
|
|
obs_data_set_obj(saveData, "modules", moduleObj);
|
|
|
|
obs_data_release(moduleObj);
|
|
|
|
}
|
|
|
|
|
2015-08-21 17:56:37 -07:00
|
|
|
if (!obs_data_save_json_safe(saveData, file, "tmp", "bak"))
|
|
|
|
blog(LOG_ERROR, "Could not save scene data to %s", file);
|
2014-04-26 23:47:50 -07:00
|
|
|
|
|
|
|
obs_data_release(saveData);
|
2015-06-25 03:53:48 -07:00
|
|
|
obs_data_array_release(sceneOrder);
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
obs_data_array_release(quickTrData);
|
2016-02-27 02:50:04 -08:00
|
|
|
obs_data_array_release(transitions);
|
2016-12-29 07:21:53 -08:00
|
|
|
obs_data_array_release(savedProjectorList);
|
|
|
|
obs_data_array_release(savedPreviewProjectorList);
|
2014-04-26 23:47:50 -07:00
|
|
|
}
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
static void LoadAudioDevice(const char *name, int channel, obs_data_t *parent)
|
2014-05-03 22:54:38 -07:00
|
|
|
{
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_data_t *data = obs_data_get_obj(parent, name);
|
2014-05-03 22:54:38 -07:00
|
|
|
if (!data)
|
|
|
|
return;
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_source_t *source = obs_load_source(data);
|
2014-05-03 22:54:38 -07:00
|
|
|
if (source) {
|
|
|
|
obs_set_output_source(channel, source);
|
|
|
|
obs_source_release(source);
|
|
|
|
}
|
|
|
|
|
|
|
|
obs_data_release(data);
|
|
|
|
}
|
|
|
|
|
2015-06-23 18:47:22 -07:00
|
|
|
static inline bool HasAudioDevices(const char *source_id)
|
|
|
|
{
|
|
|
|
const char *output_id = source_id;
|
2015-12-29 15:25:45 -08:00
|
|
|
obs_properties_t *props = obs_get_source_properties(output_id);
|
2015-06-23 18:47:22 -07:00
|
|
|
size_t count = 0;
|
|
|
|
|
|
|
|
if (!props)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
obs_property_t *devices = obs_properties_get(props, "device_id");
|
|
|
|
if (devices)
|
|
|
|
count = obs_property_list_item_count(devices);
|
|
|
|
|
|
|
|
obs_properties_destroy(props);
|
|
|
|
|
|
|
|
return count != 0;
|
|
|
|
}
|
|
|
|
|
2015-09-23 08:41:00 -07:00
|
|
|
void OBSBasic::CreateFirstRunSources()
|
2014-05-03 22:54:38 -07:00
|
|
|
{
|
2015-06-23 18:47:22 -07:00
|
|
|
bool hasDesktopAudio = HasAudioDevices(App()->OutputAudioSource());
|
|
|
|
bool hasInputAudio = HasAudioDevices(App()->InputAudioSource());
|
|
|
|
|
|
|
|
if (hasDesktopAudio)
|
|
|
|
ResetAudioDevice(App()->OutputAudioSource(), "default",
|
|
|
|
Str("Basic.DesktopDevice1"), 1);
|
|
|
|
if (hasInputAudio)
|
|
|
|
ResetAudioDevice(App()->InputAudioSource(), "default",
|
|
|
|
Str("Basic.AuxDevice1"), 3);
|
2015-09-11 21:49:21 -07:00
|
|
|
}
|
|
|
|
|
2015-09-11 21:51:09 -07:00
|
|
|
void OBSBasic::CreateDefaultScene(bool firstStart)
|
2015-09-11 21:49:21 -07:00
|
|
|
{
|
|
|
|
disableSaving++;
|
|
|
|
|
|
|
|
ClearSceneData();
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
InitDefaultTransitions();
|
|
|
|
CreateDefaultQuickTransitions();
|
|
|
|
ui->transitionDuration->setValue(300);
|
|
|
|
SetTransition(fadeTransition);
|
2015-09-11 21:49:21 -07:00
|
|
|
|
|
|
|
obs_scene_t *scene = obs_scene_create(Str("Basic.Scene"));
|
|
|
|
|
2015-09-11 21:51:09 -07:00
|
|
|
if (firstStart)
|
2015-09-23 08:41:00 -07:00
|
|
|
CreateFirstRunSources();
|
2015-09-11 21:49:21 -07:00
|
|
|
|
2016-01-03 18:21:44 -08:00
|
|
|
AddScene(obs_scene_get_source(scene));
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
SetCurrentScene(scene, true);
|
2015-09-11 21:49:21 -07:00
|
|
|
obs_scene_release(scene);
|
2015-06-30 05:49:31 -07:00
|
|
|
|
|
|
|
disableSaving--;
|
2014-05-03 22:54:38 -07:00
|
|
|
}
|
|
|
|
|
2015-06-25 03:53:48 -07:00
|
|
|
static void ReorderItemByName(QListWidget *lw, const char *name, int newIndex)
|
|
|
|
{
|
|
|
|
for (int i = 0; i < lw->count(); i++) {
|
|
|
|
QListWidgetItem *item = lw->item(i);
|
|
|
|
|
|
|
|
if (strcmp(name, QT_TO_UTF8(item->text())) == 0) {
|
|
|
|
if (newIndex != i) {
|
|
|
|
item = lw->takeItem(i);
|
|
|
|
lw->insertItem(newIndex, item);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::LoadSceneListOrder(obs_data_array_t *array)
|
|
|
|
{
|
|
|
|
size_t num = obs_data_array_count(array);
|
|
|
|
|
|
|
|
for (size_t i = 0; i < num; i++) {
|
|
|
|
obs_data_t *data = obs_data_array_item(array, i);
|
|
|
|
const char *name = obs_data_get_string(data, "name");
|
|
|
|
|
|
|
|
ReorderItemByName(ui->scenes, name, (int)i);
|
|
|
|
|
|
|
|
obs_data_release(data);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-12-29 07:21:53 -08:00
|
|
|
void OBSBasic::LoadSavedProjectors(obs_data_array_t *array)
|
|
|
|
{
|
|
|
|
size_t num = obs_data_array_count(array);
|
|
|
|
|
|
|
|
for (size_t i = 0; i < num; i++) {
|
|
|
|
obs_data_t *data = obs_data_array_item(array, i);
|
|
|
|
projectorArray.at(i) = obs_data_get_string(data,
|
|
|
|
"saved_projectors");
|
|
|
|
|
|
|
|
obs_data_release(data);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::LoadSavedPreviewProjectors(obs_data_array_t *array)
|
|
|
|
{
|
|
|
|
size_t num = obs_data_array_count(array);
|
|
|
|
|
|
|
|
for (size_t i = 0; i < num; i++) {
|
|
|
|
obs_data_t *data = obs_data_array_item(array, i);
|
|
|
|
previewProjectorArray.at(i) = obs_data_get_int(data,
|
|
|
|
"saved_preview_projectors");
|
|
|
|
|
|
|
|
obs_data_release(data);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-08-05 17:43:30 -07:00
|
|
|
static void LogFilter(obs_source_t*, obs_source_t *filter, void *v_val)
|
|
|
|
{
|
|
|
|
const char *name = obs_source_get_name(filter);
|
|
|
|
const char *id = obs_source_get_id(filter);
|
|
|
|
int val = (int)(intptr_t)v_val;
|
|
|
|
string indent;
|
|
|
|
|
|
|
|
for (int i = 0; i < val; i++)
|
|
|
|
indent += " ";
|
|
|
|
|
|
|
|
blog(LOG_INFO, "%s- filter: '%s' (%s)", indent.c_str(), name, id);
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool LogSceneItem(obs_scene_t*, obs_sceneitem_t *item, void*)
|
|
|
|
{
|
|
|
|
obs_source_t *source = obs_sceneitem_get_source(item);
|
|
|
|
const char *name = obs_source_get_name(source);
|
|
|
|
const char *id = obs_source_get_id(source);
|
|
|
|
|
|
|
|
blog(LOG_INFO, " - source: '%s' (%s)", name, id);
|
|
|
|
|
|
|
|
obs_source_enum_filters(source, LogFilter, (void*)(intptr_t)2);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::LogScenes()
|
|
|
|
{
|
|
|
|
blog(LOG_INFO, "------------------------------------------------");
|
|
|
|
blog(LOG_INFO, "Loaded scenes:");
|
|
|
|
|
|
|
|
for (int i = 0; i < ui->scenes->count(); i++) {
|
|
|
|
QListWidgetItem *item = ui->scenes->item(i);
|
|
|
|
OBSScene scene = GetOBSRef<OBSScene>(item);
|
|
|
|
|
|
|
|
obs_source_t *source = obs_scene_get_source(scene);
|
|
|
|
const char *name = obs_source_get_name(source);
|
|
|
|
|
|
|
|
blog(LOG_INFO, "- scene '%s':", name);
|
|
|
|
obs_scene_enum_items(scene, LogSceneItem, nullptr);
|
|
|
|
obs_source_enum_filters(source, LogFilter, (void*)(intptr_t)1);
|
|
|
|
}
|
|
|
|
|
|
|
|
blog(LOG_INFO, "------------------------------------------------");
|
|
|
|
}
|
|
|
|
|
2014-04-26 23:47:50 -07:00
|
|
|
void OBSBasic::Load(const char *file)
|
|
|
|
{
|
2015-08-21 17:56:37 -07:00
|
|
|
if (!file || !os_file_exists(file)) {
|
2015-09-11 21:45:06 -07:00
|
|
|
blog(LOG_INFO, "No scene file found, creating default scene");
|
2015-09-11 21:51:09 -07:00
|
|
|
CreateDefaultScene(true);
|
2015-09-11 21:45:06 -07:00
|
|
|
SaveProject();
|
2014-04-26 23:47:50 -07:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2015-08-21 17:56:37 -07:00
|
|
|
disableSaving++;
|
|
|
|
|
|
|
|
obs_data_t *data = obs_data_create_from_json_file_safe(file, "bak");
|
|
|
|
if (!data) {
|
|
|
|
disableSaving--;
|
2015-09-11 21:45:51 -07:00
|
|
|
blog(LOG_ERROR, "Failed to load '%s', creating default scene",
|
|
|
|
file);
|
2015-09-11 21:51:09 -07:00
|
|
|
CreateDefaultScene(true);
|
2015-07-02 16:15:51 -07:00
|
|
|
SaveProject();
|
2014-04-26 23:47:50 -07:00
|
|
|
return;
|
2014-05-03 22:54:38 -07:00
|
|
|
}
|
2014-04-26 23:47:50 -07:00
|
|
|
|
2015-07-02 16:17:55 -07:00
|
|
|
ClearSceneData();
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
InitDefaultTransitions();
|
2015-07-02 16:17:55 -07:00
|
|
|
|
2015-06-25 03:53:48 -07:00
|
|
|
obs_data_array_t *sceneOrder = obs_data_get_array(data, "scene_order");
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_data_array_t *sources = obs_data_get_array(data, "sources");
|
2016-02-27 02:50:04 -08:00
|
|
|
obs_data_array_t *transitions= obs_data_get_array(data, "transitions");
|
2014-08-05 11:09:29 -07:00
|
|
|
const char *sceneName = obs_data_get_string(data,
|
|
|
|
"current_scene");
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
const char *programSceneName = obs_data_get_string(data,
|
|
|
|
"current_program_scene");
|
|
|
|
const char *transitionName = obs_data_get_string(data,
|
|
|
|
"current_transition");
|
|
|
|
|
2016-04-13 18:59:27 -07:00
|
|
|
if (!opt_starting_scene.empty()) {
|
|
|
|
programSceneName = opt_starting_scene.c_str();
|
|
|
|
if (!IsPreviewProgramMode())
|
|
|
|
sceneName = opt_starting_scene.c_str();
|
|
|
|
}
|
|
|
|
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
int newDuration = obs_data_get_int(data, "transition_duration");
|
|
|
|
if (!newDuration)
|
|
|
|
newDuration = 300;
|
|
|
|
|
|
|
|
if (!transitionName)
|
|
|
|
transitionName = obs_source_get_name(fadeTransition);
|
2015-06-23 19:29:07 -07:00
|
|
|
|
|
|
|
const char *curSceneCollection = config_get_string(
|
|
|
|
App()->GlobalConfig(), "Basic", "SceneCollection");
|
|
|
|
|
|
|
|
obs_data_set_default_string(data, "name", curSceneCollection);
|
|
|
|
|
|
|
|
const char *name = obs_data_get_string(data, "name");
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_source_t *curScene;
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
obs_source_t *curProgramScene;
|
|
|
|
obs_source_t *curTransition;
|
2014-04-26 23:47:50 -07:00
|
|
|
|
2015-06-23 19:29:07 -07:00
|
|
|
if (!name || !*name)
|
|
|
|
name = curSceneCollection;
|
|
|
|
|
2014-05-03 22:54:38 -07:00
|
|
|
LoadAudioDevice(DESKTOP_AUDIO_1, 1, data);
|
|
|
|
LoadAudioDevice(DESKTOP_AUDIO_2, 2, data);
|
|
|
|
LoadAudioDevice(AUX_AUDIO_1, 3, data);
|
|
|
|
LoadAudioDevice(AUX_AUDIO_2, 4, data);
|
|
|
|
LoadAudioDevice(AUX_AUDIO_3, 5, data);
|
|
|
|
|
2016-03-04 12:56:09 -08:00
|
|
|
obs_load_sources(sources, OBSBasic::SourceLoaded, this);
|
2014-04-26 23:47:50 -07:00
|
|
|
|
2016-02-27 02:50:04 -08:00
|
|
|
if (transitions)
|
|
|
|
LoadTransitions(transitions);
|
2015-06-25 03:53:48 -07:00
|
|
|
if (sceneOrder)
|
|
|
|
LoadSceneListOrder(sceneOrder);
|
|
|
|
|
2016-02-27 02:50:04 -08:00
|
|
|
obs_data_array_release(transitions);
|
|
|
|
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
curTransition = FindTransition(transitionName);
|
|
|
|
if (!curTransition)
|
|
|
|
curTransition = fadeTransition;
|
|
|
|
|
|
|
|
ui->transitionDuration->setValue(newDuration);
|
|
|
|
SetTransition(curTransition);
|
|
|
|
|
2016-12-29 07:21:53 -08:00
|
|
|
obs_data_array_t *savedProjectors = obs_data_get_array(data,
|
|
|
|
"saved_projectors");
|
|
|
|
|
|
|
|
if (savedProjectors)
|
|
|
|
LoadSavedProjectors(savedProjectors);
|
|
|
|
|
|
|
|
obs_data_array_release(savedProjectors);
|
|
|
|
|
|
|
|
obs_data_array_t *savedPreviewProjectors = obs_data_get_array(data,
|
|
|
|
"saved_preview_projectors");
|
|
|
|
|
|
|
|
if (savedPreviewProjectors)
|
|
|
|
LoadSavedPreviewProjectors(savedPreviewProjectors);
|
|
|
|
|
|
|
|
obs_data_array_release(savedPreviewProjectors);
|
|
|
|
|
|
|
|
|
2016-04-13 18:59:27 -07:00
|
|
|
retryScene:
|
2014-04-26 23:47:50 -07:00
|
|
|
curScene = obs_get_source_by_name(sceneName);
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
curProgramScene = obs_get_source_by_name(programSceneName);
|
2016-04-13 18:59:27 -07:00
|
|
|
|
|
|
|
/* if the starting scene command line parameter is bad at all,
|
|
|
|
* fall back to original settings */
|
|
|
|
if (!opt_starting_scene.empty() && (!curScene || !curProgramScene)) {
|
|
|
|
sceneName = obs_data_get_string(data, "current_scene");
|
|
|
|
programSceneName = obs_data_get_string(data,
|
|
|
|
"current_program_scene");
|
|
|
|
obs_source_release(curScene);
|
|
|
|
obs_source_release(curProgramScene);
|
|
|
|
opt_starting_scene.clear();
|
|
|
|
goto retryScene;
|
|
|
|
}
|
|
|
|
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
if (!curProgramScene) {
|
|
|
|
curProgramScene = curScene;
|
|
|
|
obs_source_addref(curScene);
|
|
|
|
}
|
|
|
|
|
|
|
|
SetCurrentScene(curScene, true);
|
|
|
|
if (IsPreviewProgramMode())
|
|
|
|
TransitionToScene(curProgramScene, true);
|
2014-04-26 23:47:50 -07:00
|
|
|
obs_source_release(curScene);
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
obs_source_release(curProgramScene);
|
2014-04-26 23:47:50 -07:00
|
|
|
|
|
|
|
obs_data_array_release(sources);
|
2015-06-25 03:53:48 -07:00
|
|
|
obs_data_array_release(sceneOrder);
|
2015-06-23 19:29:07 -07:00
|
|
|
|
|
|
|
std::string file_base = strrchr(file, '/') + 1;
|
|
|
|
file_base.erase(file_base.size() - 5, 5);
|
|
|
|
|
|
|
|
config_set_string(App()->GlobalConfig(), "Basic", "SceneCollection",
|
|
|
|
name);
|
|
|
|
config_set_string(App()->GlobalConfig(), "Basic", "SceneCollectionFile",
|
|
|
|
file_base.c_str());
|
|
|
|
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
obs_data_array_t *quickTransitionData = obs_data_get_array(data,
|
|
|
|
"quick_transitions");
|
|
|
|
LoadQuickTransitions(quickTransitionData);
|
|
|
|
obs_data_array_release(quickTransitionData);
|
|
|
|
|
|
|
|
RefreshQuickTransitions();
|
|
|
|
|
2016-07-26 01:32:43 -07:00
|
|
|
bool previewLocked = obs_data_get_bool(data, "preview_locked");
|
|
|
|
ui->preview->SetLocked(previewLocked);
|
|
|
|
ui->actionLockPreview->setChecked(previewLocked);
|
|
|
|
|
2016-11-05 09:48:46 -07:00
|
|
|
ScalingMode previewScaling = static_cast<ScalingMode>(
|
|
|
|
obs_data_get_int(data, "scaling_mode"));
|
|
|
|
switch (previewScaling) {
|
|
|
|
case ScalingMode::Window:
|
|
|
|
case ScalingMode::Canvas:
|
|
|
|
case ScalingMode::Output:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
previewScaling = ScalingMode::Window;
|
|
|
|
}
|
|
|
|
|
|
|
|
ui->preview->SetScaling(previewScaling);
|
|
|
|
|
2016-08-28 14:24:14 -07:00
|
|
|
if (api) {
|
|
|
|
obs_data_t *modulesObj = obs_data_get_obj(data, "modules");
|
|
|
|
api->on_load(modulesObj);
|
|
|
|
obs_data_release(modulesObj);
|
|
|
|
}
|
|
|
|
|
2014-04-26 23:47:50 -07:00
|
|
|
obs_data_release(data);
|
2015-06-30 05:49:31 -07:00
|
|
|
|
2016-04-13 18:59:27 -07:00
|
|
|
if (!opt_starting_scene.empty())
|
|
|
|
opt_starting_scene.clear();
|
|
|
|
|
2016-04-13 19:00:12 -07:00
|
|
|
if (opt_start_streaming) {
|
|
|
|
QMetaObject::invokeMethod(this, "StartStreaming",
|
|
|
|
Qt::QueuedConnection);
|
|
|
|
opt_start_streaming = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (opt_start_recording) {
|
|
|
|
QMetaObject::invokeMethod(this, "StartRecording",
|
|
|
|
Qt::QueuedConnection);
|
|
|
|
opt_start_recording = false;
|
|
|
|
}
|
|
|
|
|
2017-01-11 11:19:17 -08:00
|
|
|
if (opt_start_replaybuffer) {
|
|
|
|
QMetaObject::invokeMethod(this, "StartReplayBuffer",
|
|
|
|
Qt::QueuedConnection);
|
|
|
|
opt_start_replaybuffer = false;
|
|
|
|
}
|
|
|
|
|
2016-08-05 17:43:30 -07:00
|
|
|
LogScenes();
|
|
|
|
|
2015-06-30 05:49:31 -07:00
|
|
|
disableSaving--;
|
2014-04-26 23:47:50 -07:00
|
|
|
}
|
|
|
|
|
2015-06-23 19:38:01 -07:00
|
|
|
#define SERVICE_PATH "service.json"
|
obs-studio UI: Implement stream settings UI
- Updated the services API so that it links up with an output and
the output gets data from that service rather than via settings.
This allows the service context to have control over how an output is
used, and makes it so that the URL/key/etc isn't necessarily some
static setting.
Also, if the service is attached to an output, it will stick around
until the output is destroyed.
- The settings interface has been updated so that it can allow the
usage of service plugins. What this means is that now you can create
a service plugin that can control aspects of the stream, and it
allows each service to create their own user interface if they create
a service plugin module.
- Testing out saving of current service information. Saves/loads from
JSON in to obs_data_t, seems to be working quite nicely, and the
service object information is saved/preserved on exit, and loaded
again on startup.
- I agonized over the settings user interface for days, and eventually
I just decided that the only way that users weren't going to be
fumbling over options was to split up the settings in to simple/basic
output, pre-configured, and then advanced for advanced use (such as
multiple outputs or services, which I'll implement later).
This was particularly painful to really design right, I wanted more
features and wanted to include everything in one interface but
ultimately just realized from experience that users are just not
technically knowledgable about it and will end up fumbling with the
settings rather than getting things done.
Basically, what this means is that casual users only have to enter in
about 3 things to configure their stream: Stream key, audio bitrate,
and video bitrate. I am really happy with this interface for those
types of users, but it definitely won't be sufficient for advanced
usage or for custom outputs, so that stuff will have to be separated.
- Improved the JSON usage for the 'common streaming services' context,
I realized that JSON arrays are there to ensure sorting, while
forgetting that general items are optimized for hashing. So
basically I'm just using arrays now to sort items in it.
2014-04-24 01:49:07 -07:00
|
|
|
|
|
|
|
void OBSBasic::SaveService()
|
|
|
|
{
|
|
|
|
if (!service)
|
|
|
|
return;
|
|
|
|
|
2015-01-15 23:44:38 -08:00
|
|
|
char serviceJsonPath[512];
|
2015-06-23 19:38:01 -07:00
|
|
|
int ret = GetProfilePath(serviceJsonPath, sizeof(serviceJsonPath),
|
2015-01-15 23:44:38 -08:00
|
|
|
SERVICE_PATH);
|
|
|
|
if (ret <= 0)
|
obs-studio UI: Implement stream settings UI
- Updated the services API so that it links up with an output and
the output gets data from that service rather than via settings.
This allows the service context to have control over how an output is
used, and makes it so that the URL/key/etc isn't necessarily some
static setting.
Also, if the service is attached to an output, it will stick around
until the output is destroyed.
- The settings interface has been updated so that it can allow the
usage of service plugins. What this means is that now you can create
a service plugin that can control aspects of the stream, and it
allows each service to create their own user interface if they create
a service plugin module.
- Testing out saving of current service information. Saves/loads from
JSON in to obs_data_t, seems to be working quite nicely, and the
service object information is saved/preserved on exit, and loaded
again on startup.
- I agonized over the settings user interface for days, and eventually
I just decided that the only way that users weren't going to be
fumbling over options was to split up the settings in to simple/basic
output, pre-configured, and then advanced for advanced use (such as
multiple outputs or services, which I'll implement later).
This was particularly painful to really design right, I wanted more
features and wanted to include everything in one interface but
ultimately just realized from experience that users are just not
technically knowledgable about it and will end up fumbling with the
settings rather than getting things done.
Basically, what this means is that casual users only have to enter in
about 3 things to configure their stream: Stream key, audio bitrate,
and video bitrate. I am really happy with this interface for those
types of users, but it definitely won't be sufficient for advanced
usage or for custom outputs, so that stuff will have to be separated.
- Improved the JSON usage for the 'common streaming services' context,
I realized that JSON arrays are there to ensure sorting, while
forgetting that general items are optimized for hashing. So
basically I'm just using arrays now to sort items in it.
2014-04-24 01:49:07 -07:00
|
|
|
return;
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_data_t *data = obs_data_create();
|
|
|
|
obs_data_t *settings = obs_service_get_settings(service);
|
obs-studio UI: Implement stream settings UI
- Updated the services API so that it links up with an output and
the output gets data from that service rather than via settings.
This allows the service context to have control over how an output is
used, and makes it so that the URL/key/etc isn't necessarily some
static setting.
Also, if the service is attached to an output, it will stick around
until the output is destroyed.
- The settings interface has been updated so that it can allow the
usage of service plugins. What this means is that now you can create
a service plugin that can control aspects of the stream, and it
allows each service to create their own user interface if they create
a service plugin module.
- Testing out saving of current service information. Saves/loads from
JSON in to obs_data_t, seems to be working quite nicely, and the
service object information is saved/preserved on exit, and loaded
again on startup.
- I agonized over the settings user interface for days, and eventually
I just decided that the only way that users weren't going to be
fumbling over options was to split up the settings in to simple/basic
output, pre-configured, and then advanced for advanced use (such as
multiple outputs or services, which I'll implement later).
This was particularly painful to really design right, I wanted more
features and wanted to include everything in one interface but
ultimately just realized from experience that users are just not
technically knowledgable about it and will end up fumbling with the
settings rather than getting things done.
Basically, what this means is that casual users only have to enter in
about 3 things to configure their stream: Stream key, audio bitrate,
and video bitrate. I am really happy with this interface for those
types of users, but it definitely won't be sufficient for advanced
usage or for custom outputs, so that stuff will have to be separated.
- Improved the JSON usage for the 'common streaming services' context,
I realized that JSON arrays are there to ensure sorting, while
forgetting that general items are optimized for hashing. So
basically I'm just using arrays now to sort items in it.
2014-04-24 01:49:07 -07:00
|
|
|
|
2015-02-07 08:19:34 -08:00
|
|
|
obs_data_set_string(data, "type", obs_service_get_type(service));
|
2014-08-05 11:09:29 -07:00
|
|
|
obs_data_set_obj(data, "settings", settings);
|
obs-studio UI: Implement stream settings UI
- Updated the services API so that it links up with an output and
the output gets data from that service rather than via settings.
This allows the service context to have control over how an output is
used, and makes it so that the URL/key/etc isn't necessarily some
static setting.
Also, if the service is attached to an output, it will stick around
until the output is destroyed.
- The settings interface has been updated so that it can allow the
usage of service plugins. What this means is that now you can create
a service plugin that can control aspects of the stream, and it
allows each service to create their own user interface if they create
a service plugin module.
- Testing out saving of current service information. Saves/loads from
JSON in to obs_data_t, seems to be working quite nicely, and the
service object information is saved/preserved on exit, and loaded
again on startup.
- I agonized over the settings user interface for days, and eventually
I just decided that the only way that users weren't going to be
fumbling over options was to split up the settings in to simple/basic
output, pre-configured, and then advanced for advanced use (such as
multiple outputs or services, which I'll implement later).
This was particularly painful to really design right, I wanted more
features and wanted to include everything in one interface but
ultimately just realized from experience that users are just not
technically knowledgable about it and will end up fumbling with the
settings rather than getting things done.
Basically, what this means is that casual users only have to enter in
about 3 things to configure their stream: Stream key, audio bitrate,
and video bitrate. I am really happy with this interface for those
types of users, but it definitely won't be sufficient for advanced
usage or for custom outputs, so that stuff will have to be separated.
- Improved the JSON usage for the 'common streaming services' context,
I realized that JSON arrays are there to ensure sorting, while
forgetting that general items are optimized for hashing. So
basically I'm just using arrays now to sort items in it.
2014-04-24 01:49:07 -07:00
|
|
|
|
2015-08-21 17:56:37 -07:00
|
|
|
if (!obs_data_save_json_safe(data, serviceJsonPath, "tmp", "bak"))
|
|
|
|
blog(LOG_WARNING, "Failed to save service");
|
obs-studio UI: Implement stream settings UI
- Updated the services API so that it links up with an output and
the output gets data from that service rather than via settings.
This allows the service context to have control over how an output is
used, and makes it so that the URL/key/etc isn't necessarily some
static setting.
Also, if the service is attached to an output, it will stick around
until the output is destroyed.
- The settings interface has been updated so that it can allow the
usage of service plugins. What this means is that now you can create
a service plugin that can control aspects of the stream, and it
allows each service to create their own user interface if they create
a service plugin module.
- Testing out saving of current service information. Saves/loads from
JSON in to obs_data_t, seems to be working quite nicely, and the
service object information is saved/preserved on exit, and loaded
again on startup.
- I agonized over the settings user interface for days, and eventually
I just decided that the only way that users weren't going to be
fumbling over options was to split up the settings in to simple/basic
output, pre-configured, and then advanced for advanced use (such as
multiple outputs or services, which I'll implement later).
This was particularly painful to really design right, I wanted more
features and wanted to include everything in one interface but
ultimately just realized from experience that users are just not
technically knowledgable about it and will end up fumbling with the
settings rather than getting things done.
Basically, what this means is that casual users only have to enter in
about 3 things to configure their stream: Stream key, audio bitrate,
and video bitrate. I am really happy with this interface for those
types of users, but it definitely won't be sufficient for advanced
usage or for custom outputs, so that stuff will have to be separated.
- Improved the JSON usage for the 'common streaming services' context,
I realized that JSON arrays are there to ensure sorting, while
forgetting that general items are optimized for hashing. So
basically I'm just using arrays now to sort items in it.
2014-04-24 01:49:07 -07:00
|
|
|
|
|
|
|
obs_data_release(settings);
|
|
|
|
obs_data_release(data);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool OBSBasic::LoadService()
|
|
|
|
{
|
|
|
|
const char *type;
|
|
|
|
|
2015-01-15 23:44:38 -08:00
|
|
|
char serviceJsonPath[512];
|
2015-06-23 19:38:01 -07:00
|
|
|
int ret = GetProfilePath(serviceJsonPath, sizeof(serviceJsonPath),
|
2015-01-15 23:44:38 -08:00
|
|
|
SERVICE_PATH);
|
|
|
|
if (ret <= 0)
|
obs-studio UI: Implement stream settings UI
- Updated the services API so that it links up with an output and
the output gets data from that service rather than via settings.
This allows the service context to have control over how an output is
used, and makes it so that the URL/key/etc isn't necessarily some
static setting.
Also, if the service is attached to an output, it will stick around
until the output is destroyed.
- The settings interface has been updated so that it can allow the
usage of service plugins. What this means is that now you can create
a service plugin that can control aspects of the stream, and it
allows each service to create their own user interface if they create
a service plugin module.
- Testing out saving of current service information. Saves/loads from
JSON in to obs_data_t, seems to be working quite nicely, and the
service object information is saved/preserved on exit, and loaded
again on startup.
- I agonized over the settings user interface for days, and eventually
I just decided that the only way that users weren't going to be
fumbling over options was to split up the settings in to simple/basic
output, pre-configured, and then advanced for advanced use (such as
multiple outputs or services, which I'll implement later).
This was particularly painful to really design right, I wanted more
features and wanted to include everything in one interface but
ultimately just realized from experience that users are just not
technically knowledgable about it and will end up fumbling with the
settings rather than getting things done.
Basically, what this means is that casual users only have to enter in
about 3 things to configure their stream: Stream key, audio bitrate,
and video bitrate. I am really happy with this interface for those
types of users, but it definitely won't be sufficient for advanced
usage or for custom outputs, so that stuff will have to be separated.
- Improved the JSON usage for the 'common streaming services' context,
I realized that JSON arrays are there to ensure sorting, while
forgetting that general items are optimized for hashing. So
basically I'm just using arrays now to sort items in it.
2014-04-24 01:49:07 -07:00
|
|
|
return false;
|
|
|
|
|
2015-08-21 17:56:37 -07:00
|
|
|
obs_data_t *data = obs_data_create_from_json_file_safe(serviceJsonPath,
|
|
|
|
"bak");
|
obs-studio UI: Implement stream settings UI
- Updated the services API so that it links up with an output and
the output gets data from that service rather than via settings.
This allows the service context to have control over how an output is
used, and makes it so that the URL/key/etc isn't necessarily some
static setting.
Also, if the service is attached to an output, it will stick around
until the output is destroyed.
- The settings interface has been updated so that it can allow the
usage of service plugins. What this means is that now you can create
a service plugin that can control aspects of the stream, and it
allows each service to create their own user interface if they create
a service plugin module.
- Testing out saving of current service information. Saves/loads from
JSON in to obs_data_t, seems to be working quite nicely, and the
service object information is saved/preserved on exit, and loaded
again on startup.
- I agonized over the settings user interface for days, and eventually
I just decided that the only way that users weren't going to be
fumbling over options was to split up the settings in to simple/basic
output, pre-configured, and then advanced for advanced use (such as
multiple outputs or services, which I'll implement later).
This was particularly painful to really design right, I wanted more
features and wanted to include everything in one interface but
ultimately just realized from experience that users are just not
technically knowledgable about it and will end up fumbling with the
settings rather than getting things done.
Basically, what this means is that casual users only have to enter in
about 3 things to configure their stream: Stream key, audio bitrate,
and video bitrate. I am really happy with this interface for those
types of users, but it definitely won't be sufficient for advanced
usage or for custom outputs, so that stuff will have to be separated.
- Improved the JSON usage for the 'common streaming services' context,
I realized that JSON arrays are there to ensure sorting, while
forgetting that general items are optimized for hashing. So
basically I'm just using arrays now to sort items in it.
2014-04-24 01:49:07 -07:00
|
|
|
|
|
|
|
obs_data_set_default_string(data, "type", "rtmp_common");
|
2014-08-05 11:09:29 -07:00
|
|
|
type = obs_data_get_string(data, "type");
|
obs-studio UI: Implement stream settings UI
- Updated the services API so that it links up with an output and
the output gets data from that service rather than via settings.
This allows the service context to have control over how an output is
used, and makes it so that the URL/key/etc isn't necessarily some
static setting.
Also, if the service is attached to an output, it will stick around
until the output is destroyed.
- The settings interface has been updated so that it can allow the
usage of service plugins. What this means is that now you can create
a service plugin that can control aspects of the stream, and it
allows each service to create their own user interface if they create
a service plugin module.
- Testing out saving of current service information. Saves/loads from
JSON in to obs_data_t, seems to be working quite nicely, and the
service object information is saved/preserved on exit, and loaded
again on startup.
- I agonized over the settings user interface for days, and eventually
I just decided that the only way that users weren't going to be
fumbling over options was to split up the settings in to simple/basic
output, pre-configured, and then advanced for advanced use (such as
multiple outputs or services, which I'll implement later).
This was particularly painful to really design right, I wanted more
features and wanted to include everything in one interface but
ultimately just realized from experience that users are just not
technically knowledgable about it and will end up fumbling with the
settings rather than getting things done.
Basically, what this means is that casual users only have to enter in
about 3 things to configure their stream: Stream key, audio bitrate,
and video bitrate. I am really happy with this interface for those
types of users, but it definitely won't be sufficient for advanced
usage or for custom outputs, so that stuff will have to be separated.
- Improved the JSON usage for the 'common streaming services' context,
I realized that JSON arrays are there to ensure sorting, while
forgetting that general items are optimized for hashing. So
basically I'm just using arrays now to sort items in it.
2014-04-24 01:49:07 -07:00
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_data_t *settings = obs_data_get_obj(data, "settings");
|
2015-04-04 15:03:40 -07:00
|
|
|
obs_data_t *hotkey_data = obs_data_get_obj(data, "hotkeys");
|
obs-studio UI: Implement stream settings UI
- Updated the services API so that it links up with an output and
the output gets data from that service rather than via settings.
This allows the service context to have control over how an output is
used, and makes it so that the URL/key/etc isn't necessarily some
static setting.
Also, if the service is attached to an output, it will stick around
until the output is destroyed.
- The settings interface has been updated so that it can allow the
usage of service plugins. What this means is that now you can create
a service plugin that can control aspects of the stream, and it
allows each service to create their own user interface if they create
a service plugin module.
- Testing out saving of current service information. Saves/loads from
JSON in to obs_data_t, seems to be working quite nicely, and the
service object information is saved/preserved on exit, and loaded
again on startup.
- I agonized over the settings user interface for days, and eventually
I just decided that the only way that users weren't going to be
fumbling over options was to split up the settings in to simple/basic
output, pre-configured, and then advanced for advanced use (such as
multiple outputs or services, which I'll implement later).
This was particularly painful to really design right, I wanted more
features and wanted to include everything in one interface but
ultimately just realized from experience that users are just not
technically knowledgable about it and will end up fumbling with the
settings rather than getting things done.
Basically, what this means is that casual users only have to enter in
about 3 things to configure their stream: Stream key, audio bitrate,
and video bitrate. I am really happy with this interface for those
types of users, but it definitely won't be sufficient for advanced
usage or for custom outputs, so that stuff will have to be separated.
- Improved the JSON usage for the 'common streaming services' context,
I realized that JSON arrays are there to ensure sorting, while
forgetting that general items are optimized for hashing. So
basically I'm just using arrays now to sort items in it.
2014-04-24 01:49:07 -07:00
|
|
|
|
2014-11-01 13:41:17 -07:00
|
|
|
service = obs_service_create(type, "default_service", settings,
|
2015-04-04 15:03:40 -07:00
|
|
|
hotkey_data);
|
2015-05-03 17:07:43 -07:00
|
|
|
obs_service_release(service);
|
obs-studio UI: Implement stream settings UI
- Updated the services API so that it links up with an output and
the output gets data from that service rather than via settings.
This allows the service context to have control over how an output is
used, and makes it so that the URL/key/etc isn't necessarily some
static setting.
Also, if the service is attached to an output, it will stick around
until the output is destroyed.
- The settings interface has been updated so that it can allow the
usage of service plugins. What this means is that now you can create
a service plugin that can control aspects of the stream, and it
allows each service to create their own user interface if they create
a service plugin module.
- Testing out saving of current service information. Saves/loads from
JSON in to obs_data_t, seems to be working quite nicely, and the
service object information is saved/preserved on exit, and loaded
again on startup.
- I agonized over the settings user interface for days, and eventually
I just decided that the only way that users weren't going to be
fumbling over options was to split up the settings in to simple/basic
output, pre-configured, and then advanced for advanced use (such as
multiple outputs or services, which I'll implement later).
This was particularly painful to really design right, I wanted more
features and wanted to include everything in one interface but
ultimately just realized from experience that users are just not
technically knowledgable about it and will end up fumbling with the
settings rather than getting things done.
Basically, what this means is that casual users only have to enter in
about 3 things to configure their stream: Stream key, audio bitrate,
and video bitrate. I am really happy with this interface for those
types of users, but it definitely won't be sufficient for advanced
usage or for custom outputs, so that stuff will have to be separated.
- Improved the JSON usage for the 'common streaming services' context,
I realized that JSON arrays are there to ensure sorting, while
forgetting that general items are optimized for hashing. So
basically I'm just using arrays now to sort items in it.
2014-04-24 01:49:07 -07:00
|
|
|
|
2015-04-04 15:03:40 -07:00
|
|
|
obs_data_release(hotkey_data);
|
obs-studio UI: Implement stream settings UI
- Updated the services API so that it links up with an output and
the output gets data from that service rather than via settings.
This allows the service context to have control over how an output is
used, and makes it so that the URL/key/etc isn't necessarily some
static setting.
Also, if the service is attached to an output, it will stick around
until the output is destroyed.
- The settings interface has been updated so that it can allow the
usage of service plugins. What this means is that now you can create
a service plugin that can control aspects of the stream, and it
allows each service to create their own user interface if they create
a service plugin module.
- Testing out saving of current service information. Saves/loads from
JSON in to obs_data_t, seems to be working quite nicely, and the
service object information is saved/preserved on exit, and loaded
again on startup.
- I agonized over the settings user interface for days, and eventually
I just decided that the only way that users weren't going to be
fumbling over options was to split up the settings in to simple/basic
output, pre-configured, and then advanced for advanced use (such as
multiple outputs or services, which I'll implement later).
This was particularly painful to really design right, I wanted more
features and wanted to include everything in one interface but
ultimately just realized from experience that users are just not
technically knowledgable about it and will end up fumbling with the
settings rather than getting things done.
Basically, what this means is that casual users only have to enter in
about 3 things to configure their stream: Stream key, audio bitrate,
and video bitrate. I am really happy with this interface for those
types of users, but it definitely won't be sufficient for advanced
usage or for custom outputs, so that stuff will have to be separated.
- Improved the JSON usage for the 'common streaming services' context,
I realized that JSON arrays are there to ensure sorting, while
forgetting that general items are optimized for hashing. So
basically I'm just using arrays now to sort items in it.
2014-04-24 01:49:07 -07:00
|
|
|
obs_data_release(settings);
|
|
|
|
obs_data_release(data);
|
|
|
|
|
|
|
|
return !!service;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool OBSBasic::InitService()
|
|
|
|
{
|
2015-07-10 23:04:12 -07:00
|
|
|
ProfileScope("OBSBasic::InitService");
|
|
|
|
|
obs-studio UI: Implement stream settings UI
- Updated the services API so that it links up with an output and
the output gets data from that service rather than via settings.
This allows the service context to have control over how an output is
used, and makes it so that the URL/key/etc isn't necessarily some
static setting.
Also, if the service is attached to an output, it will stick around
until the output is destroyed.
- The settings interface has been updated so that it can allow the
usage of service plugins. What this means is that now you can create
a service plugin that can control aspects of the stream, and it
allows each service to create their own user interface if they create
a service plugin module.
- Testing out saving of current service information. Saves/loads from
JSON in to obs_data_t, seems to be working quite nicely, and the
service object information is saved/preserved on exit, and loaded
again on startup.
- I agonized over the settings user interface for days, and eventually
I just decided that the only way that users weren't going to be
fumbling over options was to split up the settings in to simple/basic
output, pre-configured, and then advanced for advanced use (such as
multiple outputs or services, which I'll implement later).
This was particularly painful to really design right, I wanted more
features and wanted to include everything in one interface but
ultimately just realized from experience that users are just not
technically knowledgable about it and will end up fumbling with the
settings rather than getting things done.
Basically, what this means is that casual users only have to enter in
about 3 things to configure their stream: Stream key, audio bitrate,
and video bitrate. I am really happy with this interface for those
types of users, but it definitely won't be sufficient for advanced
usage or for custom outputs, so that stuff will have to be separated.
- Improved the JSON usage for the 'common streaming services' context,
I realized that JSON arrays are there to ensure sorting, while
forgetting that general items are optimized for hashing. So
basically I'm just using arrays now to sort items in it.
2014-04-24 01:49:07 -07:00
|
|
|
if (LoadService())
|
|
|
|
return true;
|
|
|
|
|
2014-11-01 13:41:17 -07:00
|
|
|
service = obs_service_create("rtmp_common", "default_service", nullptr,
|
|
|
|
nullptr);
|
obs-studio UI: Implement stream settings UI
- Updated the services API so that it links up with an output and
the output gets data from that service rather than via settings.
This allows the service context to have control over how an output is
used, and makes it so that the URL/key/etc isn't necessarily some
static setting.
Also, if the service is attached to an output, it will stick around
until the output is destroyed.
- The settings interface has been updated so that it can allow the
usage of service plugins. What this means is that now you can create
a service plugin that can control aspects of the stream, and it
allows each service to create their own user interface if they create
a service plugin module.
- Testing out saving of current service information. Saves/loads from
JSON in to obs_data_t, seems to be working quite nicely, and the
service object information is saved/preserved on exit, and loaded
again on startup.
- I agonized over the settings user interface for days, and eventually
I just decided that the only way that users weren't going to be
fumbling over options was to split up the settings in to simple/basic
output, pre-configured, and then advanced for advanced use (such as
multiple outputs or services, which I'll implement later).
This was particularly painful to really design right, I wanted more
features and wanted to include everything in one interface but
ultimately just realized from experience that users are just not
technically knowledgable about it and will end up fumbling with the
settings rather than getting things done.
Basically, what this means is that casual users only have to enter in
about 3 things to configure their stream: Stream key, audio bitrate,
and video bitrate. I am really happy with this interface for those
types of users, but it definitely won't be sufficient for advanced
usage or for custom outputs, so that stuff will have to be separated.
- Improved the JSON usage for the 'common streaming services' context,
I realized that JSON arrays are there to ensure sorting, while
forgetting that general items are optimized for hashing. So
basically I'm just using arrays now to sort items in it.
2014-04-24 01:49:07 -07:00
|
|
|
if (!service)
|
|
|
|
return false;
|
2015-05-03 17:07:43 -07:00
|
|
|
obs_service_release(service);
|
obs-studio UI: Implement stream settings UI
- Updated the services API so that it links up with an output and
the output gets data from that service rather than via settings.
This allows the service context to have control over how an output is
used, and makes it so that the URL/key/etc isn't necessarily some
static setting.
Also, if the service is attached to an output, it will stick around
until the output is destroyed.
- The settings interface has been updated so that it can allow the
usage of service plugins. What this means is that now you can create
a service plugin that can control aspects of the stream, and it
allows each service to create their own user interface if they create
a service plugin module.
- Testing out saving of current service information. Saves/loads from
JSON in to obs_data_t, seems to be working quite nicely, and the
service object information is saved/preserved on exit, and loaded
again on startup.
- I agonized over the settings user interface for days, and eventually
I just decided that the only way that users weren't going to be
fumbling over options was to split up the settings in to simple/basic
output, pre-configured, and then advanced for advanced use (such as
multiple outputs or services, which I'll implement later).
This was particularly painful to really design right, I wanted more
features and wanted to include everything in one interface but
ultimately just realized from experience that users are just not
technically knowledgable about it and will end up fumbling with the
settings rather than getting things done.
Basically, what this means is that casual users only have to enter in
about 3 things to configure their stream: Stream key, audio bitrate,
and video bitrate. I am really happy with this interface for those
types of users, but it definitely won't be sufficient for advanced
usage or for custom outputs, so that stuff will have to be separated.
- Improved the JSON usage for the 'common streaming services' context,
I realized that JSON arrays are there to ensure sorting, while
forgetting that general items are optimized for hashing. So
basically I'm just using arrays now to sort items in it.
2014-04-24 01:49:07 -07:00
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2015-07-03 10:26:18 -07:00
|
|
|
static const double scaled_vals[] =
|
|
|
|
{
|
|
|
|
1.0,
|
|
|
|
1.25,
|
|
|
|
(1.0/0.75),
|
|
|
|
1.5,
|
|
|
|
(1.0/0.6),
|
|
|
|
1.75,
|
|
|
|
2.0,
|
|
|
|
2.25,
|
|
|
|
2.5,
|
|
|
|
2.75,
|
|
|
|
3.0,
|
|
|
|
0.0
|
|
|
|
};
|
|
|
|
|
2014-03-06 20:08:12 -08:00
|
|
|
bool OBSBasic::InitBasicConfigDefaults()
|
|
|
|
{
|
2016-10-03 23:50:13 -07:00
|
|
|
QList<QScreen*> screens = QGuiApplication::screens();
|
2014-03-06 20:08:12 -08:00
|
|
|
|
2016-10-03 23:50:13 -07:00
|
|
|
if (!screens.size()) {
|
2014-03-06 20:08:12 -08:00
|
|
|
OBSErrorBox(NULL, "There appears to be no monitors. Er, this "
|
|
|
|
"technically shouldn't be possible.");
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2016-10-03 23:50:13 -07:00
|
|
|
QScreen *primaryScreen = QGuiApplication::primaryScreen();
|
|
|
|
|
|
|
|
uint32_t cx = primaryScreen->size().width();
|
|
|
|
uint32_t cy = primaryScreen->size().height();
|
2014-03-06 20:08:12 -08:00
|
|
|
|
2015-07-03 09:49:22 -07:00
|
|
|
/* ----------------------------------------------------- */
|
|
|
|
/* move over mixer values in advanced if older config */
|
|
|
|
if (config_has_user_value(basicConfig, "AdvOut", "RecTrackIndex") &&
|
|
|
|
!config_has_user_value(basicConfig, "AdvOut", "RecTracks")) {
|
|
|
|
|
|
|
|
uint64_t track = config_get_uint(basicConfig, "AdvOut",
|
|
|
|
"RecTrackIndex");
|
|
|
|
track = 1ULL << (track - 1);
|
|
|
|
config_set_uint(basicConfig, "AdvOut", "RecTracks", track);
|
|
|
|
config_remove_value(basicConfig, "AdvOut", "RecTrackIndex");
|
2015-08-21 17:56:37 -07:00
|
|
|
config_save_safe(basicConfig, "tmp", nullptr);
|
2015-07-03 09:49:22 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* ----------------------------------------------------- */
|
|
|
|
|
2015-06-25 01:06:46 -07:00
|
|
|
config_set_default_string(basicConfig, "Output", "Mode", "Simple");
|
2015-02-06 03:17:33 -08:00
|
|
|
|
2014-05-20 23:27:27 -07:00
|
|
|
config_set_default_string(basicConfig, "SimpleOutput", "FilePath",
|
|
|
|
GetDefaultVideoSavePath().c_str());
|
2015-05-29 09:45:54 -07:00
|
|
|
config_set_default_string(basicConfig, "SimpleOutput", "RecFormat",
|
|
|
|
"flv");
|
obs-studio UI: Implement stream settings UI
- Updated the services API so that it links up with an output and
the output gets data from that service rather than via settings.
This allows the service context to have control over how an output is
used, and makes it so that the URL/key/etc isn't necessarily some
static setting.
Also, if the service is attached to an output, it will stick around
until the output is destroyed.
- The settings interface has been updated so that it can allow the
usage of service plugins. What this means is that now you can create
a service plugin that can control aspects of the stream, and it
allows each service to create their own user interface if they create
a service plugin module.
- Testing out saving of current service information. Saves/loads from
JSON in to obs_data_t, seems to be working quite nicely, and the
service object information is saved/preserved on exit, and loaded
again on startup.
- I agonized over the settings user interface for days, and eventually
I just decided that the only way that users weren't going to be
fumbling over options was to split up the settings in to simple/basic
output, pre-configured, and then advanced for advanced use (such as
multiple outputs or services, which I'll implement later).
This was particularly painful to really design right, I wanted more
features and wanted to include everything in one interface but
ultimately just realized from experience that users are just not
technically knowledgable about it and will end up fumbling with the
settings rather than getting things done.
Basically, what this means is that casual users only have to enter in
about 3 things to configure their stream: Stream key, audio bitrate,
and video bitrate. I am really happy with this interface for those
types of users, but it definitely won't be sufficient for advanced
usage or for custom outputs, so that stuff will have to be separated.
- Improved the JSON usage for the 'common streaming services' context,
I realized that JSON arrays are there to ensure sorting, while
forgetting that general items are optimized for hashing. So
basically I'm just using arrays now to sort items in it.
2014-04-24 01:49:07 -07:00
|
|
|
config_set_default_uint (basicConfig, "SimpleOutput", "VBitrate",
|
|
|
|
2500);
|
2016-04-18 00:56:51 -07:00
|
|
|
config_set_default_string(basicConfig, "SimpleOutput", "StreamEncoder",
|
|
|
|
SIMPLE_ENCODER_X264);
|
2015-06-05 08:57:01 -07:00
|
|
|
config_set_default_uint (basicConfig, "SimpleOutput", "ABitrate", 160);
|
2014-08-25 07:48:51 -07:00
|
|
|
config_set_default_bool (basicConfig, "SimpleOutput", "UseAdvanced",
|
|
|
|
false);
|
2016-04-10 03:10:36 -07:00
|
|
|
config_set_default_bool (basicConfig, "SimpleOutput", "EnforceBitrate",
|
|
|
|
true);
|
2014-08-25 07:48:51 -07:00
|
|
|
config_set_default_string(basicConfig, "SimpleOutput", "Preset",
|
|
|
|
"veryfast");
|
UI: Add recording presets to simple output
So certain high-profile individuals were complaining that it was
difficult to configure recording settings for quality in OBS. So, I
decided to add a very easy-to-use auto-configuration for high quality
encoding -- including lossless encoding. This feature will
automatically configure ideal recording settings based upon a specified
quality level.
Recording quality presets added to simple output:
- Same as stream: Copies the encoded streaming data with no extra usage
hit.
- High quality: uses a higher CRF value (starting at 23) if using x264.
- Indistinguishable quality: uses a low CRF value (starting at 16) if
using x264.
- Lossless will spawn an FFmpeg output that uses huffyuv encoding. If a
user tries to select lossless, they will be warned both via a dialog
prompt and a warning message in the settings window to ensure they
understand that it requires tremendous amounts of free space. It will
always use the AVI file format.
Extra Notes:
- When High/Indistinguishable quality is set, it will allow you to
select the recording encoder. Currently, it just allows you to select
x264 (at either veryfast or ultrafast). Later on, it'll be useful to
be able to set up pre-configured presets for hardware encoders once
more are implemented and tested.
- I decided to allow the use of x264 at both veryfast or ultrafast
presets. The reasoning is two-fold:
1.) ultrafast is perfectly viable even for near indistinguishable
quality as long as it has the appropriate CRF value. It's nice if you
want to record but would like to or need to reduce the impact of
encoding on the CPU. It will automatically compensate for the preset at
the cost of larger file size.
2.) It was suggested to just always use ultrafast, but ultrafast
requires 2-4x as much disk space for the same CRF (most likely due to
x264 compensating for the preset). Providing veryfast is important if
you really want to reduce file size and/or reduce blocking at lower
quality levels.
- When a recording preset is used, a secondary audio encoder is also
spawned at 192 bitrate to ensure high quality audio. I chose 192
because that's the limit of the media foundation aac encoder on
windows, which I want to make sure is used if available due to its
high performance.
- The CRF calculation is based upon resolution, quality, and whether
it's set to ultrafast. First, quality sets the base CRF, 23 for
"good" quality, 16 for "very high" quality. If set to ultrafast,
it'll subtract 2 points from the CRF value to help compensate. Lower
resolutions will also lower the CRF value to help improve higher
details with a smaller pixel ratio.
2015-09-18 22:29:36 -07:00
|
|
|
config_set_default_string(basicConfig, "SimpleOutput", "RecQuality",
|
|
|
|
"Stream");
|
|
|
|
config_set_default_string(basicConfig, "SimpleOutput", "RecEncoder",
|
|
|
|
SIMPLE_ENCODER_X264);
|
2016-12-07 05:21:44 -08:00
|
|
|
config_set_default_bool(basicConfig, "SimpleOutput", "RecRB", false);
|
|
|
|
config_set_default_int(basicConfig, "SimpleOutput", "RecRBTime", 20);
|
|
|
|
config_set_default_int(basicConfig, "SimpleOutput", "RecRBSize", 512);
|
2016-12-09 14:42:14 -08:00
|
|
|
config_set_default_string(basicConfig, "SimpleOutput", "RecRBPrefix",
|
|
|
|
"Replay");
|
2014-03-10 13:10:35 -07:00
|
|
|
|
2015-02-10 20:06:00 -08:00
|
|
|
config_set_default_bool (basicConfig, "AdvOut", "ApplyServiceSettings",
|
|
|
|
true);
|
2015-01-26 13:41:22 -08:00
|
|
|
config_set_default_bool (basicConfig, "AdvOut", "UseRescale", false);
|
|
|
|
config_set_default_uint (basicConfig, "AdvOut", "TrackIndex", 1);
|
|
|
|
config_set_default_string(basicConfig, "AdvOut", "Encoder", "obs_x264");
|
|
|
|
|
|
|
|
config_set_default_string(basicConfig, "AdvOut", "RecType", "Standard");
|
|
|
|
|
|
|
|
config_set_default_string(basicConfig, "AdvOut", "RecFilePath",
|
|
|
|
GetDefaultVideoSavePath().c_str());
|
2015-05-29 09:45:54 -07:00
|
|
|
config_set_default_string(basicConfig, "AdvOut", "RecFormat", "flv");
|
2015-01-26 13:41:22 -08:00
|
|
|
config_set_default_bool (basicConfig, "AdvOut", "RecUseRescale",
|
|
|
|
false);
|
2015-05-30 21:45:14 -07:00
|
|
|
config_set_default_uint (basicConfig, "AdvOut", "RecTracks", (1<<0));
|
2015-01-26 13:41:22 -08:00
|
|
|
config_set_default_string(basicConfig, "AdvOut", "RecEncoder",
|
|
|
|
"none");
|
|
|
|
|
2015-08-18 20:58:24 -07:00
|
|
|
config_set_default_bool (basicConfig, "AdvOut", "FFOutputToFile",
|
|
|
|
true);
|
|
|
|
config_set_default_string(basicConfig, "AdvOut", "FFFilePath",
|
|
|
|
GetDefaultVideoSavePath().c_str());
|
|
|
|
config_set_default_string(basicConfig, "AdvOut", "FFExtension", "mp4");
|
2015-01-26 13:41:22 -08:00
|
|
|
config_set_default_uint (basicConfig, "AdvOut", "FFVBitrate", 2500);
|
|
|
|
config_set_default_bool (basicConfig, "AdvOut", "FFUseRescale",
|
|
|
|
false);
|
|
|
|
config_set_default_uint (basicConfig, "AdvOut", "FFABitrate", 160);
|
|
|
|
config_set_default_uint (basicConfig, "AdvOut", "FFAudioTrack", 1);
|
|
|
|
|
|
|
|
config_set_default_uint (basicConfig, "AdvOut", "Track1Bitrate", 160);
|
|
|
|
config_set_default_uint (basicConfig, "AdvOut", "Track2Bitrate", 160);
|
|
|
|
config_set_default_uint (basicConfig, "AdvOut", "Track3Bitrate", 160);
|
|
|
|
config_set_default_uint (basicConfig, "AdvOut", "Track4Bitrate", 160);
|
2016-12-22 06:54:05 -08:00
|
|
|
config_set_default_uint (basicConfig, "AdvOut", "Track5Bitrate", 160);
|
|
|
|
config_set_default_uint (basicConfig, "AdvOut", "Track6Bitrate", 160);
|
2015-01-26 13:41:22 -08:00
|
|
|
|
2014-03-06 20:08:12 -08:00
|
|
|
config_set_default_uint (basicConfig, "Video", "BaseCX", cx);
|
|
|
|
config_set_default_uint (basicConfig, "Video", "BaseCY", cy);
|
|
|
|
|
2016-03-25 02:43:38 -07:00
|
|
|
config_set_default_string(basicConfig, "Output", "FilenameFormatting",
|
2016-04-02 16:28:04 -07:00
|
|
|
"%CCYY-%MM-%DD %hh-%mm-%ss");
|
2016-03-25 02:43:38 -07:00
|
|
|
|
2015-09-06 16:12:03 -07:00
|
|
|
config_set_default_bool (basicConfig, "Output", "DelayEnable", false);
|
|
|
|
config_set_default_uint (basicConfig, "Output", "DelaySec", 20);
|
|
|
|
config_set_default_bool (basicConfig, "Output", "DelayPreserve", true);
|
|
|
|
|
2015-09-10 19:10:40 -07:00
|
|
|
config_set_default_bool (basicConfig, "Output", "Reconnect", true);
|
|
|
|
config_set_default_uint (basicConfig, "Output", "RetryDelay", 10);
|
|
|
|
config_set_default_uint (basicConfig, "Output", "MaxRetries", 20);
|
|
|
|
|
2016-07-29 08:30:54 -07:00
|
|
|
config_set_default_string(basicConfig, "Output", "BindIP", "default");
|
|
|
|
|
2015-07-03 10:26:18 -07:00
|
|
|
int i = 0;
|
|
|
|
uint32_t scale_cx = cx;
|
|
|
|
uint32_t scale_cy = cy;
|
|
|
|
|
|
|
|
/* use a default scaled resolution that has a pixel count no higher
|
|
|
|
* than 1280x720 */
|
|
|
|
while (((scale_cx * scale_cy) > (1280 * 720)) && scaled_vals[i] > 0.0) {
|
|
|
|
double scale = scaled_vals[i++];
|
|
|
|
scale_cx = uint32_t(double(cx) / scale);
|
|
|
|
scale_cy = uint32_t(double(cy) / scale);
|
|
|
|
}
|
|
|
|
|
|
|
|
config_set_default_uint (basicConfig, "Video", "OutputCX", scale_cx);
|
|
|
|
config_set_default_uint (basicConfig, "Video", "OutputCY", scale_cy);
|
2014-03-06 20:08:12 -08:00
|
|
|
|
|
|
|
config_set_default_uint (basicConfig, "Video", "FPSType", 0);
|
|
|
|
config_set_default_string(basicConfig, "Video", "FPSCommon", "30");
|
|
|
|
config_set_default_uint (basicConfig, "Video", "FPSInt", 30);
|
|
|
|
config_set_default_uint (basicConfig, "Video", "FPSNum", 30);
|
|
|
|
config_set_default_uint (basicConfig, "Video", "FPSDen", 1);
|
2014-12-15 01:08:46 -08:00
|
|
|
config_set_default_string(basicConfig, "Video", "ScaleType", "bicubic");
|
2015-01-09 20:16:30 -08:00
|
|
|
config_set_default_string(basicConfig, "Video", "ColorFormat", "NV12");
|
2015-09-19 12:28:33 -07:00
|
|
|
config_set_default_string(basicConfig, "Video", "ColorSpace", "601");
|
2015-01-09 20:16:30 -08:00
|
|
|
config_set_default_string(basicConfig, "Video", "ColorRange",
|
|
|
|
"Partial");
|
2014-03-06 20:08:12 -08:00
|
|
|
|
2017-02-05 21:51:50 -08:00
|
|
|
config_set_default_string(basicConfig, "Audio", "MonitoringDeviceId",
|
|
|
|
"default");
|
|
|
|
config_set_default_string(basicConfig, "Audio", "MonitoringDeviceName",
|
|
|
|
Str("Basic.Settings.Advanced.Audio.MonitoringDevice"
|
|
|
|
".Default"));
|
2014-03-06 20:08:12 -08:00
|
|
|
config_set_default_uint (basicConfig, "Audio", "SampleRate", 44100);
|
|
|
|
config_set_default_string(basicConfig, "Audio", "ChannelSetup",
|
|
|
|
"Stereo");
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool OBSBasic::InitBasicConfig()
|
|
|
|
{
|
2015-07-10 23:04:12 -07:00
|
|
|
ProfileScope("OBSBasic::InitBasicConfig");
|
|
|
|
|
2015-01-15 23:44:38 -08:00
|
|
|
char configPath[512];
|
2015-06-23 19:38:01 -07:00
|
|
|
|
|
|
|
int ret = GetProfilePath(configPath, sizeof(configPath), "");
|
|
|
|
if (ret <= 0) {
|
|
|
|
OBSErrorBox(nullptr, "Failed to get profile path");
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (os_mkdir(configPath) == MKDIR_ERROR) {
|
|
|
|
OBSErrorBox(nullptr, "Failed to create profile path");
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = GetProfilePath(configPath, sizeof(configPath), "basic.ini");
|
2015-01-15 23:44:38 -08:00
|
|
|
if (ret <= 0) {
|
|
|
|
OBSErrorBox(nullptr, "Failed to get base.ini path");
|
|
|
|
return false;
|
|
|
|
}
|
2014-03-06 20:08:12 -08:00
|
|
|
|
2014-05-12 15:30:36 -07:00
|
|
|
int code = basicConfig.Open(configPath, CONFIG_OPEN_ALWAYS);
|
|
|
|
if (code != CONFIG_SUCCESS) {
|
|
|
|
OBSErrorBox(NULL, "Failed to open basic.ini: %d", code);
|
2014-03-06 20:08:12 -08:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2015-06-23 19:38:01 -07:00
|
|
|
if (config_get_string(basicConfig, "General", "Name") == nullptr) {
|
|
|
|
const char *curName = config_get_string(App()->GlobalConfig(),
|
|
|
|
"Basic", "Profile");
|
|
|
|
|
|
|
|
config_set_string(basicConfig, "General", "Name", curName);
|
2015-08-21 17:56:37 -07:00
|
|
|
basicConfig.SaveSafe("tmp");
|
2015-06-23 19:38:01 -07:00
|
|
|
}
|
|
|
|
|
2014-03-06 20:08:12 -08:00
|
|
|
return InitBasicConfigDefaults();
|
|
|
|
}
|
|
|
|
|
2014-05-03 22:54:38 -07:00
|
|
|
void OBSBasic::InitOBSCallbacks()
|
|
|
|
{
|
2015-07-10 23:04:12 -07:00
|
|
|
ProfileScope("OBSBasic::InitOBSCallbacks");
|
|
|
|
|
2015-06-27 00:29:17 -07:00
|
|
|
signalHandlers.reserve(signalHandlers.size() + 6);
|
|
|
|
signalHandlers.emplace_back(obs_get_signal_handler(), "source_remove",
|
2014-05-03 22:54:38 -07:00
|
|
|
OBSBasic::SourceRemoved, this);
|
2015-06-27 00:29:17 -07:00
|
|
|
signalHandlers.emplace_back(obs_get_signal_handler(), "source_activate",
|
2014-05-03 22:54:38 -07:00
|
|
|
OBSBasic::SourceActivated, this);
|
2015-06-27 00:29:17 -07:00
|
|
|
signalHandlers.emplace_back(obs_get_signal_handler(), "source_deactivate",
|
2014-05-03 22:54:38 -07:00
|
|
|
OBSBasic::SourceDeactivated, this);
|
2015-06-27 00:29:17 -07:00
|
|
|
signalHandlers.emplace_back(obs_get_signal_handler(), "source_rename",
|
2014-06-30 00:06:01 -07:00
|
|
|
OBSBasic::SourceRenamed, this);
|
2014-05-03 22:54:38 -07:00
|
|
|
}
|
|
|
|
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
void OBSBasic::InitPrimitives()
|
|
|
|
{
|
2015-07-10 23:04:12 -07:00
|
|
|
ProfileScope("OBSBasic::InitPrimitives");
|
|
|
|
|
2014-08-04 05:48:58 -07:00
|
|
|
obs_enter_graphics();
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
|
2014-08-07 23:42:07 -07:00
|
|
|
gs_render_start(true);
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
gs_vertex2f(0.0f, 0.0f);
|
|
|
|
gs_vertex2f(0.0f, 1.0f);
|
|
|
|
gs_vertex2f(1.0f, 1.0f);
|
|
|
|
gs_vertex2f(1.0f, 0.0f);
|
|
|
|
gs_vertex2f(0.0f, 0.0f);
|
2014-08-07 23:42:07 -07:00
|
|
|
box = gs_render_save();
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
|
2016-03-30 18:44:49 -07:00
|
|
|
gs_render_start(true);
|
|
|
|
gs_vertex2f(0.0f, 0.0f);
|
|
|
|
gs_vertex2f(0.0f, 1.0f);
|
|
|
|
boxLeft = gs_render_save();
|
|
|
|
|
|
|
|
gs_render_start(true);
|
|
|
|
gs_vertex2f(0.0f, 0.0f);
|
|
|
|
gs_vertex2f(1.0f, 0.0f);
|
|
|
|
boxTop = gs_render_save();
|
|
|
|
|
|
|
|
gs_render_start(true);
|
|
|
|
gs_vertex2f(1.0f, 0.0f);
|
|
|
|
gs_vertex2f(1.0f, 1.0f);
|
|
|
|
boxRight = gs_render_save();
|
|
|
|
|
|
|
|
gs_render_start(true);
|
|
|
|
gs_vertex2f(0.0f, 1.0f);
|
|
|
|
gs_vertex2f(1.0f, 1.0f);
|
|
|
|
boxBottom = gs_render_save();
|
|
|
|
|
2014-08-07 23:42:07 -07:00
|
|
|
gs_render_start(true);
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
for (int i = 0; i <= 360; i += (360/20)) {
|
|
|
|
float pos = RAD(float(i));
|
|
|
|
gs_vertex2f(cosf(pos), sinf(pos));
|
|
|
|
}
|
2014-08-07 23:42:07 -07:00
|
|
|
circle = gs_render_save();
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
|
2014-08-04 05:48:58 -07:00
|
|
|
obs_leave_graphics();
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
}
|
|
|
|
|
2016-12-09 14:40:04 -08:00
|
|
|
void OBSBasic::ReplayBufferClicked()
|
|
|
|
{
|
|
|
|
if (outputHandler->ReplayBufferActive())
|
|
|
|
StopReplayBuffer();
|
|
|
|
else
|
|
|
|
StartReplayBuffer();
|
|
|
|
};
|
|
|
|
|
2015-02-06 03:17:33 -08:00
|
|
|
void OBSBasic::ResetOutputs()
|
|
|
|
{
|
2015-07-10 23:04:12 -07:00
|
|
|
ProfileScope("OBSBasic::ResetOutputs");
|
|
|
|
|
2015-01-26 13:41:22 -08:00
|
|
|
const char *mode = config_get_string(basicConfig, "Output", "Mode");
|
|
|
|
bool advOut = astrcmpi(mode, "Advanced") == 0;
|
|
|
|
|
2015-02-06 03:17:33 -08:00
|
|
|
if (!outputHandler || !outputHandler->Active()) {
|
|
|
|
outputHandler.reset();
|
2015-01-26 13:41:22 -08:00
|
|
|
outputHandler.reset(advOut ?
|
|
|
|
CreateAdvancedOutputHandler(this) :
|
|
|
|
CreateSimpleOutputHandler(this));
|
2016-12-07 05:21:44 -08:00
|
|
|
|
2016-12-09 14:40:04 -08:00
|
|
|
delete replayBufferButton;
|
|
|
|
|
|
|
|
if (outputHandler->replayBuffer) {
|
|
|
|
replayBufferButton = new QPushButton(
|
|
|
|
QTStr("Basic.Main.StartReplayBuffer"),
|
|
|
|
this);
|
2016-12-11 21:04:58 -08:00
|
|
|
connect(replayBufferButton.data(),
|
2016-12-09 14:40:04 -08:00
|
|
|
&QPushButton::clicked,
|
|
|
|
this,
|
|
|
|
&OBSBasic::ReplayBufferClicked);
|
|
|
|
|
|
|
|
ui->buttonsVLayout->insertWidget(2, replayBufferButton);
|
|
|
|
}
|
2016-12-07 05:21:44 -08:00
|
|
|
|
2016-12-09 14:40:04 -08:00
|
|
|
if (sysTrayReplayBuffer)
|
|
|
|
sysTrayReplayBuffer->setEnabled(
|
|
|
|
!!outputHandler->replayBuffer);
|
2015-02-06 03:17:33 -08:00
|
|
|
} else {
|
|
|
|
outputHandler->Update();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-08-05 17:44:12 -07:00
|
|
|
#define STARTUP_SEPARATOR \
|
|
|
|
"==== Startup complete ==============================================="
|
|
|
|
#define SHUTDOWN_SEPARATOR \
|
|
|
|
"==== Shutting down =================================================="
|
2015-07-05 23:42:46 -07:00
|
|
|
|
2016-08-28 14:24:14 -07:00
|
|
|
extern obs_frontend_callbacks *InitializeAPIInterface(OBSBasic *main);
|
|
|
|
|
2016-12-21 19:17:39 -08:00
|
|
|
#define UNSUPPORTED_ERROR \
|
|
|
|
"Failed to initialize video:\n\nRequired graphics API functionality " \
|
|
|
|
"not found. Your GPU may not be supported."
|
|
|
|
|
|
|
|
#define UNKNOWN_ERROR \
|
2016-12-22 06:57:26 -08:00
|
|
|
"Failed to initialize video. Your GPU may not be supported, " \
|
|
|
|
"or your graphics drivers may need to be updated."
|
2016-12-21 19:17:39 -08:00
|
|
|
|
2014-02-02 14:23:38 -08:00
|
|
|
void OBSBasic::OBSInit()
|
|
|
|
{
|
2015-07-10 23:04:12 -07:00
|
|
|
ProfileScope("OBSBasic::OBSInit");
|
|
|
|
|
2015-06-23 19:29:07 -07:00
|
|
|
const char *sceneCollection = config_get_string(App()->GlobalConfig(),
|
|
|
|
"Basic", "SceneCollectionFile");
|
2015-01-15 23:44:38 -08:00
|
|
|
char savePath[512];
|
2015-06-23 19:29:07 -07:00
|
|
|
char fileName[512];
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (!sceneCollection)
|
|
|
|
throw "Failed to get scene collection name";
|
|
|
|
|
|
|
|
ret = snprintf(fileName, 512, "obs-studio/basic/scenes/%s.json",
|
|
|
|
sceneCollection);
|
2015-01-15 23:44:38 -08:00
|
|
|
if (ret <= 0)
|
2015-06-23 19:29:07 -07:00
|
|
|
throw "Failed to create scene collection file name";
|
|
|
|
|
|
|
|
ret = GetConfigPath(savePath, sizeof(savePath), fileName);
|
|
|
|
if (ret <= 0)
|
|
|
|
throw "Failed to get scene collection json file path";
|
2014-05-03 22:54:38 -07:00
|
|
|
|
2014-03-06 20:08:12 -08:00
|
|
|
if (!InitBasicConfig())
|
|
|
|
throw "Failed to load basic.ini";
|
2014-02-22 19:14:19 -08:00
|
|
|
if (!ResetAudio())
|
2014-02-02 14:23:38 -08:00
|
|
|
throw "Failed to initialize audio";
|
|
|
|
|
2015-01-15 23:44:38 -08:00
|
|
|
ret = ResetVideo();
|
2014-07-20 17:40:57 -07:00
|
|
|
|
|
|
|
switch (ret) {
|
|
|
|
case OBS_VIDEO_MODULE_NOT_FOUND:
|
|
|
|
throw "Failed to initialize video: Graphics module not found";
|
|
|
|
case OBS_VIDEO_NOT_SUPPORTED:
|
2016-12-21 19:17:39 -08:00
|
|
|
throw UNSUPPORTED_ERROR;
|
2014-07-20 17:40:57 -07:00
|
|
|
case OBS_VIDEO_INVALID_PARAM:
|
|
|
|
throw "Failed to initialize video: Invalid parameters";
|
|
|
|
default:
|
|
|
|
if (ret != OBS_VIDEO_SUCCESS)
|
2016-12-21 19:17:39 -08:00
|
|
|
throw UNKNOWN_ERROR;
|
2014-07-20 17:40:57 -07:00
|
|
|
}
|
|
|
|
|
2014-05-03 22:54:38 -07:00
|
|
|
InitOBSCallbacks();
|
2014-11-01 13:48:58 -07:00
|
|
|
InitHotkeys();
|
2014-02-02 14:23:38 -08:00
|
|
|
|
2016-08-28 14:24:14 -07:00
|
|
|
api = InitializeAPIInterface(this);
|
|
|
|
|
2014-07-27 12:48:14 -07:00
|
|
|
AddExtraModulePaths();
|
2016-08-05 17:46:00 -07:00
|
|
|
blog(LOG_INFO, "---------------------------------");
|
(API Change) Refactor module handling
Changed API:
- char *obs_find_plugin_file(const char *sub_path);
Changed to: char *obs_module_file(const char *file);
Cahnge it so you no longer need to specify a sub-path such as:
obs_find_plugin_file("module_name/file.ext")
Instead, now automatically handle the module data path so all you need
to do is:
obs_module_file("file.ext")
- int obs_load_module(const char *name);
Changed to: int obs_open_module(obs_module_t *module,
const char *path,
const char *data_path);
bool obs_init_module(obs_module_t module);
Change the module loading API so that if the front-end chooses, it can
load modules directly from a specified path, and associate a data
directory with it on the spot.
The module will not be initialized immediately; obs_init_module must
be called on the module pointer in order to fully initialize the
module. This is done so a module can be disabled by the front-end if
the it so chooses.
New API:
- void obs_add_module_path(const char *bin, const char *data);
These functions allow you to specify new module search paths to add,
and allow you to search through them, or optionally just load all
modules from them. If the string %module% is included, it will
replace it with the module's name when that string is used as a
lookup. Data paths are now directly added to the module's internal
storage structure, and when obs_find_module_file is used, it will look
up the pointer to the obs_module structure and get its data directory
that way.
Example:
obs_add_module_path("/opt/obs/my-modules/%module%/bin",
"/opt/obs/my-modules/%module%/data");
This would cause it to additionally look for the binary of a
hypthetical module named "foo" at /opt/obs/my-modules/foo/bin/foo.so
(or libfoo.so), and then look for the data in
/opt/obs/my-modules/foo/data.
This gives the front-end more flexibility for handling third-party
plugin modules, or handling all plugin modules in a custom way.
- void obs_find_modules(obs_find_module_callback_t callback, void
*param);
This searches the existing paths for modules and calls the callback
function when any are found. Useful for plugin management and custom
handling of the paths by the front-end if desired.
- void obs_load_all_modules(void);
Search through the paths and both loads and initializes all modules
automatically without custom handling.
- void obs_enum_modules(obs_enum_module_callback_t callback,
void *param);
Enumerates currently opened modules.
2014-07-27 12:00:11 -07:00
|
|
|
obs_load_all_modules();
|
2016-08-05 17:46:00 -07:00
|
|
|
blog(LOG_INFO, "---------------------------------");
|
|
|
|
obs_log_loaded_modules();
|
2014-03-07 16:03:34 -08:00
|
|
|
|
2016-08-05 17:44:12 -07:00
|
|
|
blog(LOG_INFO, STARTUP_SEPARATOR);
|
2015-07-05 23:42:46 -07:00
|
|
|
|
2015-02-06 03:17:33 -08:00
|
|
|
ResetOutputs();
|
2014-11-01 13:53:25 -07:00
|
|
|
CreateHotkeys();
|
2015-02-06 03:17:33 -08:00
|
|
|
|
obs-studio UI: Implement stream settings UI
- Updated the services API so that it links up with an output and
the output gets data from that service rather than via settings.
This allows the service context to have control over how an output is
used, and makes it so that the URL/key/etc isn't necessarily some
static setting.
Also, if the service is attached to an output, it will stick around
until the output is destroyed.
- The settings interface has been updated so that it can allow the
usage of service plugins. What this means is that now you can create
a service plugin that can control aspects of the stream, and it
allows each service to create their own user interface if they create
a service plugin module.
- Testing out saving of current service information. Saves/loads from
JSON in to obs_data_t, seems to be working quite nicely, and the
service object information is saved/preserved on exit, and loaded
again on startup.
- I agonized over the settings user interface for days, and eventually
I just decided that the only way that users weren't going to be
fumbling over options was to split up the settings in to simple/basic
output, pre-configured, and then advanced for advanced use (such as
multiple outputs or services, which I'll implement later).
This was particularly painful to really design right, I wanted more
features and wanted to include everything in one interface but
ultimately just realized from experience that users are just not
technically knowledgable about it and will end up fumbling with the
settings rather than getting things done.
Basically, what this means is that casual users only have to enter in
about 3 things to configure their stream: Stream key, audio bitrate,
and video bitrate. I am really happy with this interface for those
types of users, but it definitely won't be sufficient for advanced
usage or for custom outputs, so that stuff will have to be separated.
- Improved the JSON usage for the 'common streaming services' context,
I realized that JSON arrays are there to ensure sorting, while
forgetting that general items are optimized for hashing. So
basically I'm just using arrays now to sort items in it.
2014-04-24 01:49:07 -07:00
|
|
|
if (!InitService())
|
|
|
|
throw "Failed to initialize service";
|
|
|
|
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
InitPrimitives();
|
|
|
|
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
sceneDuplicationMode = config_get_bool(App()->GlobalConfig(),
|
|
|
|
"BasicWindow", "SceneDuplicationMode");
|
|
|
|
swapScenesMode = config_get_bool(App()->GlobalConfig(),
|
|
|
|
"BasicWindow", "SwapScenesMode");
|
|
|
|
editPropertiesMode = config_get_bool(App()->GlobalConfig(),
|
|
|
|
"BasicWindow", "EditPropertiesMode");
|
2017-01-11 11:19:17 -08:00
|
|
|
|
|
|
|
if (!opt_studio_mode) {
|
|
|
|
SetPreviewProgramMode(config_get_bool(App()->GlobalConfig(),
|
|
|
|
"BasicWindow", "PreviewProgramMode"));
|
|
|
|
} else {
|
|
|
|
SetPreviewProgramMode(true);
|
|
|
|
opt_studio_mode = false;
|
|
|
|
}
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
|
2016-06-30 14:52:56 -07:00
|
|
|
#define SET_VISIBILITY(name, control) \
|
|
|
|
do { \
|
|
|
|
if (config_has_user_value(App()->GlobalConfig(), \
|
|
|
|
"BasicWindow", name)) { \
|
|
|
|
bool visible = config_get_bool(App()->GlobalConfig(), \
|
|
|
|
"BasicWindow", name); \
|
|
|
|
ui->control->setChecked(visible); \
|
|
|
|
} \
|
|
|
|
} while (false)
|
|
|
|
|
|
|
|
SET_VISIBILITY("ShowTransitions", toggleSceneTransitions);
|
|
|
|
SET_VISIBILITY("ShowListboxToolbars", toggleListboxToolbars);
|
|
|
|
SET_VISIBILITY("ShowStatusBar", toggleStatusBar);
|
|
|
|
#undef SET_VISIBILITY
|
|
|
|
|
2015-07-10 23:04:12 -07:00
|
|
|
{
|
|
|
|
ProfileScope("OBSBasic::Load");
|
|
|
|
disableSaving--;
|
|
|
|
Load(savePath);
|
|
|
|
disableSaving++;
|
|
|
|
}
|
2014-06-16 19:41:36 -07:00
|
|
|
|
2014-07-13 23:56:28 -07:00
|
|
|
TimedCheckForUpdates();
|
2014-06-16 19:41:36 -07:00
|
|
|
loaded = true;
|
2015-01-04 08:20:15 -08:00
|
|
|
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
previewEnabled = config_get_bool(App()->GlobalConfig(),
|
2015-04-02 21:35:46 -07:00
|
|
|
"BasicWindow", "PreviewEnabled");
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
|
|
|
|
if (!previewEnabled && !IsPreviewProgramMode())
|
|
|
|
QMetaObject::invokeMethod(this, "EnablePreviewDisplay",
|
|
|
|
Qt::QueuedConnection,
|
|
|
|
Q_ARG(bool, previewEnabled));
|
2015-05-25 01:37:13 -07:00
|
|
|
|
|
|
|
#ifdef _WIN32
|
|
|
|
uint32_t winVer = GetWindowsVersion();
|
|
|
|
if (winVer > 0 && winVer < 0x602) {
|
|
|
|
bool disableAero = config_get_bool(basicConfig, "Video",
|
|
|
|
"DisableAero");
|
|
|
|
SetAeroEnabled(!disableAero);
|
|
|
|
}
|
|
|
|
#endif
|
2015-06-30 05:49:31 -07:00
|
|
|
|
2015-06-23 19:29:07 -07:00
|
|
|
RefreshSceneCollections();
|
2015-06-23 19:38:01 -07:00
|
|
|
RefreshProfiles();
|
2015-06-30 05:49:31 -07:00
|
|
|
disableSaving--;
|
2015-08-02 00:02:58 -07:00
|
|
|
|
|
|
|
auto addDisplay = [this] (OBSQTDisplay *window)
|
|
|
|
{
|
|
|
|
obs_display_add_draw_callback(window->GetDisplay(),
|
|
|
|
OBSBasic::RenderMain, this);
|
|
|
|
|
|
|
|
struct obs_video_info ovi;
|
|
|
|
if (obs_get_video_info(&ovi))
|
|
|
|
ResizePreview(ovi.base_width, ovi.base_height);
|
|
|
|
};
|
|
|
|
|
|
|
|
connect(ui->preview, &OBSQTDisplay::DisplayCreated, addDisplay);
|
|
|
|
|
2016-01-22 07:33:29 -08:00
|
|
|
#ifdef _WIN32
|
2016-09-26 12:40:23 -07:00
|
|
|
SetWin32DropStyle(this);
|
2016-01-22 07:33:29 -08:00
|
|
|
show();
|
|
|
|
#endif
|
|
|
|
|
|
|
|
bool alwaysOnTop = config_get_bool(App()->GlobalConfig(), "BasicWindow",
|
|
|
|
"AlwaysOnTop");
|
|
|
|
if (alwaysOnTop) {
|
|
|
|
SetAlwaysOnTop(this, true);
|
|
|
|
ui->actionAlwaysOnTop->setChecked(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifndef _WIN32
|
2015-08-02 00:02:58 -07:00
|
|
|
show();
|
2016-01-22 07:33:29 -08:00
|
|
|
#endif
|
2016-01-09 14:20:46 -08:00
|
|
|
|
|
|
|
QList<int> defSizes;
|
|
|
|
|
|
|
|
int top = config_get_int(App()->GlobalConfig(), "BasicWindow",
|
|
|
|
"splitterTop");
|
|
|
|
int bottom = config_get_int(App()->GlobalConfig(), "BasicWindow",
|
|
|
|
"splitterBottom");
|
|
|
|
|
|
|
|
if (!top || !bottom) {
|
|
|
|
defSizes = ui->mainSplitter->sizes();
|
|
|
|
int total = defSizes[0] + defSizes[1];
|
|
|
|
defSizes[0] = total * 75 / 100;
|
|
|
|
defSizes[1] = total - defSizes[0];
|
|
|
|
} else {
|
|
|
|
defSizes.push_back(top);
|
|
|
|
defSizes.push_back(bottom);
|
|
|
|
}
|
|
|
|
|
|
|
|
ui->mainSplitter->setSizes(defSizes);
|
2016-08-13 07:36:17 -07:00
|
|
|
|
|
|
|
SystemTray(true);
|
2016-12-29 07:21:53 -08:00
|
|
|
|
|
|
|
OpenSavedProjectors();
|
2014-02-02 14:23:38 -08:00
|
|
|
}
|
|
|
|
|
2014-11-01 13:48:58 -07:00
|
|
|
void OBSBasic::InitHotkeys()
|
|
|
|
{
|
2015-07-10 23:04:12 -07:00
|
|
|
ProfileScope("OBSBasic::InitHotkeys");
|
|
|
|
|
2014-11-01 13:48:58 -07:00
|
|
|
struct obs_hotkeys_translations t = {};
|
|
|
|
t.insert = Str("Hotkeys.Insert");
|
|
|
|
t.del = Str("Hotkeys.Delete");
|
|
|
|
t.home = Str("Hotkeys.Home");
|
|
|
|
t.end = Str("Hotkeys.End");
|
|
|
|
t.page_up = Str("Hotkeys.PageUp");
|
|
|
|
t.page_down = Str("Hotkeys.PageDown");
|
|
|
|
t.num_lock = Str("Hotkeys.NumLock");
|
|
|
|
t.scroll_lock = Str("Hotkeys.ScrollLock");
|
|
|
|
t.caps_lock = Str("Hotkeys.CapsLock");
|
|
|
|
t.backspace = Str("Hotkeys.Backspace");
|
|
|
|
t.tab = Str("Hotkeys.Tab");
|
|
|
|
t.print = Str("Hotkeys.Print");
|
|
|
|
t.pause = Str("Hotkeys.Pause");
|
|
|
|
t.left = Str("Hotkeys.Left");
|
|
|
|
t.right = Str("Hotkeys.Right");
|
|
|
|
t.up = Str("Hotkeys.Up");
|
|
|
|
t.down = Str("Hotkeys.Down");
|
|
|
|
#ifdef _WIN32
|
|
|
|
t.meta = Str("Hotkeys.Windows");
|
|
|
|
#else
|
|
|
|
t.meta = Str("Hotkeys.Super");
|
|
|
|
#endif
|
|
|
|
t.menu = Str("Hotkeys.Menu");
|
|
|
|
t.space = Str("Hotkeys.Space");
|
|
|
|
t.numpad_num = Str("Hotkeys.NumpadNum");
|
|
|
|
t.numpad_multiply = Str("Hotkeys.NumpadMultiply");
|
|
|
|
t.numpad_divide = Str("Hotkeys.NumpadDivide");
|
|
|
|
t.numpad_plus = Str("Hotkeys.NumpadAdd");
|
|
|
|
t.numpad_minus = Str("Hotkeys.NumpadSubtract");
|
|
|
|
t.numpad_decimal = Str("Hotkeys.NumpadDecimal");
|
|
|
|
t.apple_keypad_num = Str("Hotkeys.AppleKeypadNum");
|
|
|
|
t.apple_keypad_multiply = Str("Hotkeys.AppleKeypadMultiply");
|
|
|
|
t.apple_keypad_divide = Str("Hotkeys.AppleKeypadDivide");
|
|
|
|
t.apple_keypad_plus = Str("Hotkeys.AppleKeypadAdd");
|
|
|
|
t.apple_keypad_minus = Str("Hotkeys.AppleKeypadSubtract");
|
|
|
|
t.apple_keypad_decimal = Str("Hotkeys.AppleKeypadDecimal");
|
|
|
|
t.apple_keypad_equal = Str("Hotkeys.AppleKeypadEqual");
|
|
|
|
t.mouse_num = Str("Hotkeys.MouseButton");
|
|
|
|
obs_hotkeys_set_translations(&t);
|
|
|
|
|
|
|
|
obs_hotkeys_set_audio_hotkeys_translations(Str("Mute"), Str("Unmute"),
|
2015-05-12 12:36:19 -07:00
|
|
|
Str("Push-to-mute"), Str("Push-to-talk"));
|
2014-11-01 13:48:58 -07:00
|
|
|
|
|
|
|
obs_hotkeys_set_sceneitem_hotkeys_translations(
|
|
|
|
Str("SceneItemShow"), Str("SceneItemHide"));
|
|
|
|
|
|
|
|
obs_hotkey_enable_callback_rerouting(true);
|
|
|
|
obs_hotkey_set_callback_routing_func(OBSBasic::HotkeyTriggered, this);
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::ProcessHotkey(obs_hotkey_id id, bool pressed)
|
|
|
|
{
|
|
|
|
obs_hotkey_trigger_routed_callback(id, pressed);
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::HotkeyTriggered(void *data, obs_hotkey_id id, bool pressed)
|
|
|
|
{
|
|
|
|
OBSBasic &basic = *static_cast<OBSBasic*>(data);
|
|
|
|
QMetaObject::invokeMethod(&basic, "ProcessHotkey",
|
|
|
|
Q_ARG(obs_hotkey_id, id), Q_ARG(bool, pressed));
|
|
|
|
}
|
|
|
|
|
2014-11-01 13:53:25 -07:00
|
|
|
void OBSBasic::CreateHotkeys()
|
|
|
|
{
|
2015-07-10 23:04:12 -07:00
|
|
|
ProfileScope("OBSBasic::CreateHotkeys");
|
|
|
|
|
2014-11-01 13:53:25 -07:00
|
|
|
auto LoadHotkeyData = [&](const char *name) -> OBSData
|
|
|
|
{
|
|
|
|
const char *info = config_get_string(basicConfig,
|
|
|
|
"Hotkeys", name);
|
|
|
|
if (!info)
|
|
|
|
return {};
|
|
|
|
|
|
|
|
obs_data_t *data = obs_data_create_from_json(info);
|
|
|
|
if (!data)
|
|
|
|
return {};
|
|
|
|
|
|
|
|
OBSData res = data;
|
|
|
|
obs_data_release(data);
|
|
|
|
return res;
|
|
|
|
};
|
|
|
|
|
2015-09-06 16:19:53 -07:00
|
|
|
auto LoadHotkey = [&](obs_hotkey_id id, const char *name)
|
|
|
|
{
|
|
|
|
obs_data_array_t *array =
|
|
|
|
obs_data_get_array(LoadHotkeyData(name), "bindings");
|
|
|
|
|
|
|
|
obs_hotkey_load(id, array);
|
|
|
|
obs_data_array_release(array);
|
|
|
|
};
|
|
|
|
|
2014-11-01 13:53:25 -07:00
|
|
|
auto LoadHotkeyPair = [&](obs_hotkey_pair_id id, const char *name0,
|
|
|
|
const char *name1)
|
|
|
|
{
|
|
|
|
obs_data_array_t *array0 =
|
|
|
|
obs_data_get_array(LoadHotkeyData(name0), "bindings");
|
|
|
|
obs_data_array_t *array1 =
|
|
|
|
obs_data_get_array(LoadHotkeyData(name1), "bindings");
|
|
|
|
|
|
|
|
obs_hotkey_pair_load(id, array0, array1);
|
|
|
|
obs_data_array_release(array0);
|
|
|
|
obs_data_array_release(array1);
|
|
|
|
};
|
|
|
|
|
|
|
|
#define MAKE_CALLBACK(pred, method) \
|
|
|
|
[](void *data, obs_hotkey_pair_id, obs_hotkey_t*, bool pressed) \
|
|
|
|
{ \
|
|
|
|
OBSBasic &basic = *static_cast<OBSBasic*>(data); \
|
|
|
|
if (pred && pressed) { \
|
|
|
|
method(); \
|
|
|
|
return true; \
|
|
|
|
} \
|
|
|
|
return false; \
|
|
|
|
}
|
|
|
|
|
|
|
|
streamingHotkeys = obs_hotkey_pair_register_frontend(
|
|
|
|
"OBSBasic.StartStreaming",
|
2016-12-09 14:40:04 -08:00
|
|
|
Str("Basic.Main.StartStreaming"),
|
2014-11-01 13:53:25 -07:00
|
|
|
"OBSBasic.StopStreaming",
|
2016-12-09 14:40:04 -08:00
|
|
|
Str("Basic.Main.StopStreaming"),
|
2014-11-01 13:53:25 -07:00
|
|
|
MAKE_CALLBACK(!basic.outputHandler->StreamingActive(),
|
|
|
|
basic.StartStreaming),
|
|
|
|
MAKE_CALLBACK(basic.outputHandler->StreamingActive(),
|
|
|
|
basic.StopStreaming),
|
|
|
|
this, this);
|
|
|
|
LoadHotkeyPair(streamingHotkeys,
|
|
|
|
"OBSBasic.StartStreaming", "OBSBasic.StopStreaming");
|
|
|
|
|
2015-09-06 16:19:53 -07:00
|
|
|
auto cb = [] (void *data, obs_hotkey_id, obs_hotkey_t*, bool pressed)
|
|
|
|
{
|
|
|
|
OBSBasic &basic = *static_cast<OBSBasic*>(data);
|
|
|
|
if (basic.outputHandler->StreamingActive() && pressed) {
|
|
|
|
basic.ForceStopStreaming();
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
forceStreamingStopHotkey = obs_hotkey_register_frontend(
|
|
|
|
"OBSBasic.ForceStopStreaming",
|
|
|
|
Str("Basic.Main.ForceStopStreaming"),
|
|
|
|
cb, this);
|
|
|
|
LoadHotkey(forceStreamingStopHotkey,
|
|
|
|
"OBSBasic.ForceStopStreaming");
|
|
|
|
|
2014-11-01 13:53:25 -07:00
|
|
|
recordingHotkeys = obs_hotkey_pair_register_frontend(
|
|
|
|
"OBSBasic.StartRecording",
|
2016-12-09 14:40:04 -08:00
|
|
|
Str("Basic.Main.StartRecording"),
|
2014-11-01 13:53:25 -07:00
|
|
|
"OBSBasic.StopRecording",
|
2016-12-09 14:40:04 -08:00
|
|
|
Str("Basic.Main.StopRecording"),
|
2014-11-01 13:53:25 -07:00
|
|
|
MAKE_CALLBACK(!basic.outputHandler->RecordingActive(),
|
|
|
|
basic.StartRecording),
|
|
|
|
MAKE_CALLBACK(basic.outputHandler->RecordingActive(),
|
|
|
|
basic.StopRecording),
|
|
|
|
this, this);
|
|
|
|
LoadHotkeyPair(recordingHotkeys,
|
|
|
|
"OBSBasic.StartRecording", "OBSBasic.StopRecording");
|
2016-12-09 14:40:04 -08:00
|
|
|
|
|
|
|
replayBufHotkeys = obs_hotkey_pair_register_frontend(
|
|
|
|
"OBSBasic.StartReplayBuffer",
|
|
|
|
Str("Basic.Main.StartReplayBuffer"),
|
|
|
|
"OBSBasic.StopReplayBuffer",
|
|
|
|
Str("Basic.Main.StopReplayBuffer"),
|
|
|
|
MAKE_CALLBACK(!basic.outputHandler->ReplayBufferActive(),
|
|
|
|
basic.StartReplayBuffer),
|
|
|
|
MAKE_CALLBACK(basic.outputHandler->ReplayBufferActive(),
|
|
|
|
basic.StopReplayBuffer),
|
|
|
|
this, this);
|
|
|
|
LoadHotkeyPair(replayBufHotkeys,
|
|
|
|
"OBSBasic.StartReplayBuffer", "OBSBasic.StopReplayBuffer");
|
2014-11-01 13:53:25 -07:00
|
|
|
#undef MAKE_CALLBACK
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
|
|
|
|
auto togglePreviewProgram = [] (void *data, obs_hotkey_id,
|
|
|
|
obs_hotkey_t*, bool pressed)
|
|
|
|
{
|
|
|
|
if (pressed)
|
|
|
|
QMetaObject::invokeMethod(static_cast<OBSBasic*>(data),
|
|
|
|
"on_modeSwitch_clicked",
|
|
|
|
Qt::QueuedConnection);
|
|
|
|
};
|
|
|
|
|
|
|
|
togglePreviewProgramHotkey = obs_hotkey_register_frontend(
|
|
|
|
"OBSBasic.TogglePreviewProgram",
|
|
|
|
Str("Basic.TogglePreviewProgramMode"),
|
|
|
|
togglePreviewProgram, this);
|
|
|
|
LoadHotkey(togglePreviewProgramHotkey, "OBSBasic.TogglePreviewProgram");
|
|
|
|
|
|
|
|
auto transition = [] (void *data, obs_hotkey_id, obs_hotkey_t*,
|
|
|
|
bool pressed)
|
|
|
|
{
|
|
|
|
if (pressed)
|
|
|
|
QMetaObject::invokeMethod(static_cast<OBSBasic*>(data),
|
|
|
|
"TransitionClicked",
|
|
|
|
Qt::QueuedConnection);
|
|
|
|
};
|
|
|
|
|
|
|
|
transitionHotkey = obs_hotkey_register_frontend(
|
|
|
|
"OBSBasic.Transition",
|
|
|
|
Str("Transition"), transition, this);
|
|
|
|
LoadHotkey(transitionHotkey, "OBSBasic.Transition");
|
2014-11-01 13:53:25 -07:00
|
|
|
}
|
|
|
|
|
2015-06-29 00:47:07 -07:00
|
|
|
void OBSBasic::ClearHotkeys()
|
|
|
|
{
|
|
|
|
obs_hotkey_pair_unregister(streamingHotkeys);
|
|
|
|
obs_hotkey_pair_unregister(recordingHotkeys);
|
2016-12-09 14:40:04 -08:00
|
|
|
obs_hotkey_pair_unregister(replayBufHotkeys);
|
2015-09-06 16:19:53 -07:00
|
|
|
obs_hotkey_unregister(forceStreamingStopHotkey);
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
obs_hotkey_unregister(togglePreviewProgramHotkey);
|
|
|
|
obs_hotkey_unregister(transitionHotkey);
|
2015-06-29 00:47:07 -07:00
|
|
|
}
|
|
|
|
|
2014-02-02 14:23:38 -08:00
|
|
|
OBSBasic::~OBSBasic()
|
|
|
|
{
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
delete programOptions;
|
|
|
|
delete program;
|
2015-04-02 21:35:46 -07:00
|
|
|
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
/* XXX: any obs data must be released before calling obs_shutdown.
|
|
|
|
* currently, we can't automate this with C++ RAII because of the
|
|
|
|
* delicate nature of obs_shutdown needing to be freed before the UI
|
|
|
|
* can be freed, and we have no control over the destruction order of
|
|
|
|
* the Qt UI stuff, so we have to manually clear any references to
|
|
|
|
* libobs. */
|
2014-07-06 16:19:27 -07:00
|
|
|
delete cpuUsageTimer;
|
2014-07-06 16:18:16 -07:00
|
|
|
os_cpu_usage_info_destroy(cpuUsageInfo);
|
|
|
|
|
2014-11-01 13:48:58 -07:00
|
|
|
obs_hotkey_set_callback_routing_func(nullptr, nullptr);
|
2015-06-29 00:47:07 -07:00
|
|
|
ClearHotkeys();
|
2014-11-01 13:48:58 -07:00
|
|
|
|
2015-05-03 17:07:43 -07:00
|
|
|
service = nullptr;
|
2015-02-06 03:17:33 -08:00
|
|
|
outputHandler.reset();
|
|
|
|
|
2014-09-15 16:16:16 -07:00
|
|
|
if (interaction)
|
|
|
|
delete interaction;
|
|
|
|
|
2014-07-22 13:16:57 -07:00
|
|
|
if (properties)
|
|
|
|
delete properties;
|
|
|
|
|
2015-02-25 21:23:57 -08:00
|
|
|
if (filters)
|
|
|
|
delete filters;
|
|
|
|
|
2014-07-22 13:16:57 -07:00
|
|
|
if (transformWindow)
|
|
|
|
delete transformWindow;
|
2014-03-23 01:07:54 -07:00
|
|
|
|
2014-12-28 00:38:00 -08:00
|
|
|
if (advAudioWindow)
|
|
|
|
delete advAudioWindow;
|
|
|
|
|
2015-08-02 00:02:58 -07:00
|
|
|
obs_display_remove_draw_callback(ui->preview->GetDisplay(),
|
|
|
|
OBSBasic::RenderMain, this);
|
|
|
|
|
2014-08-04 05:48:58 -07:00
|
|
|
obs_enter_graphics();
|
2014-08-07 23:42:07 -07:00
|
|
|
gs_vertexbuffer_destroy(box);
|
2016-03-30 18:44:49 -07:00
|
|
|
gs_vertexbuffer_destroy(boxLeft);
|
|
|
|
gs_vertexbuffer_destroy(boxTop);
|
|
|
|
gs_vertexbuffer_destroy(boxRight);
|
|
|
|
gs_vertexbuffer_destroy(boxBottom);
|
2014-08-07 23:42:07 -07:00
|
|
|
gs_vertexbuffer_destroy(circle);
|
2014-08-04 05:48:58 -07:00
|
|
|
obs_leave_graphics();
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
|
2015-03-18 06:31:08 -07:00
|
|
|
/* When shutting down, sometimes source references can get in to the
|
|
|
|
* event queue, and if we don't forcibly process those events they
|
|
|
|
* won't get processed until after obs_shutdown has been called. I
|
|
|
|
* really wish there were a more elegant way to deal with this via C++,
|
|
|
|
* but Qt doesn't use C++ in a normal way, so you can't really rely on
|
|
|
|
* normal C++ behavior for your data to be freed in the order that you
|
|
|
|
* expect or want it to. */
|
|
|
|
QApplication::sendPostedEvents(this);
|
|
|
|
|
2014-07-13 12:38:58 -07:00
|
|
|
config_set_int(App()->GlobalConfig(), "General", "LastVersion",
|
|
|
|
LIBOBS_API_VER);
|
2015-03-18 19:37:34 -07:00
|
|
|
|
2016-01-09 14:20:46 -08:00
|
|
|
QList<int> splitterSizes = ui->mainSplitter->sizes();
|
2016-01-22 07:33:29 -08:00
|
|
|
bool alwaysOnTop = IsAlwaysOnTop(this);
|
2015-03-18 19:37:34 -07:00
|
|
|
|
2016-01-09 14:20:46 -08:00
|
|
|
config_set_int(App()->GlobalConfig(), "BasicWindow", "splitterTop",
|
|
|
|
splitterSizes[0]);
|
|
|
|
config_set_int(App()->GlobalConfig(), "BasicWindow", "splitterBottom",
|
|
|
|
splitterSizes[1]);
|
2015-04-02 21:35:46 -07:00
|
|
|
config_set_bool(App()->GlobalConfig(), "BasicWindow", "PreviewEnabled",
|
|
|
|
previewEnabled);
|
2016-01-22 07:33:29 -08:00
|
|
|
config_set_bool(App()->GlobalConfig(), "BasicWindow", "AlwaysOnTop",
|
|
|
|
alwaysOnTop);
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
config_set_bool(App()->GlobalConfig(), "BasicWindow",
|
|
|
|
"SceneDuplicationMode", sceneDuplicationMode);
|
|
|
|
config_set_bool(App()->GlobalConfig(), "BasicWindow",
|
|
|
|
"SwapScenesMode", swapScenesMode);
|
|
|
|
config_set_bool(App()->GlobalConfig(), "BasicWindow",
|
|
|
|
"EditPropertiesMode", editPropertiesMode);
|
|
|
|
config_set_bool(App()->GlobalConfig(), "BasicWindow",
|
|
|
|
"PreviewProgramMode", IsPreviewProgramMode());
|
2015-08-21 17:56:37 -07:00
|
|
|
config_save_safe(App()->GlobalConfig(), "tmp", nullptr);
|
2015-05-25 01:37:13 -07:00
|
|
|
|
|
|
|
#ifdef _WIN32
|
|
|
|
uint32_t winVer = GetWindowsVersion();
|
|
|
|
if (winVer > 0 && winVer < 0x602) {
|
|
|
|
bool disableAero = config_get_bool(basicConfig, "Video",
|
|
|
|
"DisableAero");
|
|
|
|
if (disableAero) {
|
|
|
|
SetAeroEnabled(true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
2014-02-02 14:23:38 -08:00
|
|
|
}
|
|
|
|
|
2015-07-09 10:51:22 -07:00
|
|
|
void OBSBasic::SaveProjectNow()
|
|
|
|
{
|
|
|
|
if (disableSaving)
|
|
|
|
return;
|
|
|
|
|
|
|
|
projectChanged = true;
|
|
|
|
SaveProjectDeferred();
|
|
|
|
}
|
|
|
|
|
2015-01-04 08:16:59 -08:00
|
|
|
void OBSBasic::SaveProject()
|
|
|
|
{
|
2015-06-30 05:49:31 -07:00
|
|
|
if (disableSaving)
|
|
|
|
return;
|
|
|
|
|
2015-07-06 09:02:13 -07:00
|
|
|
projectChanged = true;
|
|
|
|
QMetaObject::invokeMethod(this, "SaveProjectDeferred",
|
|
|
|
Qt::QueuedConnection);
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::SaveProjectDeferred()
|
|
|
|
{
|
|
|
|
if (disableSaving)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (!projectChanged)
|
|
|
|
return;
|
|
|
|
|
|
|
|
projectChanged = false;
|
|
|
|
|
2015-06-23 19:29:07 -07:00
|
|
|
const char *sceneCollection = config_get_string(App()->GlobalConfig(),
|
|
|
|
"Basic", "SceneCollectionFile");
|
2015-01-15 23:44:38 -08:00
|
|
|
char savePath[512];
|
2015-06-23 19:29:07 -07:00
|
|
|
char fileName[512];
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (!sceneCollection)
|
|
|
|
return;
|
|
|
|
|
|
|
|
ret = snprintf(fileName, 512, "obs-studio/basic/scenes/%s.json",
|
|
|
|
sceneCollection);
|
|
|
|
if (ret <= 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
ret = GetConfigPath(savePath, sizeof(savePath), fileName);
|
2015-01-15 23:44:38 -08:00
|
|
|
if (ret <= 0)
|
|
|
|
return;
|
|
|
|
|
2015-01-04 08:16:59 -08:00
|
|
|
Save(savePath);
|
|
|
|
}
|
|
|
|
|
2014-02-02 13:26:23 -08:00
|
|
|
OBSScene OBSBasic::GetCurrentScene()
|
2014-01-04 12:53:36 -08:00
|
|
|
{
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
QListWidgetItem *item = ui->scenes->currentItem();
|
2015-06-27 18:21:45 -07:00
|
|
|
return item ? GetOBSRef<OBSScene>(item) : nullptr;
|
2014-01-04 12:53:36 -08:00
|
|
|
}
|
|
|
|
|
2014-09-15 16:04:22 -07:00
|
|
|
OBSSceneItem OBSBasic::GetSceneItem(QListWidgetItem *item)
|
2014-01-30 00:31:52 -08:00
|
|
|
{
|
2015-06-27 18:21:45 -07:00
|
|
|
return item ? GetOBSRef<OBSSceneItem>(item) : nullptr;
|
2014-01-30 00:31:52 -08:00
|
|
|
}
|
|
|
|
|
2014-09-15 16:04:22 -07:00
|
|
|
OBSSceneItem OBSBasic::GetCurrentSceneItem()
|
|
|
|
{
|
2016-01-23 11:02:22 -08:00
|
|
|
return GetSceneItem(GetTopSelectedSourceItem());
|
2014-09-15 16:04:22 -07:00
|
|
|
}
|
|
|
|
|
2016-11-05 09:48:46 -07:00
|
|
|
void OBSBasic::UpdatePreviewScalingMenu()
|
|
|
|
{
|
|
|
|
ScalingMode scalingMode = ui->preview->GetScalingMode();
|
|
|
|
ui->actionScaleWindow->setChecked(
|
|
|
|
scalingMode == ScalingMode::Window);
|
|
|
|
ui->actionScaleCanvas->setChecked(
|
|
|
|
scalingMode == ScalingMode::Canvas);
|
|
|
|
ui->actionScaleOutput->setChecked(
|
|
|
|
scalingMode == ScalingMode::Output);
|
|
|
|
}
|
|
|
|
|
2014-02-02 16:03:55 -08:00
|
|
|
void OBSBasic::UpdateSources(OBSScene scene)
|
|
|
|
{
|
2015-06-27 18:18:40 -07:00
|
|
|
ClearListItems(ui->sources);
|
2014-02-02 16:03:55 -08:00
|
|
|
|
|
|
|
obs_scene_enum_items(scene,
|
2014-09-25 17:44:05 -07:00
|
|
|
[] (obs_scene_t *scene, obs_sceneitem_t *item, void *p)
|
2014-02-02 16:03:55 -08:00
|
|
|
{
|
|
|
|
OBSBasic *window = static_cast<OBSBasic*>(p);
|
2014-03-01 04:54:55 -08:00
|
|
|
window->InsertSceneItem(item);
|
2014-02-14 14:13:36 -08:00
|
|
|
|
|
|
|
UNUSED_PARAMETER(scene);
|
2014-02-02 16:03:55 -08:00
|
|
|
return true;
|
|
|
|
}, this);
|
|
|
|
}
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
void OBSBasic::InsertSceneItem(obs_sceneitem_t *item)
|
2014-03-01 04:54:55 -08:00
|
|
|
{
|
2015-03-22 20:51:21 -07:00
|
|
|
QListWidgetItem *listItem = new QListWidgetItem();
|
2015-06-27 18:21:45 -07:00
|
|
|
SetOBSRef(listItem, OBSSceneItem(item));
|
2014-03-01 04:54:55 -08:00
|
|
|
|
|
|
|
ui->sources->insertItem(0, listItem);
|
2015-06-27 19:29:26 -07:00
|
|
|
ui->sources->setCurrentRow(0, QItemSelectionModel::ClearAndSelect);
|
2014-06-16 19:41:36 -07:00
|
|
|
|
2015-03-22 20:51:21 -07:00
|
|
|
SetupVisibilityItem(ui->sources, listItem, item);
|
2014-07-22 13:16:57 -07:00
|
|
|
}
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
void OBSBasic::CreateInteractionWindow(obs_source_t *source)
|
2014-09-15 16:16:16 -07:00
|
|
|
{
|
|
|
|
if (interaction)
|
|
|
|
interaction->close();
|
|
|
|
|
|
|
|
interaction = new OBSBasicInteraction(this, source);
|
|
|
|
interaction->Init();
|
|
|
|
interaction->setAttribute(Qt::WA_DeleteOnClose, true);
|
|
|
|
}
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
void OBSBasic::CreatePropertiesWindow(obs_source_t *source)
|
2014-07-22 13:16:57 -07:00
|
|
|
{
|
|
|
|
if (properties)
|
|
|
|
properties->close();
|
|
|
|
|
|
|
|
properties = new OBSBasicProperties(this, source);
|
|
|
|
properties->Init();
|
|
|
|
properties->setAttribute(Qt::WA_DeleteOnClose, true);
|
2014-03-01 04:54:55 -08:00
|
|
|
}
|
|
|
|
|
2015-02-25 21:23:57 -08:00
|
|
|
void OBSBasic::CreateFiltersWindow(obs_source_t *source)
|
|
|
|
{
|
|
|
|
if (filters)
|
|
|
|
filters->close();
|
|
|
|
|
|
|
|
filters = new OBSBasicFilters(this, source);
|
|
|
|
filters->Init();
|
|
|
|
filters->setAttribute(Qt::WA_DeleteOnClose, true);
|
|
|
|
}
|
|
|
|
|
2014-02-02 16:03:55 -08:00
|
|
|
/* Qt callbacks for invokeMethod */
|
|
|
|
|
|
|
|
void OBSBasic::AddScene(OBSSource source)
|
2013-12-28 04:33:16 -08:00
|
|
|
{
|
2014-08-04 08:41:15 -07:00
|
|
|
const char *name = obs_source_get_name(source);
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_scene_t *scene = obs_scene_from_source(source);
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
|
|
|
|
QListWidgetItem *item = new QListWidgetItem(QT_UTF8(name));
|
2015-06-27 18:21:45 -07:00
|
|
|
SetOBSRef(item, OBSScene(scene));
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
ui->scenes->addItem(item);
|
2014-01-04 12:53:36 -08:00
|
|
|
|
2014-11-01 13:53:05 -07:00
|
|
|
obs_hotkey_register_source(source, "OBSBasic.SelectScene",
|
|
|
|
Str("Basic.Hotkeys.SelectScene"),
|
|
|
|
[](void *data,
|
|
|
|
obs_hotkey_id, obs_hotkey_t*, bool pressed)
|
|
|
|
{
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
OBSBasic *main =
|
|
|
|
reinterpret_cast<OBSBasic*>(App()->GetMainWindow());
|
|
|
|
|
2014-11-01 13:53:05 -07:00
|
|
|
auto potential_source = static_cast<obs_source_t*>(data);
|
|
|
|
auto source = obs_source_get_ref(potential_source);
|
|
|
|
if (source && pressed)
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
main->SetCurrentScene(source);
|
2014-11-01 13:53:05 -07:00
|
|
|
obs_source_release(source);
|
|
|
|
}, static_cast<obs_source_t*>(source));
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
signal_handler_t *handler = obs_source_get_signal_handler(source);
|
2015-06-27 00:28:40 -07:00
|
|
|
|
2015-12-05 05:53:38 -08:00
|
|
|
SignalContainer<OBSScene> container;
|
|
|
|
container.ref = scene;
|
|
|
|
container.handlers.assign({
|
2015-06-27 00:28:40 -07:00
|
|
|
std::make_shared<OBSSignal>(handler, "item_add",
|
|
|
|
OBSBasic::SceneItemAdded, this),
|
|
|
|
std::make_shared<OBSSignal>(handler, "item_remove",
|
|
|
|
OBSBasic::SceneItemRemoved, this),
|
|
|
|
std::make_shared<OBSSignal>(handler, "item_select",
|
|
|
|
OBSBasic::SceneItemSelected, this),
|
|
|
|
std::make_shared<OBSSignal>(handler, "item_deselect",
|
|
|
|
OBSBasic::SceneItemDeselected, this),
|
|
|
|
std::make_shared<OBSSignal>(handler, "reorder",
|
|
|
|
OBSBasic::SceneReordered, this),
|
2015-12-05 05:53:38 -08:00
|
|
|
});
|
2015-06-27 00:28:40 -07:00
|
|
|
|
|
|
|
item->setData(static_cast<int>(QtDataRole::OBSSignals),
|
2015-12-05 05:53:38 -08:00
|
|
|
QVariant::fromValue(container));
|
2015-06-30 05:49:31 -07:00
|
|
|
|
2015-08-28 15:01:39 -07:00
|
|
|
/* if the scene already has items (a duplicated scene) add them */
|
|
|
|
auto addSceneItem = [this] (obs_sceneitem_t *item)
|
|
|
|
{
|
|
|
|
AddSceneItem(item);
|
|
|
|
};
|
|
|
|
|
|
|
|
using addSceneItem_t = decltype(addSceneItem);
|
|
|
|
|
|
|
|
obs_scene_enum_items(scene,
|
|
|
|
[] (obs_scene_t*, obs_sceneitem_t *item, void *param)
|
|
|
|
{
|
|
|
|
addSceneItem_t *func;
|
|
|
|
func = reinterpret_cast<addSceneItem_t*>(param);
|
|
|
|
(*func)(item);
|
|
|
|
return true;
|
|
|
|
}, &addSceneItem);
|
|
|
|
|
2015-06-30 05:49:31 -07:00
|
|
|
SaveProject();
|
2016-08-05 18:43:04 -07:00
|
|
|
|
|
|
|
if (!disableSaving) {
|
|
|
|
obs_source_t *source = obs_scene_get_source(scene);
|
|
|
|
blog(LOG_INFO, "User added scene '%s'",
|
|
|
|
obs_source_get_name(source));
|
|
|
|
}
|
2016-12-02 10:05:57 -08:00
|
|
|
|
|
|
|
if (api)
|
|
|
|
api->on_event(OBS_FRONTEND_EVENT_SCENE_LIST_CHANGED);
|
2013-12-28 04:33:16 -08:00
|
|
|
}
|
|
|
|
|
2014-02-02 16:03:55 -08:00
|
|
|
void OBSBasic::RemoveScene(OBSSource source)
|
2013-12-28 21:29:13 -08:00
|
|
|
{
|
2015-09-24 01:11:38 -07:00
|
|
|
obs_scene_t *scene = obs_scene_from_source(source);
|
|
|
|
|
|
|
|
QListWidgetItem *sel = nullptr;
|
|
|
|
int count = ui->scenes->count();
|
|
|
|
for (int i = 0; i < count; i++) {
|
|
|
|
auto item = ui->scenes->item(i);
|
|
|
|
auto cur_scene = GetOBSRef<OBSScene>(item);
|
|
|
|
if (cur_scene != scene)
|
|
|
|
continue;
|
2013-12-28 21:29:13 -08:00
|
|
|
|
2015-09-24 01:11:38 -07:00
|
|
|
sel = item;
|
|
|
|
break;
|
|
|
|
}
|
2014-01-06 19:20:18 -08:00
|
|
|
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
if (sel != nullptr) {
|
2015-09-24 01:11:38 -07:00
|
|
|
if (sel == ui->scenes->currentItem())
|
2015-06-27 18:18:40 -07:00
|
|
|
ClearListItems(ui->sources);
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
delete sel;
|
2014-01-06 19:20:18 -08:00
|
|
|
}
|
2015-06-30 05:49:31 -07:00
|
|
|
|
|
|
|
SaveProject();
|
2016-08-05 18:43:04 -07:00
|
|
|
|
|
|
|
if (!disableSaving) {
|
|
|
|
blog(LOG_INFO, "User Removed scene '%s'",
|
|
|
|
obs_source_get_name(source));
|
|
|
|
}
|
2014-01-04 12:53:36 -08:00
|
|
|
}
|
|
|
|
|
2014-02-02 16:03:55 -08:00
|
|
|
void OBSBasic::AddSceneItem(OBSSceneItem item)
|
2014-01-04 12:53:36 -08:00
|
|
|
{
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_scene_t *scene = obs_sceneitem_get_scene(item);
|
2014-01-06 19:20:18 -08:00
|
|
|
|
2014-03-01 04:54:55 -08:00
|
|
|
if (GetCurrentScene() == scene)
|
|
|
|
InsertSceneItem(item);
|
2014-01-06 19:20:18 -08:00
|
|
|
|
2015-06-30 05:49:31 -07:00
|
|
|
SaveProject();
|
2016-08-05 18:43:04 -07:00
|
|
|
|
|
|
|
if (!disableSaving) {
|
|
|
|
obs_source_t *sceneSource = obs_scene_get_source(scene);
|
|
|
|
obs_source_t *itemSource = obs_sceneitem_get_source(item);
|
|
|
|
blog(LOG_INFO, "User added source '%s' (%s) to scene '%s'",
|
|
|
|
obs_source_get_name(itemSource),
|
|
|
|
obs_source_get_id(itemSource),
|
|
|
|
obs_source_get_name(sceneSource));
|
|
|
|
}
|
2014-01-04 12:53:36 -08:00
|
|
|
}
|
|
|
|
|
2014-02-02 16:03:55 -08:00
|
|
|
void OBSBasic::RemoveSceneItem(OBSSceneItem item)
|
2014-01-04 12:53:36 -08:00
|
|
|
{
|
2016-07-09 06:31:34 -07:00
|
|
|
for (int i = 0; i < ui->sources->count(); i++) {
|
|
|
|
QListWidgetItem *listItem = ui->sources->item(i);
|
2014-01-04 12:53:36 -08:00
|
|
|
|
2016-07-09 06:31:34 -07:00
|
|
|
if (GetOBSRef<OBSSceneItem>(listItem) == item) {
|
|
|
|
DeleteListItem(ui->sources, listItem);
|
|
|
|
break;
|
2014-01-04 18:26:15 -08:00
|
|
|
}
|
|
|
|
}
|
2014-01-06 19:20:18 -08:00
|
|
|
|
2015-06-30 05:49:31 -07:00
|
|
|
SaveProject();
|
2016-08-05 18:43:04 -07:00
|
|
|
|
|
|
|
if (!disableSaving) {
|
|
|
|
obs_scene_t *scene = obs_sceneitem_get_scene(item);
|
|
|
|
obs_source_t *sceneSource = obs_scene_get_source(scene);
|
|
|
|
obs_source_t *itemSource = obs_sceneitem_get_source(item);
|
|
|
|
blog(LOG_INFO, "User Removed source '%s' (%s) from scene '%s'",
|
|
|
|
obs_source_get_name(itemSource),
|
|
|
|
obs_source_get_id(itemSource),
|
|
|
|
obs_source_get_name(sceneSource));
|
|
|
|
}
|
2014-01-04 12:53:36 -08:00
|
|
|
}
|
|
|
|
|
2014-02-02 16:03:55 -08:00
|
|
|
void OBSBasic::UpdateSceneSelection(OBSSource source)
|
2014-01-04 12:53:36 -08:00
|
|
|
{
|
|
|
|
if (source) {
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_scene_t *scene = obs_scene_from_source(source);
|
2014-08-04 08:41:15 -07:00
|
|
|
const char *name = obs_source_get_name(source);
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
|
2014-04-26 23:47:50 -07:00
|
|
|
if (!scene)
|
|
|
|
return;
|
|
|
|
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
QList<QListWidgetItem*> items =
|
|
|
|
ui->scenes->findItems(QT_UTF8(name), Qt::MatchExactly);
|
|
|
|
|
2014-02-20 21:04:14 -08:00
|
|
|
if (items.count()) {
|
|
|
|
sceneChanging = true;
|
|
|
|
ui->scenes->setCurrentItem(items.first());
|
|
|
|
sceneChanging = false;
|
|
|
|
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
UpdateSources(scene);
|
2014-01-04 12:53:36 -08:00
|
|
|
}
|
2013-12-28 21:29:13 -08:00
|
|
|
}
|
2014-01-04 12:53:36 -08:00
|
|
|
}
|
|
|
|
|
2014-06-30 00:06:01 -07:00
|
|
|
static void RenameListValues(QListWidget *listWidget, const QString &newName,
|
|
|
|
const QString &prevName)
|
|
|
|
{
|
|
|
|
QList<QListWidgetItem*> items =
|
|
|
|
listWidget->findItems(prevName, Qt::MatchExactly);
|
|
|
|
|
|
|
|
for (int i = 0; i < items.count(); i++)
|
|
|
|
items[i]->setText(newName);
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::RenameSources(QString newName, QString prevName)
|
|
|
|
{
|
|
|
|
RenameListValues(ui->scenes, newName, prevName);
|
2014-07-08 11:58:48 -07:00
|
|
|
|
|
|
|
for (size_t i = 0; i < volumes.size(); i++) {
|
|
|
|
if (volumes[i]->GetName().compare(prevName) == 0)
|
|
|
|
volumes[i]->SetName(newName);
|
|
|
|
}
|
2015-06-30 05:49:31 -07:00
|
|
|
|
2016-12-29 07:21:53 -08:00
|
|
|
std::string newText = newName.toUtf8().constData();
|
|
|
|
std::string prevText = prevName.toUtf8().constData();
|
|
|
|
|
|
|
|
for (size_t j = 0; j < projectorArray.size(); j++) {
|
|
|
|
if (projectorArray.at(j) == prevText)
|
|
|
|
projectorArray.at(j) = newText;
|
|
|
|
}
|
|
|
|
|
2015-06-30 05:49:31 -07:00
|
|
|
SaveProject();
|
2014-06-30 00:06:01 -07:00
|
|
|
}
|
|
|
|
|
2014-10-13 13:14:06 -07:00
|
|
|
void OBSBasic::SelectSceneItem(OBSScene scene, OBSSceneItem item, bool select)
|
|
|
|
{
|
2015-11-15 08:39:50 -08:00
|
|
|
SignalBlocker sourcesSignalBlocker(ui->sources);
|
|
|
|
|
2015-06-26 18:32:33 -07:00
|
|
|
if (scene != GetCurrentScene() || ignoreSelectionUpdate)
|
2014-10-13 13:14:06 -07:00
|
|
|
return;
|
|
|
|
|
|
|
|
for (int i = 0; i < ui->sources->count(); i++) {
|
|
|
|
QListWidgetItem *witem = ui->sources->item(i);
|
2015-06-27 18:21:45 -07:00
|
|
|
QVariant data =
|
|
|
|
witem->data(static_cast<int>(QtDataRole::OBSRef));
|
2014-10-13 13:14:06 -07:00
|
|
|
if (!data.canConvert<OBSSceneItem>())
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (item != data.value<OBSSceneItem>())
|
|
|
|
continue;
|
|
|
|
|
2015-11-15 08:39:50 -08:00
|
|
|
witem->setSelected(select);
|
2014-10-13 13:14:06 -07:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-06-20 18:57:06 -07:00
|
|
|
void OBSBasic::GetAudioSourceFilters()
|
|
|
|
{
|
|
|
|
QAction *action = reinterpret_cast<QAction*>(sender());
|
|
|
|
VolControl *vol = action->property("volControl").value<VolControl*>();
|
|
|
|
obs_source_t *source = vol->GetSource();
|
|
|
|
|
|
|
|
CreateFiltersWindow(source);
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::GetAudioSourceProperties()
|
|
|
|
{
|
|
|
|
QAction *action = reinterpret_cast<QAction*>(sender());
|
|
|
|
VolControl *vol = action->property("volControl").value<VolControl*>();
|
|
|
|
obs_source_t *source = vol->GetSource();
|
|
|
|
|
|
|
|
CreatePropertiesWindow(source);
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::VolControlContextMenu()
|
|
|
|
{
|
|
|
|
VolControl *vol = reinterpret_cast<VolControl*>(sender());
|
|
|
|
|
|
|
|
QAction filtersAction(QTStr("Filters"), this);
|
|
|
|
QAction propertiesAction(QTStr("Properties"), this);
|
|
|
|
|
|
|
|
connect(&filtersAction, &QAction::triggered,
|
|
|
|
this, &OBSBasic::GetAudioSourceFilters,
|
|
|
|
Qt::DirectConnection);
|
|
|
|
connect(&propertiesAction, &QAction::triggered,
|
|
|
|
this, &OBSBasic::GetAudioSourceProperties,
|
|
|
|
Qt::DirectConnection);
|
|
|
|
|
|
|
|
filtersAction.setProperty("volControl",
|
|
|
|
QVariant::fromValue<VolControl*>(vol));
|
|
|
|
propertiesAction.setProperty("volControl",
|
|
|
|
QVariant::fromValue<VolControl*>(vol));
|
|
|
|
|
|
|
|
QMenu popup(this);
|
|
|
|
popup.addAction(&filtersAction);
|
|
|
|
popup.addAction(&propertiesAction);
|
|
|
|
popup.exec(QCursor::pos());
|
|
|
|
}
|
|
|
|
|
2014-05-03 22:54:38 -07:00
|
|
|
void OBSBasic::ActivateAudioSource(OBSSource source)
|
|
|
|
{
|
2015-06-20 18:57:06 -07:00
|
|
|
VolControl *vol = new VolControl(source, true);
|
|
|
|
|
|
|
|
connect(vol, &VolControl::ConfigClicked,
|
|
|
|
this, &OBSBasic::VolControlContextMenu);
|
2014-05-03 22:54:38 -07:00
|
|
|
|
|
|
|
volumes.push_back(vol);
|
|
|
|
ui->volumeWidgets->layout()->addWidget(vol);
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::DeactivateAudioSource(OBSSource source)
|
|
|
|
{
|
|
|
|
for (size_t i = 0; i < volumes.size(); i++) {
|
|
|
|
if (volumes[i]->GetSource() == source) {
|
|
|
|
delete volumes[i];
|
|
|
|
volumes.erase(volumes.begin() + i);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
bool OBSBasic::QueryRemoveSource(obs_source_t *source)
|
2014-06-30 01:13:32 -07:00
|
|
|
{
|
2014-08-04 08:41:15 -07:00
|
|
|
const char *name = obs_source_get_name(source);
|
2014-06-30 13:45:58 -07:00
|
|
|
|
|
|
|
QString text = QTStr("ConfirmRemove.Text");
|
|
|
|
text.replace("$1", QT_UTF8(name));
|
2014-06-30 01:13:32 -07:00
|
|
|
|
2015-01-16 01:21:11 -08:00
|
|
|
QMessageBox remove_source(this);
|
2014-08-24 08:56:50 -07:00
|
|
|
remove_source.setText(text);
|
|
|
|
QAbstractButton *Yes = remove_source.addButton(QTStr("Yes"),
|
|
|
|
QMessageBox::YesRole);
|
2014-08-15 10:07:00 -07:00
|
|
|
remove_source.addButton(QTStr("No"), QMessageBox::NoRole);
|
|
|
|
remove_source.setIcon(QMessageBox::Question);
|
|
|
|
remove_source.setWindowTitle(QTStr("ConfirmRemove.Title"));
|
|
|
|
remove_source.exec();
|
|
|
|
|
|
|
|
return Yes == remove_source.clickedButton();
|
2014-06-30 13:45:58 -07:00
|
|
|
}
|
2014-06-30 01:13:32 -07:00
|
|
|
|
2014-07-13 23:56:28 -07:00
|
|
|
#define UPDATE_CHECK_INTERVAL (60*60*24*4) /* 4 days */
|
|
|
|
|
2014-10-05 15:32:18 -07:00
|
|
|
#ifdef UPDATE_SPARKLE
|
|
|
|
void init_sparkle_updater(bool update_to_undeployed);
|
|
|
|
void trigger_sparkle_update();
|
|
|
|
#endif
|
|
|
|
|
2014-07-13 23:56:28 -07:00
|
|
|
void OBSBasic::TimedCheckForUpdates()
|
|
|
|
{
|
2014-10-05 15:32:18 -07:00
|
|
|
#ifdef UPDATE_SPARKLE
|
|
|
|
init_sparkle_updater(config_get_bool(App()->GlobalConfig(), "General",
|
|
|
|
"UpdateToUndeployed"));
|
|
|
|
#else
|
2014-07-13 23:56:28 -07:00
|
|
|
long long lastUpdate = config_get_int(App()->GlobalConfig(), "General",
|
|
|
|
"LastUpdateCheck");
|
|
|
|
uint32_t lastVersion = config_get_int(App()->GlobalConfig(), "General",
|
|
|
|
"LastVersion");
|
|
|
|
|
|
|
|
if (lastVersion < LIBOBS_API_VER) {
|
|
|
|
lastUpdate = 0;
|
|
|
|
config_set_int(App()->GlobalConfig(), "General",
|
|
|
|
"LastUpdateCheck", 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
long long t = (long long)time(nullptr);
|
|
|
|
long long secs = t - lastUpdate;
|
|
|
|
|
|
|
|
if (secs > UPDATE_CHECK_INTERVAL)
|
|
|
|
CheckForUpdates();
|
2014-10-05 15:32:18 -07:00
|
|
|
#endif
|
2014-07-13 23:56:28 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::CheckForUpdates()
|
|
|
|
{
|
2014-10-05 15:32:18 -07:00
|
|
|
#ifdef UPDATE_SPARKLE
|
|
|
|
trigger_sparkle_update();
|
|
|
|
#else
|
2014-07-13 23:56:28 -07:00
|
|
|
ui->actionCheckForUpdates->setEnabled(false);
|
|
|
|
|
UI: Replace Qt5Network classes with libcurl
The Qt5Network classes seem to only support OpenSSL, and because OpenSSL
isn't available on windows, we would have to distribute it with the
program to get SSL access working. The problem with that is that
OpenSSL is not GPL-compatible, so we cannot distribute OpenSSL with the
program, which means we have to find a better (and preferably superior)
library for accessing remote files that can use the windows SSPI for our
SSL needs, which comes with the operating system.
Fortunately, libcurl is probably the best library out there, and can be
compiled with SSPI instead of OpenSSL, so we're just going to switch to
libcurl instead. Originally I thought it didn't support SSPI, otherwise
I would have implemented it sooner.
As a side note, this will make it so we'll able to get files from the
internet via plugins, which will be quite useful.
2015-05-23 23:39:39 -07:00
|
|
|
if (updateCheckThread) {
|
|
|
|
updateCheckThread->wait();
|
|
|
|
delete updateCheckThread;
|
|
|
|
}
|
2014-07-14 08:51:57 -07:00
|
|
|
|
UI: Replace Qt5Network classes with libcurl
The Qt5Network classes seem to only support OpenSSL, and because OpenSSL
isn't available on windows, we would have to distribute it with the
program to get SSL access working. The problem with that is that
OpenSSL is not GPL-compatible, so we cannot distribute OpenSSL with the
program, which means we have to find a better (and preferably superior)
library for accessing remote files that can use the windows SSPI for our
SSL needs, which comes with the operating system.
Fortunately, libcurl is probably the best library out there, and can be
compiled with SSPI instead of OpenSSL, so we're just going to switch to
libcurl instead. Originally I thought it didn't support SSPI, otherwise
I would have implemented it sooner.
As a side note, this will make it so we'll able to get files from the
internet via plugins, which will be quite useful.
2015-05-23 23:39:39 -07:00
|
|
|
RemoteTextThread *thread = new RemoteTextThread(
|
|
|
|
"https://obsproject.com/obs2_update/basic.json");
|
|
|
|
updateCheckThread = thread;
|
|
|
|
connect(thread, &RemoteTextThread::Result,
|
|
|
|
this, &OBSBasic::updateFileFinished);
|
|
|
|
updateCheckThread->start();
|
2014-10-05 15:32:18 -07:00
|
|
|
#endif
|
2014-07-13 23:56:28 -07:00
|
|
|
}
|
|
|
|
|
2014-07-14 03:48:30 -07:00
|
|
|
#ifdef __APPLE__
|
|
|
|
#define VERSION_ENTRY "mac"
|
2014-07-17 07:03:27 -07:00
|
|
|
#elif _WIN32
|
|
|
|
#define VERSION_ENTRY "windows"
|
2014-07-14 03:48:30 -07:00
|
|
|
#else
|
|
|
|
#define VERSION_ENTRY "other"
|
|
|
|
#endif
|
|
|
|
|
UI: Replace Qt5Network classes with libcurl
The Qt5Network classes seem to only support OpenSSL, and because OpenSSL
isn't available on windows, we would have to distribute it with the
program to get SSL access working. The problem with that is that
OpenSSL is not GPL-compatible, so we cannot distribute OpenSSL with the
program, which means we have to find a better (and preferably superior)
library for accessing remote files that can use the windows SSPI for our
SSL needs, which comes with the operating system.
Fortunately, libcurl is probably the best library out there, and can be
compiled with SSPI instead of OpenSSL, so we're just going to switch to
libcurl instead. Originally I thought it didn't support SSPI, otherwise
I would have implemented it sooner.
As a side note, this will make it so we'll able to get files from the
internet via plugins, which will be quite useful.
2015-05-23 23:39:39 -07:00
|
|
|
void OBSBasic::updateFileFinished(const QString &text, const QString &error)
|
2014-07-13 23:56:28 -07:00
|
|
|
{
|
|
|
|
ui->actionCheckForUpdates->setEnabled(true);
|
|
|
|
|
UI: Replace Qt5Network classes with libcurl
The Qt5Network classes seem to only support OpenSSL, and because OpenSSL
isn't available on windows, we would have to distribute it with the
program to get SSL access working. The problem with that is that
OpenSSL is not GPL-compatible, so we cannot distribute OpenSSL with the
program, which means we have to find a better (and preferably superior)
library for accessing remote files that can use the windows SSPI for our
SSL needs, which comes with the operating system.
Fortunately, libcurl is probably the best library out there, and can be
compiled with SSPI instead of OpenSSL, so we're just going to switch to
libcurl instead. Originally I thought it didn't support SSPI, otherwise
I would have implemented it sooner.
As a side note, this will make it so we'll able to get files from the
internet via plugins, which will be quite useful.
2015-05-23 23:39:39 -07:00
|
|
|
if (text.isEmpty()) {
|
|
|
|
blog(LOG_WARNING, "Update check failed: %s", QT_TO_UTF8(error));
|
2014-07-13 23:56:28 -07:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
UI: Replace Qt5Network classes with libcurl
The Qt5Network classes seem to only support OpenSSL, and because OpenSSL
isn't available on windows, we would have to distribute it with the
program to get SSL access working. The problem with that is that
OpenSSL is not GPL-compatible, so we cannot distribute OpenSSL with the
program, which means we have to find a better (and preferably superior)
library for accessing remote files that can use the windows SSPI for our
SSL needs, which comes with the operating system.
Fortunately, libcurl is probably the best library out there, and can be
compiled with SSPI instead of OpenSSL, so we're just going to switch to
libcurl instead. Originally I thought it didn't support SSPI, otherwise
I would have implemented it sooner.
As a side note, this will make it so we'll able to get files from the
internet via plugins, which will be quite useful.
2015-05-23 23:39:39 -07:00
|
|
|
obs_data_t *returnData = obs_data_create_from_json(QT_TO_UTF8(text));
|
2014-08-25 12:22:58 -07:00
|
|
|
obs_data_t *versionData = obs_data_get_obj(returnData, VERSION_ENTRY);
|
2014-08-05 11:09:29 -07:00
|
|
|
const char *description = obs_data_get_string(returnData,
|
|
|
|
"description");
|
|
|
|
const char *download = obs_data_get_string(versionData, "download");
|
2014-07-13 23:56:28 -07:00
|
|
|
|
|
|
|
if (returnData && versionData && description && download) {
|
2014-08-05 11:09:29 -07:00
|
|
|
long major = obs_data_get_int(versionData, "major");
|
|
|
|
long minor = obs_data_get_int(versionData, "minor");
|
|
|
|
long patch = obs_data_get_int(versionData, "patch");
|
2014-07-13 23:56:28 -07:00
|
|
|
long version = MAKE_SEMANTIC_VERSION(major, minor, patch);
|
|
|
|
|
2015-07-05 23:46:34 -07:00
|
|
|
blog(LOG_INFO, "Update check: last known remote version "
|
|
|
|
"is %ld.%ld.%ld",
|
2014-07-13 23:56:28 -07:00
|
|
|
major, minor, patch);
|
|
|
|
|
|
|
|
if (version > LIBOBS_API_VER) {
|
|
|
|
QString str = QTStr("UpdateAvailable.Text");
|
|
|
|
QMessageBox messageBox(this);
|
|
|
|
|
|
|
|
str = str.arg(QString::number(major),
|
|
|
|
QString::number(minor),
|
|
|
|
QString::number(patch),
|
|
|
|
download);
|
|
|
|
|
|
|
|
messageBox.setWindowTitle(QTStr("UpdateAvailable"));
|
|
|
|
messageBox.setTextFormat(Qt::RichText);
|
|
|
|
messageBox.setText(str);
|
|
|
|
messageBox.setInformativeText(QT_UTF8(description));
|
|
|
|
messageBox.exec();
|
|
|
|
|
|
|
|
long long t = (long long)time(nullptr);
|
|
|
|
config_set_int(App()->GlobalConfig(), "General",
|
|
|
|
"LastUpdateCheck", t);
|
2015-08-21 17:56:37 -07:00
|
|
|
config_save_safe(App()->GlobalConfig(), "tmp", nullptr);
|
2014-07-13 23:56:28 -07:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
blog(LOG_WARNING, "Bad JSON file received from server");
|
|
|
|
}
|
|
|
|
|
|
|
|
obs_data_release(versionData);
|
|
|
|
obs_data_release(returnData);
|
|
|
|
}
|
|
|
|
|
2015-08-28 15:01:39 -07:00
|
|
|
void OBSBasic::DuplicateSelectedScene()
|
|
|
|
{
|
|
|
|
OBSScene curScene = GetCurrentScene();
|
|
|
|
|
|
|
|
if (!curScene)
|
|
|
|
return;
|
|
|
|
|
|
|
|
OBSSource curSceneSource = obs_scene_get_source(curScene);
|
|
|
|
QString format{obs_source_get_name(curSceneSource)};
|
|
|
|
format += " %1";
|
|
|
|
|
|
|
|
int i = 2;
|
|
|
|
QString placeHolderText = format.arg(i);
|
|
|
|
obs_source_t *source = nullptr;
|
|
|
|
while ((source = obs_get_source_by_name(QT_TO_UTF8(placeHolderText)))) {
|
|
|
|
obs_source_release(source);
|
|
|
|
placeHolderText = format.arg(++i);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
string name;
|
|
|
|
bool accepted = NameDialog::AskForName(this,
|
|
|
|
QTStr("Basic.Main.AddSceneDlg.Title"),
|
|
|
|
QTStr("Basic.Main.AddSceneDlg.Text"),
|
|
|
|
name,
|
|
|
|
placeHolderText);
|
|
|
|
if (!accepted)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (name.empty()) {
|
|
|
|
QMessageBox::information(this,
|
|
|
|
QTStr("NoNameEntered.Title"),
|
|
|
|
QTStr("NoNameEntered.Text"));
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
obs_source_t *source = obs_get_source_by_name(name.c_str());
|
|
|
|
if (source) {
|
|
|
|
QMessageBox::information(this,
|
|
|
|
QTStr("NameExists.Title"),
|
|
|
|
QTStr("NameExists.Text"));
|
|
|
|
|
|
|
|
obs_source_release(source);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
obs_scene_t *scene = obs_scene_duplicate(curScene,
|
2016-01-12 17:04:01 -08:00
|
|
|
name.c_str(), OBS_SCENE_DUP_REFS);
|
2015-08-28 15:01:39 -07:00
|
|
|
source = obs_scene_get_source(scene);
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
AddScene(source);
|
|
|
|
SetCurrentScene(source, true);
|
2015-08-28 15:01:39 -07:00
|
|
|
obs_scene_release(scene);
|
2016-08-28 14:24:14 -07:00
|
|
|
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
break;
|
2015-08-28 15:01:39 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-06-30 13:45:58 -07:00
|
|
|
void OBSBasic::RemoveSelectedScene()
|
|
|
|
{
|
|
|
|
OBSScene scene = GetCurrentScene();
|
|
|
|
if (scene) {
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_source_t *source = obs_scene_get_source(scene);
|
2016-08-28 14:24:14 -07:00
|
|
|
if (QueryRemoveSource(source)) {
|
2014-06-30 13:45:58 -07:00
|
|
|
obs_source_remove(source);
|
2016-08-28 14:24:14 -07:00
|
|
|
|
|
|
|
if (api)
|
|
|
|
api->on_event(OBS_FRONTEND_EVENT_SCENE_LIST_CHANGED);
|
|
|
|
}
|
2014-06-30 13:45:58 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::RemoveSelectedSceneItem()
|
|
|
|
{
|
|
|
|
OBSSceneItem item = GetCurrentSceneItem();
|
|
|
|
if (item) {
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_source_t *source = obs_sceneitem_get_source(item);
|
2014-06-30 13:45:58 -07:00
|
|
|
if (QueryRemoveSource(source))
|
2014-06-30 01:13:32 -07:00
|
|
|
obs_sceneitem_remove(item);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-02-19 11:02:54 -08:00
|
|
|
struct ReorderInfo {
|
|
|
|
int idx = 0;
|
|
|
|
OBSBasic *window;
|
|
|
|
|
|
|
|
inline ReorderInfo(OBSBasic *window_) : window(window_) {}
|
|
|
|
};
|
|
|
|
|
|
|
|
void OBSBasic::ReorderSceneItem(obs_sceneitem_t *item, size_t idx)
|
|
|
|
{
|
|
|
|
int count = ui->sources->count();
|
|
|
|
int idx_inv = count - (int)idx - 1;
|
|
|
|
|
|
|
|
for (int i = 0; i < count; i++) {
|
|
|
|
QListWidgetItem *listItem = ui->sources->item(i);
|
2015-06-27 18:21:45 -07:00
|
|
|
OBSSceneItem sceneItem = GetOBSRef<OBSSceneItem>(listItem);
|
2015-02-19 11:02:54 -08:00
|
|
|
|
|
|
|
if (sceneItem == item) {
|
|
|
|
if ((int)idx_inv != i) {
|
|
|
|
bool sel = (ui->sources->currentRow() == i);
|
|
|
|
|
2015-06-27 18:18:40 -07:00
|
|
|
listItem = TakeListItem(ui->sources, i);
|
2015-02-19 11:02:54 -08:00
|
|
|
if (listItem) {
|
|
|
|
ui->sources->insertItem(idx_inv,
|
|
|
|
listItem);
|
2015-03-22 20:51:21 -07:00
|
|
|
SetupVisibilityItem(ui->sources,
|
|
|
|
listItem, item);
|
|
|
|
|
2015-02-19 11:02:54 -08:00
|
|
|
if (sel)
|
|
|
|
ui->sources->setCurrentRow(
|
|
|
|
idx_inv);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::ReorderSources(OBSScene scene)
|
|
|
|
{
|
|
|
|
ReorderInfo info(this);
|
|
|
|
|
2015-06-26 19:00:24 -07:00
|
|
|
if (scene != GetCurrentScene() || ui->sources->IgnoreReorder())
|
2015-02-19 11:02:54 -08:00
|
|
|
return;
|
|
|
|
|
|
|
|
obs_scene_enum_items(scene,
|
|
|
|
[] (obs_scene_t*, obs_sceneitem_t *item, void *p)
|
|
|
|
{
|
|
|
|
ReorderInfo *info =
|
|
|
|
reinterpret_cast<ReorderInfo*>(p);
|
|
|
|
|
|
|
|
info->window->ReorderSceneItem(item,
|
|
|
|
info->idx++);
|
|
|
|
return true;
|
|
|
|
}, &info);
|
2015-06-30 05:49:31 -07:00
|
|
|
|
|
|
|
SaveProject();
|
2015-02-19 11:02:54 -08:00
|
|
|
}
|
|
|
|
|
2014-01-04 12:53:36 -08:00
|
|
|
/* OBS Callbacks */
|
|
|
|
|
2015-02-19 11:02:54 -08:00
|
|
|
void OBSBasic::SceneReordered(void *data, calldata_t *params)
|
|
|
|
{
|
|
|
|
OBSBasic *window = static_cast<OBSBasic*>(data);
|
|
|
|
|
|
|
|
obs_scene_t *scene = (obs_scene_t*)calldata_ptr(params, "scene");
|
|
|
|
|
|
|
|
QMetaObject::invokeMethod(window, "ReorderSources",
|
|
|
|
Q_ARG(OBSScene, OBSScene(scene)));
|
|
|
|
}
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
void OBSBasic::SceneItemAdded(void *data, calldata_t *params)
|
2014-01-04 12:53:36 -08:00
|
|
|
{
|
|
|
|
OBSBasic *window = static_cast<OBSBasic*>(data);
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_sceneitem_t *item = (obs_sceneitem_t*)calldata_ptr(params, "item");
|
2013-12-28 21:29:13 -08:00
|
|
|
|
2014-02-02 16:03:55 -08:00
|
|
|
QMetaObject::invokeMethod(window, "AddSceneItem",
|
|
|
|
Q_ARG(OBSSceneItem, OBSSceneItem(item)));
|
2013-12-28 21:29:13 -08:00
|
|
|
}
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
void OBSBasic::SceneItemRemoved(void *data, calldata_t *params)
|
2013-12-28 04:33:16 -08:00
|
|
|
{
|
2014-01-04 12:53:36 -08:00
|
|
|
OBSBasic *window = static_cast<OBSBasic*>(data);
|
2013-12-28 04:33:16 -08:00
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_sceneitem_t *item = (obs_sceneitem_t*)calldata_ptr(params, "item");
|
2014-01-04 12:53:36 -08:00
|
|
|
|
2014-02-02 16:03:55 -08:00
|
|
|
QMetaObject::invokeMethod(window, "RemoveSceneItem",
|
|
|
|
Q_ARG(OBSSceneItem, OBSSceneItem(item)));
|
2014-01-04 12:53:36 -08:00
|
|
|
}
|
|
|
|
|
2014-10-13 13:14:06 -07:00
|
|
|
void OBSBasic::SceneItemSelected(void *data, calldata_t *params)
|
|
|
|
{
|
|
|
|
OBSBasic *window = static_cast<OBSBasic*>(data);
|
|
|
|
|
|
|
|
obs_scene_t *scene = (obs_scene_t*)calldata_ptr(params, "scene");
|
|
|
|
obs_sceneitem_t *item = (obs_sceneitem_t*)calldata_ptr(params, "item");
|
|
|
|
|
|
|
|
QMetaObject::invokeMethod(window, "SelectSceneItem",
|
|
|
|
Q_ARG(OBSScene, scene), Q_ARG(OBSSceneItem, item),
|
|
|
|
Q_ARG(bool, true));
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::SceneItemDeselected(void *data, calldata_t *params)
|
|
|
|
{
|
|
|
|
OBSBasic *window = static_cast<OBSBasic*>(data);
|
|
|
|
|
|
|
|
obs_scene_t *scene = (obs_scene_t*)calldata_ptr(params, "scene");
|
|
|
|
obs_sceneitem_t *item = (obs_sceneitem_t*)calldata_ptr(params, "item");
|
|
|
|
|
|
|
|
QMetaObject::invokeMethod(window, "SelectSceneItem",
|
|
|
|
Q_ARG(OBSScene, scene), Q_ARG(OBSSceneItem, item),
|
|
|
|
Q_ARG(bool, false));
|
|
|
|
}
|
|
|
|
|
2016-03-04 12:56:09 -08:00
|
|
|
void OBSBasic::SourceLoaded(void *data, obs_source_t *source)
|
2014-01-04 12:53:36 -08:00
|
|
|
{
|
2014-05-10 18:47:48 -07:00
|
|
|
OBSBasic *window = static_cast<OBSBasic*>(data);
|
2013-12-28 04:33:16 -08:00
|
|
|
|
2014-08-04 08:41:15 -07:00
|
|
|
if (obs_scene_from_source(source) != NULL)
|
2014-05-10 18:47:48 -07:00
|
|
|
QMetaObject::invokeMethod(window,
|
2014-02-02 16:03:55 -08:00
|
|
|
"AddScene",
|
|
|
|
Q_ARG(OBSSource, OBSSource(source)));
|
2013-12-28 04:33:16 -08:00
|
|
|
}
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
void OBSBasic::SourceRemoved(void *data, calldata_t *params)
|
2013-12-28 04:33:16 -08:00
|
|
|
{
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_source_t *source = (obs_source_t*)calldata_ptr(params, "source");
|
2013-12-28 04:33:16 -08:00
|
|
|
|
2014-08-04 08:41:15 -07:00
|
|
|
if (obs_scene_from_source(source) != NULL)
|
2014-02-02 16:03:55 -08:00
|
|
|
QMetaObject::invokeMethod(static_cast<OBSBasic*>(data),
|
|
|
|
"RemoveScene",
|
|
|
|
Q_ARG(OBSSource, OBSSource(source)));
|
2013-12-28 04:33:16 -08:00
|
|
|
}
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
void OBSBasic::SourceActivated(void *data, calldata_t *params)
|
2014-05-03 22:54:38 -07:00
|
|
|
{
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_source_t *source = (obs_source_t*)calldata_ptr(params, "source");
|
2014-05-03 22:54:38 -07:00
|
|
|
uint32_t flags = obs_source_get_output_flags(source);
|
|
|
|
|
|
|
|
if (flags & OBS_SOURCE_AUDIO)
|
|
|
|
QMetaObject::invokeMethod(static_cast<OBSBasic*>(data),
|
|
|
|
"ActivateAudioSource",
|
|
|
|
Q_ARG(OBSSource, OBSSource(source)));
|
|
|
|
}
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
void OBSBasic::SourceDeactivated(void *data, calldata_t *params)
|
2014-05-03 22:54:38 -07:00
|
|
|
{
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_source_t *source = (obs_source_t*)calldata_ptr(params, "source");
|
2014-05-03 22:54:38 -07:00
|
|
|
uint32_t flags = obs_source_get_output_flags(source);
|
|
|
|
|
|
|
|
if (flags & OBS_SOURCE_AUDIO)
|
|
|
|
QMetaObject::invokeMethod(static_cast<OBSBasic*>(data),
|
|
|
|
"DeactivateAudioSource",
|
|
|
|
Q_ARG(OBSSource, OBSSource(source)));
|
|
|
|
}
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
void OBSBasic::SourceRenamed(void *data, calldata_t *params)
|
2014-06-30 00:06:01 -07:00
|
|
|
{
|
|
|
|
const char *newName = calldata_string(params, "new_name");
|
|
|
|
const char *prevName = calldata_string(params, "prev_name");
|
|
|
|
|
|
|
|
QMetaObject::invokeMethod(static_cast<OBSBasic*>(data),
|
|
|
|
"RenameSources",
|
|
|
|
Q_ARG(QString, QT_UTF8(newName)),
|
|
|
|
Q_ARG(QString, QT_UTF8(prevName)));
|
2016-08-05 18:43:04 -07:00
|
|
|
|
|
|
|
blog(LOG_INFO, "Source '%s' renamed to '%s'", prevName, newName);
|
2014-06-30 00:06:01 -07:00
|
|
|
}
|
|
|
|
|
2014-06-15 19:48:02 -07:00
|
|
|
void OBSBasic::DrawBackdrop(float cx, float cy)
|
|
|
|
{
|
|
|
|
if (!box)
|
|
|
|
return;
|
|
|
|
|
2015-10-16 07:31:52 -07:00
|
|
|
gs_effect_t *solid = obs_get_base_effect(OBS_EFFECT_SOLID);
|
2014-09-25 17:44:05 -07:00
|
|
|
gs_eparam_t *color = gs_effect_get_param_by_name(solid, "color");
|
|
|
|
gs_technique_t *tech = gs_effect_get_technique(solid, "Solid");
|
2014-06-15 19:48:02 -07:00
|
|
|
|
|
|
|
vec4 colorVal;
|
|
|
|
vec4_set(&colorVal, 0.0f, 0.0f, 0.0f, 1.0f);
|
2014-08-07 23:42:07 -07:00
|
|
|
gs_effect_set_vec4(color, &colorVal);
|
2014-06-15 19:48:02 -07:00
|
|
|
|
2014-08-07 23:42:07 -07:00
|
|
|
gs_technique_begin(tech);
|
|
|
|
gs_technique_begin_pass(tech, 0);
|
2014-06-15 19:48:02 -07:00
|
|
|
gs_matrix_push();
|
|
|
|
gs_matrix_identity();
|
|
|
|
gs_matrix_scale3f(float(cx), float(cy), 1.0f);
|
|
|
|
|
|
|
|
gs_load_vertexbuffer(box);
|
|
|
|
gs_draw(GS_TRISTRIP, 0, 0);
|
|
|
|
|
|
|
|
gs_matrix_pop();
|
2014-08-07 23:42:07 -07:00
|
|
|
gs_technique_end_pass(tech);
|
|
|
|
gs_technique_end(tech);
|
2014-06-15 19:48:02 -07:00
|
|
|
|
|
|
|
gs_load_vertexbuffer(nullptr);
|
|
|
|
}
|
|
|
|
|
2014-02-13 07:58:31 -08:00
|
|
|
void OBSBasic::RenderMain(void *data, uint32_t cx, uint32_t cy)
|
|
|
|
{
|
2014-03-07 09:19:03 -08:00
|
|
|
OBSBasic *window = static_cast<OBSBasic*>(data);
|
2014-04-22 11:24:05 -07:00
|
|
|
obs_video_info ovi;
|
|
|
|
|
|
|
|
obs_get_video_info(&ovi);
|
|
|
|
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
window->previewCX = int(window->previewScale * float(ovi.base_width));
|
|
|
|
window->previewCY = int(window->previewScale * float(ovi.base_height));
|
2014-04-22 11:24:05 -07:00
|
|
|
|
|
|
|
gs_viewport_push();
|
|
|
|
gs_projection_push();
|
2014-06-15 19:48:02 -07:00
|
|
|
|
|
|
|
/* --------------------------------------- */
|
|
|
|
|
2014-04-22 11:24:05 -07:00
|
|
|
gs_ortho(0.0f, float(ovi.base_width), 0.0f, float(ovi.base_height),
|
|
|
|
-100.0f, 100.0f);
|
2014-08-07 23:42:07 -07:00
|
|
|
gs_set_viewport(window->previewX, window->previewY,
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
window->previewCX, window->previewCY);
|
2014-04-22 11:24:05 -07:00
|
|
|
|
2014-06-15 19:48:02 -07:00
|
|
|
window->DrawBackdrop(float(ovi.base_width), float(ovi.base_height));
|
|
|
|
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
if (window->IsPreviewProgramMode()) {
|
|
|
|
OBSScene scene = window->GetCurrentScene();
|
|
|
|
obs_source_t *source = obs_scene_get_source(scene);
|
|
|
|
if (source)
|
|
|
|
obs_source_video_render(source);
|
|
|
|
} else {
|
|
|
|
obs_render_main_view();
|
|
|
|
}
|
2014-06-15 19:48:02 -07:00
|
|
|
gs_load_vertexbuffer(nullptr);
|
2014-04-22 11:24:05 -07:00
|
|
|
|
2014-06-15 19:48:02 -07:00
|
|
|
/* --------------------------------------- */
|
|
|
|
|
2014-07-15 17:01:59 -07:00
|
|
|
QSize previewSize = GetPixelSize(window->ui->preview);
|
|
|
|
float right = float(previewSize.width()) - window->previewX;
|
|
|
|
float bottom = float(previewSize.height()) - window->previewY;
|
2014-06-15 19:48:02 -07:00
|
|
|
|
|
|
|
gs_ortho(-window->previewX, right,
|
|
|
|
-window->previewY, bottom,
|
|
|
|
-100.0f, 100.0f);
|
2014-08-07 23:42:07 -07:00
|
|
|
gs_reset_viewport();
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
|
|
|
|
window->ui->preview->DrawSceneEditing();
|
|
|
|
|
2014-06-15 19:48:02 -07:00
|
|
|
/* --------------------------------------- */
|
|
|
|
|
2014-04-22 11:24:05 -07:00
|
|
|
gs_projection_pop();
|
|
|
|
gs_viewport_pop();
|
2014-02-14 14:13:36 -08:00
|
|
|
|
|
|
|
UNUSED_PARAMETER(cx);
|
|
|
|
UNUSED_PARAMETER(cy);
|
2014-02-13 07:58:31 -08:00
|
|
|
}
|
|
|
|
|
2014-01-04 12:53:36 -08:00
|
|
|
/* Main class functions */
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_service_t *OBSBasic::GetService()
|
obs-studio UI: Implement stream settings UI
- Updated the services API so that it links up with an output and
the output gets data from that service rather than via settings.
This allows the service context to have control over how an output is
used, and makes it so that the URL/key/etc isn't necessarily some
static setting.
Also, if the service is attached to an output, it will stick around
until the output is destroyed.
- The settings interface has been updated so that it can allow the
usage of service plugins. What this means is that now you can create
a service plugin that can control aspects of the stream, and it
allows each service to create their own user interface if they create
a service plugin module.
- Testing out saving of current service information. Saves/loads from
JSON in to obs_data_t, seems to be working quite nicely, and the
service object information is saved/preserved on exit, and loaded
again on startup.
- I agonized over the settings user interface for days, and eventually
I just decided that the only way that users weren't going to be
fumbling over options was to split up the settings in to simple/basic
output, pre-configured, and then advanced for advanced use (such as
multiple outputs or services, which I'll implement later).
This was particularly painful to really design right, I wanted more
features and wanted to include everything in one interface but
ultimately just realized from experience that users are just not
technically knowledgable about it and will end up fumbling with the
settings rather than getting things done.
Basically, what this means is that casual users only have to enter in
about 3 things to configure their stream: Stream key, audio bitrate,
and video bitrate. I am really happy with this interface for those
types of users, but it definitely won't be sufficient for advanced
usage or for custom outputs, so that stuff will have to be separated.
- Improved the JSON usage for the 'common streaming services' context,
I realized that JSON arrays are there to ensure sorting, while
forgetting that general items are optimized for hashing. So
basically I'm just using arrays now to sort items in it.
2014-04-24 01:49:07 -07:00
|
|
|
{
|
2015-05-03 17:07:43 -07:00
|
|
|
if (!service) {
|
2014-11-01 13:41:17 -07:00
|
|
|
service = obs_service_create("rtmp_common", NULL, NULL,
|
|
|
|
nullptr);
|
2015-05-03 17:07:43 -07:00
|
|
|
obs_service_release(service);
|
|
|
|
}
|
obs-studio UI: Implement stream settings UI
- Updated the services API so that it links up with an output and
the output gets data from that service rather than via settings.
This allows the service context to have control over how an output is
used, and makes it so that the URL/key/etc isn't necessarily some
static setting.
Also, if the service is attached to an output, it will stick around
until the output is destroyed.
- The settings interface has been updated so that it can allow the
usage of service plugins. What this means is that now you can create
a service plugin that can control aspects of the stream, and it
allows each service to create their own user interface if they create
a service plugin module.
- Testing out saving of current service information. Saves/loads from
JSON in to obs_data_t, seems to be working quite nicely, and the
service object information is saved/preserved on exit, and loaded
again on startup.
- I agonized over the settings user interface for days, and eventually
I just decided that the only way that users weren't going to be
fumbling over options was to split up the settings in to simple/basic
output, pre-configured, and then advanced for advanced use (such as
multiple outputs or services, which I'll implement later).
This was particularly painful to really design right, I wanted more
features and wanted to include everything in one interface but
ultimately just realized from experience that users are just not
technically knowledgable about it and will end up fumbling with the
settings rather than getting things done.
Basically, what this means is that casual users only have to enter in
about 3 things to configure their stream: Stream key, audio bitrate,
and video bitrate. I am really happy with this interface for those
types of users, but it definitely won't be sufficient for advanced
usage or for custom outputs, so that stuff will have to be separated.
- Improved the JSON usage for the 'common streaming services' context,
I realized that JSON arrays are there to ensure sorting, while
forgetting that general items are optimized for hashing. So
basically I'm just using arrays now to sort items in it.
2014-04-24 01:49:07 -07:00
|
|
|
return service;
|
|
|
|
}
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
void OBSBasic::SetService(obs_service_t *newService)
|
obs-studio UI: Implement stream settings UI
- Updated the services API so that it links up with an output and
the output gets data from that service rather than via settings.
This allows the service context to have control over how an output is
used, and makes it so that the URL/key/etc isn't necessarily some
static setting.
Also, if the service is attached to an output, it will stick around
until the output is destroyed.
- The settings interface has been updated so that it can allow the
usage of service plugins. What this means is that now you can create
a service plugin that can control aspects of the stream, and it
allows each service to create their own user interface if they create
a service plugin module.
- Testing out saving of current service information. Saves/loads from
JSON in to obs_data_t, seems to be working quite nicely, and the
service object information is saved/preserved on exit, and loaded
again on startup.
- I agonized over the settings user interface for days, and eventually
I just decided that the only way that users weren't going to be
fumbling over options was to split up the settings in to simple/basic
output, pre-configured, and then advanced for advanced use (such as
multiple outputs or services, which I'll implement later).
This was particularly painful to really design right, I wanted more
features and wanted to include everything in one interface but
ultimately just realized from experience that users are just not
technically knowledgable about it and will end up fumbling with the
settings rather than getting things done.
Basically, what this means is that casual users only have to enter in
about 3 things to configure their stream: Stream key, audio bitrate,
and video bitrate. I am really happy with this interface for those
types of users, but it definitely won't be sufficient for advanced
usage or for custom outputs, so that stuff will have to be separated.
- Improved the JSON usage for the 'common streaming services' context,
I realized that JSON arrays are there to ensure sorting, while
forgetting that general items are optimized for hashing. So
basically I'm just using arrays now to sort items in it.
2014-04-24 01:49:07 -07:00
|
|
|
{
|
2015-05-03 17:07:43 -07:00
|
|
|
if (newService)
|
obs-studio UI: Implement stream settings UI
- Updated the services API so that it links up with an output and
the output gets data from that service rather than via settings.
This allows the service context to have control over how an output is
used, and makes it so that the URL/key/etc isn't necessarily some
static setting.
Also, if the service is attached to an output, it will stick around
until the output is destroyed.
- The settings interface has been updated so that it can allow the
usage of service plugins. What this means is that now you can create
a service plugin that can control aspects of the stream, and it
allows each service to create their own user interface if they create
a service plugin module.
- Testing out saving of current service information. Saves/loads from
JSON in to obs_data_t, seems to be working quite nicely, and the
service object information is saved/preserved on exit, and loaded
again on startup.
- I agonized over the settings user interface for days, and eventually
I just decided that the only way that users weren't going to be
fumbling over options was to split up the settings in to simple/basic
output, pre-configured, and then advanced for advanced use (such as
multiple outputs or services, which I'll implement later).
This was particularly painful to really design right, I wanted more
features and wanted to include everything in one interface but
ultimately just realized from experience that users are just not
technically knowledgable about it and will end up fumbling with the
settings rather than getting things done.
Basically, what this means is that casual users only have to enter in
about 3 things to configure their stream: Stream key, audio bitrate,
and video bitrate. I am really happy with this interface for those
types of users, but it definitely won't be sufficient for advanced
usage or for custom outputs, so that stuff will have to be separated.
- Improved the JSON usage for the 'common streaming services' context,
I realized that JSON arrays are there to ensure sorting, while
forgetting that general items are optimized for hashing. So
basically I'm just using arrays now to sort items in it.
2014-04-24 01:49:07 -07:00
|
|
|
service = newService;
|
|
|
|
}
|
|
|
|
|
2016-07-01 10:27:27 -07:00
|
|
|
bool OBSBasic::StreamingActive() const
|
2015-02-07 08:09:57 -08:00
|
|
|
{
|
|
|
|
if (!outputHandler)
|
|
|
|
return false;
|
|
|
|
return outputHandler->StreamingActive();
|
|
|
|
}
|
|
|
|
|
2016-07-01 10:27:27 -07:00
|
|
|
bool OBSBasic::Active() const
|
|
|
|
{
|
|
|
|
if (!outputHandler)
|
|
|
|
return false;
|
|
|
|
return outputHandler->Active();
|
|
|
|
}
|
|
|
|
|
2014-07-20 17:49:54 -07:00
|
|
|
#ifdef _WIN32
|
|
|
|
#define IS_WIN32 1
|
|
|
|
#else
|
|
|
|
#define IS_WIN32 0
|
|
|
|
#endif
|
|
|
|
|
2014-07-20 17:49:09 -07:00
|
|
|
static inline int AttemptToResetVideo(struct obs_video_info *ovi)
|
|
|
|
{
|
2015-08-02 00:02:58 -07:00
|
|
|
return obs_reset_video(ovi);
|
2014-07-20 17:49:09 -07:00
|
|
|
}
|
|
|
|
|
2014-12-15 01:08:46 -08:00
|
|
|
static inline enum obs_scale_type GetScaleType(ConfigFile &basicConfig)
|
|
|
|
{
|
|
|
|
const char *scaleTypeStr = config_get_string(basicConfig,
|
|
|
|
"Video", "ScaleType");
|
|
|
|
|
|
|
|
if (astrcmpi(scaleTypeStr, "bilinear") == 0)
|
|
|
|
return OBS_SCALE_BILINEAR;
|
|
|
|
else if (astrcmpi(scaleTypeStr, "lanczos") == 0)
|
|
|
|
return OBS_SCALE_LANCZOS;
|
|
|
|
else
|
|
|
|
return OBS_SCALE_BICUBIC;
|
|
|
|
}
|
|
|
|
|
2015-01-09 20:16:30 -08:00
|
|
|
static inline enum video_format GetVideoFormatFromName(const char *name)
|
|
|
|
{
|
|
|
|
if (astrcmpi(name, "I420") == 0)
|
|
|
|
return VIDEO_FORMAT_I420;
|
|
|
|
else if (astrcmpi(name, "NV12") == 0)
|
|
|
|
return VIDEO_FORMAT_NV12;
|
2015-04-17 02:46:48 -07:00
|
|
|
else if (astrcmpi(name, "I444") == 0)
|
|
|
|
return VIDEO_FORMAT_I444;
|
2015-01-09 20:16:30 -08:00
|
|
|
#if 0 //currently unsupported
|
|
|
|
else if (astrcmpi(name, "YVYU") == 0)
|
|
|
|
return VIDEO_FORMAT_YVYU;
|
|
|
|
else if (astrcmpi(name, "YUY2") == 0)
|
|
|
|
return VIDEO_FORMAT_YUY2;
|
|
|
|
else if (astrcmpi(name, "UYVY") == 0)
|
|
|
|
return VIDEO_FORMAT_UYVY;
|
|
|
|
#endif
|
|
|
|
else
|
2015-04-15 18:42:06 -07:00
|
|
|
return VIDEO_FORMAT_RGBA;
|
2015-01-09 20:16:30 -08:00
|
|
|
}
|
|
|
|
|
2014-07-20 17:40:57 -07:00
|
|
|
int OBSBasic::ResetVideo()
|
2013-12-22 22:40:07 -08:00
|
|
|
{
|
2015-07-10 23:04:12 -07:00
|
|
|
ProfileScope("OBSBasic::ResetVideo");
|
|
|
|
|
2013-12-22 22:40:07 -08:00
|
|
|
struct obs_video_info ovi;
|
2014-07-20 17:40:57 -07:00
|
|
|
int ret;
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
|
2014-03-06 20:08:12 -08:00
|
|
|
GetConfigFPS(ovi.fps_num, ovi.fps_den);
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
|
2015-01-09 20:16:30 -08:00
|
|
|
const char *colorFormat = config_get_string(basicConfig, "Video",
|
|
|
|
"ColorFormat");
|
|
|
|
const char *colorSpace = config_get_string(basicConfig, "Video",
|
|
|
|
"ColorSpace");
|
|
|
|
const char *colorRange = config_get_string(basicConfig, "Video",
|
|
|
|
"ColorRange");
|
|
|
|
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
ovi.graphics_module = App()->GetRenderModule();
|
2014-03-06 20:08:12 -08:00
|
|
|
ovi.base_width = (uint32_t)config_get_uint(basicConfig,
|
2013-12-22 22:40:07 -08:00
|
|
|
"Video", "BaseCX");
|
2014-03-06 20:08:12 -08:00
|
|
|
ovi.base_height = (uint32_t)config_get_uint(basicConfig,
|
2013-12-22 22:40:07 -08:00
|
|
|
"Video", "BaseCY");
|
2014-03-06 20:08:12 -08:00
|
|
|
ovi.output_width = (uint32_t)config_get_uint(basicConfig,
|
2013-12-22 22:40:07 -08:00
|
|
|
"Video", "OutputCX");
|
2014-03-06 20:08:12 -08:00
|
|
|
ovi.output_height = (uint32_t)config_get_uint(basicConfig,
|
2013-12-22 22:40:07 -08:00
|
|
|
"Video", "OutputCY");
|
2015-01-09 20:16:30 -08:00
|
|
|
ovi.output_format = GetVideoFormatFromName(colorFormat);
|
|
|
|
ovi.colorspace = astrcmpi(colorSpace, "601") == 0 ?
|
|
|
|
VIDEO_CS_601 : VIDEO_CS_709;
|
|
|
|
ovi.range = astrcmpi(colorRange, "Full") == 0 ?
|
|
|
|
VIDEO_RANGE_FULL : VIDEO_RANGE_PARTIAL;
|
2014-02-16 18:28:21 -08:00
|
|
|
ovi.adapter = 0;
|
|
|
|
ovi.gpu_conversion = true;
|
2014-12-15 01:08:46 -08:00
|
|
|
ovi.scale_type = GetScaleType(basicConfig);
|
2014-01-09 17:51:51 -08:00
|
|
|
|
2016-02-04 14:42:46 -08:00
|
|
|
if (ovi.base_width == 0 || ovi.base_height == 0) {
|
|
|
|
ovi.base_width = 1920;
|
|
|
|
ovi.base_height = 1080;
|
|
|
|
config_set_uint(basicConfig, "Video", "BaseCX", 1920);
|
|
|
|
config_set_uint(basicConfig, "Video", "BaseCY", 1080);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ovi.output_width == 0 || ovi.output_height == 0) {
|
|
|
|
ovi.output_width = ovi.base_width;
|
|
|
|
ovi.output_height = ovi.base_height;
|
|
|
|
config_set_uint(basicConfig, "Video", "OutputCX",
|
|
|
|
ovi.base_width);
|
|
|
|
config_set_uint(basicConfig, "Video", "OutputCY",
|
|
|
|
ovi.base_height);
|
|
|
|
}
|
|
|
|
|
2014-07-20 17:49:09 -07:00
|
|
|
ret = AttemptToResetVideo(&ovi);
|
2014-07-20 17:49:54 -07:00
|
|
|
if (IS_WIN32 && ret != OBS_VIDEO_SUCCESS) {
|
|
|
|
/* Try OpenGL if DirectX fails on windows */
|
2015-01-09 11:19:22 -08:00
|
|
|
if (astrcmpi(ovi.graphics_module, DL_OPENGL) != 0) {
|
2014-10-14 09:07:49 -07:00
|
|
|
blog(LOG_WARNING, "Failed to initialize obs video (%d) "
|
|
|
|
"with graphics_module='%s', retrying "
|
|
|
|
"with graphics_module='%s'",
|
|
|
|
ret, ovi.graphics_module,
|
2015-01-09 11:19:22 -08:00
|
|
|
DL_OPENGL);
|
|
|
|
ovi.graphics_module = DL_OPENGL;
|
2014-07-20 17:49:54 -07:00
|
|
|
ret = AttemptToResetVideo(&ovi);
|
|
|
|
}
|
2015-08-08 00:55:46 -07:00
|
|
|
} else if (ret == OBS_VIDEO_SUCCESS) {
|
|
|
|
ResizePreview(ovi.base_width, ovi.base_height);
|
2016-01-30 16:59:22 -08:00
|
|
|
if (program)
|
|
|
|
ResizeProgram(ovi.base_width, ovi.base_height);
|
2014-07-20 17:49:54 -07:00
|
|
|
}
|
|
|
|
|
2014-07-20 17:40:57 -07:00
|
|
|
return ret;
|
2014-01-09 18:08:20 -08:00
|
|
|
}
|
2013-12-31 03:02:07 -08:00
|
|
|
|
2014-02-22 19:14:19 -08:00
|
|
|
bool OBSBasic::ResetAudio()
|
2014-01-09 18:08:20 -08:00
|
|
|
{
|
2015-07-10 23:04:12 -07:00
|
|
|
ProfileScope("OBSBasic::ResetAudio");
|
|
|
|
|
2015-03-07 04:47:12 -08:00
|
|
|
struct obs_audio_info ai;
|
2014-03-06 20:08:12 -08:00
|
|
|
ai.samples_per_sec = config_get_uint(basicConfig, "Audio",
|
2014-02-23 15:27:19 -08:00
|
|
|
"SampleRate");
|
|
|
|
|
2014-03-06 20:08:12 -08:00
|
|
|
const char *channelSetupStr = config_get_string(basicConfig,
|
2014-02-23 15:27:19 -08:00
|
|
|
"Audio", "ChannelSetup");
|
|
|
|
|
|
|
|
if (strcmp(channelSetupStr, "Mono") == 0)
|
|
|
|
ai.speakers = SPEAKERS_MONO;
|
|
|
|
else
|
|
|
|
ai.speakers = SPEAKERS_STEREO;
|
|
|
|
|
2014-01-09 18:08:20 -08:00
|
|
|
return obs_reset_audio(&ai);
|
2013-12-22 22:40:07 -08:00
|
|
|
}
|
|
|
|
|
2015-06-23 18:47:22 -07:00
|
|
|
void OBSBasic::ResetAudioDevice(const char *sourceId, const char *deviceId,
|
2014-05-12 15:30:36 -07:00
|
|
|
const char *deviceDesc, int channel)
|
2014-03-07 16:03:34 -08:00
|
|
|
{
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_source_t *source;
|
|
|
|
obs_data_t *settings;
|
2014-03-07 16:03:34 -08:00
|
|
|
bool same = false;
|
|
|
|
|
|
|
|
source = obs_get_output_source(channel);
|
|
|
|
if (source) {
|
2014-08-04 08:41:15 -07:00
|
|
|
settings = obs_source_get_settings(source);
|
2014-08-05 11:09:29 -07:00
|
|
|
const char *curId = obs_data_get_string(settings, "device_id");
|
2014-03-07 16:03:34 -08:00
|
|
|
|
|
|
|
same = (strcmp(curId, deviceId) == 0);
|
|
|
|
|
|
|
|
obs_data_release(settings);
|
|
|
|
obs_source_release(source);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!same)
|
|
|
|
obs_set_output_source(channel, nullptr);
|
|
|
|
|
|
|
|
if (!same && strcmp(deviceId, "disabled") != 0) {
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_data_t *settings = obs_data_create();
|
2014-08-05 11:09:29 -07:00
|
|
|
obs_data_set_string(settings, "device_id", deviceId);
|
2015-12-29 15:25:45 -08:00
|
|
|
source = obs_source_create(sourceId, deviceDesc, settings,
|
|
|
|
nullptr);
|
2014-03-07 16:03:34 -08:00
|
|
|
obs_data_release(settings);
|
|
|
|
|
|
|
|
obs_set_output_source(channel, source);
|
|
|
|
obs_source_release(source);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-12-31 03:02:07 -08:00
|
|
|
void OBSBasic::ResizePreview(uint32_t cx, uint32_t cy)
|
2013-12-06 05:39:19 -08:00
|
|
|
{
|
2014-01-23 16:00:42 -08:00
|
|
|
QSize targetSize;
|
2016-11-05 09:48:46 -07:00
|
|
|
ScalingMode scalingMode;
|
|
|
|
obs_video_info ovi;
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
|
2013-12-06 08:16:33 -08:00
|
|
|
/* resize preview panel to fix to the top section of the window */
|
2014-04-16 11:28:02 -07:00
|
|
|
targetSize = GetPixelSize(ui->preview);
|
2016-11-05 09:48:46 -07:00
|
|
|
|
|
|
|
scalingMode = ui->preview->GetScalingMode();
|
|
|
|
obs_get_video_info(&ovi);
|
|
|
|
|
|
|
|
if (scalingMode == ScalingMode::Canvas) {
|
|
|
|
previewScale = 1.0f;
|
|
|
|
GetCenterPosFromFixedScale(int(cx), int(cy),
|
|
|
|
targetSize.width() - PREVIEW_EDGE_SIZE * 2,
|
|
|
|
targetSize.height() - PREVIEW_EDGE_SIZE * 2,
|
|
|
|
previewX, previewY, previewScale);
|
|
|
|
previewX += ui->preview->ScrollX();
|
|
|
|
previewY += ui->preview->ScrollY();
|
|
|
|
|
|
|
|
} else if (scalingMode == ScalingMode::Output) {
|
|
|
|
previewScale = float(ovi.output_width) / float(ovi.base_width);
|
|
|
|
GetCenterPosFromFixedScale(int(cx), int(cy),
|
|
|
|
targetSize.width() - PREVIEW_EDGE_SIZE * 2,
|
|
|
|
targetSize.height() - PREVIEW_EDGE_SIZE * 2,
|
|
|
|
previewX, previewY, previewScale);
|
|
|
|
previewX += ui->preview->ScrollX();
|
|
|
|
previewY += ui->preview->ScrollY();
|
|
|
|
|
|
|
|
} else {
|
|
|
|
GetScaleAndCenterPos(int(cx), int(cy),
|
|
|
|
targetSize.width() - PREVIEW_EDGE_SIZE * 2,
|
|
|
|
targetSize.height() - PREVIEW_EDGE_SIZE * 2,
|
|
|
|
previewX, previewY, previewScale);
|
|
|
|
}
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
|
2014-06-15 19:48:02 -07:00
|
|
|
previewX += float(PREVIEW_EDGE_SIZE);
|
|
|
|
previewY += float(PREVIEW_EDGE_SIZE);
|
2013-12-31 03:02:07 -08:00
|
|
|
}
|
|
|
|
|
2015-07-02 16:12:47 -07:00
|
|
|
void OBSBasic::CloseDialogs()
|
|
|
|
{
|
|
|
|
QList<QDialog*> childDialogs = this->findChildren<QDialog *>();
|
|
|
|
if (!childDialogs.isEmpty()) {
|
|
|
|
for (int i = 0; i < childDialogs.size(); ++i) {
|
|
|
|
childDialogs.at(i)->close();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for (QPointer<QWidget> &projector : projectors) {
|
|
|
|
delete projector;
|
|
|
|
projector.clear();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-01-25 00:39:18 -08:00
|
|
|
void OBSBasic::EnumDialogs()
|
|
|
|
{
|
|
|
|
visDialogs.clear();
|
|
|
|
modalDialogs.clear();
|
|
|
|
visMsgBoxes.clear();
|
|
|
|
|
|
|
|
/* fill list of Visible dialogs and Modal dialogs */
|
|
|
|
QList<QDialog*> dialogs = findChildren<QDialog*>();
|
|
|
|
for (QDialog *dialog : dialogs) {
|
|
|
|
if (dialog->isVisible())
|
|
|
|
visDialogs.append(dialog);
|
|
|
|
if (dialog->isModal())
|
|
|
|
modalDialogs.append(dialog);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* fill list of Visible message boxes */
|
|
|
|
QList<QMessageBox*> msgBoxes = findChildren<QMessageBox*>();
|
|
|
|
for (QMessageBox *msgbox : msgBoxes) {
|
|
|
|
if (msgbox->isVisible())
|
|
|
|
visMsgBoxes.append(msgbox);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-07-02 16:12:47 -07:00
|
|
|
void OBSBasic::ClearSceneData()
|
|
|
|
{
|
2015-06-30 05:49:31 -07:00
|
|
|
disableSaving++;
|
|
|
|
|
2015-07-02 16:12:47 -07:00
|
|
|
CloseDialogs();
|
|
|
|
|
|
|
|
ClearVolumeControls();
|
|
|
|
ClearListItems(ui->scenes);
|
|
|
|
ClearListItems(ui->sources);
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
ClearQuickTransitions();
|
|
|
|
ui->transitions->clear();
|
2015-07-02 16:12:47 -07:00
|
|
|
|
|
|
|
obs_set_output_source(0, nullptr);
|
|
|
|
obs_set_output_source(1, nullptr);
|
|
|
|
obs_set_output_source(2, nullptr);
|
|
|
|
obs_set_output_source(3, nullptr);
|
|
|
|
obs_set_output_source(4, nullptr);
|
|
|
|
obs_set_output_source(5, nullptr);
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
lastScene = nullptr;
|
|
|
|
swapScene = nullptr;
|
|
|
|
programScene = nullptr;
|
2015-07-02 16:12:47 -07:00
|
|
|
|
|
|
|
auto cb = [](void *unused, obs_source_t *source)
|
|
|
|
{
|
|
|
|
obs_source_remove(source);
|
|
|
|
UNUSED_PARAMETER(unused);
|
|
|
|
return true;
|
|
|
|
};
|
|
|
|
|
|
|
|
obs_enum_sources(cb, nullptr);
|
|
|
|
|
2015-06-30 05:49:31 -07:00
|
|
|
disableSaving--;
|
2015-07-05 23:39:05 -07:00
|
|
|
|
|
|
|
blog(LOG_INFO, "All scene data cleared");
|
|
|
|
blog(LOG_INFO, "------------------------------------------------");
|
2015-07-02 16:12:47 -07:00
|
|
|
}
|
|
|
|
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
void OBSBasic::closeEvent(QCloseEvent *event)
|
2013-12-31 03:02:07 -08:00
|
|
|
{
|
2016-09-28 01:56:10 -07:00
|
|
|
if (isVisible())
|
|
|
|
config_set_string(App()->GlobalConfig(),
|
|
|
|
"BasicWindow", "geometry",
|
|
|
|
saveGeometry().toBase64().constData());
|
|
|
|
|
2015-02-07 03:39:16 -08:00
|
|
|
if (outputHandler && outputHandler->Active()) {
|
2016-08-13 07:36:17 -07:00
|
|
|
SetShowing(true);
|
|
|
|
|
2015-02-07 03:39:16 -08:00
|
|
|
QMessageBox::StandardButton button = QMessageBox::question(
|
|
|
|
this, QTStr("ConfirmExit.Title"),
|
|
|
|
QTStr("ConfirmExit.Text"));
|
|
|
|
|
|
|
|
if (button == QMessageBox::No) {
|
|
|
|
event->ignore();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-04-17 08:18:51 -07:00
|
|
|
QWidget::closeEvent(event);
|
|
|
|
if (!event->isAccepted())
|
|
|
|
return;
|
|
|
|
|
2016-08-21 11:29:56 -07:00
|
|
|
blog(LOG_INFO, SHUTDOWN_SEPARATOR);
|
|
|
|
|
UI: Replace Qt5Network classes with libcurl
The Qt5Network classes seem to only support OpenSSL, and because OpenSSL
isn't available on windows, we would have to distribute it with the
program to get SSL access working. The problem with that is that
OpenSSL is not GPL-compatible, so we cannot distribute OpenSSL with the
program, which means we have to find a better (and preferably superior)
library for accessing remote files that can use the windows SSPI for our
SSL needs, which comes with the operating system.
Fortunately, libcurl is probably the best library out there, and can be
compiled with SSPI instead of OpenSSL, so we're just going to switch to
libcurl instead. Originally I thought it didn't support SSPI, otherwise
I would have implemented it sooner.
As a side note, this will make it so we'll able to get files from the
internet via plugins, which will be quite useful.
2015-05-23 23:39:39 -07:00
|
|
|
if (updateCheckThread)
|
|
|
|
updateCheckThread->wait();
|
|
|
|
if (logUploadThread)
|
|
|
|
logUploadThread->wait();
|
|
|
|
|
2015-06-27 00:29:17 -07:00
|
|
|
signalHandlers.clear();
|
|
|
|
|
2015-07-09 10:51:22 -07:00
|
|
|
SaveProjectNow();
|
2016-08-28 14:24:14 -07:00
|
|
|
|
|
|
|
if (api)
|
|
|
|
api->on_event(OBS_FRONTEND_EVENT_EXIT);
|
|
|
|
|
2015-06-30 05:49:31 -07:00
|
|
|
disableSaving++;
|
2015-03-18 07:02:58 -07:00
|
|
|
|
2015-07-02 16:12:47 -07:00
|
|
|
/* Clear all scene data (dialogs, widgets, widget sub-items, scenes,
|
|
|
|
* sources, etc) so that all references are released before shutdown */
|
|
|
|
ClearSceneData();
|
2013-12-31 06:10:47 -08:00
|
|
|
}
|
|
|
|
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
void OBSBasic::changeEvent(QEvent *event)
|
2013-12-31 06:10:47 -08:00
|
|
|
{
|
2017-01-24 23:01:24 -08:00
|
|
|
if (event->type() == QEvent::WindowStateChange &&
|
|
|
|
isMinimized() &&
|
|
|
|
trayIcon->isVisible() &&
|
|
|
|
sysTrayMinimizeToTray()) {
|
|
|
|
|
|
|
|
ToggleShowHide();
|
|
|
|
}
|
2013-11-23 22:38:52 -08:00
|
|
|
}
|
|
|
|
|
2014-08-21 18:18:42 -07:00
|
|
|
void OBSBasic::on_actionShow_Recordings_triggered()
|
|
|
|
{
|
2015-06-04 11:15:56 -07:00
|
|
|
const char *mode = config_get_string(basicConfig, "Output", "Mode");
|
|
|
|
const char *path = strcmp(mode, "Advanced") ?
|
|
|
|
config_get_string(basicConfig, "SimpleOutput", "FilePath") :
|
|
|
|
config_get_string(basicConfig, "AdvOut", "RecFilePath");
|
2014-08-21 18:18:42 -07:00
|
|
|
QDesktopServices::openUrl(QUrl::fromLocalFile(path));
|
|
|
|
}
|
|
|
|
|
2014-09-02 19:11:55 -07:00
|
|
|
void OBSBasic::on_actionRemux_triggered()
|
|
|
|
{
|
2015-06-04 11:15:56 -07:00
|
|
|
const char *mode = config_get_string(basicConfig, "Output", "Mode");
|
|
|
|
const char *path = strcmp(mode, "Advanced") ?
|
|
|
|
config_get_string(basicConfig, "SimpleOutput", "FilePath") :
|
|
|
|
config_get_string(basicConfig, "AdvOut", "RecFilePath");
|
2014-09-02 19:11:55 -07:00
|
|
|
OBSRemux remux(path, this);
|
|
|
|
remux.exec();
|
|
|
|
}
|
|
|
|
|
2014-04-15 05:19:59 -07:00
|
|
|
void OBSBasic::on_action_Settings_triggered()
|
|
|
|
{
|
|
|
|
OBSBasicSettings settings(this);
|
|
|
|
settings.exec();
|
2016-08-13 07:36:17 -07:00
|
|
|
SystemTray(false);
|
2014-04-15 05:19:59 -07:00
|
|
|
}
|
|
|
|
|
2014-12-28 00:38:00 -08:00
|
|
|
void OBSBasic::on_actionAdvAudioProperties_triggered()
|
|
|
|
{
|
2015-02-13 04:06:55 -08:00
|
|
|
if (advAudioWindow != nullptr) {
|
|
|
|
advAudioWindow->raise();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2014-12-28 00:38:00 -08:00
|
|
|
advAudioWindow = new OBSBasicAdvAudio(this);
|
|
|
|
advAudioWindow->show();
|
|
|
|
advAudioWindow->setAttribute(Qt::WA_DeleteOnClose, true);
|
2015-02-13 04:06:55 -08:00
|
|
|
|
|
|
|
connect(advAudioWindow, SIGNAL(destroyed()),
|
|
|
|
this, SLOT(on_advAudioProps_destroyed()));
|
2014-12-28 00:38:00 -08:00
|
|
|
}
|
|
|
|
|
2015-02-07 02:11:42 -08:00
|
|
|
void OBSBasic::on_advAudioProps_clicked()
|
|
|
|
{
|
|
|
|
on_actionAdvAudioProperties_triggered();
|
|
|
|
}
|
|
|
|
|
2015-02-13 04:06:55 -08:00
|
|
|
void OBSBasic::on_advAudioProps_destroyed()
|
|
|
|
{
|
|
|
|
advAudioWindow = nullptr;
|
|
|
|
}
|
|
|
|
|
2014-02-20 21:04:14 -08:00
|
|
|
void OBSBasic::on_scenes_currentItemChanged(QListWidgetItem *current,
|
|
|
|
QListWidgetItem *prev)
|
2013-12-30 00:17:57 -08:00
|
|
|
{
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_source_t *source = NULL;
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
|
2014-02-20 21:04:14 -08:00
|
|
|
if (sceneChanging)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (current) {
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_scene_t *scene;
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
|
2015-06-27 18:21:45 -07:00
|
|
|
scene = GetOBSRef<OBSScene>(current);
|
2014-08-04 08:41:15 -07:00
|
|
|
source = obs_scene_get_source(scene);
|
2013-12-30 00:17:57 -08:00
|
|
|
}
|
|
|
|
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
SetCurrentScene(source);
|
2014-02-20 21:04:14 -08:00
|
|
|
|
|
|
|
UNUSED_PARAMETER(prev);
|
2013-12-30 00:17:57 -08:00
|
|
|
}
|
|
|
|
|
2014-06-30 01:13:32 -07:00
|
|
|
void OBSBasic::EditSceneName()
|
|
|
|
{
|
2014-10-15 13:05:21 -07:00
|
|
|
QListWidgetItem *item = ui->scenes->currentItem();
|
|
|
|
Qt::ItemFlags flags = item->flags();
|
|
|
|
|
|
|
|
item->setFlags(flags | Qt::ItemIsEditable);
|
|
|
|
ui->scenes->editItem(item);
|
|
|
|
item->setFlags(flags);
|
2014-06-30 01:13:32 -07:00
|
|
|
}
|
|
|
|
|
2015-04-04 01:40:15 -07:00
|
|
|
static void AddProjectorMenuMonitors(QMenu *parent, QObject *target,
|
|
|
|
const char *slot)
|
|
|
|
{
|
|
|
|
QAction *action;
|
2016-10-03 23:50:13 -07:00
|
|
|
QList<QScreen*> screens = QGuiApplication::screens();
|
|
|
|
for (int i = 0; i < screens.size(); i++) {
|
2016-10-20 06:29:43 -07:00
|
|
|
QRect screenGeometry = screens[i]->geometry();
|
2015-04-04 01:40:15 -07:00
|
|
|
QString str = QString("%1 %2: %3x%4 @ %5,%6").
|
|
|
|
arg(QTStr("Display"),
|
|
|
|
QString::number(i),
|
2016-10-03 23:50:13 -07:00
|
|
|
QString::number((int)screenGeometry.width()),
|
|
|
|
QString::number((int)screenGeometry.height()),
|
|
|
|
QString::number((int)screenGeometry.x()),
|
|
|
|
QString::number((int)screenGeometry.y()));
|
2015-04-04 01:40:15 -07:00
|
|
|
|
|
|
|
action = parent->addAction(str, target, slot);
|
|
|
|
action->setProperty("monitor", i);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
void OBSBasic::on_scenes_customContextMenuRequested(const QPoint &pos)
|
2013-11-07 15:45:03 -08:00
|
|
|
{
|
2014-06-30 16:03:12 -07:00
|
|
|
QListWidgetItem *item = ui->scenes->itemAt(pos);
|
2015-04-04 01:40:15 -07:00
|
|
|
QPointer<QMenu> sceneProjectorMenu;
|
2014-06-30 16:03:12 -07:00
|
|
|
|
2015-01-16 01:21:11 -08:00
|
|
|
QMenu popup(this);
|
2015-06-25 03:53:48 -07:00
|
|
|
QMenu order(QTStr("Basic.MainMenu.Edit.Order"), this);
|
2014-06-30 16:03:12 -07:00
|
|
|
popup.addAction(QTStr("Add"),
|
|
|
|
this, SLOT(on_actionAddScene_triggered()));
|
|
|
|
|
2014-10-15 13:04:31 -07:00
|
|
|
if (item) {
|
|
|
|
popup.addSeparator();
|
2015-08-28 15:01:39 -07:00
|
|
|
popup.addAction(QTStr("Duplicate"),
|
|
|
|
this, SLOT(DuplicateSelectedScene()));
|
2014-10-15 13:04:31 -07:00
|
|
|
popup.addAction(QTStr("Rename"),
|
|
|
|
this, SLOT(EditSceneName()));
|
2014-06-30 16:03:12 -07:00
|
|
|
popup.addAction(QTStr("Remove"),
|
2014-10-15 13:01:49 -07:00
|
|
|
this, SLOT(RemoveSelectedScene()),
|
|
|
|
DeleteKeys.front());
|
2015-03-18 15:09:44 -07:00
|
|
|
popup.addSeparator();
|
2015-06-25 03:53:48 -07:00
|
|
|
|
|
|
|
order.addAction(QTStr("Basic.MainMenu.Edit.Order.MoveUp"),
|
|
|
|
this, SLOT(on_actionSceneUp_triggered()));
|
|
|
|
order.addAction(QTStr("Basic.MainMenu.Edit.Order.MoveDown"),
|
|
|
|
this, SLOT(on_actionSceneDown_triggered()));
|
|
|
|
order.addSeparator();
|
|
|
|
order.addAction(QTStr("Basic.MainMenu.Edit.Order.MoveToTop"),
|
|
|
|
this, SLOT(MoveSceneToTop()));
|
|
|
|
order.addAction(QTStr("Basic.MainMenu.Edit.Order.MoveToBottom"),
|
|
|
|
this, SLOT(MoveSceneToBottom()));
|
|
|
|
popup.addMenu(&order);
|
|
|
|
|
|
|
|
popup.addSeparator();
|
2015-04-04 01:40:15 -07:00
|
|
|
sceneProjectorMenu = new QMenu(QTStr("SceneProjector"));
|
|
|
|
AddProjectorMenuMonitors(sceneProjectorMenu, this,
|
|
|
|
SLOT(OpenSceneProjector()));
|
|
|
|
popup.addMenu(sceneProjectorMenu);
|
|
|
|
popup.addSeparator();
|
2015-03-18 15:09:44 -07:00
|
|
|
popup.addAction(QTStr("Filters"), this,
|
|
|
|
SLOT(OpenSceneFilters()));
|
2014-10-15 13:04:31 -07:00
|
|
|
}
|
2014-06-30 16:03:12 -07:00
|
|
|
|
|
|
|
popup.exec(QCursor::pos());
|
2013-11-07 15:45:03 -08:00
|
|
|
}
|
|
|
|
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
void OBSBasic::on_actionAddScene_triggered()
|
2013-11-07 15:45:03 -08:00
|
|
|
{
|
2013-12-29 07:54:06 -08:00
|
|
|
string name;
|
2014-05-09 15:09:17 -07:00
|
|
|
QString format{QTStr("Basic.Main.DefaultSceneName.Text")};
|
2014-05-14 11:58:15 -07:00
|
|
|
|
|
|
|
int i = 1;
|
|
|
|
QString placeHolderText = format.arg(i);
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_source_t *source = nullptr;
|
2014-05-14 13:20:08 -07:00
|
|
|
while ((source = obs_get_source_by_name(QT_TO_UTF8(placeHolderText)))) {
|
|
|
|
obs_source_release(source);
|
2014-05-14 11:58:15 -07:00
|
|
|
placeHolderText = format.arg(++i);
|
2014-05-14 13:20:08 -07:00
|
|
|
}
|
2014-05-09 15:09:17 -07:00
|
|
|
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
bool accepted = NameDialog::AskForName(this,
|
2014-05-12 15:30:36 -07:00
|
|
|
QTStr("Basic.Main.AddSceneDlg.Title"),
|
|
|
|
QTStr("Basic.Main.AddSceneDlg.Text"),
|
2014-05-09 15:09:17 -07:00
|
|
|
name,
|
|
|
|
placeHolderText);
|
2013-12-29 07:54:06 -08:00
|
|
|
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
if (accepted) {
|
2014-03-10 13:39:51 -07:00
|
|
|
if (name.empty()) {
|
|
|
|
QMessageBox::information(this,
|
2014-08-12 12:09:19 -07:00
|
|
|
QTStr("NoNameEntered.Title"),
|
|
|
|
QTStr("NoNameEntered.Text"));
|
2014-03-10 13:39:51 -07:00
|
|
|
on_actionAddScene_triggered();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_source_t *source = obs_get_source_by_name(name.c_str());
|
2013-12-29 08:17:00 -08:00
|
|
|
if (source) {
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
QMessageBox::information(this,
|
2014-05-12 15:30:36 -07:00
|
|
|
QTStr("NameExists.Title"),
|
|
|
|
QTStr("NameExists.Text"));
|
2013-12-29 08:17:00 -08:00
|
|
|
|
|
|
|
obs_source_release(source);
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
on_actionAddScene_triggered();
|
2013-12-29 08:17:00 -08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_scene_t *scene = obs_scene_create(name.c_str());
|
2014-08-04 08:41:15 -07:00
|
|
|
source = obs_scene_get_source(scene);
|
2015-12-05 05:58:05 -08:00
|
|
|
AddScene(source);
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
SetCurrentScene(source);
|
2015-12-05 05:58:05 -08:00
|
|
|
obs_scene_release(scene);
|
2013-12-29 07:54:06 -08:00
|
|
|
}
|
2013-11-07 15:45:03 -08:00
|
|
|
}
|
|
|
|
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
void OBSBasic::on_actionRemoveScene_triggered()
|
2013-11-07 15:45:03 -08:00
|
|
|
{
|
2014-06-30 13:45:58 -07:00
|
|
|
OBSScene scene = GetCurrentScene();
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_source_t *source = obs_scene_get_source(scene);
|
2014-06-30 13:45:58 -07:00
|
|
|
|
|
|
|
if (source && QueryRemoveSource(source))
|
|
|
|
obs_source_remove(source);
|
2013-11-07 15:45:03 -08:00
|
|
|
}
|
|
|
|
|
2015-06-25 03:53:48 -07:00
|
|
|
void OBSBasic::ChangeSceneIndex(bool relative, int offset, int invalidIdx)
|
|
|
|
{
|
|
|
|
int idx = ui->scenes->currentRow();
|
|
|
|
if (idx == -1 || idx == invalidIdx)
|
|
|
|
return;
|
|
|
|
|
|
|
|
sceneChanging = true;
|
|
|
|
|
|
|
|
QListWidgetItem *item = ui->scenes->takeItem(idx);
|
|
|
|
|
|
|
|
if (!relative)
|
|
|
|
idx = 0;
|
|
|
|
|
|
|
|
ui->scenes->insertItem(idx + offset, item);
|
|
|
|
ui->scenes->setCurrentRow(idx + offset);
|
|
|
|
item->setSelected(true);
|
|
|
|
|
|
|
|
sceneChanging = false;
|
|
|
|
}
|
|
|
|
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
void OBSBasic::on_actionSceneUp_triggered()
|
2013-11-07 15:45:03 -08:00
|
|
|
{
|
2015-06-25 03:53:48 -07:00
|
|
|
ChangeSceneIndex(true, -1, 0);
|
2013-11-07 15:45:03 -08:00
|
|
|
}
|
|
|
|
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
void OBSBasic::on_actionSceneDown_triggered()
|
2013-12-30 00:17:57 -08:00
|
|
|
{
|
2015-06-25 03:53:48 -07:00
|
|
|
ChangeSceneIndex(true, 1, ui->scenes->count() - 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::MoveSceneToTop()
|
|
|
|
{
|
|
|
|
ChangeSceneIndex(false, 0, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::MoveSceneToBottom()
|
|
|
|
{
|
|
|
|
ChangeSceneIndex(false, ui->scenes->count() - 1,
|
|
|
|
ui->scenes->count() - 1);
|
2013-12-30 00:17:57 -08:00
|
|
|
}
|
|
|
|
|
2015-11-15 08:39:50 -08:00
|
|
|
void OBSBasic::on_sources_itemSelectionChanged()
|
2013-12-30 00:17:57 -08:00
|
|
|
{
|
2015-11-15 08:39:50 -08:00
|
|
|
SignalBlocker sourcesSignalBlocker(ui->sources);
|
2014-07-04 10:58:03 -07:00
|
|
|
|
2015-11-15 08:39:50 -08:00
|
|
|
auto updateItemSelection = [&]()
|
2015-06-26 18:32:33 -07:00
|
|
|
{
|
|
|
|
ignoreSelectionUpdate = true;
|
2015-11-15 08:39:50 -08:00
|
|
|
for (int i = 0; i < ui->sources->count(); i++)
|
|
|
|
{
|
|
|
|
QListWidgetItem *wItem = ui->sources->item(i);
|
|
|
|
OBSSceneItem item = GetOBSRef<OBSSceneItem>(wItem);
|
|
|
|
|
|
|
|
obs_sceneitem_select(item, wItem->isSelected());
|
|
|
|
}
|
2015-06-26 18:32:33 -07:00
|
|
|
ignoreSelectionUpdate = false;
|
|
|
|
};
|
2015-11-15 08:39:50 -08:00
|
|
|
using updateItemSelection_t = decltype(updateItemSelection);
|
2015-06-26 18:32:33 -07:00
|
|
|
|
|
|
|
obs_scene_atomic_update(GetCurrentScene(),
|
2015-11-15 08:39:50 -08:00
|
|
|
[](void *data, obs_scene_t *)
|
2015-06-26 18:32:33 -07:00
|
|
|
{
|
2015-11-15 08:39:50 -08:00
|
|
|
(*static_cast<updateItemSelection_t*>(data))();
|
|
|
|
}, static_cast<void*>(&updateItemSelection));
|
2013-12-30 00:17:57 -08:00
|
|
|
}
|
|
|
|
|
2014-06-30 01:13:32 -07:00
|
|
|
void OBSBasic::EditSceneItemName()
|
|
|
|
{
|
2016-01-23 11:02:22 -08:00
|
|
|
QListWidgetItem *item = GetTopSelectedSourceItem();
|
2014-10-15 13:05:21 -07:00
|
|
|
Qt::ItemFlags flags = item->flags();
|
2015-06-27 18:21:45 -07:00
|
|
|
OBSSceneItem sceneItem= GetOBSRef<OBSSceneItem>(item);
|
2015-03-22 20:51:21 -07:00
|
|
|
obs_source_t *source = obs_sceneitem_get_source(sceneItem);
|
|
|
|
const char *name = obs_source_get_name(source);
|
2014-10-15 13:05:21 -07:00
|
|
|
|
2015-03-22 20:51:21 -07:00
|
|
|
item->setText(QT_UTF8(name));
|
2014-10-15 13:05:21 -07:00
|
|
|
item->setFlags(flags | Qt::ItemIsEditable);
|
2015-03-22 20:51:21 -07:00
|
|
|
ui->sources->removeItemWidget(item);
|
2014-10-15 13:05:21 -07:00
|
|
|
ui->sources->editItem(item);
|
|
|
|
item->setFlags(flags);
|
2014-06-30 01:13:32 -07:00
|
|
|
}
|
|
|
|
|
2016-03-15 20:55:40 -07:00
|
|
|
void OBSBasic::SetDeinterlacingMode()
|
|
|
|
{
|
|
|
|
QAction *action = reinterpret_cast<QAction*>(sender());
|
|
|
|
obs_deinterlace_mode mode =
|
|
|
|
(obs_deinterlace_mode)action->property("mode").toInt();
|
|
|
|
OBSSceneItem sceneItem = GetCurrentSceneItem();
|
|
|
|
obs_source_t *source = obs_sceneitem_get_source(sceneItem);
|
|
|
|
|
|
|
|
obs_source_set_deinterlace_mode(source, mode);
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::SetDeinterlacingOrder()
|
|
|
|
{
|
|
|
|
QAction *action = reinterpret_cast<QAction*>(sender());
|
|
|
|
obs_deinterlace_field_order order =
|
|
|
|
(obs_deinterlace_field_order)action->property("order").toInt();
|
|
|
|
OBSSceneItem sceneItem = GetCurrentSceneItem();
|
|
|
|
obs_source_t *source = obs_sceneitem_get_source(sceneItem);
|
|
|
|
|
|
|
|
obs_source_set_deinterlace_field_order(source, order);
|
|
|
|
}
|
|
|
|
|
|
|
|
QMenu *OBSBasic::AddDeinterlacingMenu(obs_source_t *source)
|
|
|
|
{
|
|
|
|
QMenu *menu = new QMenu(QTStr("Deinterlacing"));
|
|
|
|
obs_deinterlace_mode deinterlaceMode =
|
|
|
|
obs_source_get_deinterlace_mode(source);
|
|
|
|
obs_deinterlace_field_order deinterlaceOrder =
|
|
|
|
obs_source_get_deinterlace_field_order(source);
|
|
|
|
QAction *action;
|
|
|
|
|
|
|
|
#define ADD_MODE(name, mode) \
|
|
|
|
action = menu->addAction(QTStr("" name), this, \
|
|
|
|
SLOT(SetDeinterlacingMode())); \
|
|
|
|
action->setProperty("mode", (int)mode); \
|
|
|
|
action->setCheckable(true); \
|
|
|
|
action->setChecked(deinterlaceMode == mode);
|
|
|
|
|
|
|
|
ADD_MODE("Disable", OBS_DEINTERLACE_MODE_DISABLE);
|
|
|
|
ADD_MODE("Deinterlacing.Discard", OBS_DEINTERLACE_MODE_DISCARD);
|
|
|
|
ADD_MODE("Deinterlacing.Retro", OBS_DEINTERLACE_MODE_RETRO);
|
|
|
|
ADD_MODE("Deinterlacing.Blend", OBS_DEINTERLACE_MODE_BLEND);
|
|
|
|
ADD_MODE("Deinterlacing.Blend2x", OBS_DEINTERLACE_MODE_BLEND_2X);
|
|
|
|
ADD_MODE("Deinterlacing.Linear", OBS_DEINTERLACE_MODE_LINEAR);
|
|
|
|
ADD_MODE("Deinterlacing.Linear2x", OBS_DEINTERLACE_MODE_LINEAR_2X);
|
|
|
|
ADD_MODE("Deinterlacing.Yadif", OBS_DEINTERLACE_MODE_YADIF);
|
|
|
|
ADD_MODE("Deinterlacing.Yadif2x", OBS_DEINTERLACE_MODE_YADIF_2X);
|
|
|
|
#undef ADD_MODE
|
|
|
|
|
|
|
|
menu->addSeparator();
|
|
|
|
|
|
|
|
#define ADD_ORDER(name, order) \
|
|
|
|
action = menu->addAction(QTStr("Deinterlacing." name), this, \
|
|
|
|
SLOT(SetDeinterlacingOrder())); \
|
|
|
|
action->setProperty("order", (int)order); \
|
|
|
|
action->setCheckable(true); \
|
|
|
|
action->setChecked(deinterlaceOrder == order);
|
|
|
|
|
|
|
|
ADD_ORDER("TopFieldFirst", OBS_DEINTERLACE_FIELD_ORDER_TOP);
|
|
|
|
ADD_ORDER("BottomFieldFirst", OBS_DEINTERLACE_FIELD_ORDER_BOTTOM);
|
|
|
|
#undef ADD_ORDER
|
|
|
|
|
|
|
|
return menu;
|
|
|
|
}
|
|
|
|
|
2016-06-29 07:08:02 -07:00
|
|
|
void OBSBasic::SetScaleFilter()
|
|
|
|
{
|
|
|
|
QAction *action = reinterpret_cast<QAction*>(sender());
|
|
|
|
obs_scale_type mode = (obs_scale_type)action->property("mode").toInt();
|
|
|
|
OBSSceneItem sceneItem = GetCurrentSceneItem();
|
|
|
|
|
|
|
|
obs_sceneitem_set_scale_filter(sceneItem, mode);
|
|
|
|
}
|
|
|
|
|
|
|
|
QMenu *OBSBasic::AddScaleFilteringMenu(obs_sceneitem_t *item)
|
|
|
|
{
|
|
|
|
QMenu *menu = new QMenu(QTStr("ScaleFiltering"));
|
|
|
|
obs_scale_type scaleFilter = obs_sceneitem_get_scale_filter(item);
|
|
|
|
QAction *action;
|
|
|
|
|
|
|
|
#define ADD_MODE(name, mode) \
|
|
|
|
action = menu->addAction(QTStr("" name), this, \
|
|
|
|
SLOT(SetScaleFilter())); \
|
|
|
|
action->setProperty("mode", (int)mode); \
|
|
|
|
action->setCheckable(true); \
|
|
|
|
action->setChecked(scaleFilter == mode);
|
|
|
|
|
|
|
|
ADD_MODE("Disable", OBS_SCALE_DISABLE);
|
|
|
|
ADD_MODE("ScaleFiltering.Point", OBS_SCALE_POINT);
|
|
|
|
ADD_MODE("ScaleFiltering.Bilinear", OBS_SCALE_BILINEAR);
|
|
|
|
ADD_MODE("ScaleFiltering.Bicubic", OBS_SCALE_BICUBIC);
|
|
|
|
ADD_MODE("ScaleFiltering.Lanczos", OBS_SCALE_LANCZOS);
|
|
|
|
#undef ADD_MODE
|
|
|
|
|
|
|
|
return menu;
|
|
|
|
}
|
|
|
|
|
2015-04-02 21:35:46 -07:00
|
|
|
void OBSBasic::CreateSourcePopupMenu(QListWidgetItem *item, bool preview)
|
2013-11-07 15:45:03 -08:00
|
|
|
{
|
2015-01-16 01:21:11 -08:00
|
|
|
QMenu popup(this);
|
2015-04-04 01:40:15 -07:00
|
|
|
QPointer<QMenu> previewProjector;
|
|
|
|
QPointer<QMenu> sourceProjector;
|
2015-04-02 21:35:46 -07:00
|
|
|
|
|
|
|
if (preview) {
|
|
|
|
QAction *action = popup.addAction(
|
|
|
|
QTStr("Basic.Main.PreviewConextMenu.Enable"),
|
|
|
|
this, SLOT(TogglePreview()));
|
|
|
|
action->setCheckable(true);
|
2015-08-02 00:02:58 -07:00
|
|
|
action->setChecked(
|
|
|
|
obs_display_enabled(ui->preview->GetDisplay()));
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
if (IsPreviewProgramMode())
|
|
|
|
action->setEnabled(false);
|
2015-04-02 21:35:46 -07:00
|
|
|
|
2016-11-05 09:48:46 -07:00
|
|
|
popup.addAction(ui->actionLockPreview);
|
|
|
|
popup.addMenu(ui->scalingMenu);
|
2016-07-26 01:32:43 -07:00
|
|
|
|
2015-04-04 01:40:15 -07:00
|
|
|
previewProjector = new QMenu(QTStr("PreviewProjector"));
|
|
|
|
AddProjectorMenuMonitors(previewProjector, this,
|
|
|
|
SLOT(OpenPreviewProjector()));
|
|
|
|
|
|
|
|
popup.addMenu(previewProjector);
|
|
|
|
|
2015-04-02 21:35:46 -07:00
|
|
|
popup.addSeparator();
|
|
|
|
}
|
|
|
|
|
2014-06-30 01:13:32 -07:00
|
|
|
QPointer<QMenu> addSourceMenu = CreateAddSourcePopupMenu();
|
|
|
|
if (addSourceMenu)
|
|
|
|
popup.addMenu(addSourceMenu);
|
|
|
|
|
|
|
|
if (item) {
|
|
|
|
if (addSourceMenu)
|
|
|
|
popup.addSeparator();
|
|
|
|
|
2014-09-15 16:16:16 -07:00
|
|
|
OBSSceneItem sceneItem = GetSceneItem(item);
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_source_t *source = obs_sceneitem_get_source(sceneItem);
|
2016-03-15 20:55:40 -07:00
|
|
|
uint32_t flags = obs_source_get_output_flags(source);
|
|
|
|
bool isAsyncVideo = (flags & OBS_SOURCE_ASYNC_VIDEO) ==
|
|
|
|
OBS_SOURCE_ASYNC_VIDEO;
|
2014-09-15 16:16:16 -07:00
|
|
|
QAction *action;
|
|
|
|
|
2014-06-30 01:13:32 -07:00
|
|
|
popup.addAction(QTStr("Rename"), this,
|
|
|
|
SLOT(EditSceneItemName()));
|
2014-06-30 18:21:40 -07:00
|
|
|
popup.addAction(QTStr("Remove"), this,
|
|
|
|
SLOT(on_actionRemoveSource_triggered()),
|
2014-10-15 13:00:43 -07:00
|
|
|
DeleteKeys.front());
|
2014-06-30 19:47:06 -07:00
|
|
|
popup.addSeparator();
|
|
|
|
popup.addMenu(ui->orderMenu);
|
2014-06-30 01:13:32 -07:00
|
|
|
popup.addMenu(ui->transformMenu);
|
2015-04-04 01:40:15 -07:00
|
|
|
|
|
|
|
sourceProjector = new QMenu(QTStr("SourceProjector"));
|
|
|
|
AddProjectorMenuMonitors(sourceProjector, this,
|
|
|
|
SLOT(OpenSourceProjector()));
|
|
|
|
|
|
|
|
popup.addSeparator();
|
2016-03-15 20:55:40 -07:00
|
|
|
if (isAsyncVideo) {
|
|
|
|
popup.addMenu(AddDeinterlacingMenu(source));
|
|
|
|
popup.addSeparator();
|
|
|
|
}
|
2016-06-29 07:08:02 -07:00
|
|
|
|
|
|
|
popup.addMenu(AddScaleFilteringMenu(sceneItem));
|
|
|
|
popup.addSeparator();
|
|
|
|
|
2015-04-04 01:40:15 -07:00
|
|
|
popup.addMenu(sourceProjector);
|
2014-06-30 01:13:32 -07:00
|
|
|
popup.addSeparator();
|
2014-09-15 16:16:16 -07:00
|
|
|
|
|
|
|
action = popup.addAction(QTStr("Interact"), this,
|
|
|
|
SLOT(on_actionInteract_triggered()));
|
|
|
|
|
|
|
|
action->setEnabled(obs_source_get_output_flags(source) &
|
|
|
|
OBS_SOURCE_INTERACTION);
|
|
|
|
|
2015-02-25 21:23:57 -08:00
|
|
|
popup.addAction(QTStr("Filters"), this,
|
|
|
|
SLOT(OpenFilters()));
|
2014-06-30 01:13:32 -07:00
|
|
|
popup.addAction(QTStr("Properties"), this,
|
|
|
|
SLOT(on_actionSourceProperties_triggered()));
|
|
|
|
}
|
|
|
|
|
|
|
|
popup.exec(QCursor::pos());
|
2013-11-07 15:45:03 -08:00
|
|
|
}
|
|
|
|
|
2015-04-02 21:35:46 -07:00
|
|
|
void OBSBasic::on_sources_customContextMenuRequested(const QPoint &pos)
|
|
|
|
{
|
2016-01-02 21:01:48 -08:00
|
|
|
if (ui->scenes->count())
|
|
|
|
CreateSourcePopupMenu(ui->sources->itemAt(pos), false);
|
2015-04-02 21:35:46 -07:00
|
|
|
}
|
|
|
|
|
2014-10-15 13:05:56 -07:00
|
|
|
void OBSBasic::on_sources_itemDoubleClicked(QListWidgetItem *witem)
|
|
|
|
{
|
|
|
|
if (!witem)
|
|
|
|
return;
|
|
|
|
|
|
|
|
OBSSceneItem item = GetSceneItem(witem);
|
|
|
|
OBSSource source = obs_sceneitem_get_source(item);
|
|
|
|
|
|
|
|
if (source)
|
|
|
|
CreatePropertiesWindow(source);
|
|
|
|
}
|
|
|
|
|
2014-05-10 18:47:48 -07:00
|
|
|
void OBSBasic::AddSource(const char *id)
|
2013-12-30 05:56:39 -08:00
|
|
|
{
|
2014-06-29 17:33:40 -07:00
|
|
|
if (id && *id) {
|
|
|
|
OBSBasicSourceSelect sourceSelect(this, id);
|
|
|
|
sourceSelect.exec();
|
2015-10-24 07:07:05 -07:00
|
|
|
if (sourceSelect.newSource)
|
|
|
|
CreatePropertiesWindow(sourceSelect.newSource);
|
2014-06-29 17:33:40 -07:00
|
|
|
}
|
2013-12-30 05:56:39 -08:00
|
|
|
}
|
|
|
|
|
2014-06-29 17:33:40 -07:00
|
|
|
QMenu *OBSBasic::CreateAddSourcePopupMenu()
|
2013-11-07 15:45:03 -08:00
|
|
|
{
|
2013-12-30 05:56:39 -08:00
|
|
|
const char *type;
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
bool foundValues = false;
|
2016-11-03 12:28:33 -07:00
|
|
|
bool foundDeprecated = false;
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
size_t idx = 0;
|
2013-12-30 05:56:39 -08:00
|
|
|
|
2015-01-16 01:21:11 -08:00
|
|
|
QMenu *popup = new QMenu(QTStr("Add"), this);
|
2016-11-03 12:28:33 -07:00
|
|
|
QMenu *deprecated = new QMenu(QTStr("Deprecated"), popup);
|
2014-04-26 23:47:50 -07:00
|
|
|
|
2016-09-14 16:27:04 -07:00
|
|
|
auto getActionAfter = [] (QMenu *menu, const QString &name)
|
|
|
|
{
|
|
|
|
QList<QAction*> actions = menu->actions();
|
|
|
|
|
|
|
|
for (QAction *menuAction : actions) {
|
|
|
|
if (menuAction->text().compare(name) >= 0)
|
|
|
|
return menuAction;
|
|
|
|
}
|
|
|
|
|
|
|
|
return (QAction*)nullptr;
|
|
|
|
};
|
|
|
|
|
|
|
|
auto addSource = [this, getActionAfter] (QMenu *popup,
|
|
|
|
const char *type, const char *name)
|
|
|
|
{
|
|
|
|
QString qname = QT_UTF8(name);
|
|
|
|
QAction *popupItem = new QAction(qname, this);
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
popupItem->setData(QT_UTF8(type));
|
2014-06-29 17:33:40 -07:00
|
|
|
connect(popupItem, SIGNAL(triggered(bool)),
|
|
|
|
this, SLOT(AddSourceFromAction()));
|
2016-09-14 16:27:04 -07:00
|
|
|
|
|
|
|
QAction *after = getActionAfter(popup, qname);
|
|
|
|
popup->insertAction(after, popupItem);
|
2016-07-01 15:23:06 -07:00
|
|
|
};
|
2013-12-30 05:56:39 -08:00
|
|
|
|
2016-07-01 15:23:06 -07:00
|
|
|
while (obs_enum_input_types(idx++, &type)) {
|
|
|
|
const char *name = obs_source_get_display_name(type);
|
2016-09-14 16:32:56 -07:00
|
|
|
uint32_t caps = obs_get_source_output_flags(type);
|
2016-07-01 15:23:06 -07:00
|
|
|
|
2016-09-14 16:32:56 -07:00
|
|
|
if ((caps & OBS_SOURCE_DEPRECATED) == 0) {
|
|
|
|
addSource(popup, type, name);
|
2016-11-03 12:28:33 -07:00
|
|
|
} else {
|
|
|
|
addSource(deprecated, type, name);
|
|
|
|
foundDeprecated = true;
|
2016-09-14 16:32:56 -07:00
|
|
|
}
|
2016-11-03 12:28:33 -07:00
|
|
|
foundValues = true;
|
2013-12-30 05:56:39 -08:00
|
|
|
}
|
|
|
|
|
2016-09-14 16:27:04 -07:00
|
|
|
addSource(popup, "scene", Str("Basic.Scene"));
|
2016-07-01 15:23:06 -07:00
|
|
|
|
2016-11-03 12:28:33 -07:00
|
|
|
if (!foundDeprecated) {
|
|
|
|
delete deprecated;
|
|
|
|
deprecated = nullptr;
|
|
|
|
}
|
|
|
|
|
2014-06-29 17:33:40 -07:00
|
|
|
if (!foundValues) {
|
|
|
|
delete popup;
|
|
|
|
popup = nullptr;
|
2016-11-03 12:28:33 -07:00
|
|
|
|
|
|
|
} else if (foundDeprecated) {
|
|
|
|
popup->addMenu(deprecated);
|
2013-12-30 05:56:39 -08:00
|
|
|
}
|
2014-06-29 17:33:40 -07:00
|
|
|
|
|
|
|
return popup;
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::AddSourceFromAction()
|
|
|
|
{
|
|
|
|
QAction *action = qobject_cast<QAction*>(sender());
|
|
|
|
if (!action)
|
|
|
|
return;
|
|
|
|
|
|
|
|
AddSource(QT_TO_UTF8(action->data().toString()));
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::AddSourcePopupMenu(const QPoint &pos)
|
|
|
|
{
|
|
|
|
if (!GetCurrentScene()) {
|
|
|
|
// Tell the user he needs a scene first (help beginners).
|
|
|
|
QMessageBox::information(this,
|
|
|
|
QTStr("Basic.Main.AddSourceHelp.Title"),
|
|
|
|
QTStr("Basic.Main.AddSourceHelp.Text"));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
QPointer<QMenu> popup = CreateAddSourcePopupMenu();
|
|
|
|
if (popup)
|
|
|
|
popup->exec(pos);
|
2013-12-30 05:56:39 -08:00
|
|
|
}
|
|
|
|
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
void OBSBasic::on_actionAddSource_triggered()
|
2013-12-30 05:56:39 -08:00
|
|
|
{
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
AddSourcePopupMenu(QCursor::pos());
|
2013-11-07 15:45:03 -08:00
|
|
|
}
|
|
|
|
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
void OBSBasic::on_actionRemoveSource_triggered()
|
2013-11-07 15:45:03 -08:00
|
|
|
{
|
2016-07-02 15:44:24 -07:00
|
|
|
vector<OBSSceneItem> items;
|
2014-06-30 13:45:58 -07:00
|
|
|
|
2016-07-02 15:44:24 -07:00
|
|
|
auto func = [] (obs_scene_t *, obs_sceneitem_t *item, void *param)
|
|
|
|
{
|
|
|
|
vector<OBSSceneItem> &items =
|
|
|
|
*reinterpret_cast<vector<OBSSceneItem>*>(param);
|
|
|
|
if (obs_sceneitem_selected(item))
|
|
|
|
items.emplace_back(item);
|
|
|
|
return true;
|
|
|
|
};
|
|
|
|
|
|
|
|
obs_scene_enum_items(GetCurrentScene(), func, &items);
|
|
|
|
|
|
|
|
if (!items.size())
|
|
|
|
return;
|
|
|
|
|
|
|
|
auto removeMultiple = [this] (size_t count)
|
|
|
|
{
|
|
|
|
QString text = QTStr("ConfirmRemove.TextMultiple")
|
|
|
|
.arg(QString::number(count));
|
|
|
|
|
|
|
|
QMessageBox remove_items(this);
|
|
|
|
remove_items.setText(text);
|
|
|
|
QAbstractButton *Yes = remove_items.addButton(QTStr("Yes"),
|
|
|
|
QMessageBox::YesRole);
|
|
|
|
remove_items.addButton(QTStr("No"), QMessageBox::NoRole);
|
|
|
|
remove_items.setIcon(QMessageBox::Question);
|
|
|
|
remove_items.setWindowTitle(QTStr("ConfirmRemove.Title"));
|
|
|
|
remove_items.exec();
|
|
|
|
|
|
|
|
return Yes == remove_items.clickedButton();
|
|
|
|
};
|
|
|
|
|
|
|
|
if (items.size() == 1) {
|
|
|
|
OBSSceneItem &item = items[0];
|
|
|
|
obs_source_t *source = obs_sceneitem_get_source(item);
|
|
|
|
|
|
|
|
if (source && QueryRemoveSource(source))
|
|
|
|
obs_sceneitem_remove(item);
|
|
|
|
} else {
|
|
|
|
if (removeMultiple(items.size())) {
|
|
|
|
for (auto &item : items)
|
|
|
|
obs_sceneitem_remove(item);
|
|
|
|
}
|
|
|
|
}
|
2013-11-07 15:45:03 -08:00
|
|
|
}
|
|
|
|
|
2014-09-15 16:16:16 -07:00
|
|
|
void OBSBasic::on_actionInteract_triggered()
|
|
|
|
{
|
|
|
|
OBSSceneItem item = GetCurrentSceneItem();
|
|
|
|
OBSSource source = obs_sceneitem_get_source(item);
|
|
|
|
|
|
|
|
if (source)
|
|
|
|
CreateInteractionWindow(source);
|
|
|
|
}
|
|
|
|
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
void OBSBasic::on_actionSourceProperties_triggered()
|
2013-11-07 15:45:03 -08:00
|
|
|
{
|
2014-03-23 01:07:54 -07:00
|
|
|
OBSSceneItem item = GetCurrentSceneItem();
|
2014-08-03 14:39:19 -07:00
|
|
|
OBSSource source = obs_sceneitem_get_source(item);
|
2014-03-23 01:07:54 -07:00
|
|
|
|
2014-07-22 13:16:57 -07:00
|
|
|
if (source)
|
|
|
|
CreatePropertiesWindow(source);
|
2013-11-07 15:45:03 -08:00
|
|
|
}
|
|
|
|
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
void OBSBasic::on_actionSourceUp_triggered()
|
2013-11-07 15:45:03 -08:00
|
|
|
{
|
2014-05-15 17:40:53 -07:00
|
|
|
OBSSceneItem item = GetCurrentSceneItem();
|
2014-08-03 14:39:19 -07:00
|
|
|
obs_sceneitem_set_order(item, OBS_ORDER_MOVE_UP);
|
2013-11-07 15:45:03 -08:00
|
|
|
}
|
2013-12-10 10:22:33 -08:00
|
|
|
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
void OBSBasic::on_actionSourceDown_triggered()
|
2013-12-10 20:14:45 -08:00
|
|
|
{
|
2014-05-15 17:40:53 -07:00
|
|
|
OBSSceneItem item = GetCurrentSceneItem();
|
2014-08-03 14:39:19 -07:00
|
|
|
obs_sceneitem_set_order(item, OBS_ORDER_MOVE_DOWN);
|
2013-12-10 20:14:45 -08:00
|
|
|
}
|
|
|
|
|
2014-06-30 19:47:06 -07:00
|
|
|
void OBSBasic::on_actionMoveUp_triggered()
|
|
|
|
{
|
|
|
|
OBSSceneItem item = GetCurrentSceneItem();
|
2014-08-03 14:39:19 -07:00
|
|
|
obs_sceneitem_set_order(item, OBS_ORDER_MOVE_UP);
|
2014-06-30 19:47:06 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::on_actionMoveDown_triggered()
|
|
|
|
{
|
|
|
|
OBSSceneItem item = GetCurrentSceneItem();
|
2014-08-03 14:39:19 -07:00
|
|
|
obs_sceneitem_set_order(item, OBS_ORDER_MOVE_DOWN);
|
2014-06-30 19:47:06 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::on_actionMoveToTop_triggered()
|
|
|
|
{
|
|
|
|
OBSSceneItem item = GetCurrentSceneItem();
|
2014-08-03 14:39:19 -07:00
|
|
|
obs_sceneitem_set_order(item, OBS_ORDER_MOVE_TOP);
|
2014-06-30 19:47:06 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::on_actionMoveToBottom_triggered()
|
|
|
|
{
|
|
|
|
OBSSceneItem item = GetCurrentSceneItem();
|
2014-08-03 14:39:19 -07:00
|
|
|
obs_sceneitem_set_order(item, OBS_ORDER_MOVE_BOTTOM);
|
2014-06-30 19:47:06 -07:00
|
|
|
}
|
|
|
|
|
2014-08-23 17:02:45 -07:00
|
|
|
static BPtr<char> ReadLogFile(const char *log)
|
2014-05-18 17:44:10 -07:00
|
|
|
{
|
2015-01-15 23:44:38 -08:00
|
|
|
char logDir[512];
|
2015-06-01 16:11:57 -07:00
|
|
|
if (GetConfigPath(logDir, sizeof(logDir), "obs-studio/logs") <= 0)
|
2015-01-15 23:44:38 -08:00
|
|
|
return nullptr;
|
2014-05-18 17:44:10 -07:00
|
|
|
|
|
|
|
string path = (char*)logDir;
|
|
|
|
path += "/";
|
|
|
|
path += log;
|
|
|
|
|
2014-08-23 17:02:45 -07:00
|
|
|
BPtr<char> file = os_quick_read_utf8_file(path.c_str());
|
2014-05-18 17:44:10 -07:00
|
|
|
if (!file)
|
|
|
|
blog(LOG_WARNING, "Failed to read log file %s", path.c_str());
|
|
|
|
|
|
|
|
return file;
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::UploadLog(const char *file)
|
|
|
|
{
|
2014-08-23 17:02:45 -07:00
|
|
|
BPtr<char> fileString{ReadLogFile(file)};
|
2014-05-18 17:44:10 -07:00
|
|
|
|
2014-08-23 17:02:45 -07:00
|
|
|
if (!fileString)
|
2014-05-18 17:44:10 -07:00
|
|
|
return;
|
|
|
|
|
2014-08-23 17:02:45 -07:00
|
|
|
if (!*fileString)
|
2014-05-18 17:44:10 -07:00
|
|
|
return;
|
|
|
|
|
|
|
|
ui->menuLogFiles->setEnabled(false);
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
auto data_deleter = [](obs_data_t *d) { obs_data_release(d); };
|
2014-08-23 17:02:45 -07:00
|
|
|
using data_t = unique_ptr<struct obs_data, decltype(data_deleter)>;
|
2014-05-18 17:44:10 -07:00
|
|
|
|
2014-08-23 17:02:45 -07:00
|
|
|
data_t content{obs_data_create(), data_deleter};
|
|
|
|
data_t files{obs_data_create(), data_deleter};
|
|
|
|
data_t request{obs_data_create(), data_deleter};
|
2014-05-18 17:44:10 -07:00
|
|
|
|
2014-08-23 17:02:45 -07:00
|
|
|
obs_data_set_string(content.get(), "content", fileString);
|
2014-05-18 17:44:10 -07:00
|
|
|
|
2014-08-23 17:02:45 -07:00
|
|
|
obs_data_set_obj(files.get(), file, content.get());
|
|
|
|
|
|
|
|
stringstream ss;
|
|
|
|
ss << "OBS " << App()->GetVersionString()
|
|
|
|
<< " log file uploaded at " << CurrentDateTimeString();
|
|
|
|
obs_data_set_string(request.get(), "description", ss.str().c_str());
|
|
|
|
obs_data_set_bool(request.get(), "public", false);
|
|
|
|
obs_data_set_obj(request.get(), "files", files.get());
|
|
|
|
|
|
|
|
const char *json = obs_data_get_json(request.get());
|
2014-08-25 13:22:57 -07:00
|
|
|
if (!json) {
|
2014-08-23 17:02:45 -07:00
|
|
|
blog(LOG_ERROR, "Failed to get JSON data for log upload");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2014-08-25 12:22:58 -07:00
|
|
|
QBuffer *postData = new QBuffer();
|
|
|
|
postData->setData(json, (int) strlen(json));
|
|
|
|
|
UI: Replace Qt5Network classes with libcurl
The Qt5Network classes seem to only support OpenSSL, and because OpenSSL
isn't available on windows, we would have to distribute it with the
program to get SSL access working. The problem with that is that
OpenSSL is not GPL-compatible, so we cannot distribute OpenSSL with the
program, which means we have to find a better (and preferably superior)
library for accessing remote files that can use the windows SSPI for our
SSL needs, which comes with the operating system.
Fortunately, libcurl is probably the best library out there, and can be
compiled with SSPI instead of OpenSSL, so we're just going to switch to
libcurl instead. Originally I thought it didn't support SSPI, otherwise
I would have implemented it sooner.
As a side note, this will make it so we'll able to get files from the
internet via plugins, which will be quite useful.
2015-05-23 23:39:39 -07:00
|
|
|
if (logUploadThread) {
|
|
|
|
logUploadThread->wait();
|
|
|
|
delete logUploadThread;
|
|
|
|
}
|
2014-08-25 12:22:58 -07:00
|
|
|
|
UI: Replace Qt5Network classes with libcurl
The Qt5Network classes seem to only support OpenSSL, and because OpenSSL
isn't available on windows, we would have to distribute it with the
program to get SSL access working. The problem with that is that
OpenSSL is not GPL-compatible, so we cannot distribute OpenSSL with the
program, which means we have to find a better (and preferably superior)
library for accessing remote files that can use the windows SSPI for our
SSL needs, which comes with the operating system.
Fortunately, libcurl is probably the best library out there, and can be
compiled with SSPI instead of OpenSSL, so we're just going to switch to
libcurl instead. Originally I thought it didn't support SSPI, otherwise
I would have implemented it sooner.
As a side note, this will make it so we'll able to get files from the
internet via plugins, which will be quite useful.
2015-05-23 23:39:39 -07:00
|
|
|
RemoteTextThread *thread = new RemoteTextThread(
|
|
|
|
"https://api.github.com/gists",
|
|
|
|
"application/json", json);
|
|
|
|
logUploadThread = thread;
|
|
|
|
connect(thread, &RemoteTextThread::Result,
|
|
|
|
this, &OBSBasic::logUploadFinished);
|
|
|
|
logUploadThread->start();
|
2014-05-18 17:44:10 -07:00
|
|
|
}
|
|
|
|
|
2014-08-21 18:19:19 -07:00
|
|
|
void OBSBasic::on_actionShowLogs_triggered()
|
|
|
|
{
|
2015-01-15 23:44:38 -08:00
|
|
|
char logDir[512];
|
2015-06-01 16:11:57 -07:00
|
|
|
if (GetConfigPath(logDir, sizeof(logDir), "obs-studio/logs") <= 0)
|
2015-01-15 23:44:38 -08:00
|
|
|
return;
|
|
|
|
|
2014-08-21 18:19:19 -07:00
|
|
|
QUrl url = QUrl::fromLocalFile(QT_UTF8(logDir));
|
|
|
|
QDesktopServices::openUrl(url);
|
|
|
|
}
|
|
|
|
|
2014-05-18 17:44:10 -07:00
|
|
|
void OBSBasic::on_actionUploadCurrentLog_triggered()
|
|
|
|
{
|
|
|
|
UploadLog(App()->GetCurrentLog());
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::on_actionUploadLastLog_triggered()
|
|
|
|
{
|
|
|
|
UploadLog(App()->GetLastLog());
|
|
|
|
}
|
|
|
|
|
2015-02-23 22:04:19 -08:00
|
|
|
void OBSBasic::on_actionViewCurrentLog_triggered()
|
|
|
|
{
|
|
|
|
char logDir[512];
|
2015-06-01 16:11:57 -07:00
|
|
|
if (GetConfigPath(logDir, sizeof(logDir), "obs-studio/logs") <= 0)
|
2015-02-23 22:04:19 -08:00
|
|
|
return;
|
|
|
|
|
|
|
|
const char* log = App()->GetCurrentLog();
|
|
|
|
|
|
|
|
string path = (char*)logDir;
|
|
|
|
path += "/";
|
|
|
|
path += log;
|
|
|
|
|
|
|
|
QUrl url = QUrl::fromLocalFile(QT_UTF8(path.c_str()));
|
|
|
|
QDesktopServices::openUrl(url);
|
|
|
|
}
|
|
|
|
|
2014-07-13 23:56:28 -07:00
|
|
|
void OBSBasic::on_actionCheckForUpdates_triggered()
|
|
|
|
{
|
|
|
|
CheckForUpdates();
|
|
|
|
}
|
|
|
|
|
UI: Replace Qt5Network classes with libcurl
The Qt5Network classes seem to only support OpenSSL, and because OpenSSL
isn't available on windows, we would have to distribute it with the
program to get SSL access working. The problem with that is that
OpenSSL is not GPL-compatible, so we cannot distribute OpenSSL with the
program, which means we have to find a better (and preferably superior)
library for accessing remote files that can use the windows SSPI for our
SSL needs, which comes with the operating system.
Fortunately, libcurl is probably the best library out there, and can be
compiled with SSPI instead of OpenSSL, so we're just going to switch to
libcurl instead. Originally I thought it didn't support SSPI, otherwise
I would have implemented it sooner.
As a side note, this will make it so we'll able to get files from the
internet via plugins, which will be quite useful.
2015-05-23 23:39:39 -07:00
|
|
|
void OBSBasic::logUploadFinished(const QString &text, const QString &error)
|
2014-05-18 17:44:10 -07:00
|
|
|
{
|
|
|
|
ui->menuLogFiles->setEnabled(true);
|
|
|
|
|
UI: Replace Qt5Network classes with libcurl
The Qt5Network classes seem to only support OpenSSL, and because OpenSSL
isn't available on windows, we would have to distribute it with the
program to get SSL access working. The problem with that is that
OpenSSL is not GPL-compatible, so we cannot distribute OpenSSL with the
program, which means we have to find a better (and preferably superior)
library for accessing remote files that can use the windows SSPI for our
SSL needs, which comes with the operating system.
Fortunately, libcurl is probably the best library out there, and can be
compiled with SSPI instead of OpenSSL, so we're just going to switch to
libcurl instead. Originally I thought it didn't support SSPI, otherwise
I would have implemented it sooner.
As a side note, this will make it so we'll able to get files from the
internet via plugins, which will be quite useful.
2015-05-23 23:39:39 -07:00
|
|
|
if (text.isEmpty()) {
|
2014-05-18 17:44:10 -07:00
|
|
|
QMessageBox::information(this,
|
|
|
|
QTStr("LogReturnDialog.ErrorUploadingLog"),
|
UI: Replace Qt5Network classes with libcurl
The Qt5Network classes seem to only support OpenSSL, and because OpenSSL
isn't available on windows, we would have to distribute it with the
program to get SSL access working. The problem with that is that
OpenSSL is not GPL-compatible, so we cannot distribute OpenSSL with the
program, which means we have to find a better (and preferably superior)
library for accessing remote files that can use the windows SSPI for our
SSL needs, which comes with the operating system.
Fortunately, libcurl is probably the best library out there, and can be
compiled with SSPI instead of OpenSSL, so we're just going to switch to
libcurl instead. Originally I thought it didn't support SSPI, otherwise
I would have implemented it sooner.
As a side note, this will make it so we'll able to get files from the
internet via plugins, which will be quite useful.
2015-05-23 23:39:39 -07:00
|
|
|
error);
|
2014-05-18 17:44:10 -07:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
UI: Replace Qt5Network classes with libcurl
The Qt5Network classes seem to only support OpenSSL, and because OpenSSL
isn't available on windows, we would have to distribute it with the
program to get SSL access working. The problem with that is that
OpenSSL is not GPL-compatible, so we cannot distribute OpenSSL with the
program, which means we have to find a better (and preferably superior)
library for accessing remote files that can use the windows SSPI for our
SSL needs, which comes with the operating system.
Fortunately, libcurl is probably the best library out there, and can be
compiled with SSPI instead of OpenSSL, so we're just going to switch to
libcurl instead. Originally I thought it didn't support SSPI, otherwise
I would have implemented it sooner.
As a side note, this will make it so we'll able to get files from the
internet via plugins, which will be quite useful.
2015-05-23 23:39:39 -07:00
|
|
|
obs_data_t *returnData = obs_data_create_from_json(QT_TO_UTF8(text));
|
2014-08-25 12:22:58 -07:00
|
|
|
QString logURL = obs_data_get_string(returnData, "html_url");
|
2014-05-18 17:44:10 -07:00
|
|
|
obs_data_release(returnData);
|
|
|
|
|
|
|
|
OBSLogReply logDialog(this, logURL);
|
|
|
|
logDialog.exec();
|
|
|
|
}
|
|
|
|
|
2014-08-25 10:10:58 -07:00
|
|
|
static void RenameListItem(OBSBasic *parent, QListWidget *listWidget,
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_source_t *source, const string &name)
|
2014-06-30 01:05:33 -07:00
|
|
|
{
|
2014-10-13 09:09:06 -07:00
|
|
|
const char *prevName = obs_source_get_name(source);
|
|
|
|
if (name == prevName)
|
|
|
|
return;
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_source_t *foundSource = obs_get_source_by_name(name.c_str());
|
2014-10-13 09:09:06 -07:00
|
|
|
QListWidgetItem *listItem = listWidget->currentItem();
|
2014-06-30 01:05:33 -07:00
|
|
|
|
2014-10-13 09:09:06 -07:00
|
|
|
if (foundSource || name.empty()) {
|
2014-06-30 01:05:33 -07:00
|
|
|
listItem->setText(QT_UTF8(prevName));
|
2014-08-12 12:09:19 -07:00
|
|
|
|
2014-10-13 09:09:06 -07:00
|
|
|
if (foundSource) {
|
2014-08-12 12:09:19 -07:00
|
|
|
QMessageBox::information(parent,
|
|
|
|
QTStr("NameExists.Title"),
|
|
|
|
QTStr("NameExists.Text"));
|
|
|
|
} else if (name.empty()) {
|
|
|
|
QMessageBox::information(parent,
|
|
|
|
QTStr("NoNameEntered.Title"),
|
|
|
|
QTStr("NoNameEntered.Text"));
|
|
|
|
}
|
|
|
|
|
2014-06-30 01:05:33 -07:00
|
|
|
obs_source_release(foundSource);
|
|
|
|
} else {
|
|
|
|
listItem->setText(QT_UTF8(name.c_str()));
|
2014-08-04 08:41:15 -07:00
|
|
|
obs_source_set_name(source, name.c_str());
|
2014-06-30 01:05:33 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-06-30 00:06:01 -07:00
|
|
|
void OBSBasic::SceneNameEdited(QWidget *editor,
|
|
|
|
QAbstractItemDelegate::EndEditHint endHint)
|
|
|
|
{
|
|
|
|
OBSScene scene = GetCurrentScene();
|
|
|
|
QLineEdit *edit = qobject_cast<QLineEdit*>(editor);
|
2014-06-30 01:05:33 -07:00
|
|
|
string text = QT_TO_UTF8(edit->text().trimmed());
|
2014-06-30 00:06:01 -07:00
|
|
|
|
|
|
|
if (!scene)
|
|
|
|
return;
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_source_t *source = obs_scene_get_source(scene);
|
2014-08-12 12:09:19 -07:00
|
|
|
RenameListItem(this, ui->scenes, source, text);
|
2014-06-30 00:06:01 -07:00
|
|
|
|
2016-08-28 14:24:14 -07:00
|
|
|
if (api)
|
|
|
|
api->on_event(OBS_FRONTEND_EVENT_SCENE_LIST_CHANGED);
|
|
|
|
|
2014-06-30 00:06:01 -07:00
|
|
|
UNUSED_PARAMETER(endHint);
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::SceneItemNameEdited(QWidget *editor,
|
|
|
|
QAbstractItemDelegate::EndEditHint endHint)
|
|
|
|
{
|
|
|
|
OBSSceneItem item = GetCurrentSceneItem();
|
|
|
|
QLineEdit *edit = qobject_cast<QLineEdit*>(editor);
|
2014-06-30 01:05:33 -07:00
|
|
|
string text = QT_TO_UTF8(edit->text().trimmed());
|
2014-06-30 00:06:01 -07:00
|
|
|
|
|
|
|
if (!item)
|
|
|
|
return;
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_source_t *source = obs_sceneitem_get_source(item);
|
2014-08-12 12:09:19 -07:00
|
|
|
RenameListItem(this, ui->sources, source, text);
|
2014-06-30 00:06:01 -07:00
|
|
|
|
2015-03-22 20:51:21 -07:00
|
|
|
QListWidgetItem *listItem = ui->sources->currentItem();
|
|
|
|
listItem->setText(QString());
|
|
|
|
SetupVisibilityItem(ui->sources, listItem, item);
|
|
|
|
|
2014-06-30 00:06:01 -07:00
|
|
|
UNUSED_PARAMETER(endHint);
|
|
|
|
}
|
|
|
|
|
2015-02-25 21:23:57 -08:00
|
|
|
void OBSBasic::OpenFilters()
|
|
|
|
{
|
|
|
|
OBSSceneItem item = GetCurrentSceneItem();
|
|
|
|
OBSSource source = obs_sceneitem_get_source(item);
|
|
|
|
|
|
|
|
CreateFiltersWindow(source);
|
|
|
|
}
|
|
|
|
|
2015-03-18 15:09:44 -07:00
|
|
|
void OBSBasic::OpenSceneFilters()
|
|
|
|
{
|
|
|
|
OBSScene scene = GetCurrentScene();
|
|
|
|
OBSSource source = obs_scene_get_source(scene);
|
|
|
|
|
|
|
|
CreateFiltersWindow(source);
|
|
|
|
}
|
|
|
|
|
2015-06-30 07:58:29 -07:00
|
|
|
#define RECORDING_START \
|
|
|
|
"==== Recording Start ==============================================="
|
|
|
|
#define RECORDING_STOP \
|
|
|
|
"==== Recording Stop ================================================"
|
2016-12-09 14:40:04 -08:00
|
|
|
#define REPLAY_BUFFER_START \
|
|
|
|
"==== Replay Buffer Start ==========================================="
|
|
|
|
#define REPLAY_BUFFER_STOP \
|
|
|
|
"==== Replay Buffer Stop ============================================"
|
2015-06-30 07:58:29 -07:00
|
|
|
#define STREAMING_START \
|
|
|
|
"==== Streaming Start ==============================================="
|
|
|
|
#define STREAMING_STOP \
|
|
|
|
"==== Streaming Stop ================================================"
|
|
|
|
|
2014-10-25 17:03:13 -07:00
|
|
|
void OBSBasic::StartStreaming()
|
|
|
|
{
|
2016-08-28 14:24:14 -07:00
|
|
|
if (outputHandler->StreamingActive())
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (api)
|
|
|
|
api->on_event(OBS_FRONTEND_EVENT_STREAMING_STARTING);
|
|
|
|
|
2014-10-25 17:03:13 -07:00
|
|
|
SaveProject();
|
|
|
|
|
2015-09-06 16:19:53 -07:00
|
|
|
ui->streamButton->setEnabled(false);
|
|
|
|
ui->streamButton->setText(QTStr("Basic.Main.Connecting"));
|
2016-10-19 05:29:34 -07:00
|
|
|
|
|
|
|
if (sysTrayStream) {
|
|
|
|
sysTrayStream->setEnabled(false);
|
|
|
|
sysTrayStream->setText(ui->streamButton->text());
|
|
|
|
}
|
2014-10-25 17:03:13 -07:00
|
|
|
|
2015-09-06 16:19:53 -07:00
|
|
|
if (!outputHandler->StartStreaming(service)) {
|
|
|
|
ui->streamButton->setText(QTStr("Basic.Main.StartStreaming"));
|
|
|
|
ui->streamButton->setEnabled(true);
|
2016-10-19 05:29:34 -07:00
|
|
|
|
|
|
|
if (sysTrayStream) {
|
|
|
|
sysTrayStream->setText(ui->streamButton->text());
|
|
|
|
sysTrayStream->setEnabled(true);
|
|
|
|
}
|
2014-10-25 17:03:13 -07:00
|
|
|
}
|
2016-06-16 10:59:36 -07:00
|
|
|
|
|
|
|
bool recordWhenStreaming = config_get_bool(GetGlobalConfig(),
|
|
|
|
"BasicWindow", "RecordWhenStreaming");
|
|
|
|
if (recordWhenStreaming)
|
|
|
|
StartRecording();
|
2017-01-04 13:11:52 -08:00
|
|
|
|
|
|
|
bool replayBufferWhileStreaming = config_get_bool(GetGlobalConfig(),
|
|
|
|
"BasicWindow", "ReplayBufferWhileStreaming");
|
|
|
|
if (replayBufferWhileStreaming)
|
|
|
|
StartReplayBuffer();
|
|
|
|
|
2014-10-25 17:03:13 -07:00
|
|
|
}
|
|
|
|
|
2016-07-01 10:27:27 -07:00
|
|
|
#ifdef _WIN32
|
|
|
|
static inline void UpdateProcessPriority()
|
|
|
|
{
|
|
|
|
const char *priority = config_get_string(App()->GlobalConfig(),
|
|
|
|
"General", "ProcessPriority");
|
|
|
|
if (priority && strcmp(priority, "Normal") != 0)
|
|
|
|
SetProcessPriority(priority);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void ClearProcessPriority()
|
|
|
|
{
|
|
|
|
const char *priority = config_get_string(App()->GlobalConfig(),
|
|
|
|
"General", "ProcessPriority");
|
|
|
|
if (priority && strcmp(priority, "Normal") != 0)
|
|
|
|
SetProcessPriority("Normal");
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
#define UpdateProcessPriority() do {} while(false)
|
|
|
|
#define ClearProcessPriority() do {} while(false)
|
|
|
|
#endif
|
|
|
|
|
2016-08-21 12:05:25 -07:00
|
|
|
inline void OBSBasic::OnActivate()
|
2014-10-25 17:03:13 -07:00
|
|
|
{
|
2016-08-21 12:05:25 -07:00
|
|
|
if (ui->profileMenu->isEnabled()) {
|
|
|
|
ui->profileMenu->setEnabled(false);
|
|
|
|
App()->IncrementSleepInhibition();
|
|
|
|
UpdateProcessPriority();
|
2016-08-13 07:36:17 -07:00
|
|
|
|
2016-10-19 06:44:02 -07:00
|
|
|
if (trayIcon)
|
|
|
|
trayIcon->setIcon(QIcon(":/res/images/tray_active.png"));
|
2016-08-21 12:05:25 -07:00
|
|
|
}
|
|
|
|
}
|
2015-06-30 07:58:29 -07:00
|
|
|
|
2016-08-21 12:05:25 -07:00
|
|
|
inline void OBSBasic::OnDeactivate()
|
|
|
|
{
|
2015-11-16 09:08:55 -08:00
|
|
|
if (!outputHandler->Active() && !ui->profileMenu->isEnabled()) {
|
2015-06-23 19:38:01 -07:00
|
|
|
ui->profileMenu->setEnabled(true);
|
2015-11-16 09:08:55 -08:00
|
|
|
App()->DecrementSleepInhibition();
|
2016-07-01 10:27:27 -07:00
|
|
|
ClearProcessPriority();
|
2016-08-13 07:36:17 -07:00
|
|
|
|
2016-10-19 06:44:02 -07:00
|
|
|
if (trayIcon)
|
|
|
|
trayIcon->setIcon(QIcon(":/res/images/obs.png"));
|
2015-06-30 07:58:29 -07:00
|
|
|
}
|
2016-08-21 12:05:25 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::StopStreaming()
|
|
|
|
{
|
|
|
|
SaveProject();
|
|
|
|
|
|
|
|
if (outputHandler->StreamingActive())
|
2016-09-09 07:37:54 -07:00
|
|
|
outputHandler->StopStreaming(streamingStopping);
|
2016-08-21 12:05:25 -07:00
|
|
|
|
|
|
|
OnDeactivate();
|
2016-06-16 10:59:36 -07:00
|
|
|
|
|
|
|
bool recordWhenStreaming = config_get_bool(GetGlobalConfig(),
|
|
|
|
"BasicWindow", "RecordWhenStreaming");
|
|
|
|
bool keepRecordingWhenStreamStops = config_get_bool(GetGlobalConfig(),
|
|
|
|
"BasicWindow", "KeepRecordingWhenStreamStops");
|
|
|
|
if (recordWhenStreaming && !keepRecordingWhenStreamStops)
|
|
|
|
StopRecording();
|
2017-01-04 13:11:52 -08:00
|
|
|
|
|
|
|
bool replayBufferWhileStreaming = config_get_bool(GetGlobalConfig(),
|
|
|
|
"BasicWindow", "ReplayBufferWhileStreaming");
|
|
|
|
bool keepReplayBufferStreamStops = config_get_bool(GetGlobalConfig(),
|
|
|
|
"BasicWindow", "KeepReplayBufferStreamStops");
|
|
|
|
if (replayBufferWhileStreaming && !keepReplayBufferStreamStops)
|
|
|
|
StopReplayBuffer();
|
2014-10-25 17:03:13 -07:00
|
|
|
}
|
|
|
|
|
2015-09-06 16:19:53 -07:00
|
|
|
void OBSBasic::ForceStopStreaming()
|
|
|
|
{
|
|
|
|
SaveProject();
|
|
|
|
|
|
|
|
if (outputHandler->StreamingActive())
|
2016-09-09 07:37:54 -07:00
|
|
|
outputHandler->StopStreaming(true);
|
2015-09-06 16:19:53 -07:00
|
|
|
|
2016-08-21 12:05:25 -07:00
|
|
|
OnDeactivate();
|
2016-06-16 10:59:36 -07:00
|
|
|
|
|
|
|
bool recordWhenStreaming = config_get_bool(GetGlobalConfig(),
|
|
|
|
"BasicWindow", "RecordWhenStreaming");
|
|
|
|
bool keepRecordingWhenStreamStops = config_get_bool(GetGlobalConfig(),
|
|
|
|
"BasicWindow", "KeepRecordingWhenStreamStops");
|
|
|
|
if (recordWhenStreaming && !keepRecordingWhenStreamStops)
|
|
|
|
StopRecording();
|
2017-01-04 13:11:52 -08:00
|
|
|
|
|
|
|
bool replayBufferWhileStreaming = config_get_bool(GetGlobalConfig(),
|
|
|
|
"BasicWindow", "ReplayBufferWhileStreaming");
|
|
|
|
bool keepReplayBufferStreamStops = config_get_bool(GetGlobalConfig(),
|
|
|
|
"BasicWindow", "KeepReplayBufferStreamStops");
|
|
|
|
if (replayBufferWhileStreaming && !keepReplayBufferStreamStops)
|
|
|
|
StopReplayBuffer();
|
2015-09-06 16:19:53 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::StreamDelayStarting(int sec)
|
|
|
|
{
|
|
|
|
ui->streamButton->setText(QTStr("Basic.Main.StopStreaming"));
|
|
|
|
ui->streamButton->setEnabled(true);
|
2016-10-19 05:29:34 -07:00
|
|
|
|
|
|
|
if (sysTrayStream) {
|
|
|
|
sysTrayStream->setText(ui->streamButton->text());
|
|
|
|
sysTrayStream->setEnabled(true);
|
|
|
|
}
|
2015-09-06 16:19:53 -07:00
|
|
|
|
|
|
|
if (!startStreamMenu.isNull())
|
|
|
|
startStreamMenu->deleteLater();
|
|
|
|
|
|
|
|
startStreamMenu = new QMenu();
|
|
|
|
startStreamMenu->addAction(QTStr("Basic.Main.StopStreaming"),
|
|
|
|
this, SLOT(StopStreaming()));
|
|
|
|
startStreamMenu->addAction(QTStr("Basic.Main.ForceStopStreaming"),
|
|
|
|
this, SLOT(ForceStopStreaming()));
|
|
|
|
ui->streamButton->setMenu(startStreamMenu);
|
|
|
|
|
|
|
|
ui->statusbar->StreamDelayStarting(sec);
|
2015-11-16 09:08:55 -08:00
|
|
|
|
2016-08-21 12:05:25 -07:00
|
|
|
OnActivate();
|
2015-09-06 16:19:53 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::StreamDelayStopping(int sec)
|
|
|
|
{
|
|
|
|
ui->streamButton->setText(QTStr("Basic.Main.StartStreaming"));
|
|
|
|
ui->streamButton->setEnabled(true);
|
2016-10-19 05:29:34 -07:00
|
|
|
|
|
|
|
if (sysTrayStream) {
|
|
|
|
sysTrayStream->setText(ui->streamButton->text());
|
|
|
|
sysTrayStream->setEnabled(true);
|
|
|
|
}
|
2015-09-06 16:19:53 -07:00
|
|
|
|
|
|
|
if (!startStreamMenu.isNull())
|
|
|
|
startStreamMenu->deleteLater();
|
|
|
|
|
|
|
|
startStreamMenu = new QMenu();
|
|
|
|
startStreamMenu->addAction(QTStr("Basic.Main.StartStreaming"),
|
|
|
|
this, SLOT(StartStreaming()));
|
|
|
|
startStreamMenu->addAction(QTStr("Basic.Main.ForceStopStreaming"),
|
|
|
|
this, SLOT(ForceStopStreaming()));
|
|
|
|
ui->streamButton->setMenu(startStreamMenu);
|
|
|
|
|
|
|
|
ui->statusbar->StreamDelayStopping(sec);
|
|
|
|
}
|
|
|
|
|
obs-studio UI: Implement stream settings UI
- Updated the services API so that it links up with an output and
the output gets data from that service rather than via settings.
This allows the service context to have control over how an output is
used, and makes it so that the URL/key/etc isn't necessarily some
static setting.
Also, if the service is attached to an output, it will stick around
until the output is destroyed.
- The settings interface has been updated so that it can allow the
usage of service plugins. What this means is that now you can create
a service plugin that can control aspects of the stream, and it
allows each service to create their own user interface if they create
a service plugin module.
- Testing out saving of current service information. Saves/loads from
JSON in to obs_data_t, seems to be working quite nicely, and the
service object information is saved/preserved on exit, and loaded
again on startup.
- I agonized over the settings user interface for days, and eventually
I just decided that the only way that users weren't going to be
fumbling over options was to split up the settings in to simple/basic
output, pre-configured, and then advanced for advanced use (such as
multiple outputs or services, which I'll implement later).
This was particularly painful to really design right, I wanted more
features and wanted to include everything in one interface but
ultimately just realized from experience that users are just not
technically knowledgable about it and will end up fumbling with the
settings rather than getting things done.
Basically, what this means is that casual users only have to enter in
about 3 things to configure their stream: Stream key, audio bitrate,
and video bitrate. I am really happy with this interface for those
types of users, but it definitely won't be sufficient for advanced
usage or for custom outputs, so that stuff will have to be separated.
- Improved the JSON usage for the 'common streaming services' context,
I realized that JSON arrays are there to ensure sorting, while
forgetting that general items are optimized for hashing. So
basically I'm just using arrays now to sort items in it.
2014-04-24 01:49:07 -07:00
|
|
|
void OBSBasic::StreamingStart()
|
Implement RTMP module (still needs drop code)
- Implement the RTMP output module. This time around, we just use a
simple FLV muxer, then just write to the stream with RTMP_Write.
Easy and effective.
- Fix the FLV muxer, the muxer now outputs proper FLV packets.
- Output API:
* When using encoders, automatically interleave encoded packets
before sending it to the output.
* Pair encoders and have them automatically wait for the other to
start to ensure sync.
* Change 'obs_output_signal_start_fail' to 'obs_output_signal_stop'
because it was a bit confusing, and doing this makes a lot more
sense for outputs that need to stop suddenly (disconnections/etc).
- Encoder API:
* Remove some unnecessary encoder functions from the actual API and
make them internal. Most of the encoder functions are handled
automatically by outputs anyway, so there's no real need to expose
them and end up inadvertently confusing plugin writers.
* Have audio encoders wait for the video encoder to get a frame, then
start at the exact data point that the first video frame starts to
ensure the most accrate sync of video/audio possible.
* Add a required 'frame_size' callback for audio encoders that
returns the expected number of frames desired to encode with. This
way, the libobs encoder API can handle the circular buffering
internally automatically for the encoder modules, so encoder
writers don't have to do it themselves.
- Fix a few bugs in the serializer interface. It was passing the wrong
variable for the data in a few cases.
- If a source has video, make obs_source_update defer the actual update
callback until the tick function is called to prevent threading
issues.
2014-04-07 22:00:10 -07:00
|
|
|
{
|
2014-07-12 05:34:23 -07:00
|
|
|
ui->streamButton->setText(QTStr("Basic.Main.StopStreaming"));
|
2014-05-15 14:04:18 -07:00
|
|
|
ui->streamButton->setEnabled(true);
|
2015-02-06 03:17:33 -08:00
|
|
|
ui->statusbar->StreamStarted(outputHandler->streamOutput);
|
2016-10-19 05:29:34 -07:00
|
|
|
|
|
|
|
if (sysTrayStream) {
|
|
|
|
sysTrayStream->setText(ui->streamButton->text());
|
|
|
|
sysTrayStream->setEnabled(true);
|
|
|
|
}
|
2015-11-16 09:08:55 -08:00
|
|
|
|
2016-08-28 14:24:14 -07:00
|
|
|
if (api)
|
|
|
|
api->on_event(OBS_FRONTEND_EVENT_STREAMING_STARTED);
|
|
|
|
|
2016-08-21 12:05:25 -07:00
|
|
|
OnActivate();
|
2015-11-16 09:08:55 -08:00
|
|
|
|
2015-07-05 23:48:29 -07:00
|
|
|
blog(LOG_INFO, STREAMING_START);
|
2014-03-10 13:10:35 -07:00
|
|
|
}
|
|
|
|
|
2016-06-22 01:47:08 -07:00
|
|
|
void OBSBasic::StreamStopping()
|
|
|
|
{
|
|
|
|
ui->streamButton->setText(QTStr("Basic.Main.StoppingStreaming"));
|
2016-10-19 05:29:34 -07:00
|
|
|
|
|
|
|
if (sysTrayStream)
|
|
|
|
sysTrayStream->setText(ui->streamButton->text());
|
2016-08-28 14:24:14 -07:00
|
|
|
|
2016-09-09 07:37:54 -07:00
|
|
|
streamingStopping = true;
|
2016-08-28 14:24:14 -07:00
|
|
|
if (api)
|
|
|
|
api->on_event(OBS_FRONTEND_EVENT_STREAMING_STOPPING);
|
2016-06-22 01:47:08 -07:00
|
|
|
}
|
|
|
|
|
2014-05-12 15:30:36 -07:00
|
|
|
void OBSBasic::StreamingStop(int code)
|
2014-03-10 13:10:35 -07:00
|
|
|
{
|
2014-05-12 15:30:36 -07:00
|
|
|
const char *errorMessage;
|
|
|
|
|
|
|
|
switch (code) {
|
|
|
|
case OBS_OUTPUT_BAD_PATH:
|
|
|
|
errorMessage = Str("Output.ConnectFail.BadPath");
|
|
|
|
break;
|
|
|
|
|
|
|
|
case OBS_OUTPUT_CONNECT_FAILED:
|
|
|
|
errorMessage = Str("Output.ConnectFail.ConnectFailed");
|
|
|
|
break;
|
|
|
|
|
|
|
|
case OBS_OUTPUT_INVALID_STREAM:
|
|
|
|
errorMessage = Str("Output.ConnectFail.InvalidStream");
|
|
|
|
break;
|
|
|
|
|
2014-06-25 02:03:00 -07:00
|
|
|
default:
|
2014-05-12 15:30:36 -07:00
|
|
|
case OBS_OUTPUT_ERROR:
|
|
|
|
errorMessage = Str("Output.ConnectFail.Error");
|
|
|
|
break;
|
|
|
|
|
|
|
|
case OBS_OUTPUT_DISCONNECTED:
|
|
|
|
/* doesn't happen if output is set to reconnect. note that
|
|
|
|
* reconnects are handled in the output, not in the UI */
|
|
|
|
errorMessage = Str("Output.ConnectFail.Disconnected");
|
|
|
|
}
|
|
|
|
|
2014-07-06 16:19:27 -07:00
|
|
|
ui->statusbar->StreamStopped();
|
2014-05-20 23:27:27 -07:00
|
|
|
|
2014-05-12 15:30:36 -07:00
|
|
|
ui->streamButton->setText(QTStr("Basic.Main.StartStreaming"));
|
2014-05-15 14:04:18 -07:00
|
|
|
ui->streamButton->setEnabled(true);
|
2016-10-19 05:29:34 -07:00
|
|
|
|
|
|
|
if (sysTrayStream) {
|
|
|
|
sysTrayStream->setText(ui->streamButton->text());
|
|
|
|
sysTrayStream->setEnabled(true);
|
|
|
|
}
|
2014-05-12 15:30:36 -07:00
|
|
|
|
2016-09-09 07:37:54 -07:00
|
|
|
streamingStopping = false;
|
2016-08-28 14:24:14 -07:00
|
|
|
if (api)
|
|
|
|
api->on_event(OBS_FRONTEND_EVENT_STREAMING_STOPPED);
|
|
|
|
|
2016-08-21 12:05:25 -07:00
|
|
|
OnDeactivate();
|
2015-07-05 23:48:29 -07:00
|
|
|
|
|
|
|
blog(LOG_INFO, STREAMING_STOP);
|
2015-06-30 07:58:29 -07:00
|
|
|
|
2016-08-13 07:36:17 -07:00
|
|
|
if (code != OBS_OUTPUT_SUCCESS && isVisible()) {
|
2014-05-12 15:30:36 -07:00
|
|
|
QMessageBox::information(this,
|
|
|
|
QTStr("Output.ConnectFail.Title"),
|
|
|
|
QT_UTF8(errorMessage));
|
2016-08-13 07:36:17 -07:00
|
|
|
} else if (code != OBS_OUTPUT_SUCCESS && !isVisible()) {
|
|
|
|
SysTrayNotify(QT_UTF8(errorMessage), QSystemTrayIcon::Warning);
|
|
|
|
}
|
2015-09-06 16:19:53 -07:00
|
|
|
|
|
|
|
if (!startStreamMenu.isNull()) {
|
|
|
|
ui->streamButton->setMenu(nullptr);
|
|
|
|
startStreamMenu->deleteLater();
|
|
|
|
startStreamMenu = nullptr;
|
|
|
|
}
|
2014-04-14 02:22:09 -07:00
|
|
|
}
|
|
|
|
|
2014-10-25 16:57:29 -07:00
|
|
|
void OBSBasic::StartRecording()
|
|
|
|
{
|
2016-06-16 10:59:36 -07:00
|
|
|
if (outputHandler->RecordingActive())
|
|
|
|
return;
|
2014-10-25 16:57:29 -07:00
|
|
|
|
2016-08-28 14:24:14 -07:00
|
|
|
if (api)
|
|
|
|
api->on_event(OBS_FRONTEND_EVENT_RECORDING_STARTING);
|
|
|
|
|
2016-06-16 10:59:36 -07:00
|
|
|
SaveProject();
|
|
|
|
outputHandler->StartRecording();
|
2014-10-25 16:57:29 -07:00
|
|
|
}
|
|
|
|
|
2016-06-22 01:47:08 -07:00
|
|
|
void OBSBasic::RecordStopping()
|
|
|
|
{
|
2016-12-09 14:40:04 -08:00
|
|
|
ui->recordButton->setText(QTStr("Basic.Main.StoppingRecording"));
|
2016-10-19 05:29:34 -07:00
|
|
|
|
|
|
|
if (sysTrayRecord)
|
|
|
|
sysTrayRecord->setText(ui->recordButton->text());
|
2016-08-28 14:24:14 -07:00
|
|
|
|
2016-09-09 07:37:54 -07:00
|
|
|
recordingStopping = true;
|
2016-08-28 14:24:14 -07:00
|
|
|
if (api)
|
|
|
|
api->on_event(OBS_FRONTEND_EVENT_RECORDING_STOPPING);
|
2016-06-22 01:47:08 -07:00
|
|
|
}
|
|
|
|
|
2014-10-25 16:57:29 -07:00
|
|
|
void OBSBasic::StopRecording()
|
|
|
|
{
|
|
|
|
SaveProject();
|
|
|
|
|
|
|
|
if (outputHandler->RecordingActive())
|
2016-09-09 07:37:54 -07:00
|
|
|
outputHandler->StopRecording(recordingStopping);
|
2015-06-30 07:58:29 -07:00
|
|
|
|
2016-08-21 12:05:25 -07:00
|
|
|
OnDeactivate();
|
2014-10-25 16:57:29 -07:00
|
|
|
}
|
|
|
|
|
2014-08-24 18:10:57 -07:00
|
|
|
void OBSBasic::RecordingStart()
|
|
|
|
{
|
2015-02-06 03:17:33 -08:00
|
|
|
ui->statusbar->RecordingStarted(outputHandler->fileOutput);
|
2016-12-09 14:40:04 -08:00
|
|
|
ui->recordButton->setText(QTStr("Basic.Main.StopRecording"));
|
2016-10-19 05:29:34 -07:00
|
|
|
|
|
|
|
if (sysTrayRecord)
|
|
|
|
sysTrayRecord->setText(ui->recordButton->text());
|
2015-11-16 09:08:55 -08:00
|
|
|
|
2016-09-09 07:37:54 -07:00
|
|
|
recordingStopping = false;
|
2016-08-28 14:24:14 -07:00
|
|
|
if (api)
|
|
|
|
api->on_event(OBS_FRONTEND_EVENT_RECORDING_STARTED);
|
|
|
|
|
2016-08-21 12:05:25 -07:00
|
|
|
OnActivate();
|
2015-11-16 09:08:55 -08:00
|
|
|
|
2015-07-05 23:48:29 -07:00
|
|
|
blog(LOG_INFO, RECORDING_START);
|
2014-08-24 18:10:57 -07:00
|
|
|
}
|
|
|
|
|
2015-06-09 21:00:22 -07:00
|
|
|
void OBSBasic::RecordingStop(int code)
|
2014-03-10 13:10:35 -07:00
|
|
|
{
|
2014-08-24 18:10:57 -07:00
|
|
|
ui->statusbar->RecordingStopped();
|
2016-12-09 14:40:04 -08:00
|
|
|
ui->recordButton->setText(QTStr("Basic.Main.StartRecording"));
|
2016-10-19 05:29:34 -07:00
|
|
|
|
|
|
|
if (sysTrayRecord)
|
|
|
|
sysTrayRecord->setText(ui->recordButton->text());
|
2016-12-09 14:40:04 -08:00
|
|
|
|
2015-07-05 23:48:29 -07:00
|
|
|
blog(LOG_INFO, RECORDING_STOP);
|
2015-06-09 21:00:22 -07:00
|
|
|
|
2016-08-13 07:36:17 -07:00
|
|
|
if (code == OBS_OUTPUT_UNSUPPORTED && isVisible()) {
|
2015-06-09 21:00:22 -07:00
|
|
|
QMessageBox::information(this,
|
|
|
|
QTStr("Output.RecordFail.Title"),
|
|
|
|
QTStr("Output.RecordFail.Unsupported"));
|
2015-06-30 07:58:29 -07:00
|
|
|
|
2016-08-13 07:36:17 -07:00
|
|
|
} else if (code == OBS_OUTPUT_NO_SPACE && isVisible()) {
|
2015-09-18 22:20:55 -07:00
|
|
|
QMessageBox::information(this,
|
|
|
|
QTStr("Output.RecordNoSpace.Title"),
|
|
|
|
QTStr("Output.RecordNoSpace.Msg"));
|
|
|
|
|
2016-08-13 07:36:17 -07:00
|
|
|
} else if (code != OBS_OUTPUT_SUCCESS && isVisible()) {
|
2015-09-18 22:20:55 -07:00
|
|
|
QMessageBox::information(this,
|
|
|
|
QTStr("Output.RecordError.Title"),
|
|
|
|
QTStr("Output.RecordError.Msg"));
|
2016-08-13 07:36:17 -07:00
|
|
|
|
|
|
|
} else if (code == OBS_OUTPUT_UNSUPPORTED && !isVisible()) {
|
|
|
|
SysTrayNotify(QTStr("Output.RecordFail.Unsupported"),
|
|
|
|
QSystemTrayIcon::Warning);
|
|
|
|
|
|
|
|
} else if (code == OBS_OUTPUT_NO_SPACE && !isVisible()) {
|
|
|
|
SysTrayNotify(QTStr("Output.RecordNoSpace.Msg"),
|
|
|
|
QSystemTrayIcon::Warning);
|
|
|
|
|
|
|
|
} else if (code != OBS_OUTPUT_SUCCESS && !isVisible()) {
|
|
|
|
SysTrayNotify(QTStr("Output.RecordError.Msg"),
|
|
|
|
QSystemTrayIcon::Warning);
|
2015-09-18 22:20:55 -07:00
|
|
|
}
|
|
|
|
|
2016-08-28 14:24:14 -07:00
|
|
|
if (api)
|
|
|
|
api->on_event(OBS_FRONTEND_EVENT_RECORDING_STOPPED);
|
|
|
|
|
2016-08-21 12:05:25 -07:00
|
|
|
OnDeactivate();
|
2014-05-20 23:27:27 -07:00
|
|
|
}
|
obs-studio UI: Implement stream settings UI
- Updated the services API so that it links up with an output and
the output gets data from that service rather than via settings.
This allows the service context to have control over how an output is
used, and makes it so that the URL/key/etc isn't necessarily some
static setting.
Also, if the service is attached to an output, it will stick around
until the output is destroyed.
- The settings interface has been updated so that it can allow the
usage of service plugins. What this means is that now you can create
a service plugin that can control aspects of the stream, and it
allows each service to create their own user interface if they create
a service plugin module.
- Testing out saving of current service information. Saves/loads from
JSON in to obs_data_t, seems to be working quite nicely, and the
service object information is saved/preserved on exit, and loaded
again on startup.
- I agonized over the settings user interface for days, and eventually
I just decided that the only way that users weren't going to be
fumbling over options was to split up the settings in to simple/basic
output, pre-configured, and then advanced for advanced use (such as
multiple outputs or services, which I'll implement later).
This was particularly painful to really design right, I wanted more
features and wanted to include everything in one interface but
ultimately just realized from experience that users are just not
technically knowledgable about it and will end up fumbling with the
settings rather than getting things done.
Basically, what this means is that casual users only have to enter in
about 3 things to configure their stream: Stream key, audio bitrate,
and video bitrate. I am really happy with this interface for those
types of users, but it definitely won't be sufficient for advanced
usage or for custom outputs, so that stuff will have to be separated.
- Improved the JSON usage for the 'common streaming services' context,
I realized that JSON arrays are there to ensure sorting, while
forgetting that general items are optimized for hashing. So
basically I'm just using arrays now to sort items in it.
2014-04-24 01:49:07 -07:00
|
|
|
|
2016-12-09 14:40:04 -08:00
|
|
|
#define RP_NO_HOTKEY_TITLE QTStr("Output.ReplayBuffer.NoHotkey.Title")
|
|
|
|
#define RP_NO_HOTKEY_TEXT QTStr("Output.ReplayBuffer.NoHotkey.Msg")
|
|
|
|
|
|
|
|
void OBSBasic::StartReplayBuffer()
|
|
|
|
{
|
|
|
|
if (!outputHandler || !outputHandler->replayBuffer)
|
|
|
|
return;
|
|
|
|
if (outputHandler->ReplayBufferActive())
|
|
|
|
return;
|
|
|
|
|
|
|
|
obs_output_t *output = outputHandler->replayBuffer;
|
|
|
|
obs_data_t *hotkeys = obs_hotkeys_save_output(output);
|
|
|
|
obs_data_array_t *bindings = obs_data_get_array(hotkeys,
|
|
|
|
"ReplayBuffer.Save");
|
|
|
|
size_t count = obs_data_array_count(bindings);
|
|
|
|
obs_data_array_release(bindings);
|
|
|
|
obs_data_release(hotkeys);
|
|
|
|
|
|
|
|
if (!count) {
|
|
|
|
QMessageBox::information(this,
|
|
|
|
RP_NO_HOTKEY_TITLE,
|
|
|
|
RP_NO_HOTKEY_TEXT);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (api)
|
|
|
|
api->on_event(OBS_FRONTEND_EVENT_REPLAY_BUFFER_STARTING);
|
|
|
|
|
|
|
|
SaveProject();
|
|
|
|
outputHandler->StartReplayBuffer();
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::ReplayBufferStopping()
|
|
|
|
{
|
|
|
|
if (!outputHandler || !outputHandler->replayBuffer)
|
|
|
|
return;
|
|
|
|
|
|
|
|
replayBufferButton->setText(QTStr("Basic.Main.StoppingReplayBuffer"));
|
|
|
|
|
|
|
|
if (sysTrayReplayBuffer)
|
|
|
|
sysTrayReplayBuffer->setText(replayBufferButton->text());
|
|
|
|
|
|
|
|
replayBufferStopping = true;
|
|
|
|
if (api)
|
|
|
|
api->on_event(OBS_FRONTEND_EVENT_REPLAY_BUFFER_STOPPING);
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::StopReplayBuffer()
|
|
|
|
{
|
|
|
|
if (!outputHandler || !outputHandler->replayBuffer)
|
|
|
|
return;
|
|
|
|
|
|
|
|
SaveProject();
|
|
|
|
|
|
|
|
if (outputHandler->ReplayBufferActive())
|
|
|
|
outputHandler->StopReplayBuffer(replayBufferStopping);
|
|
|
|
|
|
|
|
OnDeactivate();
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::ReplayBufferStart()
|
|
|
|
{
|
|
|
|
if (!outputHandler || !outputHandler->replayBuffer)
|
|
|
|
return;
|
|
|
|
|
|
|
|
replayBufferButton->setText(QTStr("Basic.Main.StopReplayBuffer"));
|
|
|
|
|
|
|
|
if (sysTrayReplayBuffer)
|
|
|
|
sysTrayReplayBuffer->setText(replayBufferButton->text());
|
|
|
|
|
|
|
|
replayBufferStopping = false;
|
|
|
|
if (api)
|
|
|
|
api->on_event(OBS_FRONTEND_EVENT_REPLAY_BUFFER_STARTED);
|
|
|
|
|
|
|
|
OnActivate();
|
|
|
|
|
|
|
|
blog(LOG_INFO, REPLAY_BUFFER_START);
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::ReplayBufferStop(int code)
|
|
|
|
{
|
|
|
|
if (!outputHandler || !outputHandler->replayBuffer)
|
|
|
|
return;
|
|
|
|
|
|
|
|
replayBufferButton->setText(QTStr("Basic.Main.StartReplayBuffer"));
|
|
|
|
|
|
|
|
if (sysTrayReplayBuffer)
|
|
|
|
sysTrayReplayBuffer->setText(replayBufferButton->text());
|
|
|
|
|
|
|
|
blog(LOG_INFO, REPLAY_BUFFER_STOP);
|
|
|
|
|
|
|
|
if (code == OBS_OUTPUT_UNSUPPORTED && isVisible()) {
|
|
|
|
QMessageBox::information(this,
|
|
|
|
QTStr("Output.RecordFail.Title"),
|
|
|
|
QTStr("Output.RecordFail.Unsupported"));
|
|
|
|
|
|
|
|
} else if (code == OBS_OUTPUT_NO_SPACE && isVisible()) {
|
|
|
|
QMessageBox::information(this,
|
|
|
|
QTStr("Output.RecordNoSpace.Title"),
|
|
|
|
QTStr("Output.RecordNoSpace.Msg"));
|
|
|
|
|
|
|
|
} else if (code != OBS_OUTPUT_SUCCESS && isVisible()) {
|
|
|
|
QMessageBox::information(this,
|
|
|
|
QTStr("Output.RecordError.Title"),
|
|
|
|
QTStr("Output.RecordError.Msg"));
|
|
|
|
|
|
|
|
} else if (code == OBS_OUTPUT_UNSUPPORTED && !isVisible()) {
|
|
|
|
SysTrayNotify(QTStr("Output.RecordFail.Unsupported"),
|
|
|
|
QSystemTrayIcon::Warning);
|
|
|
|
|
|
|
|
} else if (code == OBS_OUTPUT_NO_SPACE && !isVisible()) {
|
|
|
|
SysTrayNotify(QTStr("Output.RecordNoSpace.Msg"),
|
|
|
|
QSystemTrayIcon::Warning);
|
|
|
|
|
|
|
|
} else if (code != OBS_OUTPUT_SUCCESS && !isVisible()) {
|
|
|
|
SysTrayNotify(QTStr("Output.RecordError.Msg"),
|
|
|
|
QSystemTrayIcon::Warning);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (api)
|
|
|
|
api->on_event(OBS_FRONTEND_EVENT_REPLAY_BUFFER_STOPPED);
|
|
|
|
|
|
|
|
OnDeactivate();
|
|
|
|
}
|
|
|
|
|
2014-05-20 23:27:27 -07:00
|
|
|
void OBSBasic::on_streamButton_clicked()
|
|
|
|
{
|
2015-02-06 03:17:33 -08:00
|
|
|
if (outputHandler->StreamingActive()) {
|
2016-01-22 08:09:04 -08:00
|
|
|
bool confirm = config_get_bool(GetGlobalConfig(), "BasicWindow",
|
|
|
|
"WarnBeforeStoppingStream");
|
|
|
|
|
2016-08-13 07:36:17 -07:00
|
|
|
if (confirm && isVisible()) {
|
2016-01-22 08:09:04 -08:00
|
|
|
QMessageBox::StandardButton button =
|
|
|
|
QMessageBox::question(this,
|
|
|
|
QTStr("ConfirmStop.Title"),
|
|
|
|
QTStr("ConfirmStop.Text"));
|
|
|
|
|
|
|
|
if (button == QMessageBox::No)
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2014-10-25 17:03:13 -07:00
|
|
|
StopStreaming();
|
2014-05-20 23:27:27 -07:00
|
|
|
} else {
|
2016-01-22 08:09:04 -08:00
|
|
|
bool confirm = config_get_bool(GetGlobalConfig(), "BasicWindow",
|
|
|
|
"WarnBeforeStartingStream");
|
|
|
|
|
2016-08-13 07:36:17 -07:00
|
|
|
if (confirm && isVisible()) {
|
2016-01-22 08:09:04 -08:00
|
|
|
QMessageBox::StandardButton button =
|
|
|
|
QMessageBox::question(this,
|
|
|
|
QTStr("ConfirmStart.Title"),
|
|
|
|
QTStr("ConfirmStart.Text"));
|
|
|
|
|
|
|
|
if (button == QMessageBox::No)
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2014-10-25 17:03:13 -07:00
|
|
|
StartStreaming();
|
2014-05-20 23:27:27 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::on_recordButton_clicked()
|
|
|
|
{
|
2014-10-25 16:57:29 -07:00
|
|
|
if (outputHandler->RecordingActive())
|
|
|
|
StopRecording();
|
|
|
|
else
|
|
|
|
StartRecording();
|
2014-02-10 09:22:35 -08:00
|
|
|
}
|
|
|
|
|
Change the UI to Qt (work in progress)
--------------------------------------------------
Notes and details
--------------------------------------------------
Why was this done? Because wxWidgets was just lacking in many areas. I
know wxWidgets is designed to be used with native controls, and that's
great, but wxWidgets just is not a feature-complete toolkit for
multiplatform applications. It lacks in dialog editors, its code is
archaic and outdated, and I just feel frustrated every time I try to do
things with it.
Qt on the other hand.. I had to actually try Qt to realize how much
better it was as a toolkit. They've got everything from dialog editors,
to an IDE, a debugger, build tools, just everything, and it's all
top-notch and highly maintained. The focus of the toolkit is
application development, and they spend their time trying to help
people do exactly that: make programs. Great support, great tools,
and because of that, great toolkit. I just didn't want to alienate any
developers by being stubborn about native widgets.
There *are* some things that are rather lackluster about it and design
choices I disagree with though. For example, I realize that to have an
easy to use toolkit you have to have some level of code generation.
However, in my personal and humble opinion, moc just feels like a
terrible way to approach the problem. Even now I feel like there are a
variety of ways you could handle code generation and automatic
management of things like that. I don't like the idea of circumventing
the language itself like that. It feels like one giant massive hack.
--------------------------------------------------
Things that aren't working properly:
--------------------------------------------------
- Settings dialog is not implemented. The dialog is complete but the
code to handle the dialog hasn't been constructed yet.
- There is a problem with using Qt widgets as a device target on
windows, with at least OpenGL: if I have the preview widget
automatically resize itself, it seems to cause some sort of video
card failure that I don't understand.
- Because of the above, resizing the preview widget has been disabled
until I can figure out what's going on, so it's currently only a
32x32 area.
- Direct3D doesn't seem to render correctly either, seems that the
viewport is messed up or something. I'm sort of confused about
what's going on with it.
- The new main window seems to be triggering more race conditions than
the wxWidgets main window dialog did. I'm not entirely sure what's
going on here, but this may just be existing race conditions within
libobs itself that I just never spotted before (even though I tend to
be very thorough with race conditions any time I use variables
cross-thread)
2014-01-23 10:53:55 -08:00
|
|
|
void OBSBasic::on_settingsButton_clicked()
|
2013-12-10 10:22:33 -08:00
|
|
|
{
|
2016-09-21 21:20:06 -07:00
|
|
|
on_action_Settings_triggered();
|
2013-12-10 10:22:33 -08:00
|
|
|
}
|
2014-03-06 20:08:12 -08:00
|
|
|
|
2015-06-25 01:02:47 -07:00
|
|
|
void OBSBasic::on_actionWebsite_triggered()
|
|
|
|
{
|
|
|
|
QUrl url = QUrl("https://obsproject.com", QUrl::TolerantMode);
|
|
|
|
QDesktopServices::openUrl(url);
|
|
|
|
}
|
|
|
|
|
2015-07-02 20:41:19 -07:00
|
|
|
void OBSBasic::on_actionShowSettingsFolder_triggered()
|
|
|
|
{
|
|
|
|
char path[512];
|
|
|
|
int ret = GetConfigPath(path, 512, "obs-studio");
|
|
|
|
if (ret <= 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
QDesktopServices::openUrl(QUrl::fromLocalFile(path));
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::on_actionShowProfileFolder_triggered()
|
|
|
|
{
|
|
|
|
char path[512];
|
|
|
|
int ret = GetProfilePath(path, 512, "");
|
|
|
|
if (ret <= 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
QDesktopServices::openUrl(QUrl::fromLocalFile(path));
|
|
|
|
}
|
|
|
|
|
2016-01-23 11:02:22 -08:00
|
|
|
QListWidgetItem *OBSBasic::GetTopSelectedSourceItem()
|
|
|
|
{
|
|
|
|
QList<QListWidgetItem*> selectedItems = ui->sources->selectedItems();
|
|
|
|
QListWidgetItem *topItem = nullptr;
|
|
|
|
if (selectedItems.size() != 0)
|
|
|
|
topItem = selectedItems[0];
|
|
|
|
return topItem;
|
|
|
|
}
|
|
|
|
|
2015-04-02 21:35:46 -07:00
|
|
|
void OBSBasic::on_preview_customContextMenuRequested(const QPoint &pos)
|
|
|
|
{
|
2016-01-23 11:02:22 -08:00
|
|
|
CreateSourcePopupMenu(GetTopSelectedSourceItem(), true);
|
2015-04-02 21:35:46 -07:00
|
|
|
|
|
|
|
UNUSED_PARAMETER(pos);
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::on_previewDisabledLabel_customContextMenuRequested(
|
|
|
|
const QPoint &pos)
|
|
|
|
{
|
|
|
|
QMenu popup(this);
|
2015-04-04 01:40:15 -07:00
|
|
|
QPointer<QMenu> previewProjector;
|
2015-04-02 21:35:46 -07:00
|
|
|
|
|
|
|
QAction *action = popup.addAction(
|
|
|
|
QTStr("Basic.Main.PreviewConextMenu.Enable"),
|
|
|
|
this, SLOT(TogglePreview()));
|
|
|
|
action->setCheckable(true);
|
2015-08-02 00:02:58 -07:00
|
|
|
action->setChecked(obs_display_enabled(ui->preview->GetDisplay()));
|
2015-04-02 21:35:46 -07:00
|
|
|
|
2015-04-04 01:40:15 -07:00
|
|
|
previewProjector = new QMenu(QTStr("PreviewProjector"));
|
|
|
|
AddProjectorMenuMonitors(previewProjector, this,
|
|
|
|
SLOT(OpenPreviewProjector()));
|
|
|
|
|
|
|
|
popup.addMenu(previewProjector);
|
2015-04-02 21:35:46 -07:00
|
|
|
popup.exec(QCursor::pos());
|
|
|
|
|
|
|
|
UNUSED_PARAMETER(pos);
|
|
|
|
}
|
|
|
|
|
2016-01-22 07:33:29 -08:00
|
|
|
void OBSBasic::on_actionAlwaysOnTop_triggered()
|
|
|
|
{
|
|
|
|
CloseDialogs();
|
|
|
|
|
|
|
|
/* Make sure all dialogs are safely and successfully closed before
|
|
|
|
* switching the always on top mode due to the fact that windows all
|
|
|
|
* have to be recreated, so queue the actual toggle to happen after
|
|
|
|
* all events related to closing the dialogs have finished */
|
|
|
|
QMetaObject::invokeMethod(this, "ToggleAlwaysOnTop",
|
|
|
|
Qt::QueuedConnection);
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::ToggleAlwaysOnTop()
|
|
|
|
{
|
|
|
|
bool isAlwaysOnTop = IsAlwaysOnTop(this);
|
|
|
|
|
|
|
|
ui->actionAlwaysOnTop->setChecked(!isAlwaysOnTop);
|
|
|
|
SetAlwaysOnTop(this, !isAlwaysOnTop);
|
|
|
|
|
|
|
|
show();
|
|
|
|
}
|
|
|
|
|
2014-03-06 20:08:12 -08:00
|
|
|
void OBSBasic::GetFPSCommon(uint32_t &num, uint32_t &den) const
|
|
|
|
{
|
|
|
|
const char *val = config_get_string(basicConfig, "Video", "FPSCommon");
|
|
|
|
|
|
|
|
if (strcmp(val, "10") == 0) {
|
|
|
|
num = 10;
|
|
|
|
den = 1;
|
|
|
|
} else if (strcmp(val, "20") == 0) {
|
|
|
|
num = 20;
|
|
|
|
den = 1;
|
|
|
|
} else if (strcmp(val, "25") == 0) {
|
|
|
|
num = 25;
|
|
|
|
den = 1;
|
|
|
|
} else if (strcmp(val, "29.97") == 0) {
|
|
|
|
num = 30000;
|
|
|
|
den = 1001;
|
|
|
|
} else if (strcmp(val, "48") == 0) {
|
|
|
|
num = 48;
|
|
|
|
den = 1;
|
|
|
|
} else if (strcmp(val, "59.94") == 0) {
|
|
|
|
num = 60000;
|
|
|
|
den = 1001;
|
|
|
|
} else if (strcmp(val, "60") == 0) {
|
|
|
|
num = 60;
|
|
|
|
den = 1;
|
|
|
|
} else {
|
|
|
|
num = 30;
|
|
|
|
den = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::GetFPSInteger(uint32_t &num, uint32_t &den) const
|
|
|
|
{
|
|
|
|
num = (uint32_t)config_get_uint(basicConfig, "Video", "FPSInt");
|
|
|
|
den = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::GetFPSFraction(uint32_t &num, uint32_t &den) const
|
|
|
|
{
|
|
|
|
num = (uint32_t)config_get_uint(basicConfig, "Video", "FPSNum");
|
|
|
|
den = (uint32_t)config_get_uint(basicConfig, "Video", "FPSDen");
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::GetFPSNanoseconds(uint32_t &num, uint32_t &den) const
|
|
|
|
{
|
|
|
|
num = 1000000000;
|
|
|
|
den = (uint32_t)config_get_uint(basicConfig, "Video", "FPSNS");
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::GetConfigFPS(uint32_t &num, uint32_t &den) const
|
|
|
|
{
|
|
|
|
uint32_t type = config_get_uint(basicConfig, "Video", "FPSType");
|
|
|
|
|
|
|
|
if (type == 1) //"Integer"
|
|
|
|
GetFPSInteger(num, den);
|
|
|
|
else if (type == 2) //"Fraction"
|
|
|
|
GetFPSFraction(num, den);
|
|
|
|
else if (false) //"Nanoseconds", currently not implemented
|
|
|
|
GetFPSNanoseconds(num, den);
|
|
|
|
else
|
|
|
|
GetFPSCommon(num, den);
|
|
|
|
}
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
config_t *OBSBasic::Config() const
|
2014-03-06 20:08:12 -08:00
|
|
|
{
|
|
|
|
return basicConfig;
|
|
|
|
}
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
|
|
|
|
void OBSBasic::on_actionEditTransform_triggered()
|
|
|
|
{
|
2014-07-22 13:16:57 -07:00
|
|
|
if (transformWindow)
|
|
|
|
transformWindow->close();
|
|
|
|
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
transformWindow = new OBSBasicTransform(this);
|
|
|
|
transformWindow->show();
|
2014-07-22 13:16:57 -07:00
|
|
|
transformWindow->setAttribute(Qt::WA_DeleteOnClose, true);
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
}
|
|
|
|
|
2016-12-06 23:43:23 -08:00
|
|
|
static obs_transform_info copiedTransformInfo;
|
|
|
|
static obs_sceneitem_crop copiedCropInfo;
|
|
|
|
|
|
|
|
void OBSBasic::on_actionCopyTransform_triggered()
|
|
|
|
{
|
|
|
|
auto func = [](obs_scene_t *scene, obs_sceneitem_t *item, void *param)
|
|
|
|
{
|
|
|
|
if (!obs_sceneitem_selected(item))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
obs_sceneitem_defer_update_begin(item);
|
|
|
|
obs_sceneitem_get_info(item, &copiedTransformInfo);
|
|
|
|
obs_sceneitem_get_crop(item, &copiedCropInfo);
|
|
|
|
obs_sceneitem_defer_update_end(item);
|
|
|
|
|
|
|
|
UNUSED_PARAMETER(scene);
|
|
|
|
UNUSED_PARAMETER(param);
|
|
|
|
return true;
|
|
|
|
};
|
|
|
|
|
|
|
|
obs_scene_enum_items(GetCurrentScene(), func, nullptr);
|
|
|
|
ui->actionPasteTransform->setEnabled(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::on_actionPasteTransform_triggered()
|
|
|
|
{
|
|
|
|
auto func = [](obs_scene_t *scene, obs_sceneitem_t *item, void *param)
|
|
|
|
{
|
|
|
|
if (!obs_sceneitem_selected(item))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
obs_sceneitem_defer_update_begin(item);
|
|
|
|
obs_sceneitem_set_info(item, &copiedTransformInfo);
|
|
|
|
obs_sceneitem_set_crop(item, &copiedCropInfo);
|
|
|
|
obs_sceneitem_defer_update_end(item);
|
|
|
|
|
|
|
|
UNUSED_PARAMETER(scene);
|
|
|
|
UNUSED_PARAMETER(param);
|
|
|
|
return true;
|
|
|
|
};
|
|
|
|
|
|
|
|
obs_scene_enum_items(GetCurrentScene(), func, nullptr);
|
|
|
|
}
|
|
|
|
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
void OBSBasic::on_actionResetTransform_triggered()
|
|
|
|
{
|
2014-09-25 17:44:05 -07:00
|
|
|
auto func = [] (obs_scene_t *scene, obs_sceneitem_t *item, void *param)
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
{
|
|
|
|
if (!obs_sceneitem_selected(item))
|
|
|
|
return true;
|
|
|
|
|
2016-03-31 10:15:20 -07:00
|
|
|
obs_sceneitem_defer_update_begin(item);
|
|
|
|
|
2014-08-01 23:33:45 -07:00
|
|
|
obs_transform_info info;
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
vec2_set(&info.pos, 0.0f, 0.0f);
|
|
|
|
vec2_set(&info.scale, 1.0f, 1.0f);
|
|
|
|
info.rot = 0.0f;
|
|
|
|
info.alignment = OBS_ALIGN_TOP | OBS_ALIGN_LEFT;
|
|
|
|
info.bounds_type = OBS_BOUNDS_NONE;
|
|
|
|
info.bounds_alignment = OBS_ALIGN_CENTER;
|
|
|
|
vec2_set(&info.bounds, 0.0f, 0.0f);
|
|
|
|
obs_sceneitem_set_info(item, &info);
|
|
|
|
|
2016-03-31 10:15:20 -07:00
|
|
|
obs_sceneitem_crop crop = {};
|
|
|
|
obs_sceneitem_set_crop(item, &crop);
|
|
|
|
|
|
|
|
obs_sceneitem_defer_update_end(item);
|
|
|
|
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
UNUSED_PARAMETER(scene);
|
|
|
|
UNUSED_PARAMETER(param);
|
|
|
|
return true;
|
|
|
|
};
|
|
|
|
|
|
|
|
obs_scene_enum_items(GetCurrentScene(), func, nullptr);
|
|
|
|
}
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
static void GetItemBox(obs_sceneitem_t *item, vec3 &tl, vec3 &br)
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
{
|
|
|
|
matrix4 boxTransform;
|
|
|
|
obs_sceneitem_get_box_transform(item, &boxTransform);
|
|
|
|
|
|
|
|
vec3_set(&tl, M_INFINITE, M_INFINITE, 0.0f);
|
2014-06-22 23:49:57 -07:00
|
|
|
vec3_set(&br, -M_INFINITE, -M_INFINITE, 0.0f);
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
|
2014-06-22 23:49:57 -07:00
|
|
|
auto GetMinPos = [&] (float x, float y)
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
{
|
|
|
|
vec3 pos;
|
|
|
|
vec3_set(&pos, x, y, 0.0f);
|
|
|
|
vec3_transform(&pos, &pos, &boxTransform);
|
2014-06-22 23:49:57 -07:00
|
|
|
vec3_min(&tl, &tl, &pos);
|
|
|
|
vec3_max(&br, &br, &pos);
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
};
|
|
|
|
|
2014-06-22 23:49:57 -07:00
|
|
|
GetMinPos(0.0f, 0.0f);
|
|
|
|
GetMinPos(1.0f, 0.0f);
|
|
|
|
GetMinPos(0.0f, 1.0f);
|
|
|
|
GetMinPos(1.0f, 1.0f);
|
|
|
|
}
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
static vec3 GetItemTL(obs_sceneitem_t *item)
|
2014-06-22 23:49:57 -07:00
|
|
|
{
|
|
|
|
vec3 tl, br;
|
|
|
|
GetItemBox(item, tl, br);
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
return tl;
|
|
|
|
}
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
static void SetItemTL(obs_sceneitem_t *item, const vec3 &tl)
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
{
|
|
|
|
vec3 newTL;
|
|
|
|
vec2 pos;
|
|
|
|
|
2014-08-03 14:39:19 -07:00
|
|
|
obs_sceneitem_get_pos(item, &pos);
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
newTL = GetItemTL(item);
|
|
|
|
pos.x += tl.x - newTL.x;
|
|
|
|
pos.y += tl.y - newTL.y;
|
2014-08-03 14:39:19 -07:00
|
|
|
obs_sceneitem_set_pos(item, &pos);
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
}
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
static bool RotateSelectedSources(obs_scene_t *scene, obs_sceneitem_t *item,
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
void *param)
|
|
|
|
{
|
|
|
|
if (!obs_sceneitem_selected(item))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
float rot = *reinterpret_cast<float*>(param);
|
|
|
|
|
|
|
|
vec3 tl = GetItemTL(item);
|
|
|
|
|
2014-08-03 14:39:19 -07:00
|
|
|
rot += obs_sceneitem_get_rot(item);
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
if (rot >= 360.0f) rot -= 360.0f;
|
|
|
|
else if (rot <= -360.0f) rot += 360.0f;
|
2014-08-03 14:39:19 -07:00
|
|
|
obs_sceneitem_set_rot(item, rot);
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
|
|
|
|
SetItemTL(item, tl);
|
|
|
|
|
|
|
|
UNUSED_PARAMETER(scene);
|
|
|
|
UNUSED_PARAMETER(param);
|
|
|
|
return true;
|
|
|
|
};
|
|
|
|
|
|
|
|
void OBSBasic::on_actionRotate90CW_triggered()
|
|
|
|
{
|
|
|
|
float f90CW = 90.0f;
|
|
|
|
obs_scene_enum_items(GetCurrentScene(), RotateSelectedSources, &f90CW);
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::on_actionRotate90CCW_triggered()
|
|
|
|
{
|
|
|
|
float f90CCW = -90.0f;
|
|
|
|
obs_scene_enum_items(GetCurrentScene(), RotateSelectedSources, &f90CCW);
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::on_actionRotate180_triggered()
|
|
|
|
{
|
|
|
|
float f180 = 180.0f;
|
|
|
|
obs_scene_enum_items(GetCurrentScene(), RotateSelectedSources, &f180);
|
|
|
|
}
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
static bool MultiplySelectedItemScale(obs_scene_t *scene, obs_sceneitem_t *item,
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
void *param)
|
|
|
|
{
|
|
|
|
vec2 &mul = *reinterpret_cast<vec2*>(param);
|
|
|
|
|
|
|
|
if (!obs_sceneitem_selected(item))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
vec3 tl = GetItemTL(item);
|
|
|
|
|
|
|
|
vec2 scale;
|
2014-08-03 14:39:19 -07:00
|
|
|
obs_sceneitem_get_scale(item, &scale);
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
vec2_mul(&scale, &scale, &mul);
|
2014-08-03 14:39:19 -07:00
|
|
|
obs_sceneitem_set_scale(item, &scale);
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
|
|
|
|
SetItemTL(item, tl);
|
2014-06-16 17:55:48 -07:00
|
|
|
|
|
|
|
UNUSED_PARAMETER(scene);
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::on_actionFlipHorizontal_triggered()
|
|
|
|
{
|
2014-06-16 17:55:48 -07:00
|
|
|
vec2 scale;
|
|
|
|
vec2_set(&scale, -1.0f, 1.0f);
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
obs_scene_enum_items(GetCurrentScene(), MultiplySelectedItemScale,
|
|
|
|
&scale);
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::on_actionFlipVertical_triggered()
|
|
|
|
{
|
2014-06-16 17:55:48 -07:00
|
|
|
vec2 scale;
|
|
|
|
vec2_set(&scale, 1.0f, -1.0f);
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
obs_scene_enum_items(GetCurrentScene(), MultiplySelectedItemScale,
|
|
|
|
&scale);
|
|
|
|
}
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
static bool CenterAlignSelectedItems(obs_scene_t *scene, obs_sceneitem_t *item,
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
void *param)
|
|
|
|
{
|
|
|
|
obs_bounds_type boundsType = *reinterpret_cast<obs_bounds_type*>(param);
|
|
|
|
|
|
|
|
if (!obs_sceneitem_selected(item))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
obs_video_info ovi;
|
|
|
|
obs_get_video_info(&ovi);
|
|
|
|
|
2014-08-01 23:33:45 -07:00
|
|
|
obs_transform_info itemInfo;
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
vec2_set(&itemInfo.pos, 0.0f, 0.0f);
|
|
|
|
vec2_set(&itemInfo.scale, 1.0f, 1.0f);
|
|
|
|
itemInfo.alignment = OBS_ALIGN_LEFT | OBS_ALIGN_TOP;
|
|
|
|
itemInfo.rot = 0.0f;
|
|
|
|
|
|
|
|
vec2_set(&itemInfo.bounds,
|
|
|
|
float(ovi.base_width), float(ovi.base_height));
|
|
|
|
itemInfo.bounds_type = boundsType;
|
|
|
|
itemInfo.bounds_alignment = OBS_ALIGN_CENTER;
|
|
|
|
|
|
|
|
obs_sceneitem_set_info(item, &itemInfo);
|
|
|
|
|
|
|
|
UNUSED_PARAMETER(scene);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::on_actionFitToScreen_triggered()
|
|
|
|
{
|
|
|
|
obs_bounds_type boundsType = OBS_BOUNDS_SCALE_INNER;
|
|
|
|
obs_scene_enum_items(GetCurrentScene(), CenterAlignSelectedItems,
|
|
|
|
&boundsType);
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::on_actionStretchToScreen_triggered()
|
|
|
|
{
|
|
|
|
obs_bounds_type boundsType = OBS_BOUNDS_STRETCH;
|
|
|
|
obs_scene_enum_items(GetCurrentScene(), CenterAlignSelectedItems,
|
|
|
|
&boundsType);
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::on_actionCenterToScreen_triggered()
|
|
|
|
{
|
2014-09-25 17:44:05 -07:00
|
|
|
auto func = [] (obs_scene_t *scene, obs_sceneitem_t *item, void *param)
|
2014-06-22 23:49:57 -07:00
|
|
|
{
|
|
|
|
vec3 tl, br, itemCenter, screenCenter, offset;
|
|
|
|
obs_video_info ovi;
|
|
|
|
|
|
|
|
if (!obs_sceneitem_selected(item))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
obs_get_video_info(&ovi);
|
|
|
|
|
|
|
|
vec3_set(&screenCenter, float(ovi.base_width),
|
|
|
|
float(ovi.base_height), 0.0f);
|
|
|
|
vec3_mulf(&screenCenter, &screenCenter, 0.5f);
|
|
|
|
|
|
|
|
GetItemBox(item, tl, br);
|
|
|
|
|
|
|
|
vec3_sub(&itemCenter, &br, &tl);
|
|
|
|
vec3_mulf(&itemCenter, &itemCenter, 0.5f);
|
|
|
|
vec3_add(&itemCenter, &itemCenter, &tl);
|
|
|
|
|
|
|
|
vec3_sub(&offset, &screenCenter, &itemCenter);
|
|
|
|
vec3_add(&tl, &tl, &offset);
|
|
|
|
|
|
|
|
SetItemTL(item, tl);
|
|
|
|
|
|
|
|
UNUSED_PARAMETER(scene);
|
2014-06-25 01:40:39 -07:00
|
|
|
UNUSED_PARAMETER(param);
|
2014-06-22 23:49:57 -07:00
|
|
|
return true;
|
|
|
|
};
|
|
|
|
|
|
|
|
obs_scene_enum_items(GetCurrentScene(), func, nullptr);
|
UI: Add scene editing
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.
2014-06-15 00:54:48 -07:00
|
|
|
}
|
2015-04-02 21:35:46 -07:00
|
|
|
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
void OBSBasic::EnablePreviewDisplay(bool enable)
|
|
|
|
{
|
|
|
|
obs_display_set_enabled(ui->preview->GetDisplay(), enable);
|
|
|
|
ui->preview->setVisible(enable);
|
|
|
|
ui->previewDisabledLabel->setVisible(!enable);
|
|
|
|
}
|
|
|
|
|
2015-04-02 21:35:46 -07:00
|
|
|
void OBSBasic::TogglePreview()
|
|
|
|
{
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
previewEnabled = !previewEnabled;
|
|
|
|
EnablePreviewDisplay(previewEnabled);
|
2015-04-02 21:35:46 -07:00
|
|
|
}
|
2015-04-02 23:09:13 -07:00
|
|
|
|
|
|
|
void OBSBasic::Nudge(int dist, MoveDir dir)
|
|
|
|
{
|
2016-09-02 08:13:45 -07:00
|
|
|
if (ui->preview->Locked())
|
|
|
|
return;
|
|
|
|
|
2015-04-02 23:09:13 -07:00
|
|
|
struct MoveInfo {
|
|
|
|
float dist;
|
|
|
|
MoveDir dir;
|
|
|
|
} info = {(float)dist, dir};
|
|
|
|
|
|
|
|
auto func = [] (obs_scene_t*, obs_sceneitem_t *item, void *param)
|
|
|
|
{
|
|
|
|
MoveInfo *info = reinterpret_cast<MoveInfo*>(param);
|
2015-04-10 10:07:56 -07:00
|
|
|
struct vec2 dir;
|
2015-04-02 23:09:13 -07:00
|
|
|
struct vec2 pos;
|
|
|
|
|
2015-04-10 10:07:56 -07:00
|
|
|
vec2_set(&dir, 0.0f, 0.0f);
|
|
|
|
|
2015-04-02 23:09:13 -07:00
|
|
|
if (!obs_sceneitem_selected(item))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
switch (info->dir) {
|
|
|
|
case MoveDir::Up: dir.y = -info->dist; break;
|
|
|
|
case MoveDir::Down: dir.y = info->dist; break;
|
|
|
|
case MoveDir::Left: dir.x = -info->dist; break;
|
|
|
|
case MoveDir::Right: dir.x = info->dist; break;
|
|
|
|
}
|
|
|
|
|
|
|
|
obs_sceneitem_get_pos(item, &pos);
|
|
|
|
vec2_add(&pos, &pos, &dir);
|
|
|
|
obs_sceneitem_set_pos(item, &pos);
|
|
|
|
return true;
|
|
|
|
};
|
|
|
|
|
|
|
|
obs_scene_enum_items(GetCurrentScene(), func, &info);
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::NudgeUp() {Nudge(1, MoveDir::Up);}
|
|
|
|
void OBSBasic::NudgeDown() {Nudge(1, MoveDir::Down);}
|
|
|
|
void OBSBasic::NudgeLeft() {Nudge(1, MoveDir::Left);}
|
|
|
|
void OBSBasic::NudgeRight() {Nudge(1, MoveDir::Right);}
|
2015-04-04 01:40:15 -07:00
|
|
|
|
|
|
|
void OBSBasic::OpenProjector(obs_source_t *source, int monitor)
|
|
|
|
{
|
|
|
|
/* seriously? 10 monitors? */
|
2016-12-29 07:21:53 -08:00
|
|
|
if (monitor > 9 || monitor > QGuiApplication::screens().size() - 1)
|
2015-04-04 01:40:15 -07:00
|
|
|
return;
|
|
|
|
|
2016-12-29 07:21:53 -08:00
|
|
|
bool isPreview = false;
|
|
|
|
|
|
|
|
if (source == nullptr)
|
|
|
|
isPreview = true;
|
|
|
|
|
2015-04-04 01:40:15 -07:00
|
|
|
delete projectors[monitor];
|
|
|
|
projectors[monitor].clear();
|
|
|
|
|
2016-12-29 07:21:53 -08:00
|
|
|
RemoveSavedProjectors(monitor);
|
|
|
|
|
2016-04-27 16:00:28 -07:00
|
|
|
OBSProjector *projector = new OBSProjector(nullptr, source);
|
2015-04-04 01:40:15 -07:00
|
|
|
|
2016-12-29 07:21:53 -08:00
|
|
|
const char *name = obs_source_get_name(source);
|
|
|
|
|
|
|
|
if (isPreview) {
|
|
|
|
previewProjectorArray.at((size_t)monitor) = 1;
|
|
|
|
} else {
|
|
|
|
projectorArray.at((size_t)monitor) = name;
|
|
|
|
}
|
|
|
|
|
|
|
|
projector->Init(monitor);
|
2015-04-04 01:40:15 -07:00
|
|
|
projectors[monitor] = projector;
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::OpenPreviewProjector()
|
|
|
|
{
|
|
|
|
int monitor = sender()->property("monitor").toInt();
|
|
|
|
OpenProjector(nullptr, monitor);
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::OpenSourceProjector()
|
|
|
|
{
|
|
|
|
int monitor = sender()->property("monitor").toInt();
|
|
|
|
OBSSceneItem item = GetCurrentSceneItem();
|
|
|
|
if (!item)
|
|
|
|
return;
|
|
|
|
|
|
|
|
OpenProjector(obs_sceneitem_get_source(item), monitor);
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::OpenSceneProjector()
|
|
|
|
{
|
|
|
|
int monitor = sender()->property("monitor").toInt();
|
|
|
|
OBSScene scene = GetCurrentScene();
|
|
|
|
if (!scene)
|
|
|
|
return;
|
|
|
|
|
|
|
|
OpenProjector(obs_scene_get_source(scene), monitor);
|
|
|
|
}
|
2015-07-03 17:55:55 -07:00
|
|
|
|
2016-12-29 07:21:53 -08:00
|
|
|
void OBSBasic::OpenSavedProjectors()
|
|
|
|
{
|
|
|
|
bool projectorSave = config_get_bool(GetGlobalConfig(),
|
|
|
|
"BasicWindow", "SaveProjectors");
|
|
|
|
|
|
|
|
if (projectorSave) {
|
|
|
|
for (size_t i = 0; i < projectorArray.size(); i++) {
|
|
|
|
if (projectorArray.at(i).empty() == false) {
|
|
|
|
OBSSource source = obs_get_source_by_name(
|
|
|
|
projectorArray.at(i).c_str());
|
|
|
|
|
|
|
|
if (!source) {
|
|
|
|
RemoveSavedProjectors((int)i);
|
|
|
|
obs_source_release(source);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
OpenProjector(source, (int)i);
|
|
|
|
obs_source_release(source);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for (size_t i = 0; i < previewProjectorArray.size(); i++) {
|
|
|
|
if (previewProjectorArray.at(i) == 1) {
|
|
|
|
OpenProjector(nullptr, (int)i);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::RemoveSavedProjectors(int monitor)
|
|
|
|
{
|
|
|
|
previewProjectorArray.at((size_t)monitor) = 0;
|
|
|
|
projectorArray.at((size_t)monitor) = "";
|
|
|
|
}
|
|
|
|
|
2015-07-03 17:55:55 -07:00
|
|
|
void OBSBasic::UpdateTitleBar()
|
|
|
|
{
|
|
|
|
stringstream name;
|
|
|
|
|
2015-06-23 19:38:01 -07:00
|
|
|
const char *profile = config_get_string(App()->GlobalConfig(),
|
|
|
|
"Basic", "Profile");
|
2015-06-23 19:29:07 -07:00
|
|
|
const char *sceneCollection = config_get_string(App()->GlobalConfig(),
|
|
|
|
"Basic", "SceneCollection");
|
|
|
|
|
UI: Implement transitions and preview/program mode
Implements transitions, and introduces "Studio Mode" which allows live
editing of the same or different scenes while preserving what's
currently being displayed.
Studio Mode offers a number of new features:
- The ability to edit different scenes or the same scene without
modifying what's currently being displayed (of course)
- The ability to set up "quick transitions" with a desired transition
and duration that can be assigned hotkeys
- The option to create full copies of all sources in the program scene
to allow editing of source properties of the same scene live without
modifying the output, or (by default) just use references. (Note
however that certain sources cannot be duplicated, such as capture
sources, media sources, and device sources)
- Swap Mode (enabled by default) which swaps the program scene with
the preview scene when a transition completes
Currently, only non-configurable transitions (transitions without
properties) are listed, and the only transitions available as of this
writing are fade and cut. In future versions more transitions will be
added, such as swipe, stingers, and many other various sort of
transitions, and the UI will support being able to add/configure/remove
those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
|
|
|
name << "OBS ";
|
|
|
|
if (previewProgramMode)
|
|
|
|
name << "Studio ";
|
|
|
|
|
|
|
|
name << App()->GetVersionString();
|
2016-10-09 17:53:45 -07:00
|
|
|
if (App()->IsPortableMode())
|
|
|
|
name << " - Portable Mode";
|
|
|
|
|
2015-06-23 19:38:01 -07:00
|
|
|
name << " - " << Str("TitleBar.Profile") << ": " << profile;
|
2015-06-23 19:29:07 -07:00
|
|
|
name << " - " << Str("TitleBar.Scenes") << ": " << sceneCollection;
|
2015-07-03 17:55:55 -07:00
|
|
|
|
|
|
|
setWindowTitle(QT_UTF8(name.str().c_str()));
|
|
|
|
}
|
2015-06-23 19:38:01 -07:00
|
|
|
|
|
|
|
int OBSBasic::GetProfilePath(char *path, size_t size, const char *file) const
|
|
|
|
{
|
|
|
|
char profiles_path[512];
|
|
|
|
const char *profile = config_get_string(App()->GlobalConfig(),
|
|
|
|
"Basic", "ProfileDir");
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (!profile)
|
|
|
|
return -1;
|
|
|
|
if (!path)
|
|
|
|
return -1;
|
|
|
|
if (!file)
|
|
|
|
file = "";
|
|
|
|
|
|
|
|
ret = GetConfigPath(profiles_path, 512, "obs-studio/basic/profiles");
|
|
|
|
if (ret <= 0)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
if (!*file)
|
|
|
|
return snprintf(path, size, "%s/%s", profiles_path, profile);
|
|
|
|
|
|
|
|
return snprintf(path, size, "%s/%s/%s", profiles_path, profile, file);
|
|
|
|
}
|
2016-06-30 14:52:56 -07:00
|
|
|
|
|
|
|
void OBSBasic::on_toggleSceneTransitions_toggled(bool visible)
|
|
|
|
{
|
|
|
|
ui->sceneTransitionsLabel->setVisible(visible);
|
|
|
|
ui->transitionsContainer->setVisible(visible);
|
|
|
|
|
|
|
|
config_set_bool(App()->GlobalConfig(), "BasicWindow",
|
|
|
|
"ShowTransitions", visible);
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::on_toggleListboxToolbars_toggled(bool visible)
|
|
|
|
{
|
|
|
|
ui->sourcesToolbar->setVisible(visible);
|
|
|
|
ui->scenesToolbar->setVisible(visible);
|
|
|
|
|
|
|
|
config_set_bool(App()->GlobalConfig(), "BasicWindow",
|
|
|
|
"ShowListboxToolbars", visible);
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::on_toggleStatusBar_toggled(bool visible)
|
|
|
|
{
|
|
|
|
ui->statusbar->setVisible(visible);
|
|
|
|
|
|
|
|
config_set_bool(App()->GlobalConfig(), "BasicWindow",
|
|
|
|
"ShowStatusBar", visible);
|
|
|
|
}
|
2016-07-26 01:32:43 -07:00
|
|
|
|
|
|
|
void OBSBasic::on_actionLockPreview_triggered()
|
|
|
|
{
|
|
|
|
ui->preview->ToggleLocked();
|
|
|
|
ui->actionLockPreview->setChecked(ui->preview->Locked());
|
|
|
|
}
|
2016-08-13 07:36:17 -07:00
|
|
|
|
2016-11-05 09:48:46 -07:00
|
|
|
void OBSBasic::on_scalingMenu_aboutToShow()
|
|
|
|
{
|
|
|
|
obs_video_info ovi;
|
|
|
|
obs_get_video_info(&ovi);
|
|
|
|
|
|
|
|
QAction *action = ui->actionScaleCanvas;
|
|
|
|
QString text = QTStr("Basic.MainMenu.Edit.Scale.Canvas");
|
|
|
|
text = text.arg(QString::number(ovi.base_width),
|
|
|
|
QString::number(ovi.base_height));
|
|
|
|
action->setText(text);
|
|
|
|
|
|
|
|
action = ui->actionScaleOutput;
|
|
|
|
text = QTStr("Basic.MainMenu.Edit.Scale.Output");
|
|
|
|
text = text.arg(QString::number(ovi.output_width),
|
|
|
|
QString::number(ovi.output_height));
|
|
|
|
action->setText(text);
|
|
|
|
|
|
|
|
UpdatePreviewScalingMenu();
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::on_actionScaleWindow_triggered()
|
|
|
|
{
|
|
|
|
ui->preview->SetScaling(ScalingMode::Window);
|
|
|
|
ui->preview->ResetScrollingOffset();
|
|
|
|
emit ui->preview->DisplayResized();
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::on_actionScaleCanvas_triggered()
|
|
|
|
{
|
|
|
|
ui->preview->SetScaling(ScalingMode::Canvas);
|
|
|
|
emit ui->preview->DisplayResized();
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::on_actionScaleOutput_triggered()
|
|
|
|
{
|
|
|
|
ui->preview->SetScaling(ScalingMode::Output);
|
|
|
|
emit ui->preview->DisplayResized();
|
|
|
|
}
|
|
|
|
|
2016-08-13 07:36:17 -07:00
|
|
|
void OBSBasic::SetShowing(bool showing)
|
|
|
|
{
|
|
|
|
if (!showing && isVisible()) {
|
|
|
|
config_set_string(App()->GlobalConfig(),
|
|
|
|
"BasicWindow", "geometry",
|
|
|
|
saveGeometry().toBase64().constData());
|
|
|
|
|
2017-01-25 00:39:18 -08:00
|
|
|
/* hide all visible child dialogs */
|
|
|
|
visDlgPositions.clear();
|
|
|
|
if (!visDialogs.isEmpty()) {
|
|
|
|
for (QDialog *dlg : visDialogs) {
|
|
|
|
visDlgPositions.append(dlg->pos());
|
|
|
|
dlg->hide();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-10-19 06:44:02 -07:00
|
|
|
if (showHide)
|
|
|
|
showHide->setText(QTStr("Basic.SystemTray.Show"));
|
2016-08-13 07:36:17 -07:00
|
|
|
QTimer::singleShot(250, this, SLOT(hide()));
|
|
|
|
|
|
|
|
if (previewEnabled)
|
|
|
|
EnablePreviewDisplay(false);
|
|
|
|
|
|
|
|
setVisible(false);
|
|
|
|
|
|
|
|
} else if (showing && !isVisible()) {
|
2016-10-19 06:44:02 -07:00
|
|
|
if (showHide)
|
|
|
|
showHide->setText(QTStr("Basic.SystemTray.Hide"));
|
2016-08-13 07:36:17 -07:00
|
|
|
QTimer::singleShot(250, this, SLOT(show()));
|
|
|
|
|
|
|
|
if (previewEnabled)
|
|
|
|
EnablePreviewDisplay(true);
|
|
|
|
|
|
|
|
setVisible(true);
|
2017-01-24 23:01:24 -08:00
|
|
|
|
2017-01-25 00:39:18 -08:00
|
|
|
/* show all child dialogs that was visible earlier */
|
|
|
|
if (!visDialogs.isEmpty()) {
|
|
|
|
for (int i = 0; i < visDialogs.size(); ++i) {
|
|
|
|
QDialog *dlg = visDialogs[i];
|
|
|
|
dlg->move(visDlgPositions[i]);
|
|
|
|
dlg->show();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-01-24 23:01:24 -08:00
|
|
|
/* Unminimize window if it was hidden to tray instead of task
|
|
|
|
* bar. */
|
|
|
|
if (sysTrayMinimizeToTray()) {
|
|
|
|
Qt::WindowStates state;
|
|
|
|
state = windowState() & ~Qt::WindowMinimized;
|
|
|
|
state |= Qt::WindowActive;
|
|
|
|
setWindowState(state);
|
|
|
|
}
|
2016-08-13 07:36:17 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-01-25 00:39:18 -08:00
|
|
|
void OBSBasic::ToggleShowHide()
|
|
|
|
{
|
|
|
|
bool showing = isVisible();
|
|
|
|
if (showing) {
|
|
|
|
/* check for modal dialogs */
|
|
|
|
EnumDialogs();
|
|
|
|
if (!modalDialogs.isEmpty() || !visMsgBoxes.isEmpty())
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
SetShowing(!showing);
|
|
|
|
}
|
|
|
|
|
2016-10-19 06:49:12 -07:00
|
|
|
void OBSBasic::SystemTrayInit()
|
|
|
|
{
|
2016-08-13 07:36:17 -07:00
|
|
|
trayIcon = new QSystemTrayIcon(QIcon(":/res/images/obs.png"),
|
|
|
|
this);
|
|
|
|
trayIcon->setToolTip("OBS Studio");
|
|
|
|
|
|
|
|
showHide = new QAction(QTStr("Basic.SystemTray.Show"),
|
|
|
|
trayIcon);
|
|
|
|
sysTrayStream = new QAction(QTStr("Basic.Main.StartStreaming"),
|
|
|
|
trayIcon);
|
|
|
|
sysTrayRecord = new QAction(QTStr("Basic.Main.StartRecording"),
|
|
|
|
trayIcon);
|
2016-12-09 14:40:04 -08:00
|
|
|
sysTrayReplayBuffer = new QAction(QTStr("Basic.Main.StartReplayBuffer"),
|
|
|
|
trayIcon);
|
2016-08-13 07:36:17 -07:00
|
|
|
exit = new QAction(QTStr("Exit"),
|
|
|
|
trayIcon);
|
|
|
|
|
2016-12-09 14:40:04 -08:00
|
|
|
if (outputHandler && !outputHandler->replayBuffer)
|
|
|
|
sysTrayReplayBuffer->setEnabled(false);
|
2016-12-07 05:21:44 -08:00
|
|
|
|
2016-08-13 07:36:17 -07:00
|
|
|
connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
|
|
|
|
this,
|
|
|
|
SLOT(IconActivated(QSystemTrayIcon::ActivationReason)));
|
|
|
|
connect(showHide, SIGNAL(triggered()),
|
|
|
|
this, SLOT(ToggleShowHide()));
|
|
|
|
connect(sysTrayStream, SIGNAL(triggered()),
|
|
|
|
this, SLOT(on_streamButton_clicked()));
|
|
|
|
connect(sysTrayRecord, SIGNAL(triggered()),
|
|
|
|
this, SLOT(on_recordButton_clicked()));
|
2016-12-11 21:04:58 -08:00
|
|
|
connect(sysTrayReplayBuffer.data(), &QAction::triggered,
|
2016-12-09 14:40:04 -08:00
|
|
|
this, &OBSBasic::ReplayBufferClicked);
|
2016-08-13 07:36:17 -07:00
|
|
|
connect(exit, SIGNAL(triggered()),
|
|
|
|
this, SLOT(close()));
|
|
|
|
|
|
|
|
trayMenu = new QMenu;
|
|
|
|
trayMenu->addAction(showHide);
|
|
|
|
trayMenu->addAction(sysTrayStream);
|
|
|
|
trayMenu->addAction(sysTrayRecord);
|
2016-12-09 14:40:04 -08:00
|
|
|
trayMenu->addAction(sysTrayReplayBuffer);
|
2016-08-13 07:36:17 -07:00
|
|
|
trayMenu->addAction(exit);
|
|
|
|
trayIcon->setContextMenu(trayMenu);
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::IconActivated(QSystemTrayIcon::ActivationReason reason)
|
|
|
|
{
|
|
|
|
if (reason == QSystemTrayIcon::Trigger)
|
|
|
|
ToggleShowHide();
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::SysTrayNotify(const QString &text,
|
|
|
|
QSystemTrayIcon::MessageIcon n)
|
|
|
|
{
|
|
|
|
if (QSystemTrayIcon::supportsMessages()) {
|
|
|
|
QSystemTrayIcon::MessageIcon icon =
|
|
|
|
QSystemTrayIcon::MessageIcon(n);
|
|
|
|
trayIcon->showMessage("OBS Studio", text, icon, 10000);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void OBSBasic::SystemTray(bool firstStarted)
|
|
|
|
{
|
|
|
|
if (!QSystemTrayIcon::isSystemTrayAvailable())
|
|
|
|
return;
|
|
|
|
|
|
|
|
bool sysTrayWhenStarted = config_get_bool(GetGlobalConfig(),
|
|
|
|
"BasicWindow", "SysTrayWhenStarted");
|
|
|
|
bool sysTrayEnabled = config_get_bool(GetGlobalConfig(),
|
|
|
|
"BasicWindow", "SysTrayEnabled");
|
|
|
|
|
|
|
|
if (firstStarted)
|
|
|
|
SystemTrayInit();
|
|
|
|
|
|
|
|
if (!sysTrayWhenStarted && !sysTrayEnabled) {
|
|
|
|
trayIcon->hide();
|
2017-01-11 11:19:17 -08:00
|
|
|
} else if ((sysTrayWhenStarted && sysTrayEnabled)
|
|
|
|
|| opt_minimize_tray) {
|
2016-08-13 07:36:17 -07:00
|
|
|
trayIcon->show();
|
|
|
|
if (firstStarted) {
|
|
|
|
QTimer::singleShot(50, this, SLOT(hide()));
|
|
|
|
EnablePreviewDisplay(false);
|
|
|
|
setVisible(false);
|
2017-01-11 11:19:17 -08:00
|
|
|
opt_minimize_tray = false;
|
2016-08-13 07:36:17 -07:00
|
|
|
}
|
|
|
|
} else if (sysTrayEnabled) {
|
|
|
|
trayIcon->show();
|
|
|
|
} else if (!sysTrayEnabled) {
|
|
|
|
trayIcon->hide();
|
|
|
|
} else if (!sysTrayWhenStarted && sysTrayEnabled) {
|
|
|
|
trayIcon->hide();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (isVisible())
|
|
|
|
showHide->setText(QTStr("Basic.SystemTray.Hide"));
|
|
|
|
else
|
|
|
|
showHide->setText(QTStr("Basic.SystemTray.Show"));
|
|
|
|
}
|
2017-01-24 23:01:24 -08:00
|
|
|
|
|
|
|
bool OBSBasic::sysTrayMinimizeToTray()
|
|
|
|
{
|
|
|
|
return config_get_bool(GetGlobalConfig(),
|
|
|
|
"BasicWindow", "SysTrayMinimizeToTray");
|
|
|
|
}
|