OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-19 17:49:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
obs-studio/UI/window-basic-main.cpp

5823 lines
151 KiB
C++
Raw Normal View History

added initial main program and directshow files, finally have a UI functioning
2013-11-07 23:45:03 +00:00
/******************************************************************************
UI: Use 'reorder' signal for scene item reordering The old signals for for reordering have been removed; the new signal to use is the 'reorder' signal, which means that the list needs to be refreshed.
2015-02-19 19:02:54 +00:00
Copyright (C) 2013-2015 by Hugh Bailey <obs.jim@gmail.com>
UI: Add name/version to window title Also, make the 'start stream' button say 'connecting...' when it's initially trying to connect.
2014-05-15 21:04:18 +00:00
Zachary Lund <admin@computerquip.com>
UI: Use 'reorder' signal for scene item reordering The old signals for for reordering have been removed; the new signal to use is the 'reorder' signal, which means that the list needs to be refreshed.
2015-02-19 19:02:54 +00:00
Philippe Groarke <philippe.groarke@gmail.com>
added initial main program and directshow files, finally have a UI functioning
2013-11-07 23:45:03 +00: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
With the permission of my fellow contributors, I'm switching obs-studio back to GPL v2+ to prevent issues between this project and the original OBS project, and for personal reasons to avoid legal ambiguity (not political reasons, I admittedly would prefer GPL v3+)
2013-12-03 05:24:38 +00:00
the Free Software Foundation, either version 2 of the License, or
added initial main program and directshow files, finally have a UI functioning
2013-11-07 23:45:03 +00:00
(at your option) any later version.
This program is distributed in the hope that it will be useful,
fix a few windows wx issues, make windows use default GUI fonts, and a few other minor tweaks
2013-11-09 07:19:38 +00:00
but WITHOUT ANY WARRANTY; without even the implied warranty of
added initial main program and directshow files, finally have a UI functioning
2013-11-07 23:45:03 +00: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/>.
******************************************************************************/
Add basic update checking
2014-07-14 06:56:28 +00:00
#include <time.h>
move libobs C++ bindings to libobs
2013-12-23 00:42:02 +00:00
#include <obs.hpp>
UI: Use Qt lib for screen info instead of x11 libs All of the monitor discovery logic can be implemented with Qt. This change removes all the x11 implementations in favor of Qt and removes a fair amount of platform specific code.
2016-10-04 06:50:13 +00: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 18:53:55 +00:00
#include <QMessageBox>
Apply a number of fixes to the main window - Fix the size issue with list boxes on mac. Was displaying the list boxes with an improper size. Turns out it was just the wrong size policies on the frame below. - Ensure the main windows are fully displayed *before* initializing subsystems. This ensures that the graphics system will properly start up on macos, and allows the glitch fix. - Made a workaround for weird QT glitch that would happen to the parent of a pure native widget that also has internal painting fully disabled. (Should definitely write an example and report this bug on the QT forums)
2014-01-25 16:08:56 +00:00
#include <QShowEvent>
Add File -> "Show Recordings" menu entry
2014-08-22 01:18:42 +00:00
#include <QDesktopServices>
Do test recording to a specified file It will now output to a a filename that you specify when you click the record button. This is just for testing.
2014-02-10 17:22:35 +00:00
#include <QFileDialog>
UI: Fix window start pos when not inside a monitor Commit 8932bd39 attempted to fix the starting position when the program started up inside of a monitor that no longer exists, but it was incorrectly assumed that it would cause the program to automatically center its position. Instead it set its position to {0,0}, which is a really awkward position. This fixes that commit and ensures the window starts up centered to the primary display when its saved starting position is invalid.
2016-07-05 05:34:56 +00:00
#include <QDesktopWidget>
UI: Use Qt lib for screen info instead of x11 libs All of the monitor discovery logic can be implemented with Qt. This change removes all the x11 implementations in favor of Qt and removes a fair amount of platform specific code.
2016-10-04 06:50:13 +00:00
#include <QRect>
#include <QScreen>
make sure another source by the same name doesn't already exist when choosing a name for that scene
2013-12-29 16:17:00 +00:00
Add help menu with log file uploading Added github gist API uploading to the help menu to help make problems a bit easier to debug in the future. It's somewhat vital that this functionality be implemented before any release in order to analyze any given problem a user may be experiencing.
2014-05-19 00:44:10 +00:00
#include <util/dstr.h>
Move basic mode configuration to a separate file Having everything in global.ini meant that if you wanted different settings for studio mode, that it would also overwrite it for basic mode. This way, the settings for each mode are separate, and you can use different settings for each mode.
2014-03-07 04:08:12 +00:00
#include <util/util.hpp>
#include <util/platform.h>
UI: Profile initialization
2015-07-11 06:04:12 +00:00
#include <util/profiler.hpp>
UI: Add support for showing output error messages
2017-05-15 10:03:00 +00:00
#include <util/dstr.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 07:54:48 +00:00
#include <graphics/math-defs.h>
Move basic mode configuration to a separate file Having everything in global.ini meant that if you wanted different settings for studio mode, that it would also overwrite it for basic mode. This way, the settings for each mode are separate, and you can use different settings for each mode.
2014-03-07 04:08:12 +00:00
added initial config file stuff, set up a 'dummy' window to cause the graphics system to persist through window changes
2013-11-24 06:38:52 +00:00
#include "obs-app.hpp"
Move basic mode configuration to a separate file Having everything in global.ini meant that if you wanted different settings for studio mode, that it would also overwrite it for basic mode. This way, the settings for each mode are separate, and you can use different settings for each mode.
2014-03-07 04:08:12 +00:00
#include "platform.hpp"
UI: Add visibility checkbox to main sources list Adds a visibility checkbox to the main sources list so that users can temporarily disable/re-enable sources. Only applies to scene items, not the sources themselves.
2015-03-23 03:51:21 +00:00
#include "visibility-item-widget.hpp"
UI: Manually delete visibility item widgets
2015-06-28 01:18:40 +00:00
#include "item-widget-helpers.hpp"
Fix/update forms for main and settings window - Had the wrong names set for the up/down widgets for sources/scenes - Updated the settings dialog and gave most of the widgets actual object names - Added code for the settings window. Settings window should now at least display.
2014-01-25 04:19:50 +00:00
#include "window-basic-settings.hpp"
change obs_scene_destroy to obs_scene_release, add ability to add scenes, fix name dialog sizing
2013-12-29 15:54:06 +00:00
#include "window-namedialog.hpp"
UI: Add auto-configuration wizard The auto-configuration wizard is designed to allow first-time or novice/uneducated users or to set up video and encoding settings in a very quick and easy way. It'll automatically perform a bandwidth test, and/or test the user's video settings to determine the most ideal settings for streaming and recording (assuming a 1-pc setup).
2017-05-06 19:13:56 +00:00
#include "window-basic-auto-config.hpp"
Add 'source selection' dialog Add a 'source selection' dialog to replace the 'enter a name' dialog. This new dialog allows you to make new instances of pre-existing sources so that you can add a pre-existing source to a different scene, or in to the same scene more than once. Also started implementing locale. Comtemplating switching to JSON-based locale later, so we can add things like descriptions/disambiguation, and so we can use jansson's built-in hash table when doing the string lookup.
2014-05-11 01:47:48 +00: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 18:53:55 +00:00
#include "window-basic-main.hpp"
UI: Add stats dialog Shows performance stats, and streaming/recording stats, and helps warn the user when they have less-than-optimal values with coloring on the values (e.g. yellow when getting low on disk space, red when getting really low)
2017-05-11 02:37:45 +00:00
#include "window-basic-stats.hpp"
UI: Refactor output handling To accommodate multiple types of outputs, there has to be some level of abstraction. The BasicOutputHandler structure will give us a way that we can switch between different output configurations.
2015-02-06 11:17:33 +00:00
#include "window-basic-main-outputs.hpp"
Add source properties window (very preliminary) - Add a properties window for sources so that you can now actually edit the settings for sources. Also, display the source by itself in the window (Note: not working on mac, and possibly not working on linux). When changing the settings for a source, it will call obs_source_update on that source when you have modified any values automatically. - Add a properties 'widget', eventually I want to turn this in to a regular nice properties view like you'd see in the designer, but right now it just uses a form layout in a QScrollArea with regular controls to display the properties. It's clunky but works for the time being. - Make it so that swap chains and the main graphics subsystem will automatically use at least one backbuffer if none was specified - Fix bug where displays weren't added to the main display array - Make it so that you can get the properties of a source via the actual pointer of a source/encoder/output in addition to being able to look up properties via identifier. - When registering source types, check for required functions (wasn't doing it before). getheight/getwidth should not be optional if it's a video source as well. - Add an RAII OBSObj wrapper to obs.hpp for non-reference-counted libobs pointers - Add an RAII OBSSignal wrapper to obs.hpp for libobs signals to automatically disconnect them on destruction - Move the "scale and center" calculation in window-basic-main.cpp to its own function and in its own source file - Add an 'update' callback to WASAPI audio sources
2014-03-23 08:07:54 +00:00
#include "window-basic-properties.hpp"
Add help menu with log file uploading Added github gist API uploading to the help menu to help make problems a bit easier to debug in the future. It's somewhat vital that this functionality be implemented before any release in order to analyze any given problem a user may be experiencing.
2014-05-19 00:44:10 +00:00
#include "window-log-reply.hpp"
UI: Add fullscreen projector options Add the ability to use a fullscreen projector for scenes, sources, and the preview display.
2015-04-04 08:40:15 +00:00
#include "window-projector.hpp"
Add UI for remuxing recordings via FFmpeg
2014-09-03 02:11:55 +00: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 18:53:55 +00:00
#include "qt-wrappers.hpp"
Add source properties window (very preliminary) - Add a properties window for sources so that you can now actually edit the settings for sources. Also, display the source by itself in the window (Note: not working on mac, and possibly not working on linux). When changing the settings for a source, it will call obs_source_update on that source when you have modified any values automatically. - Add a properties 'widget', eventually I want to turn this in to a regular nice properties view like you'd see in the designer, but right now it just uses a form layout in a QScrollArea with regular controls to display the properties. It's clunky but works for the time being. - Make it so that swap chains and the main graphics subsystem will automatically use at least one backbuffer if none was specified - Fix bug where displays weren't added to the main display array - Make it so that you can get the properties of a source via the actual pointer of a source/encoder/output in addition to being able to look up properties via identifier. - When registering source types, check for required functions (wasn't doing it before). getheight/getwidth should not be optional if it's a video source as well. - Add an RAII OBSObj wrapper to obs.hpp for non-reference-counted libobs pointers - Add an RAII OBSSignal wrapper to obs.hpp for libobs signals to automatically disconnect them on destruction - Move the "scale and center" calculation in window-basic-main.cpp to its own function and in its own source file - Add an 'update' callback to WASAPI audio sources
2014-03-23 08:07:54 +00:00
#include "display-helpers.hpp"
Add (temporary terrible) volume controls - Add volume control These volume controls are basically nothing more than sliders. They look terrible and hopefully will be as temporary as they are terrible. - Allow saving of specific non-user sources via obs_load_source and obs_save_source functions. - Save data of desktop/mic audio sources (sync data, volume data, etc), and load the data on startup. - Make it so that a scene is created by default if first time using the application. On certain operating systems where supported, a default capture will be created. Desktop capture on mac, particularly. Not sure what to do about windows because monitor capture on windows 7 is completely terrible and is bad to start users off with.
2014-05-04 05:54:38 +00: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-24 06:39:39 +00:00
#include "remote-text.hpp"
Implemented adding sources to scenes via GUI Sources can now be added to scenes via user interface. It's a little convoluted because everything has to work through OBS signals to ensure that plugins/etc can modify the scenes/sources exernally. Also, when switching scenes, it will properly list sources for the scene you changed to.
2014-01-04 20:53:36 +00:00
UI: Add front-end auto-updater
2017-02-20 12:46:29 +00:00
#if defined(_WIN32) && defined(ENABLE_WIN_UPDATER)
#include "win-update/win-update.hpp"
#endif
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 18:53:55 +00:00
#include "ui_OBSBasic.h"
Cleaned up a bit, reverted API back to normal
2014-01-10 01:51:51 +00:00
Add help menu with log file uploading Added github gist API uploading to the help menu to help make problems a bit easier to debug in the future. It's somewhat vital that this functionality be implemented before any release in order to analyze any given problem a user may be experiencing.
2014-05-19 00:44:10 +00: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-08 05:00:10 +00:00
#include <sstream>
Resize preview when OBS windows are moved between monitors This should fix the previews in most cases when moving between monitors with differing pixel ratios
2014-04-16 20:35:01 +00:00
#include <QScreen>
#include <QWindow>
change obs_scene_destroy to obs_scene_release, add ability to add scenes, fix name dialog sizing
2013-12-29 15:54:06 +00:00
using namespace std;
updated UI files
2013-11-22 23:20:52 +00:00
UI: Hold ref when storing signals (skip) (Note: This commit breaks UI compilation. Skip if bisecting) Ensures that a reference is kept until the signals associated with that reference are disconnected.
2015-12-05 13:53:38 +00:00
namespace {
template <typename OBSRef>
struct SignalContainer {
OBSRef ref;
vector<shared_ptr<OBSSignal>> handlers;
};
}
Improve thread safety in UI code - Implemented better C++ classes for handling scenes/sources/items in obs.hpp, allowing them to automatically increment and decrement the references of each, as well as assign them to QVariants. - Because QVariants are now using the C++ classes, remove the pointer QVariant wrapper. - Use the new C++ classes with the QVariant user data of list box items, both for the sake of thread safety and to ensure that the data referenced is not freed until removed. NOTE: still might need some testing. - Implemented a source-remove signal from libobs, and start using that signal instead of the source-destroy signal for signalling item removal.
2014-02-02 21:26:23 +00:00
Q_DECLARE_METATYPE(OBSScene);
Q_DECLARE_METATYPE(OBSSceneItem);
Register OBSSource as Qt metatype
2014-10-29 14:53:59 +00:00
Q_DECLARE_METATYPE(OBSSource);
(API Change) Rename order_movement Prefix with obs_ for the sake of consistency Renamed enums: - order_movement (now obs_order_movement) Affected functions: - obs_source_filter_setorder - obs_sceneitem_setorder
2014-08-02 08:33:53 +00:00
Q_DECLARE_METATYPE(obs_order_movement);
UI: Hold ref when storing signals (skip) (Note: This commit breaks UI compilation. Skip if bisecting) Ensures that a reference is kept until the signals associated with that reference are disconnected.
2015-12-05 13:53:38 +00:00
Q_DECLARE_METATYPE(SignalContainer<OBSScene>);
Improve thread safety in UI code - Implemented better C++ classes for handling scenes/sources/items in obs.hpp, allowing them to automatically increment and decrement the references of each, as well as assign them to QVariants. - Because QVariants are now using the C++ classes, remove the pointer QVariant wrapper. - Use the new C++ classes with the QVariant user data of list box items, both for the sake of thread safety and to ensure that the data referenced is not freed until removed. NOTE: still might need some testing. - Implemented a source-remove signal from libobs, and start using that signal instead of the source-destroy signal for signalling item removal.
2014-02-02 21:26:23 +00:00
UI: Add QtDataRole enum This introduces the OBSSignals data role, which will be used to store signal handlers in stock Qt objects
2015-06-28 01:21:45 +00: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));
}
Add extra search path for third party plugins The OBSBasic UI will now allow the use of a subdirectory of the user application data directory for third-party plugins. Though I'm not entirely sure if this ideal or not. Regardless, this is one of the first (of many) steps towards a plugin manager. On windows, this is %appdata%/obs-studio/plugins On linux, this is ~/.obs-studio/plugins On mac, this is ~/Library/Application Support/obs-sudio/plugins
2014-07-27 19:48:14 +00:00
static void AddExtraModulePaths()
{
(API Change) Make os_get_config_path safer to use Changed: char *os_get_config_path(const char *name); To: int os_get_config_path(char *dst, size_t size, const char *name); Also added: char *os_get_config_path_ptr(const char *name); I don't like this function returning an allocation by default. Similarly to what was done with the wide character conversion functions, this function now operates on an array argument, and if you really want to just get a pointer for convenience, you use the *_ptr version of the function that clearly indicates that it's returning an allocation.
2015-01-16 07:44:38 +00:00
char base_module_dir[512];
UI: Make third-party plugins use program data dirs Makes it so third-party plugins are stored in system-local specific data directories (except on linux, which will still use user-local data directories for the time being)
2016-07-06 08:35:12 +00:00
#if defined(_WIN32) || defined(__APPLE__)
int ret = GetProgramDataPath(base_module_dir, sizeof(base_module_dir),
"obs-studio/plugins/%module%");
#else
UI: Replace os_get_config_path with GetConfigPath This allows the UI to be able to use a custom config path for cases such as portable mode, where the config path is relative to the executable.
2015-06-01 23:11:57 +00:00
int ret = GetConfigPath(base_module_dir, sizeof(base_module_dir),
(API Change) Make os_get_config_path safer to use Changed: char *os_get_config_path(const char *name); To: int os_get_config_path(char *dst, size_t size, const char *name); Also added: char *os_get_config_path_ptr(const char *name); I don't like this function returning an allocation by default. Similarly to what was done with the wide character conversion functions, this function now operates on an array argument, and if you really want to just get a pointer for convenience, you use the *_ptr version of the function that clearly indicates that it's returning an allocation.
2015-01-16 07:44:38 +00:00
"obs-studio/plugins/%module%");
UI: Make third-party plugins use program data dirs Makes it so third-party plugins are stored in system-local specific data directories (except on linux, which will still use user-local data directories for the time being)
2016-07-06 08:35:12 +00:00
#endif
Fix path to modules in AppData
2014-08-31 14:28:36 +00:00
(API Change) Make os_get_config_path safer to use Changed: char *os_get_config_path(const char *name); To: int os_get_config_path(char *dst, size_t size, const char *name); Also added: char *os_get_config_path_ptr(const char *name); I don't like this function returning an allocation by default. Similarly to what was done with the wide character conversion functions, this function now operates on an array argument, and if you really want to just get a pointer for convenience, you use the *_ptr version of the function that clearly indicates that it's returning an allocation.
2015-01-16 07:44:38 +00:00
if (ret <= 0)
Add extra search path for third party plugins The OBSBasic UI will now allow the use of a subdirectory of the user application data directory for third-party plugins. Though I'm not entirely sure if this ideal or not. Regardless, this is one of the first (of many) steps towards a plugin manager. On windows, this is %appdata%/obs-studio/plugins On linux, this is ~/.obs-studio/plugins On mac, this is ~/Library/Application Support/obs-sudio/plugins
2014-07-27 19:48:14 +00:00
return;
string path = (char*)base_module_dir;
UI: Make plugin search path use arch. bits in name If on windows/linux, make the plugin search path also include the architecture bits for its binary search path.
2015-07-15 01:05:26 +00:00
#if defined(__APPLE__)
Add extra search path for third party plugins The OBSBasic UI will now allow the use of a subdirectory of the user application data directory for third-party plugins. Though I'm not entirely sure if this ideal or not. Regardless, this is one of the first (of many) steps towards a plugin manager. On windows, this is %appdata%/obs-studio/plugins On linux, this is ~/.obs-studio/plugins On mac, this is ~/Library/Application Support/obs-sudio/plugins
2014-07-27 19:48:14 +00:00
obs_add_module_path((path + "/bin").c_str(), (path + "/data").c_str());
UI: Look for plugins in ~/Library/Application Support/obs-studio/plugins/
2017-05-28 17:27:58 +00:00
BPtr<char> config_bin = os_get_config_path_ptr("obs-studio/plugins/%module%/bin");
BPtr<char> config_data = os_get_config_path_ptr("obs-studio/plugins/%module%/data");
obs_add_module_path(config_bin, config_data);
UI: Make plugin search path use arch. bits in name If on windows/linux, make the plugin search path also include the architecture bits for its binary search path.
2015-07-15 01:05:26 +00: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
Add extra search path for third party plugins The OBSBasic UI will now allow the use of a subdirectory of the user application data directory for third-party plugins. Though I'm not entirely sure if this ideal or not. Regardless, this is one of the first (of many) steps towards a plugin manager. On windows, this is %appdata%/obs-studio/plugins On linux, this is ~/.obs-studio/plugins On mac, this is ~/Library/Application Support/obs-sudio/plugins
2014-07-27 19:48:14 +00:00
}
Fix sources context menu "Remove" shortcut for OSX
2014-10-15 20:00:43 +00:00
static QList<QKeySequence> DeleteKeys;
Add a comment and replace some class references Also, removed some unused headers, and moved the constructor/destructor functions to the top
2014-02-02 22:23:38 +00:00
OBSBasic::OBSBasic(QWidget *parent)
UI: Add FLV file output (sharing encoders) Implement the 'file path' in output settings, and implement the 'start recording' button, though for the time being I'm just going to make it use a directory rather than allow custom file names. This file output will actually share the video and audio encoder with the stream. I don't really know what to do about MP4 -- I don't really like the idea of saving directly in the program, if you do and the program crashes, that MP4 file is lost. I'm contemplating making some sort of mp4 output process stub. So no MP4 file output for the time being. If you need MP4, just remux it with FFmpeg: ffmpeg -i flv_file.flv -acodec copy -vcodec copy mp4_file.mp4
2014-05-21 06:27:27 +00:00
: OBSMainWindow (parent),
Add help menu with log file uploading Added github gist API uploading to the help menu to help make problems a bit easier to debug in the future. It's somewhat vital that this functionality be implemented before any release in order to analyze any given problem a user may be experiencing.
2014-05-19 00:44:10 +00:00
ui (new Ui::OBSBasic)
Add a comment and replace some class references Also, removed some unused headers, and moved the constructor/destructor functions to the top
2014-02-02 22:23:38 +00:00
{
UI: Fix linux display/resize bug with preview widget On linux, the main window isn't immediately set to a native widget, so the call: connect(windowHandle(), &QWindow::screenChanged, displayResize); on line 189 will fail, causing the preview widget to not properly resize when the main window is resized. Closes jp9000/obs-studio#776
2017-01-25 02:45:22 +00:00
setAttribute(Qt::WA_NativeWindow);
UI: Add option to save projectors This adds an option to the general settings to save the opened projectors on exit. (Note: Fixed conflicts -Jim) Closes jp9000/obs-studio#743
2016-12-29 15:21:53 +00:00
projectorArray.resize(10, "");
previewProjectorArray.resize(10, 0);
UI: Add media/image file drop support
2016-09-26 19:40:23 +00:00
setAcceptDrops(true);
Add a comment and replace some class references Also, removed some unused headers, and moved the constructor/destructor functions to the top
2014-02-02 22:23:38 +00:00
ui->setupUi(this);
UI: Add context menu to preview Includes the ability to disable the preview and general source context menu options (add/remove/filters/properties/etc)
2015-04-03 04:35:46 +00:00
ui->previewDisabledLabel->setVisible(false);
UI: Add modular UI Changes the UI to an adjustable user interface, allowing the user to fully customize how the scenes list, sources list, the mixer, transitions, and the buttons are oriented on the main window window.
2017-07-27 09:40:41 +00:00
startingDockLayout = saveState();
UI: Implement theme selection option OBS will offer the user a list of themes which are .qss files inside data/obs-studio/themes. If no theme is found in the configuration, it loads the default theme for the system.
2015-02-17 07:45:34 +00:00
copyActionsDynamicProperties();
Resize preview when OBS windows are moved between monitors This should fix the previews in most cases when moving between monitors with differing pixel ratios
2014-04-16 20:35:01 +00:00
UI: Add visibility checkbox to main sources list Adds a visibility checkbox to the main sources list so that users can temporarily disable/re-enable sources. Only applies to scene items, not the sources themselves.
2015-03-23 03:51:21 +00:00
ui->sources->setItemDelegate(new VisibilityItemDelegate(ui->sources));
UI: Enable load of stylesheet.qss from config dir This will allow obs to load stylesheet.qss (Qt stylesheet). It enables users to theme obs how they please within Qt stylesheet guidelines. A default stylesheet is not yet available.
2015-01-16 08:06:54 +00:00
char styleSheetPath[512];
UI: Add Profiles Adds setting profiles to the basic user interface. For each profile, a subdirectory for the profile will be created in [config_dir]/obs-studio/basic/profiles which will contain the settings data for each profile.
2015-06-24 02:38:01 +00:00
int ret = GetProfilePath(styleSheetPath, sizeof(styleSheetPath),
"stylesheet.qss");
UI: Enable load of stylesheet.qss from config dir This will allow obs to load stylesheet.qss (Qt stylesheet). It enables users to theme obs how they please within Qt stylesheet guidelines. A default stylesheet is not yet available.
2015-01-16 08:06:54 +00:00
if (ret > 0) {
UI: Apply a style sheet using path This allows the usage of other resources in the style sheet, like icons/etc, relative to the style sheet location. For example, to change the main window app icon, add #OBSBasic { qproperty-windowIcon: url("basic/newicon.png") } in the style sheet, where "basic/newicon.png" is a path relative to the qss file location.
2015-01-17 17:24:00 +00:00
if (QFile::exists(styleSheetPath)) {
QString path = QString("file:///") +
QT_UTF8(styleSheetPath);
App()->setStyleSheet(path);
}
UI: Enable load of stylesheet.qss from config dir This will allow obs to load stylesheet.qss (Qt stylesheet). It enables users to theme obs how they please within Qt stylesheet guidelines. A default stylesheet is not yet available.
2015-01-16 08:06:54 +00:00
}
Fix Qt unregistered datatype messages
2014-10-29 14:54:45 +00:00
qRegisterMetaType<OBSScene> ("OBSScene");
qRegisterMetaType<OBSSceneItem>("OBSSceneItem");
qRegisterMetaType<OBSSource> ("OBSSource");
UI: Add basic hotkey integration
2014-11-01 20:48:58 +00:00
qRegisterMetaType<obs_hotkey_id>("obs_hotkey_id");
Fix Qt unregistered datatype messages
2014-10-29 14:54:45 +00:00
UI: Enable drag&drop reordering for scenes The empty implementation for the QDataStream operators is necessary to fix a Qt assertion: "QVariant::save: unable to save type 'std::vector<std::shared_ptr<OBSSignal> >' (type id: 1036)." It doesn't seem like a full implementation of the stream operators would be useful since the signal registration is very specific to the interaction between the scenes and sources list, i.e. in case the scenes list ever accepts scenes from sources (not 'obs_source's) other than itself (non InternalMove drag&drop?) it would have to register those scenes with the libobs core which should trigger the normal signal registration
2015-06-27 02:06:34 +00:00
qRegisterMetaTypeStreamOperators<
std::vector<std::shared_ptr<OBSSignal>>>(
"std::vector<std::shared_ptr<OBSSignal>>");
UI: Make scenes serializable via QDataStream This minimal implementation should be enough to drag&drop scenes between UI elements in the same process in the future
2015-06-27 08:48:58 +00:00
qRegisterMetaTypeStreamOperators<OBSScene>("OBSScene");
UI: Make scene items serializable via QDataStream This minimal implementation should be enough to drag&drop scenes between UI elements in the same process in the future
2015-06-27 01:39:39 +00:00
qRegisterMetaTypeStreamOperators<OBSSceneItem>("OBSSceneItem");
UI: Make scenes serializable via QDataStream This minimal implementation should be enough to drag&drop scenes between UI elements in the same process in the future
2015-06-27 08:48:58 +00:00
UI: Selectively disable focus frame NoFocusFrameStyle was meant to disable focus frames around the scenes/sources list (on OSX); unfortunately it also removed focus frames from controls that should have focus frames like input boxes in the settings window
2014-10-29 16:18:00 +00:00
ui->scenes->setAttribute(Qt::WA_MacShowFocusRect, false);
ui->sources->setAttribute(Qt::WA_MacShowFocusRect, false);
UI: Resize main preview on the widget's resize signal Fixes a bug where the preview's size calculations wouldn't update if the widget itself was resizes but the window wasn't resized.
2016-01-09 22:47:58 +00:00
auto displayResize = [this]() {
Resize preview when OBS windows are moved between monitors This should fix the previews in most cases when moving between monitors with differing pixel ratios
2014-04-16 20:35:01 +00:00
struct obs_video_info ovi;
if (obs_get_video_info(&ovi))
ResizePreview(ovi.base_width, ovi.base_height);
UI: Resize main preview on the widget's resize signal Fixes a bug where the preview's size calculations wouldn't update if the widget itself was resizes but the window wasn't resized.
2016-01-09 22:47:58 +00:00
};
connect(windowHandle(), &QWindow::screenChanged, displayResize);
connect(ui->preview, &OBSQTDisplay::DisplayResized, displayResize);
UI: Add name/version to window title Also, make the 'start stream' button say 'connecting...' when it's initially trying to connect.
2014-05-15 21:04:18 +00:00
UI: Add basic hotkey integration
2014-11-01 20:48:58 +00:00
installEventFilter(CreateShortcutFilter());
UI: Don't log version in OBSBasic::UpdateTitleBar
2015-07-06 06:41:36 +00:00
stringstream name;
UI: Remove trailing whitespace
2016-08-21 18:26:15 +00:00
name << "OBS " << App()->GetVersionString();
UI: Don't log version in OBSBasic::UpdateTitleBar
2015-07-06 06:41:36 +00:00
blog(LOG_INFO, "%s", name.str().c_str());
blog(LOG_INFO, "---------------------------------");
UI: Add UpdateTitleBar function to basic UI
2015-07-04 00:55:55 +00:00
UpdateTitleBar();
Implement renaming of scenes/sources
2014-06-30 07:06:01 +00: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)));
Add function to main window to query CPU usage
2014-07-06 23:18:16 +00:00
cpuUsageInfo = os_cpu_usage_info_start();
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
cpuUsageTimer = new QTimer(this);
connect(cpuUsageTimer, SIGNAL(timeout()),
ui->statusbar, SLOT(UpdateCPUUsage()));
cpuUsageTimer->start(3000);
Add OSX native shortcut for scene/source deletion
2014-07-13 19:46:23 +00:00
Fix sources context menu "Remove" shortcut for OSX
2014-10-15 20:00:43 +00:00
DeleteKeys =
#ifdef __APPLE__
QList<QKeySequence>{{Qt::Key_Backspace}} <<
#endif
QKeySequence::keyBindings(QKeySequence::Delete);
Add OSX native shortcut for scene/source deletion
2014-07-13 19:46:23 +00:00
#ifdef __APPLE__
Fix "Remove" shortcut (Del) to work for both scenes and sources
2014-10-15 20:03:22 +00:00
ui->actionRemoveSource->setShortcuts(DeleteKeys);
ui->actionRemoveScene->setShortcuts(DeleteKeys);
Mark menu entries for Qt application menu mangling on OSX
2014-07-21 01:06:02 +00:00
ui->action_Settings->setMenuRole(QAction::PreferencesRole);
ui->actionE_xit->setMenuRole(QAction::QuitRole);
Add OSX native shortcut for scene/source deletion
2014-07-13 19:46:23 +00:00
#endif
UI: Add up/down/left/right position shortcuts Allows nudging of selected items in the direction pressed when the preview window is focused.
2015-04-03 06:09:13 +00: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()));
UI: Add modular UI Changes the UI to an adjustable user interface, allowing the user to fully customize how the scenes list, sources list, the mixer, transitions, and the buttons are oriented on the main window window.
2017-07-27 09:40:41 +00:00
auto assignDockToggle = [this](QDockWidget *dock, QAction *action)
{
auto handleWindowToggle = [action] (bool vis)
{
action->blockSignals(true);
action->setChecked(vis);
action->blockSignals(false);
};
auto handleMenuToggle = [dock] (bool check)
{
dock->blockSignals(true);
dock->setVisible(check);
dock->blockSignals(false);
};
dock->connect(dock->toggleViewAction(), &QAction::toggled,
handleWindowToggle);
dock->connect(action, &QAction::toggled,
handleMenuToggle);
};
assignDockToggle(ui->scenesDock, ui->toggleScenes);
assignDockToggle(ui->sourcesDock, ui->toggleSources);
assignDockToggle(ui->mixerDock, ui->toggleMixer);
assignDockToggle(ui->transitionsDock, ui->toggleTransitions);
assignDockToggle(ui->controlsDock, ui->toggleControls);
UI: Fix parent window geometry loading The parent window adjusted according to child object polices and hint sizes. Thus, it is possible to disable all docking panes to restore true parent geometry first, the docking geometry and settings will be restored later in OBSBasic::OBSInit().
2017-08-12 17:45:25 +00:00
//hide all docking panes
ui->toggleScenes->setChecked(false);
ui->toggleSources->setChecked(false);
ui->toggleMixer->setChecked(false);
ui->toggleTransitions->setChecked(false);
ui->toggleControls->setChecked(false);
//restore parent window geometry
const char *geometry = config_get_string(App()->GlobalConfig(),
"BasicWindow", "geometry");
if (geometry != NULL) {
QByteArray byteArray = QByteArray::fromBase64(
QByteArray(geometry));
restoreGeometry(byteArray);
QRect windowGeometry = normalGeometry();
if (!WindowPositionValid(windowGeometry)) {
QRect rect = App()->desktop()->geometry();
setGeometry(QStyle::alignedRect(
Qt::LeftToRight,
Qt::AlignCenter,
size(), rect));
}
}
Add a comment and replace some class references Also, removed some unused headers, and moved the constructor/destructor functions to the top
2014-02-02 22:23:38 +00:00
}
UI: Remove obs_source_add and sourceSceneRefs variable Prunes code used to workaround libobs "user sources" (such as sourceSceneRefs) and instead simply holds its own references and saves sources it chooses with obs_save_sources_filtered.
2015-12-05 13:58:05 +00:00
static void SaveAudioDevice(const char *name, int channel, obs_data_t *parent,
vector<OBSSource> &audioSources)
Add (temporary terrible) volume controls - Add volume control These volume controls are basically nothing more than sliders. They look terrible and hopefully will be as temporary as they are terrible. - Allow saving of specific non-user sources via obs_load_source and obs_save_source functions. - Save data of desktop/mic audio sources (sync data, volume data, etc), and load the data on startup. - Make it so that a scene is created by default if first time using the application. On certain operating systems where supported, a default capture will be created. Desktop capture on mac, particularly. Not sure what to do about windows because monitor capture on windows 7 is completely terrible and is bad to start users off with.
2014-05-04 05:54:38 +00:00
{
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
obs_source_t *source = obs_get_output_source(channel);
Add (temporary terrible) volume controls - Add volume control These volume controls are basically nothing more than sliders. They look terrible and hopefully will be as temporary as they are terrible. - Allow saving of specific non-user sources via obs_load_source and obs_save_source functions. - Save data of desktop/mic audio sources (sync data, volume data, etc), and load the data on startup. - Make it so that a scene is created by default if first time using the application. On certain operating systems where supported, a default capture will be created. Desktop capture on mac, particularly. Not sure what to do about windows because monitor capture on windows 7 is completely terrible and is bad to start users off with.
2014-05-04 05:54:38 +00:00
if (!source)
return;
UI: Remove obs_source_add and sourceSceneRefs variable Prunes code used to workaround libobs "user sources" (such as sourceSceneRefs) and instead simply holds its own references and saves sources it chooses with obs_save_sources_filtered.
2015-12-05 13:58:05 +00:00
audioSources.push_back(source);
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
obs_data_t *data = obs_save_source(source);
Add (temporary terrible) volume controls - Add volume control These volume controls are basically nothing more than sliders. They look terrible and hopefully will be as temporary as they are terrible. - Allow saving of specific non-user sources via obs_load_source and obs_save_source functions. - Save data of desktop/mic audio sources (sync data, volume data, etc), and load the data on startup. - Make it so that a scene is created by default if first time using the application. On certain operating systems where supported, a default capture will be created. Desktop capture on mac, particularly. Not sure what to do about windows because monitor capture on windows 7 is completely terrible and is bad to start users off with.
2014-05-04 05:54:38 +00:00
(API Change) Unsquish obs_data_* names Changed: To: ----------------------------------------------- obs_data_getjson obs_data_get_json obs_data_getstring obs_data_get_string obs_data_getint obs_data_get_int obs_data_getdouble obs_data_get_double obs_data_getbool obs_data_get_bool obs_data_getobj obs_data_get_obj obs_data_getarray obs_data_get_array obs_data_setstring obs_data_set_string obs_data_setint obs_data_set_int obs_data_setdouble obs_data_set_double obs_data_setbool obs_data_set_bool obs_data_setobj obs_data_set_obj obs_data_setarray obs_data_set_array obs_data_item_getstring obs_data_item_get_string obs_data_item_getint obs_data_item_get_int obs_data_item_getdouble obs_data_item_get_double obs_data_item_getbool obs_data_item_get_bool obs_data_item_getobj obs_data_item_get_obj obs_data_item_getarray obs_data_item_get_array obs_data_item_setstring obs_data_item_set_string obs_data_item_setint obs_data_item_set_int obs_data_item_setdouble obs_data_item_set_double obs_data_item_setbool obs_data_item_set_bool obs_data_item_setobj obs_data_item_set_obj obs_data_item_setarray obs_data_item_set_array
2014-08-05 18:09:29 +00:00
obs_data_set_obj(parent, name, data);
Add (temporary terrible) volume controls - Add volume control These volume controls are basically nothing more than sliders. They look terrible and hopefully will be as temporary as they are terrible. - Allow saving of specific non-user sources via obs_load_source and obs_save_source functions. - Save data of desktop/mic audio sources (sync data, volume data, etc), and load the data on startup. - Make it so that a scene is created by default if first time using the application. On certain operating systems where supported, a default capture will be created. Desktop capture on mac, particularly. Not sure what to do about windows because monitor capture on windows 7 is completely terrible and is bad to start users off with.
2014-05-04 05:54:38 +00: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 19:19:29 +00:00
static obs_data_t *GenerateSaveData(obs_data_array_t *sceneOrder,
obs_data_array_t *quickTransitionData, int transitionDuration,
UI: Add configurable transitions
2016-02-27 10:50:04 +00:00
obs_data_array_t *transitions,
UI: Add option to save projectors This adds an option to the general settings to save the opened projectors on exit. (Note: Fixed conflicts -Jim) Closes jp9000/obs-studio#743
2016-12-29 15:21:53 +00:00
OBSScene &scene, OBSSource &curProgramScene,
obs_data_array_t *savedProjectorList,
obs_data_array_t *savedPreviewProjectorList)
Add preliminary saving/loading of scene/sources This saves scenes/sources from json on exit, and properly loads it back up when starting up the program again, as well as the currently active scene. I had to add a 'load' and 'save' callback to the source interface structure because I realizes that certain sources (such as scenes) operate different with their saved data; scenes for example would have to keep track of their settings information constantly, and that was somewhat unacceptable to make it functional. The optional 'load' callback will be called only after having loaded setttings specifically from file/imported data, and the 'save' function will be called only specifically when data actually needs to be saved. I also had to adjust the obs_scene code so that it's a regular input source type now, and I also modified it so that it doesn't have some strange custom creation code anymore. The obs_scene_create function is now simply just a wrapper for obs_source_create. You could even create a scene with obs_source_create manually as well.
2014-04-27 06:47:50 +00:00
{
UI: Remove obs_source_add and sourceSceneRefs variable Prunes code used to workaround libobs "user sources" (such as sourceSceneRefs) and instead simply holds its own references and saves sources it chooses with obs_save_sources_filtered.
2015-12-05 13:58:05 +00: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 19:19:29 +00:00
obs_source_t *transition = obs_get_output_source(0);
obs_source_t *currentScene = obs_scene_get_source(scene);
UI: Remove obs_source_add and sourceSceneRefs variable Prunes code used to workaround libobs "user sources" (such as sourceSceneRefs) and instead simply holds its own references and saves sources it chooses with obs_save_sources_filtered.
2015-12-05 13:58:05 +00: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 19:19:29 +00:00
const char *programName = obs_source_get_name(curProgramScene);
Add preliminary saving/loading of scene/sources This saves scenes/sources from json on exit, and properly loads it back up when starting up the program again, as well as the currently active scene. I had to add a 'load' and 'save' callback to the source interface structure because I realizes that certain sources (such as scenes) operate different with their saved data; scenes for example would have to keep track of their settings information constantly, and that was somewhat unacceptable to make it functional. The optional 'load' callback will be called only after having loaded setttings specifically from file/imported data, and the 'save' function will be called only specifically when data actually needs to be saved. I also had to adjust the obs_scene code so that it's a regular input source type now, and I also modified it so that it doesn't have some strange custom creation code anymore. The obs_scene_create function is now simply just a wrapper for obs_source_create. You could even create a scene with obs_source_create manually as well.
2014-04-27 06:47:50 +00:00
UI: Add scene collections Adds scene collections to the menu bar, which allows you to duplicate, rename, remove, or add clean new scene collections. Scene files are now stored in ./obs-studio/basic/scenes directory with filesystem-safe names.
2015-06-24 02:29:07 +00:00
const char *sceneCollection = config_get_string(App()->GlobalConfig(),
"Basic", "SceneCollection");
(API Change) Unsquish obs_data_* names Changed: To: ----------------------------------------------- obs_data_getjson obs_data_get_json obs_data_getstring obs_data_get_string obs_data_getint obs_data_get_int obs_data_getdouble obs_data_get_double obs_data_getbool obs_data_get_bool obs_data_getobj obs_data_get_obj obs_data_getarray obs_data_get_array obs_data_setstring obs_data_set_string obs_data_setint obs_data_set_int obs_data_setdouble obs_data_set_double obs_data_setbool obs_data_set_bool obs_data_setobj obs_data_set_obj obs_data_setarray obs_data_set_array obs_data_item_getstring obs_data_item_get_string obs_data_item_getint obs_data_item_get_int obs_data_item_getdouble obs_data_item_get_double obs_data_item_getbool obs_data_item_get_bool obs_data_item_getobj obs_data_item_get_obj obs_data_item_getarray obs_data_item_get_array obs_data_item_setstring obs_data_item_set_string obs_data_item_setint obs_data_item_set_int obs_data_item_setdouble obs_data_item_set_double obs_data_item_setbool obs_data_item_set_bool obs_data_item_setobj obs_data_item_set_obj obs_data_item_setarray obs_data_item_set_array
2014-08-05 18:09:29 +00: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 19:19:29 +00:00
obs_data_set_string(saveData, "current_program_scene", programName);
UI: Implement scene reordering This simply saves/loads the actual list widget item order. The reason why this is done is because internally, libobs doesn't have a list of scenes, it only has a list of sources. The list of scenes is actually something artificially implemented by the basic window user interface.
2015-06-25 10:53:48 +00:00
obs_data_set_array(saveData, "scene_order", sceneOrder);
UI: Add scene collections Adds scene collections to the menu bar, which allows you to duplicate, rename, remove, or add clean new scene collections. Scene files are now stored in ./obs-studio/basic/scenes directory with filesystem-safe names.
2015-06-24 02:29:07 +00:00
obs_data_set_string(saveData, "name", sceneCollection);
(API Change) Unsquish obs_data_* names Changed: To: ----------------------------------------------- obs_data_getjson obs_data_get_json obs_data_getstring obs_data_get_string obs_data_getint obs_data_get_int obs_data_getdouble obs_data_get_double obs_data_getbool obs_data_get_bool obs_data_getobj obs_data_get_obj obs_data_getarray obs_data_get_array obs_data_setstring obs_data_set_string obs_data_setint obs_data_set_int obs_data_setdouble obs_data_set_double obs_data_setbool obs_data_set_bool obs_data_setobj obs_data_set_obj obs_data_setarray obs_data_set_array obs_data_item_getstring obs_data_item_get_string obs_data_item_getint obs_data_item_get_int obs_data_item_getdouble obs_data_item_get_double obs_data_item_getbool obs_data_item_get_bool obs_data_item_getobj obs_data_item_get_obj obs_data_item_getarray obs_data_item_get_array obs_data_item_setstring obs_data_item_set_string obs_data_item_setint obs_data_item_set_int obs_data_item_setdouble obs_data_item_set_double obs_data_item_setbool obs_data_item_set_bool obs_data_item_setobj obs_data_item_set_obj obs_data_item_setarray obs_data_item_set_array
2014-08-05 18:09:29 +00: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 19:19:29 +00:00
obs_data_set_array(saveData, "quick_transitions", quickTransitionData);
UI: Add configurable transitions
2016-02-27 10:50:04 +00:00
obs_data_set_array(saveData, "transitions", transitions);
UI: Add option to save projectors This adds an option to the general settings to save the opened projectors on exit. (Note: Fixed conflicts -Jim) Closes jp9000/obs-studio#743
2016-12-29 15:21:53 +00:00
obs_data_set_array(saveData, "saved_projectors", savedProjectorList);
obs_data_set_array(saveData, "saved_preview_projectors",
savedPreviewProjectorList);
Add preliminary saving/loading of scene/sources This saves scenes/sources from json on exit, and properly loads it back up when starting up the program again, as well as the currently active scene. I had to add a 'load' and 'save' callback to the source interface structure because I realizes that certain sources (such as scenes) operate different with their saved data; scenes for example would have to keep track of their settings information constantly, and that was somewhat unacceptable to make it functional. The optional 'load' callback will be called only after having loaded setttings specifically from file/imported data, and the 'save' function will be called only specifically when data actually needs to be saved. I also had to adjust the obs_scene code so that it's a regular input source type now, and I also modified it so that it doesn't have some strange custom creation code anymore. The obs_scene_create function is now simply just a wrapper for obs_source_create. You could even create a scene with obs_source_create manually as well.
2014-04-27 06:47:50 +00: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 19:19:29 +00: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);
Add preliminary saving/loading of scene/sources This saves scenes/sources from json on exit, and properly loads it back up when starting up the program again, as well as the currently active scene. I had to add a 'load' and 'save' callback to the source interface structure because I realizes that certain sources (such as scenes) operate different with their saved data; scenes for example would have to keep track of their settings information constantly, and that was somewhat unacceptable to make it functional. The optional 'load' callback will be called only after having loaded setttings specifically from file/imported data, and the 'save' function will be called only specifically when data actually needs to be saved. I also had to adjust the obs_scene code so that it's a regular input source type now, and I also modified it so that it doesn't have some strange custom creation code anymore. The obs_scene_create function is now simply just a wrapper for obs_source_create. You could even create a scene with obs_source_create manually as well.
2014-04-27 06:47:50 +00:00
return saveData;
}
UI: Implement theme selection option OBS will offer the user a list of themes which are .qss files inside data/obs-studio/themes. If no theme is found in the configuration, it loads the default theme for the system.
2015-02-17 07:45:34 +00: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));
}
}
}
Add (temporary terrible) volume controls - Add volume control These volume controls are basically nothing more than sliders. They look terrible and hopefully will be as temporary as they are terrible. - Allow saving of specific non-user sources via obs_load_source and obs_save_source functions. - Save data of desktop/mic audio sources (sync data, volume data, etc), and load the data on startup. - Make it so that a scene is created by default if first time using the application. On certain operating systems where supported, a default capture will be created. Desktop capture on mac, particularly. Not sure what to do about windows because monitor capture on windows 7 is completely terrible and is bad to start users off with.
2014-05-04 05:54:38 +00:00
void OBSBasic::ClearVolumeControls()
{
VolControl *control;
for (size_t i = 0; i < volumes.size(); i++) {
control = volumes[i];
delete control;
}
volumes.clear();
}
UI: Implement scene reordering This simply saves/loads the actual list widget item order. The reason why this is done is because internally, libobs doesn't have a list of scenes, it only has a list of sources. The list of scenes is actually something artificially implemented by the basic window user interface.
2015-06-25 10:53:48 +00: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;
}
UI: Add option to save projectors This adds an option to the general settings to save the opened projectors on exit. (Note: Fixed conflicts -Jim) Closes jp9000/obs-studio#743
2016-12-29 15:21:53 +00: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;
}
Add preliminary saving/loading of scene/sources This saves scenes/sources from json on exit, and properly loads it back up when starting up the program again, as well as the currently active scene. I had to add a 'load' and 'save' callback to the source interface structure because I realizes that certain sources (such as scenes) operate different with their saved data; scenes for example would have to keep track of their settings information constantly, and that was somewhat unacceptable to make it functional. The optional 'load' callback will be called only after having loaded setttings specifically from file/imported data, and the 'save' function will be called only specifically when data actually needs to be saved. I also had to adjust the obs_scene code so that it's a regular input source type now, and I also modified it so that it doesn't have some strange custom creation code anymore. The obs_scene_create function is now simply just a wrapper for obs_source_create. You could even create a scene with obs_source_create manually as well.
2014-04-27 06:47:50 +00: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 19:19:29 +00:00
OBSScene scene = GetCurrentScene();
OBSSource curProgramScene = OBSGetStrongRef(programScene);
if (!curProgramScene)
curProgramScene = obs_scene_get_source(scene);
UI: Implement scene reordering This simply saves/loads the actual list widget item order. The reason why this is done is because internally, libobs doesn't have a list of scenes, it only has a list of sources. The list of scenes is actually something artificially implemented by the basic window user interface.
2015-06-25 10:53:48 +00:00
obs_data_array_t *sceneOrder = SaveSceneListOrder();
UI: Add configurable transitions
2016-02-27 10:50:04 +00: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 19:19:29 +00:00
obs_data_array_t *quickTrData = SaveQuickTransitions();
UI: Add option to save projectors This adds an option to the general settings to save the opened projectors on exit. (Note: Fixed conflicts -Jim) Closes jp9000/obs-studio#743
2016-12-29 15:21:53 +00: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 19:19:29 +00:00
obs_data_t *saveData = GenerateSaveData(sceneOrder, quickTrData,
UI: Add configurable transitions
2016-02-27 10:50:04 +00:00
ui->transitionDuration->value(), transitions,
UI: Add option to save projectors This adds an option to the general settings to save the opened projectors on exit. (Note: Fixed conflicts -Jim) Closes jp9000/obs-studio#743
2016-12-29 15:21:53 +00:00
scene, curProgramScene, savedProjectorList,
savedPreviewProjectorList);
UI: Use saving functions for profiles/scenes Replaces all the json/config loading/saving functions with safe variants to reduce the chance of potential file corruption as much as possible. Also does a minor refactor of json writing by using obs_data_save_json_safe for writing json files instead of manually using obs_data_get_json and os_quick_write_utf8 each time.
2015-08-22 00:56:37 +00:00
UI: Add ability to lock preview Adds the ability to lock the preview so sources can't be edited. This feature is typically used in the case where the user wants to prevent accidentally clicking and dragging on sources.
2016-07-26 08:32:43 +00:00
obs_data_set_bool(saveData, "preview_locked", ui->preview->Locked());
UI: Allow zoom with the scroll wheel Adds the ability to zoom into the preview when fixed scaling mode is enabled. (Edit by Jim: Also now saves zoom and scroll position) Closes jp9000/obs-studio#917
2017-05-13 17:13:55 +00:00
obs_data_set_bool(saveData, "scaling_enabled",
ui->preview->IsFixedScaling());
obs_data_set_int(saveData, "scaling_level",
ui->preview->GetScalingLevel());
obs_data_set_double(saveData, "scaling_off_x",
ui->preview->GetScrollX());
obs_data_set_double(saveData, "scaling_off_y",
ui->preview->GetScrollY());
UI: Add ability to lock preview Adds the ability to lock the preview so sources can't be edited. This feature is typically used in the case where the user wants to prevent accidentally clicking and dragging on sources.
2016-07-26 08:32:43 +00:00
UI: Add front-end API library Allows manipulating and modifying the front-end via plugins.
2016-08-28 21:24:14 +00: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);
}
UI: Use saving functions for profiles/scenes Replaces all the json/config loading/saving functions with safe variants to reduce the chance of potential file corruption as much as possible. Also does a minor refactor of json writing by using obs_data_save_json_safe for writing json files instead of manually using obs_data_get_json and os_quick_write_utf8 each time.
2015-08-22 00:56:37 +00:00
if (!obs_data_save_json_safe(saveData, file, "tmp", "bak"))
blog(LOG_ERROR, "Could not save scene data to %s", file);
Add preliminary saving/loading of scene/sources This saves scenes/sources from json on exit, and properly loads it back up when starting up the program again, as well as the currently active scene. I had to add a 'load' and 'save' callback to the source interface structure because I realizes that certain sources (such as scenes) operate different with their saved data; scenes for example would have to keep track of their settings information constantly, and that was somewhat unacceptable to make it functional. The optional 'load' callback will be called only after having loaded setttings specifically from file/imported data, and the 'save' function will be called only specifically when data actually needs to be saved. I also had to adjust the obs_scene code so that it's a regular input source type now, and I also modified it so that it doesn't have some strange custom creation code anymore. The obs_scene_create function is now simply just a wrapper for obs_source_create. You could even create a scene with obs_source_create manually as well.
2014-04-27 06:47:50 +00:00
obs_data_release(saveData);
UI: Implement scene reordering This simply saves/loads the actual list widget item order. The reason why this is done is because internally, libobs doesn't have a list of scenes, it only has a list of sources. The list of scenes is actually something artificially implemented by the basic window user interface.
2015-06-25 10:53:48 +00: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 19:19:29 +00:00
obs_data_array_release(quickTrData);
UI: Add configurable transitions
2016-02-27 10:50:04 +00:00
obs_data_array_release(transitions);
UI: Add option to save projectors This adds an option to the general settings to save the opened projectors on exit. (Note: Fixed conflicts -Jim) Closes jp9000/obs-studio#743
2016-12-29 15:21:53 +00:00
obs_data_array_release(savedProjectorList);
obs_data_array_release(savedPreviewProjectorList);
Add preliminary saving/loading of scene/sources This saves scenes/sources from json on exit, and properly loads it back up when starting up the program again, as well as the currently active scene. I had to add a 'load' and 'save' callback to the source interface structure because I realizes that certain sources (such as scenes) operate different with their saved data; scenes for example would have to keep track of their settings information constantly, and that was somewhat unacceptable to make it functional. The optional 'load' callback will be called only after having loaded setttings specifically from file/imported data, and the 'save' function will be called only specifically when data actually needs to be saved. I also had to adjust the obs_scene code so that it's a regular input source type now, and I also modified it so that it doesn't have some strange custom creation code anymore. The obs_scene_create function is now simply just a wrapper for obs_source_create. You could even create a scene with obs_source_create manually as well.
2014-04-27 06:47:50 +00:00
}
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
static void LoadAudioDevice(const char *name, int channel, obs_data_t *parent)
Add (temporary terrible) volume controls - Add volume control These volume controls are basically nothing more than sliders. They look terrible and hopefully will be as temporary as they are terrible. - Allow saving of specific non-user sources via obs_load_source and obs_save_source functions. - Save data of desktop/mic audio sources (sync data, volume data, etc), and load the data on startup. - Make it so that a scene is created by default if first time using the application. On certain operating systems where supported, a default capture will be created. Desktop capture on mac, particularly. Not sure what to do about windows because monitor capture on windows 7 is completely terrible and is bad to start users off with.
2014-05-04 05:54:38 +00:00
{
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
obs_data_t *data = obs_data_get_obj(parent, name);
Add (temporary terrible) volume controls - Add volume control These volume controls are basically nothing more than sliders. They look terrible and hopefully will be as temporary as they are terrible. - Allow saving of specific non-user sources via obs_load_source and obs_save_source functions. - Save data of desktop/mic audio sources (sync data, volume data, etc), and load the data on startup. - Make it so that a scene is created by default if first time using the application. On certain operating systems where supported, a default capture will be created. Desktop capture on mac, particularly. Not sure what to do about windows because monitor capture on windows 7 is completely terrible and is bad to start users off with.
2014-05-04 05:54:38 +00:00
if (!data)
return;
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
obs_source_t *source = obs_load_source(data);
Add (temporary terrible) volume controls - Add volume control These volume controls are basically nothing more than sliders. They look terrible and hopefully will be as temporary as they are terrible. - Allow saving of specific non-user sources via obs_load_source and obs_save_source functions. - Save data of desktop/mic audio sources (sync data, volume data, etc), and load the data on startup. - Make it so that a scene is created by default if first time using the application. On certain operating systems where supported, a default capture will be created. Desktop capture on mac, particularly. Not sure what to do about windows because monitor capture on windows 7 is completely terrible and is bad to start users off with.
2014-05-04 05:54:38 +00:00
if (source) {
obs_set_output_source(channel, source);
obs_source_release(source);
}
obs_data_release(data);
}
UI: Store global audio sources in scenes file only Right now, information about global audio sources is stored in both scene files and in the config. These must be separated; there's no need to store them in both when they can just be stored in the scenes file.
2015-06-24 01:47:22 +00:00
static inline bool HasAudioDevices(const char *source_id)
{
const char *output_id = source_id;
(API Change) libobs: Remove source_type param from functions (Note: test and UI are also modified by this commit) API Changed (removed "enum obs_source_type type" parameter): ------------------------- obs_source_get_display_name obs_source_create obs_get_source_output_flags obs_get_source_defaults obs_get_source_properties Removes the "type" parameter from these functions. The "type" parameter really doesn't serve much of a purpose being a parameter in any of these cases, the type is just to indicate what it's used for.
2015-12-29 23:25:45 +00:00
obs_properties_t *props = obs_get_source_properties(output_id);
UI: Store global audio sources in scenes file only Right now, information about global audio sources is stored in both scene files and in the config. These must be separated; there's no need to store them in both when they can just be stored in the scenes file.
2015-06-24 01:47:22 +00: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;
}
Revert "UI: Always create a display capture on first run" This reverts commit 35b2ce565a2b90909e2b94da5f28de4bb3a87ff0. There is far too much potential for issues to occur if the first-time start creates a display capture by default on linux and windows. Display capture on windows laptops will not be guaranteed to capture properly, leaving the user with a blank screen. Display capture on linux downloads its image off the graphics processor, so it's quite inefficient to have on by default.
2015-09-23 15:41:00 +00:00
void OBSBasic::CreateFirstRunSources()
Add (temporary terrible) volume controls - Add volume control These volume controls are basically nothing more than sliders. They look terrible and hopefully will be as temporary as they are terrible. - Allow saving of specific non-user sources via obs_load_source and obs_save_source functions. - Save data of desktop/mic audio sources (sync data, volume data, etc), and load the data on startup. - Make it so that a scene is created by default if first time using the application. On certain operating systems where supported, a default capture will be created. Desktop capture on mac, particularly. Not sure what to do about windows because monitor capture on windows 7 is completely terrible and is bad to start users off with.
2014-05-04 05:54:38 +00:00
{
UI: Store global audio sources in scenes file only Right now, information about global audio sources is stored in both scene files and in the config. These must be separated; there's no need to store them in both when they can just be stored in the scenes file.
2015-06-24 01:47:22 +00: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);
UI: Always create a display capture on first run For the sake of consistency, always create a display capture source on the very first run of the program, just to have something displayed. (NOTE: The only exception here is on windows 7/vista, which isn't ideal for display capture, so it'll continue to be left blank)
2015-09-12 04:49:21 +00:00
}
UI: Use empty scene for new scene collection The user may not want their audio or their display to be captured when creating a new scene collection. Make new scene collections default to fully empty.
2015-09-12 04:51:09 +00:00
void OBSBasic::CreateDefaultScene(bool firstStart)
UI: Always create a display capture on first run For the sake of consistency, always create a display capture source on the very first run of the program, just to have something displayed. (NOTE: The only exception here is on windows 7/vista, which isn't ideal for display capture, so it'll continue to be left blank)
2015-09-12 04:49:21 +00: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 19:19:29 +00:00
InitDefaultTransitions();
CreateDefaultQuickTransitions();
ui->transitionDuration->setValue(300);
SetTransition(fadeTransition);
UI: Always create a display capture on first run For the sake of consistency, always create a display capture source on the very first run of the program, just to have something displayed. (NOTE: The only exception here is on windows 7/vista, which isn't ideal for display capture, so it'll continue to be left blank)
2015-09-12 04:49:21 +00:00
obs_scene_t *scene = obs_scene_create(Str("Basic.Scene"));
UI: Use empty scene for new scene collection The user may not want their audio or their display to be captured when creating a new scene collection. Make new scene collections default to fully empty.
2015-09-12 04:51:09 +00:00
if (firstStart)
Revert "UI: Always create a display capture on first run" This reverts commit 35b2ce565a2b90909e2b94da5f28de4bb3a87ff0. There is far too much potential for issues to occur if the first-time start creates a display capture by default on linux and windows. Display capture on windows laptops will not be guaranteed to capture properly, leaving the user with a blank screen. Display capture on linux downloads its image off the graphics processor, so it's quite inefficient to have on by default.
2015-09-23 15:41:00 +00:00
CreateFirstRunSources();
UI: Always create a display capture on first run For the sake of consistency, always create a display capture source on the very first run of the program, just to have something displayed. (NOTE: The only exception here is on windows 7/vista, which isn't ideal for display capture, so it'll continue to be left blank)
2015-09-12 04:49:21 +00:00
UI: Fix bug where default scene would not be added to list
2016-01-04 02:21:44 +00: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 19:19:29 +00:00
SetCurrentScene(scene, true);
UI: Always create a display capture on first run For the sake of consistency, always create a display capture source on the very first run of the program, just to have something displayed. (NOTE: The only exception here is on windows 7/vista, which isn't ideal for display capture, so it'll continue to be left blank)
2015-09-12 04:49:21 +00:00
obs_scene_release(scene);
UI: Save project only on new changes
2015-06-30 12:49:31 +00:00
disableSaving--;
Add (temporary terrible) volume controls - Add volume control These volume controls are basically nothing more than sliders. They look terrible and hopefully will be as temporary as they are terrible. - Allow saving of specific non-user sources via obs_load_source and obs_save_source functions. - Save data of desktop/mic audio sources (sync data, volume data, etc), and load the data on startup. - Make it so that a scene is created by default if first time using the application. On certain operating systems where supported, a default capture will be created. Desktop capture on mac, particularly. Not sure what to do about windows because monitor capture on windows 7 is completely terrible and is bad to start users off with.
2014-05-04 05:54:38 +00:00
}
UI: Implement scene reordering This simply saves/loads the actual list widget item order. The reason why this is done is because internally, libobs doesn't have a list of scenes, it only has a list of sources. The list of scenes is actually something artificially implemented by the basic window user interface.
2015-06-25 10:53:48 +00: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);
}
}
UI: Add option to save projectors This adds an option to the general settings to save the opened projectors on exit. (Note: Fixed conflicts -Jim) Closes jp9000/obs-studio#743
2016-12-29 15:21:53 +00: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);
}
}
UI: Log scenes more cleanly when loading from file
2016-08-06 00:43:30 +00: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);
UI: Add logging of audio monitoring to sources
2017-03-02 21:05:38 +00:00
obs_monitoring_type monitoring_type =
obs_source_get_monitoring_type(source);
if (monitoring_type != OBS_MONITORING_TYPE_NONE) {
const char *type =
(monitoring_type == OBS_MONITORING_TYPE_MONITOR_ONLY)
? "monitor only"
: "monitor and output";
blog(LOG_INFO, " - monitoring: %s", type);
}
UI: Log scenes more cleanly when loading from file
2016-08-06 00:43:30 +00:00
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, "------------------------------------------------");
}
Add preliminary saving/loading of scene/sources This saves scenes/sources from json on exit, and properly loads it back up when starting up the program again, as well as the currently active scene. I had to add a 'load' and 'save' callback to the source interface structure because I realizes that certain sources (such as scenes) operate different with their saved data; scenes for example would have to keep track of their settings information constantly, and that was somewhat unacceptable to make it functional. The optional 'load' callback will be called only after having loaded setttings specifically from file/imported data, and the 'save' function will be called only specifically when data actually needs to be saved. I also had to adjust the obs_scene code so that it's a regular input source type now, and I also modified it so that it doesn't have some strange custom creation code anymore. The obs_scene_create function is now simply just a wrapper for obs_source_create. You could even create a scene with obs_source_create manually as well.
2014-04-27 06:47:50 +00:00
void OBSBasic::Load(const char *file)
{
UI: Use saving functions for profiles/scenes Replaces all the json/config loading/saving functions with safe variants to reduce the chance of potential file corruption as much as possible. Also does a minor refactor of json writing by using obs_data_save_json_safe for writing json files instead of manually using obs_data_get_json and os_quick_write_utf8 each time.
2015-08-22 00:56:37 +00:00
disableSaving++;
obs_data_t *data = obs_data_create_from_json_file_safe(file, "bak");
if (!data) {
disableSaving--;
UI: Always alternatively open backup scene json file Fixes an issue where scene data would reset if the file was not found, even if a backup file existed. This should prevent those remaining stray cases where user's scenes would seem to be suddenly deleted if the original file was deleted for some reason or another. The backup files should always be available, so this should clear up that last remaining case.
2017-05-05 01:17:42 +00:00
blog(LOG_INFO, "No scene file found, creating default scene");
UI: Use empty scene for new scene collection The user may not want their audio or their display to be captured when creating a new scene collection. Make new scene collections default to fully empty.
2015-09-12 04:51:09 +00:00
CreateDefaultScene(true);
UI: Save after creating default scene When initializing with a default scene, save the data to ensure a file is actually present when needed (such as for scene collections which may need the file)
2015-07-02 23:15:51 +00:00
SaveProject();
Add preliminary saving/loading of scene/sources This saves scenes/sources from json on exit, and properly loads it back up when starting up the program again, as well as the currently active scene. I had to add a 'load' and 'save' callback to the source interface structure because I realizes that certain sources (such as scenes) operate different with their saved data; scenes for example would have to keep track of their settings information constantly, and that was somewhat unacceptable to make it functional. The optional 'load' callback will be called only after having loaded setttings specifically from file/imported data, and the 'save' function will be called only specifically when data actually needs to be saved. I also had to adjust the obs_scene code so that it's a regular input source type now, and I also modified it so that it doesn't have some strange custom creation code anymore. The obs_scene_create function is now simply just a wrapper for obs_source_create. You could even create a scene with obs_source_create manually as well.
2014-04-27 06:47:50 +00:00
return;
Add (temporary terrible) volume controls - Add volume control These volume controls are basically nothing more than sliders. They look terrible and hopefully will be as temporary as they are terrible. - Allow saving of specific non-user sources via obs_load_source and obs_save_source functions. - Save data of desktop/mic audio sources (sync data, volume data, etc), and load the data on startup. - Make it so that a scene is created by default if first time using the application. On certain operating systems where supported, a default capture will be created. Desktop capture on mac, particularly. Not sure what to do about windows because monitor capture on windows 7 is completely terrible and is bad to start users off with.
2014-05-04 05:54:38 +00:00
}
Add preliminary saving/loading of scene/sources This saves scenes/sources from json on exit, and properly loads it back up when starting up the program again, as well as the currently active scene. I had to add a 'load' and 'save' callback to the source interface structure because I realizes that certain sources (such as scenes) operate different with their saved data; scenes for example would have to keep track of their settings information constantly, and that was somewhat unacceptable to make it functional. The optional 'load' callback will be called only after having loaded setttings specifically from file/imported data, and the 'save' function will be called only specifically when data actually needs to be saved. I also had to adjust the obs_scene code so that it's a regular input source type now, and I also modified it so that it doesn't have some strange custom creation code anymore. The obs_scene_create function is now simply just a wrapper for obs_source_create. You could even create a scene with obs_source_create manually as well.
2014-04-27 06:47:50 +00:00
UI: Clear scene data before loading new scene data Clear scene data before loading new scene files or when creating new scene data from scratch.
2015-07-02 23:17:55 +00: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 19:19:29 +00:00
InitDefaultTransitions();
UI: Clear scene data before loading new scene data Clear scene data before loading new scene files or when creating new scene data from scratch.
2015-07-02 23:17:55 +00:00
UI: Implement scene reordering This simply saves/loads the actual list widget item order. The reason why this is done is because internally, libobs doesn't have a list of scenes, it only has a list of sources. The list of scenes is actually something artificially implemented by the basic window user interface.
2015-06-25 10:53:48 +00:00
obs_data_array_t *sceneOrder = obs_data_get_array(data, "scene_order");
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
obs_data_array_t *sources = obs_data_get_array(data, "sources");
UI: Add configurable transitions
2016-02-27 10:50:04 +00:00
obs_data_array_t *transitions= obs_data_get_array(data, "transitions");
(API Change) Unsquish obs_data_* names Changed: To: ----------------------------------------------- obs_data_getjson obs_data_get_json obs_data_getstring obs_data_get_string obs_data_getint obs_data_get_int obs_data_getdouble obs_data_get_double obs_data_getbool obs_data_get_bool obs_data_getobj obs_data_get_obj obs_data_getarray obs_data_get_array obs_data_setstring obs_data_set_string obs_data_setint obs_data_set_int obs_data_setdouble obs_data_set_double obs_data_setbool obs_data_set_bool obs_data_setobj obs_data_set_obj obs_data_setarray obs_data_set_array obs_data_item_getstring obs_data_item_get_string obs_data_item_getint obs_data_item_get_int obs_data_item_getdouble obs_data_item_get_double obs_data_item_getbool obs_data_item_get_bool obs_data_item_getobj obs_data_item_get_obj obs_data_item_getarray obs_data_item_get_array obs_data_item_setstring obs_data_item_set_string obs_data_item_setint obs_data_item_set_int obs_data_item_setdouble obs_data_item_set_double obs_data_item_setbool obs_data_item_set_bool obs_data_item_setobj obs_data_item_set_obj obs_data_item_setarray obs_data_item_set_array
2014-08-05 18:09:29 +00: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 19:19:29 +00:00
const char *programSceneName = obs_data_get_string(data,
"current_program_scene");
const char *transitionName = obs_data_get_string(data,
"current_transition");
UI: Add command line opt to start w/ specific scene
2016-04-14 01:59:27 +00: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 19:19:29 +00:00
int newDuration = obs_data_get_int(data, "transition_duration");
if (!newDuration)
newDuration = 300;
if (!transitionName)
transitionName = obs_source_get_name(fadeTransition);
UI: Add scene collections Adds scene collections to the menu bar, which allows you to duplicate, rename, remove, or add clean new scene collections. Scene files are now stored in ./obs-studio/basic/scenes directory with filesystem-safe names.
2015-06-24 02:29:07 +00: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");
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00: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 19:19:29 +00:00
obs_source_t *curProgramScene;
obs_source_t *curTransition;
Add preliminary saving/loading of scene/sources This saves scenes/sources from json on exit, and properly loads it back up when starting up the program again, as well as the currently active scene. I had to add a 'load' and 'save' callback to the source interface structure because I realizes that certain sources (such as scenes) operate different with their saved data; scenes for example would have to keep track of their settings information constantly, and that was somewhat unacceptable to make it functional. The optional 'load' callback will be called only after having loaded setttings specifically from file/imported data, and the 'save' function will be called only specifically when data actually needs to be saved. I also had to adjust the obs_scene code so that it's a regular input source type now, and I also modified it so that it doesn't have some strange custom creation code anymore. The obs_scene_create function is now simply just a wrapper for obs_source_create. You could even create a scene with obs_source_create manually as well.
2014-04-27 06:47:50 +00:00
UI: Add scene collections Adds scene collections to the menu bar, which allows you to duplicate, rename, remove, or add clean new scene collections. Scene files are now stored in ./obs-studio/basic/scenes directory with filesystem-safe names.
2015-06-24 02:29:07 +00:00
if (!name || !*name)
name = curSceneCollection;
Add (temporary terrible) volume controls - Add volume control These volume controls are basically nothing more than sliders. They look terrible and hopefully will be as temporary as they are terrible. - Allow saving of specific non-user sources via obs_load_source and obs_save_source functions. - Save data of desktop/mic audio sources (sync data, volume data, etc), and load the data on startup. - Make it so that a scene is created by default if first time using the application. On certain operating systems where supported, a default capture will be created. Desktop capture on mac, particularly. Not sure what to do about windows because monitor capture on windows 7 is completely terrible and is bad to start users off with.
2014-05-04 05:54:38 +00: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);
(API Change) libobs: Don't use signal for obs_load_sources (Note: This commit also changes the UI) Changed: ------------------- void obs_load_sources(obs_data_array_t *sources_list); To: ------------------- void obs_load_sources(obs_data_array_t *sources_list, obs_source_load_cb callback, void *private_data); Signals should really never be required to use to make some function work properly. The "source_load" signal was required for the obs_load_sources function, but it's meant more for loading private data in the settings, not for general loading of sources. This changes it so that a callback is explicitly required to load the sources.
2016-03-04 20:56:09 +00:00
obs_load_sources(sources, OBSBasic::SourceLoaded, this);
Add preliminary saving/loading of scene/sources This saves scenes/sources from json on exit, and properly loads it back up when starting up the program again, as well as the currently active scene. I had to add a 'load' and 'save' callback to the source interface structure because I realizes that certain sources (such as scenes) operate different with their saved data; scenes for example would have to keep track of their settings information constantly, and that was somewhat unacceptable to make it functional. The optional 'load' callback will be called only after having loaded setttings specifically from file/imported data, and the 'save' function will be called only specifically when data actually needs to be saved. I also had to adjust the obs_scene code so that it's a regular input source type now, and I also modified it so that it doesn't have some strange custom creation code anymore. The obs_scene_create function is now simply just a wrapper for obs_source_create. You could even create a scene with obs_source_create manually as well.
2014-04-27 06:47:50 +00:00
UI: Add configurable transitions
2016-02-27 10:50:04 +00:00
if (transitions)
LoadTransitions(transitions);
UI: Implement scene reordering This simply saves/loads the actual list widget item order. The reason why this is done is because internally, libobs doesn't have a list of scenes, it only has a list of sources. The list of scenes is actually something artificially implemented by the basic window user interface.
2015-06-25 10:53:48 +00:00
if (sceneOrder)
LoadSceneListOrder(sceneOrder);
UI: Add configurable transitions
2016-02-27 10:50:04 +00: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 19:19:29 +00:00
curTransition = FindTransition(transitionName);
if (!curTransition)
curTransition = fadeTransition;
ui->transitionDuration->setValue(newDuration);
SetTransition(curTransition);
UI: Add option to save projectors This adds an option to the general settings to save the opened projectors on exit. (Note: Fixed conflicts -Jim) Closes jp9000/obs-studio#743
2016-12-29 15:21:53 +00: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);
UI: Add command line opt to start w/ specific scene
2016-04-14 01:59:27 +00:00
retryScene:
Add preliminary saving/loading of scene/sources This saves scenes/sources from json on exit, and properly loads it back up when starting up the program again, as well as the currently active scene. I had to add a 'load' and 'save' callback to the source interface structure because I realizes that certain sources (such as scenes) operate different with their saved data; scenes for example would have to keep track of their settings information constantly, and that was somewhat unacceptable to make it functional. The optional 'load' callback will be called only after having loaded setttings specifically from file/imported data, and the 'save' function will be called only specifically when data actually needs to be saved. I also had to adjust the obs_scene code so that it's a regular input source type now, and I also modified it so that it doesn't have some strange custom creation code anymore. The obs_scene_create function is now simply just a wrapper for obs_source_create. You could even create a scene with obs_source_create manually as well.
2014-04-27 06:47:50 +00: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 19:19:29 +00:00
curProgramScene = obs_get_source_by_name(programSceneName);
UI: Add command line opt to start w/ specific scene
2016-04-14 01:59:27 +00: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 19:19:29 +00:00
if (!curProgramScene) {
curProgramScene = curScene;
obs_source_addref(curScene);
}
SetCurrentScene(curScene, true);
if (IsPreviewProgramMode())
TransitionToScene(curProgramScene, true);
Add preliminary saving/loading of scene/sources This saves scenes/sources from json on exit, and properly loads it back up when starting up the program again, as well as the currently active scene. I had to add a 'load' and 'save' callback to the source interface structure because I realizes that certain sources (such as scenes) operate different with their saved data; scenes for example would have to keep track of their settings information constantly, and that was somewhat unacceptable to make it functional. The optional 'load' callback will be called only after having loaded setttings specifically from file/imported data, and the 'save' function will be called only specifically when data actually needs to be saved. I also had to adjust the obs_scene code so that it's a regular input source type now, and I also modified it so that it doesn't have some strange custom creation code anymore. The obs_scene_create function is now simply just a wrapper for obs_source_create. You could even create a scene with obs_source_create manually as well.
2014-04-27 06:47:50 +00: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 19:19:29 +00:00
obs_source_release(curProgramScene);
Add preliminary saving/loading of scene/sources This saves scenes/sources from json on exit, and properly loads it back up when starting up the program again, as well as the currently active scene. I had to add a 'load' and 'save' callback to the source interface structure because I realizes that certain sources (such as scenes) operate different with their saved data; scenes for example would have to keep track of their settings information constantly, and that was somewhat unacceptable to make it functional. The optional 'load' callback will be called only after having loaded setttings specifically from file/imported data, and the 'save' function will be called only specifically when data actually needs to be saved. I also had to adjust the obs_scene code so that it's a regular input source type now, and I also modified it so that it doesn't have some strange custom creation code anymore. The obs_scene_create function is now simply just a wrapper for obs_source_create. You could even create a scene with obs_source_create manually as well.
2014-04-27 06:47:50 +00:00
obs_data_array_release(sources);
UI: Implement scene reordering This simply saves/loads the actual list widget item order. The reason why this is done is because internally, libobs doesn't have a list of scenes, it only has a list of sources. The list of scenes is actually something artificially implemented by the basic window user interface.
2015-06-25 10:53:48 +00:00
obs_data_array_release(sceneOrder);
UI: Add scene collections Adds scene collections to the menu bar, which allows you to duplicate, rename, remove, or add clean new scene collections. Scene files are now stored in ./obs-studio/basic/scenes directory with filesystem-safe names.
2015-06-24 02:29:07 +00: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 19:19:29 +00:00
obs_data_array_t *quickTransitionData = obs_data_get_array(data,
"quick_transitions");
LoadQuickTransitions(quickTransitionData);
obs_data_array_release(quickTransitionData);
RefreshQuickTransitions();
UI: Add ability to lock preview Adds the ability to lock the preview so sources can't be edited. This feature is typically used in the case where the user wants to prevent accidentally clicking and dragging on sources.
2016-07-26 08:32:43 +00:00
bool previewLocked = obs_data_get_bool(data, "preview_locked");
ui->preview->SetLocked(previewLocked);
ui->actionLockPreview->setChecked(previewLocked);
UI: Allow zoom with the scroll wheel Adds the ability to zoom into the preview when fixed scaling mode is enabled. (Edit by Jim: Also now saves zoom and scroll position) Closes jp9000/obs-studio#917
2017-05-13 17:13:55 +00:00
/* ---------------------- */
bool fixedScaling = obs_data_get_bool(data, "scaling_enabled");
int scalingLevel = (int)obs_data_get_int(data, "scaling_level");
float scrollOffX = (float)obs_data_get_double(data, "scaling_off_x");
float scrollOffY = (float)obs_data_get_double(data, "scaling_off_y");
if (fixedScaling) {
ui->preview->SetScalingLevel(scalingLevel);
ui->preview->SetScrollingOffset(scrollOffX, scrollOffY);
UI: Add preview scaling options Adds preview scaling to the right-click context menu for the preview pane. This allows the ability to, for example, zoom the preview and edit the preview 1:1 (canvas/base resolution). This was a missing parity feature. Additionally, also allows scaling to the "output/scaled" resolution the program is set to. When the preview is in scale mode and is the focused widget, you can hold space and drag with left click to change the zoomed position. (Notes added by Jim) Closes jp9000/obs-studio#687
2016-11-05 16:48:46 +00:00
}
UI: Allow zoom with the scroll wheel Adds the ability to zoom into the preview when fixed scaling mode is enabled. (Edit by Jim: Also now saves zoom and scroll position) Closes jp9000/obs-studio#917
2017-05-13 17:13:55 +00:00
ui->preview->SetFixedScaling(fixedScaling);
UI: Add preview scaling options Adds preview scaling to the right-click context menu for the preview pane. This allows the ability to, for example, zoom the preview and edit the preview 1:1 (canvas/base resolution). This was a missing parity feature. Additionally, also allows scaling to the "output/scaled" resolution the program is set to. When the preview is in scale mode and is the focused widget, you can hold space and drag with left click to change the zoomed position. (Notes added by Jim) Closes jp9000/obs-studio#687
2016-11-05 16:48:46 +00:00
UI: Allow zoom with the scroll wheel Adds the ability to zoom into the preview when fixed scaling mode is enabled. (Edit by Jim: Also now saves zoom and scroll position) Closes jp9000/obs-studio#917
2017-05-13 17:13:55 +00:00
/* ---------------------- */
UI: Add preview scaling options Adds preview scaling to the right-click context menu for the preview pane. This allows the ability to, for example, zoom the preview and edit the preview 1:1 (canvas/base resolution). This was a missing parity feature. Additionally, also allows scaling to the "output/scaled" resolution the program is set to. When the preview is in scale mode and is the focused widget, you can hold space and drag with left click to change the zoomed position. (Notes added by Jim) Closes jp9000/obs-studio#687
2016-11-05 16:48:46 +00:00
UI: Add front-end API library Allows manipulating and modifying the front-end via plugins.
2016-08-28 21:24:14 +00:00
if (api) {
obs_data_t *modulesObj = obs_data_get_obj(data, "modules");
api->on_load(modulesObj);
obs_data_release(modulesObj);
}
Add preliminary saving/loading of scene/sources This saves scenes/sources from json on exit, and properly loads it back up when starting up the program again, as well as the currently active scene. I had to add a 'load' and 'save' callback to the source interface structure because I realizes that certain sources (such as scenes) operate different with their saved data; scenes for example would have to keep track of their settings information constantly, and that was somewhat unacceptable to make it functional. The optional 'load' callback will be called only after having loaded setttings specifically from file/imported data, and the 'save' function will be called only specifically when data actually needs to be saved. I also had to adjust the obs_scene code so that it's a regular input source type now, and I also modified it so that it doesn't have some strange custom creation code anymore. The obs_scene_create function is now simply just a wrapper for obs_source_create. You could even create a scene with obs_source_create manually as well.
2014-04-27 06:47:50 +00:00
obs_data_release(data);
UI: Save project only on new changes
2015-06-30 12:49:31 +00:00
UI: Add command line opt to start w/ specific scene
2016-04-14 01:59:27 +00:00
if (!opt_starting_scene.empty())
opt_starting_scene.clear();
UI: Add command line opts to start streaming/recording These command line options allow the user to start streaming/recording on program startup.
2016-04-14 02:00:12 +00:00
if (opt_start_streaming) {
UI: Log when starting / stopping via hotkey or timer This will help resolve incidents where users accidentally started or stopped their stream without knowing what triggered it (usually from hotkeys that were forgotten about).
2017-10-12 15:20:19 +00:00
blog(LOG_INFO, "Starting stream due to command line parameter");
UI: Add command line opts to start streaming/recording These command line options allow the user to start streaming/recording on program startup.
2016-04-14 02:00:12 +00:00
QMetaObject::invokeMethod(this, "StartStreaming",
Qt::QueuedConnection);
opt_start_streaming = false;
}
if (opt_start_recording) {
UI: Log when starting / stopping via hotkey or timer This will help resolve incidents where users accidentally started or stopped their stream without knowing what triggered it (usually from hotkeys that were forgotten about).
2017-10-12 15:20:19 +00:00
blog(LOG_INFO, "Starting recording due to command line parameter");
UI: Add command line opts to start streaming/recording These command line options allow the user to start streaming/recording on program startup.
2016-04-14 02:00:12 +00:00
QMetaObject::invokeMethod(this, "StartRecording",
Qt::QueuedConnection);
opt_start_recording = false;
}
UI: Add more command line options
2017-01-11 19:19:17 +00:00
if (opt_start_replaybuffer) {
QMetaObject::invokeMethod(this, "StartReplayBuffer",
Qt::QueuedConnection);
opt_start_replaybuffer = false;
}
UI: Log scenes more cleanly when loading from file
2016-08-06 00:43:30 +00:00
LogScenes();
UI: Save project only on new changes
2015-06-30 12:49:31 +00:00
disableSaving--;
Add preliminary saving/loading of scene/sources This saves scenes/sources from json on exit, and properly loads it back up when starting up the program again, as well as the currently active scene. I had to add a 'load' and 'save' callback to the source interface structure because I realizes that certain sources (such as scenes) operate different with their saved data; scenes for example would have to keep track of their settings information constantly, and that was somewhat unacceptable to make it functional. The optional 'load' callback will be called only after having loaded setttings specifically from file/imported data, and the 'save' function will be called only specifically when data actually needs to be saved. I also had to adjust the obs_scene code so that it's a regular input source type now, and I also modified it so that it doesn't have some strange custom creation code anymore. The obs_scene_create function is now simply just a wrapper for obs_source_create. You could even create a scene with obs_source_create manually as well.
2014-04-27 06:47:50 +00:00
}
UI: Add Profiles Adds setting profiles to the basic user interface. For each profile, a subdirectory for the profile will be created in [config_dir]/obs-studio/basic/profiles which will contain the settings data for each profile.
2015-06-24 02:38:01 +00: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 08:49:07 +00:00
void OBSBasic::SaveService()
{
if (!service)
return;
(API Change) Make os_get_config_path safer to use Changed: char *os_get_config_path(const char *name); To: int os_get_config_path(char *dst, size_t size, const char *name); Also added: char *os_get_config_path_ptr(const char *name); I don't like this function returning an allocation by default. Similarly to what was done with the wide character conversion functions, this function now operates on an array argument, and if you really want to just get a pointer for convenience, you use the *_ptr version of the function that clearly indicates that it's returning an allocation.
2015-01-16 07:44:38 +00:00
char serviceJsonPath[512];
UI: Add Profiles Adds setting profiles to the basic user interface. For each profile, a subdirectory for the profile will be created in [config_dir]/obs-studio/basic/profiles which will contain the settings data for each profile.
2015-06-24 02:38:01 +00:00
int ret = GetProfilePath(serviceJsonPath, sizeof(serviceJsonPath),
(API Change) Make os_get_config_path safer to use Changed: char *os_get_config_path(const char *name); To: int os_get_config_path(char *dst, size_t size, const char *name); Also added: char *os_get_config_path_ptr(const char *name); I don't like this function returning an allocation by default. Similarly to what was done with the wide character conversion functions, this function now operates on an array argument, and if you really want to just get a pointer for convenience, you use the *_ptr version of the function that clearly indicates that it's returning an allocation.
2015-01-16 07:44:38 +00: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 08:49:07 +00:00
return;
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00: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 08:49:07 +00:00
(API Change) Fix obs_service_gettype func name Before: After: obs_service_gettype obs_service_get_type It seems there was an API function that was missed when we were doing our big API consistency update. Unsquishes obs_service_gettype to obs_service_get_type.
2015-02-07 16:19:34 +00:00
obs_data_set_string(data, "type", obs_service_get_type(service));
(API Change) Unsquish obs_data_* names Changed: To: ----------------------------------------------- obs_data_getjson obs_data_get_json obs_data_getstring obs_data_get_string obs_data_getint obs_data_get_int obs_data_getdouble obs_data_get_double obs_data_getbool obs_data_get_bool obs_data_getobj obs_data_get_obj obs_data_getarray obs_data_get_array obs_data_setstring obs_data_set_string obs_data_setint obs_data_set_int obs_data_setdouble obs_data_set_double obs_data_setbool obs_data_set_bool obs_data_setobj obs_data_set_obj obs_data_setarray obs_data_set_array obs_data_item_getstring obs_data_item_get_string obs_data_item_getint obs_data_item_get_int obs_data_item_getdouble obs_data_item_get_double obs_data_item_getbool obs_data_item_get_bool obs_data_item_getobj obs_data_item_get_obj obs_data_item_getarray obs_data_item_get_array obs_data_item_setstring obs_data_item_set_string obs_data_item_setint obs_data_item_set_int obs_data_item_setdouble obs_data_item_set_double obs_data_item_setbool obs_data_item_set_bool obs_data_item_setobj obs_data_item_set_obj obs_data_item_setarray obs_data_item_set_array
2014-08-05 18:09:29 +00: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 08:49:07 +00:00
UI: Use saving functions for profiles/scenes Replaces all the json/config loading/saving functions with safe variants to reduce the chance of potential file corruption as much as possible. Also does a minor refactor of json writing by using obs_data_save_json_safe for writing json files instead of manually using obs_data_get_json and os_quick_write_utf8 each time.
2015-08-22 00:56:37 +00: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 08:49:07 +00:00
obs_data_release(settings);
obs_data_release(data);
}
bool OBSBasic::LoadService()
{
const char *type;
(API Change) Make os_get_config_path safer to use Changed: char *os_get_config_path(const char *name); To: int os_get_config_path(char *dst, size_t size, const char *name); Also added: char *os_get_config_path_ptr(const char *name); I don't like this function returning an allocation by default. Similarly to what was done with the wide character conversion functions, this function now operates on an array argument, and if you really want to just get a pointer for convenience, you use the *_ptr version of the function that clearly indicates that it's returning an allocation.
2015-01-16 07:44:38 +00:00
char serviceJsonPath[512];
UI: Add Profiles Adds setting profiles to the basic user interface. For each profile, a subdirectory for the profile will be created in [config_dir]/obs-studio/basic/profiles which will contain the settings data for each profile.
2015-06-24 02:38:01 +00:00
int ret = GetProfilePath(serviceJsonPath, sizeof(serviceJsonPath),
(API Change) Make os_get_config_path safer to use Changed: char *os_get_config_path(const char *name); To: int os_get_config_path(char *dst, size_t size, const char *name); Also added: char *os_get_config_path_ptr(const char *name); I don't like this function returning an allocation by default. Similarly to what was done with the wide character conversion functions, this function now operates on an array argument, and if you really want to just get a pointer for convenience, you use the *_ptr version of the function that clearly indicates that it's returning an allocation.
2015-01-16 07:44:38 +00: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 08:49:07 +00:00
return false;
UI: Use saving functions for profiles/scenes Replaces all the json/config loading/saving functions with safe variants to reduce the chance of potential file corruption as much as possible. Also does a minor refactor of json writing by using obs_data_save_json_safe for writing json files instead of manually using obs_data_get_json and os_quick_write_utf8 each time.
2015-08-22 00:56:37 +00: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 08:49:07 +00:00
obs_data_set_default_string(data, "type", "rtmp_common");
(API Change) Unsquish obs_data_* names Changed: To: ----------------------------------------------- obs_data_getjson obs_data_get_json obs_data_getstring obs_data_get_string obs_data_getint obs_data_get_int obs_data_getdouble obs_data_get_double obs_data_getbool obs_data_get_bool obs_data_getobj obs_data_get_obj obs_data_getarray obs_data_get_array obs_data_setstring obs_data_set_string obs_data_setint obs_data_set_int obs_data_setdouble obs_data_set_double obs_data_setbool obs_data_set_bool obs_data_setobj obs_data_set_obj obs_data_setarray obs_data_set_array obs_data_item_getstring obs_data_item_get_string obs_data_item_getint obs_data_item_get_int obs_data_item_getdouble obs_data_item_get_double obs_data_item_getbool obs_data_item_get_bool obs_data_item_getobj obs_data_item_get_obj obs_data_item_getarray obs_data_item_get_array obs_data_item_setstring obs_data_item_set_string obs_data_item_setint obs_data_item_set_int obs_data_item_setdouble obs_data_item_set_double obs_data_item_setbool obs_data_item_set_bool obs_data_item_setobj obs_data_item_set_obj obs_data_item_setarray obs_data_item_set_array
2014-08-05 18:09:29 +00: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 08:49:07 +00:00
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
obs_data_t *settings = obs_data_get_obj(data, "settings");
UI: Preserve service hotkey data
2015-04-04 22:03:40 +00: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 08:49:07 +00:00
(API Change) libobs: Add hotkey data to *_create functions
2014-11-01 20:41:17 +00:00
service = obs_service_create(type, "default_service", settings,
UI: Preserve service hotkey data
2015-04-04 22:03:40 +00:00
hotkey_data);
(API Change) libobs: Make obs_service refcounted
2015-05-04 00:07:43 +00: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 08:49:07 +00:00
UI: Preserve service hotkey data
2015-04-04 22:03:40 +00: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 08:49:07 +00:00
obs_data_release(settings);
obs_data_release(data);
return !!service;
}
bool OBSBasic::InitService()
{
UI: Profile initialization
2015-07-11 06:04:12 +00: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 08:49:07 +00:00
if (LoadService())
return true;
(API Change) libobs: Add hotkey data to *_create functions
2014-11-01 20:41:17 +00: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 08:49:07 +00:00
if (!service)
return false;
(API Change) libobs: Make obs_service refcounted
2015-05-04 00:07:43 +00: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 08:49:07 +00:00
return true;
}
UI: Use default scaled res. of 1280x720 or equiv. Originally this value defaulted to 1.5 downscaling, but on very high resolution displays this would cause the default to be above 1280x720, which is not ideal for streaming/recording due to the CPU usage requirements. Instead, it will now find the closest resolution with a pixel count equivalent to or closest below 1280x720, and use that instead.
2015-07-03 17:26:18 +00: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
};
Move basic mode configuration to a separate file Having everything in global.ini meant that if you wanted different settings for studio mode, that it would also overwrite it for basic mode. This way, the settings for each mode are separate, and you can use different settings for each mode.
2014-03-07 04:08:12 +00:00
bool OBSBasic::InitBasicConfigDefaults()
{
UI: Use Qt lib for screen info instead of x11 libs All of the monitor discovery logic can be implemented with Qt. This change removes all the x11 implementations in favor of Qt and removes a fair amount of platform specific code.
2016-10-04 06:50:13 +00:00
QList<QScreen*> screens = QGuiApplication::screens();
Move basic mode configuration to a separate file Having everything in global.ini meant that if you wanted different settings for studio mode, that it would also overwrite it for basic mode. This way, the settings for each mode are separate, and you can use different settings for each mode.
2014-03-07 04:08:12 +00:00
UI: Use Qt lib for screen info instead of x11 libs All of the monitor discovery logic can be implemented with Qt. This change removes all the x11 implementations in favor of Qt and removes a fair amount of platform specific code.
2016-10-04 06:50:13 +00:00
if (!screens.size()) {
Move basic mode configuration to a separate file Having everything in global.ini meant that if you wanted different settings for studio mode, that it would also overwrite it for basic mode. This way, the settings for each mode are separate, and you can use different settings for each mode.
2014-03-07 04:08:12 +00:00
OBSErrorBox(NULL, "There appears to be no monitors. Er, this "
"technically shouldn't be possible.");
return false;
}
UI: Use Qt lib for screen info instead of x11 libs All of the monitor discovery logic can be implemented with Qt. This change removes all the x11 implementations in favor of Qt and removes a fair amount of platform specific code.
2016-10-04 06:50:13 +00:00
QScreen *primaryScreen = QGuiApplication::primaryScreen();
uint32_t cx = primaryScreen->size().width();
uint32_t cy = primaryScreen->size().height();
Move basic mode configuration to a separate file Having everything in global.ini meant that if you wanted different settings for studio mode, that it would also overwrite it for basic mode. This way, the settings for each mode are separate, and you can use different settings for each mode.
2014-03-07 04:08:12 +00:00
UI: Limit default canvas res to 1920x1080 or below The reasoning behind this is because having a very large canvas size can negatively affect the user experience -- most sources end up seeming smaller than they need to be to users, resulting in the user needing to size up the sources, or in the case of webcams it makes the user try to use much larger webcam resolutions than they should reasonably need to do, resulting in higher unintentional resource usage. The program will additionally require more fillrate to render and downscale things as well. This applies only to the default starting base/canvas resolution for new users only. Additionally, users that ran the program pre-19 will be unaffected by this change, as it will detect that and set the old defaults to prevent an unexpected change in resolution for those users.
2017-04-29 01:02:03 +00:00
bool oldResolutionDefaults = config_get_bool(App()->GlobalConfig(),
"General", "Pre19Defaults");
/* use 1920x1080 for new default base res if main monitor is above
* 1920x1080, but don't apply for people from older builds -- only to
* new users */
if (!oldResolutionDefaults && (cx * cy) > (1920 * 1080)) {
cx = 1920;
cy = 1080;
}
UI: Move adv. rec. tracks if updating from 0.10.1
2015-07-03 16:49:22 +00: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");
UI: Use saving functions for profiles/scenes Replaces all the json/config loading/saving functions with safe variants to reduce the chance of potential file corruption as much as possible. Also does a minor refactor of json writing by using obs_data_save_json_safe for writing json files instead of manually using obs_data_get_json and os_quick_write_utf8 each time.
2015-08-22 00:56:37 +00:00
config_save_safe(basicConfig, "tmp", nullptr);
UI: Move adv. rec. tracks if updating from 0.10.1
2015-07-03 16:49:22 +00:00
}
/* ----------------------------------------------------- */
UI: Fix output mode name when setting defaults The item in the [Output] section for the output mode is "Mode", not "Type".
2015-06-25 08:06:46 +00:00
config_set_default_string(basicConfig, "Output", "Mode", "Simple");
UI: Refactor output handling To accommodate multiple types of outputs, there has to be some level of abstraction. The BasicOutputHandler structure will give us a way that we can switch between different output configurations.
2015-02-06 11:17:33 +00:00
UI: Add FLV file output (sharing encoders) Implement the 'file path' in output settings, and implement the 'start recording' button, though for the time being I'm just going to make it use a directory rather than allow custom file names. This file output will actually share the video and audio encoder with the stream. I don't really know what to do about MP4 -- I don't really like the idea of saving directly in the program, if you do and the program crashes, that MP4 file is lost. I'm contemplating making some sort of mp4 output process stub. So no MP4 file output for the time being. If you need MP4, just remux it with FFmpeg: ffmpeg -i flv_file.flv -acodec copy -vcodec copy mp4_file.mp4
2014-05-21 06:27:27 +00:00
config_set_default_string(basicConfig, "SimpleOutput", "FilePath",
GetDefaultVideoSavePath().c_str());
UI: Add option to select recording format Add a listboxes to recording to allow changing file formats (allows mp4, mov, mkv, ts, flv)
2015-05-29 16:45:54 +00: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 08:49:07 +00:00
config_set_default_uint (basicConfig, "SimpleOutput", "VBitrate",
2500);
UI: Add support for QSV encoder to simple output
2016-04-18 07:56:51 +00:00
config_set_default_string(basicConfig, "SimpleOutput", "StreamEncoder",
SIMPLE_ENCODER_X264);
UI: Change default simple audio bitrate to 160 The audio bitrate required is insignificant relative to the video bitrate, and due to the fact that it's possible that a lower-quality encoder may be in use (such as FFmpeg's AAC encoder), setting the default to 160 is really more ideal to reducee any potential quality loss.
2015-06-05 15:57:01 +00:00
config_set_default_uint (basicConfig, "SimpleOutput", "ABitrate", 160);
Basic UI: Add advanced encoder settings
2014-08-25 14:48:51 +00:00
config_set_default_bool (basicConfig, "SimpleOutput", "UseAdvanced",
false);
UI: Add "Enforce streaming bitrate limits" setting Allows the user to disable streaming bitrate limits in simple output mode if they so choose. This option is enabled by default.
2016-04-10 10:10:36 +00:00
config_set_default_bool (basicConfig, "SimpleOutput", "EnforceBitrate",
true);
Basic UI: Add advanced encoder settings
2014-08-25 14:48:51 +00: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-19 05:29:36 +00:00
config_set_default_string(basicConfig, "SimpleOutput", "RecQuality",
"Stream");
config_set_default_string(basicConfig, "SimpleOutput", "RecEncoder",
SIMPLE_ENCODER_X264);
UI: Add replay buffer options to simple output mode
2016-12-07 13:21:44 +00: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);
UI: Add file prefix/suffix options for replay buffer Adds the ability to use a specific prefix and/or suffix on replay buffer filenames to distinguish them from normal recordings. Defaults to having the prefix "Replay".
2016-12-09 22:42:14 +00:00
config_set_default_string(basicConfig, "SimpleOutput", "RecRBPrefix",
"Replay");
Add preliminary streaming code for testing - Add some temporary streaming code using FFmpeg. FFmpeg itself is not very ideal for streaming; lack of direct control of the sockets and no framedrop handling means that FFmpeg is definitely not something you want to use without wrapper code. I'd prefer writing my own network framework in this particular case just because you give away so much control of the network interface. Wasted an entire day trying to go through FFmpeg issues. There's just no way FFmpeg should be used for real streaming (at least without being patched or submitting some sort of patch, but I'm sort of feeling "meh" on that idea) I had to end up writing multiple threads just to handle both connecting and writing, because av_interleaved_write_frame blocks every call, stalling the main encoder thread, and thus also stalling draw signals. - Add some temporary user interface for streaming settings. This is just temporary for the time being. It's in the outputs section of the basic-mode settings - Make it so that dynamic arrays do not free all their data when the size just happens to be reduced to 0. This prevents constant reallocation when an array keeps going from 1 item to 0 items. Also, it was bad to become dependent upon that functionality. You must now always explicitly call "free" on it to ensure the data is free, and that's how it should be. Implicit functionality can lead to confusion and maintainability issues.
2014-03-10 20:10:35 +00:00
UI: Add "enforce streaming service settings" Add a checkbox named "Enforce streaming service encoder settings" checkbox to advanced output. Disabling this checkbox allows the user to optionally disable the enforcement of streaming service encoder settings. I had a user complain that they didn't want to always have the service's preferred encoder settings forced on them.
2015-02-11 04:06:00 +00:00
config_set_default_bool (basicConfig, "AdvOut", "ApplyServiceSettings",
true);
UI: Add advanced output settings Adds an 'advanced' mode to the output settings to allow more powerful and complex streaming and recording options: - Optionally use a different encoder for recording than for streaming to allow the recording to use a different encoder or encoder settings if desired (though at the cost if increased CPU usage depending on the encoders being used) - Use encoders other than x264 - Rescale the recording or streaming encoders in case the user wishes to stream and record at different resolutions - Select the specific mixer to use for recording and for streaming, allowing the stream and recording to use separate mixers (to for example allow a user to stream the game/mic audio but only record the game audio) - Use FFmpeg output for the recording button instead of only recording h264/aac to FLV, allowing the user to output to various different types of file formats or remote URLs, as well as allowing the user to select and use different encoders and encoder settings that are available in the FFmpeg library - Optionally allow the use of multiple audio tracks in a single output if the file formats or stream services support it
2015-01-26 21:41:22 +00: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());
UI: Add option to select recording format Add a listboxes to recording to allow changing file formats (allows mp4, mov, mkv, ts, flv)
2015-05-29 16:45:54 +00:00
config_set_default_string(basicConfig, "AdvOut", "RecFormat", "flv");
UI: Add advanced output settings Adds an 'advanced' mode to the output settings to allow more powerful and complex streaming and recording options: - Optionally use a different encoder for recording than for streaming to allow the recording to use a different encoder or encoder settings if desired (though at the cost if increased CPU usage depending on the encoders being used) - Use encoders other than x264 - Rescale the recording or streaming encoders in case the user wishes to stream and record at different resolutions - Select the specific mixer to use for recording and for streaming, allowing the stream and recording to use separate mixers (to for example allow a user to stream the game/mic audio but only record the game audio) - Use FFmpeg output for the recording button instead of only recording h264/aac to FLV, allowing the user to output to various different types of file formats or remote URLs, as well as allowing the user to select and use different encoders and encoder settings that are available in the FFmpeg library - Optionally allow the use of multiple audio tracks in a single output if the file formats or stream services support it
2015-01-26 21:41:22 +00:00
config_set_default_bool (basicConfig, "AdvOut", "RecUseRescale",
false);
UI: Allow multi-track recording in advanced output
2015-05-31 04:45:14 +00:00
config_set_default_uint (basicConfig, "AdvOut", "RecTracks", (1<<0));
UI: Add advanced output settings Adds an 'advanced' mode to the output settings to allow more powerful and complex streaming and recording options: - Optionally use a different encoder for recording than for streaming to allow the recording to use a different encoder or encoder settings if desired (though at the cost if increased CPU usage depending on the encoders being used) - Use encoders other than x264 - Rescale the recording or streaming encoders in case the user wishes to stream and record at different resolutions - Select the specific mixer to use for recording and for streaming, allowing the stream and recording to use separate mixers (to for example allow a user to stream the game/mic audio but only record the game audio) - Use FFmpeg output for the recording button instead of only recording h264/aac to FLV, allowing the user to output to various different types of file formats or remote URLs, as well as allowing the user to select and use different encoders and encoder settings that are available in the FFmpeg library - Optionally allow the use of multiple audio tracks in a single output if the file formats or stream services support it
2015-01-26 21:41:22 +00:00
config_set_default_string(basicConfig, "AdvOut", "RecEncoder",
"none");
UI: Allow generated filenames for FFmpeg output This changes the way the advanced output section's FFmpeg output settings work by allowing the user to select whether they want to output to a file or output to a URL, and makes it so file names are automatically generated like other recording outputs. If they choose to output to a file, it'll only require an output directory similarly to how other recording outputs work. They can select a directory to output to rather than being required to type in a full path and filename; the filename is automatically generated. The extension is also automatically retrieved from libff depending on the format selected. Otherwise if they have Output to URL selected, it'll show a simple edit box where they can type in the target URL.
2015-08-19 03:58:24 +00: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");
UI: Add advanced output settings Adds an 'advanced' mode to the output settings to allow more powerful and complex streaming and recording options: - Optionally use a different encoder for recording than for streaming to allow the recording to use a different encoder or encoder settings if desired (though at the cost if increased CPU usage depending on the encoders being used) - Use encoders other than x264 - Rescale the recording or streaming encoders in case the user wishes to stream and record at different resolutions - Select the specific mixer to use for recording and for streaming, allowing the stream and recording to use separate mixers (to for example allow a user to stream the game/mic audio but only record the game audio) - Use FFmpeg output for the recording button instead of only recording h264/aac to FLV, allowing the user to output to various different types of file formats or remote URLs, as well as allowing the user to select and use different encoders and encoder settings that are available in the FFmpeg library - Optionally allow the use of multiple audio tracks in a single output if the file formats or stream services support it
2015-01-26 21:41:22 +00:00
config_set_default_uint (basicConfig, "AdvOut", "FFVBitrate", 2500);
UI: Add gop size option for custom ffmpeg output Closes jp9000/obs-studio#804
2017-02-17 16:25:21 +00:00
config_set_default_uint (basicConfig, "AdvOut", "FFVGOPSize", 250);
UI: Add advanced output settings Adds an 'advanced' mode to the output settings to allow more powerful and complex streaming and recording options: - Optionally use a different encoder for recording than for streaming to allow the recording to use a different encoder or encoder settings if desired (though at the cost if increased CPU usage depending on the encoders being used) - Use encoders other than x264 - Rescale the recording or streaming encoders in case the user wishes to stream and record at different resolutions - Select the specific mixer to use for recording and for streaming, allowing the stream and recording to use separate mixers (to for example allow a user to stream the game/mic audio but only record the game audio) - Use FFmpeg output for the recording button instead of only recording h264/aac to FLV, allowing the user to output to various different types of file formats or remote URLs, as well as allowing the user to select and use different encoders and encoder settings that are available in the FFmpeg library - Optionally allow the use of multiple audio tracks in a single output if the file formats or stream services support it
2015-01-26 21:41:22 +00:00
config_set_default_bool (basicConfig, "AdvOut", "FFUseRescale",
false);
UI: Add codec compatability checkbox to ffmpeg output Closes jp9000/obs-studio#804
2017-02-17 17:07:32 +00:00
config_set_default_bool (basicConfig, "AdvOut", "FFIgnoreCompat",
false);
UI: Add advanced output settings Adds an 'advanced' mode to the output settings to allow more powerful and complex streaming and recording options: - Optionally use a different encoder for recording than for streaming to allow the recording to use a different encoder or encoder settings if desired (though at the cost if increased CPU usage depending on the encoders being used) - Use encoders other than x264 - Rescale the recording or streaming encoders in case the user wishes to stream and record at different resolutions - Select the specific mixer to use for recording and for streaming, allowing the stream and recording to use separate mixers (to for example allow a user to stream the game/mic audio but only record the game audio) - Use FFmpeg output for the recording button instead of only recording h264/aac to FLV, allowing the user to output to various different types of file formats or remote URLs, as well as allowing the user to select and use different encoders and encoder settings that are available in the FFmpeg library - Optionally allow the use of multiple audio tracks in a single output if the file formats or stream services support it
2015-01-26 21:41:22 +00:00
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);
UI: Add default audio track bitrates Closes jp9000/obs-studio#732
2016-12-22 14:54:05 +00:00
config_set_default_uint (basicConfig, "AdvOut", "Track5Bitrate", 160);
config_set_default_uint (basicConfig, "AdvOut", "Track6Bitrate", 160);
UI: Add advanced output settings Adds an 'advanced' mode to the output settings to allow more powerful and complex streaming and recording options: - Optionally use a different encoder for recording than for streaming to allow the recording to use a different encoder or encoder settings if desired (though at the cost if increased CPU usage depending on the encoders being used) - Use encoders other than x264 - Rescale the recording or streaming encoders in case the user wishes to stream and record at different resolutions - Select the specific mixer to use for recording and for streaming, allowing the stream and recording to use separate mixers (to for example allow a user to stream the game/mic audio but only record the game audio) - Use FFmpeg output for the recording button instead of only recording h264/aac to FLV, allowing the user to output to various different types of file formats or remote URLs, as well as allowing the user to select and use different encoders and encoder settings that are available in the FFmpeg library - Optionally allow the use of multiple audio tracks in a single output if the file formats or stream services support it
2015-01-26 21:41:22 +00:00
UI: Enable Replay Buffer in Advanced Mode Replay buffer is currently only supported in simple mode. This change adds support to advanced mode and is, for the most part, a mirror of the addition of replay buffer to simple mode. Mantis-bug: https://obsproject.com/mantis/view.php?id=792 Closes jp9000/obs-studio#1019
2017-09-06 00:01:49 +00:00
config_set_default_bool (basicConfig, "AdvOut", "RecRB", false);
config_set_default_uint (basicConfig, "AdvOut", "RecRBTime", 20);
config_set_default_int (basicConfig, "AdvOut", "RecRBSize", 512);
Move basic mode configuration to a separate file Having everything in global.ini meant that if you wanted different settings for studio mode, that it would also overwrite it for basic mode. This way, the settings for each mode are separate, and you can use different settings for each mode.
2014-03-07 04:08:12 +00:00
config_set_default_uint (basicConfig, "Video", "BaseCX", cx);
config_set_default_uint (basicConfig, "Video", "BaseCY", cy);
UI: Don't subject base/output resolutions defaults If defaults change for the base or output resolutions, it could unintentionally affect users who are using defaults by chance and have never changed those values. Instead, save those values are soon as defaults are set if the users haven't already set them.
2017-04-29 01:00:11 +00:00
/* don't allow BaseCX/BaseCY to be susceptible to defaults changing */
if (!config_has_user_value(basicConfig, "Video", "BaseCX") ||
!config_has_user_value(basicConfig, "Video", "BaseCY")) {
config_set_uint(basicConfig, "Video", "BaseCX", cx);
config_set_uint(basicConfig, "Video", "BaseCY", cy);
config_save_safe(basicConfig, "tmp", nullptr);
}
UI: Add file formatting options for recording Allows the user to specify custom formatting for their recording file names with many formatting options, viewed via tooltip. The options have been added to the advanced settings section. Closes jp9000/obs-studio#507
2016-03-25 09:43:38 +00:00
config_set_default_string(basicConfig, "Output", "FilenameFormatting",
UI: Fix duplicate filename specifiers Fix redundant specifiers and change specifiers to match Linux date command. Closes jp9000/obs-studio#531
2016-04-02 23:28:04 +00:00
"%CCYY-%MM-%DD %hh-%mm-%ss");
UI: Add file formatting options for recording Allows the user to specify custom formatting for their recording file names with many formatting options, viewed via tooltip. The options have been added to the advanced settings section. Closes jp9000/obs-studio#507
2016-03-25 09:43:38 +00:00
UI: Add stream delay options to advanced settings I added stream delay options to advanced settings not just because I feel it's an advanced option, but also to reduce clutter in the outputs section and its sub-sections, which already have far too many options as it is.
2015-09-06 23:12:03 +00: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);
UI: Move reconnect options to advanced settings This is mostly just to remove the unnecessary clutter from the output sections. The reconnect settings are generally rarely modified by users as it is.
2015-09-11 02:10:40 +00: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);
UI: Add "Bind to IP" setting to advanced settings
2016-07-29 15:30:54 +00:00
config_set_default_string(basicConfig, "Output", "BindIP", "default");
UI: Add options for new socket loop
2017-02-22 01:05:45 +00:00
config_set_default_bool (basicConfig, "Output", "NewSocketLoopEnable",
false);
config_set_default_bool (basicConfig, "Output", "LowLatencyEnable",
false);
UI: Add "Bind to IP" setting to advanced settings
2016-07-29 15:30:54 +00:00
UI: Use default scaled res. of 1280x720 or equiv. Originally this value defaulted to 1.5 downscaling, but on very high resolution displays this would cause the default to be above 1280x720, which is not ideal for streaming/recording due to the CPU usage requirements. Instead, it will now find the closest resolution with a pixel count equivalent to or closest below 1280x720, and use that instead.
2015-07-03 17:26:18 +00: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);
Move basic mode configuration to a separate file Having everything in global.ini meant that if you wanted different settings for studio mode, that it would also overwrite it for basic mode. This way, the settings for each mode are separate, and you can use different settings for each mode.
2014-03-07 04:08:12 +00:00
UI: Don't subject base/output resolutions defaults If defaults change for the base or output resolutions, it could unintentionally affect users who are using defaults by chance and have never changed those values. Instead, save those values are soon as defaults are set if the users haven't already set them.
2017-04-29 01:00:11 +00:00
/* don't allow OutputCX/OutputCY to be susceptible to defaults
* changing */
if (!config_has_user_value(basicConfig, "Video", "OutputCX") ||
!config_has_user_value(basicConfig, "Video", "OutputCY")) {
config_set_uint(basicConfig, "Video", "OutputCX", scale_cx);
config_set_uint(basicConfig, "Video", "OutputCY", scale_cy);
config_save_safe(basicConfig, "tmp", nullptr);
}
Move basic mode configuration to a separate file Having everything in global.ini meant that if you wanted different settings for studio mode, that it would also overwrite it for basic mode. This way, the settings for each mode are separate, and you can use different settings for each mode.
2014-03-07 04:08:12 +00: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);
UI: Add video scale filters to basic settings
2014-12-15 09:08:46 +00:00
config_set_default_string(basicConfig, "Video", "ScaleType", "bicubic");
UI: Use config file for color format/space/range Allows the color format, color space, and color range to be set by the user. This will need user interface for in the future, though it'll have to be an advanced setting that's hidden from the user by default because I don't feel comfortable exposing this to a typical user.
2015-01-10 04:16:30 +00:00
config_set_default_string(basicConfig, "Video", "ColorFormat", "NV12");
UI: Default to colorspace 601 instead of 709 Seems that most decoders that don't read the h264 header tend to expect 601 instead of 709.
2015-09-19 19:28:33 +00:00
config_set_default_string(basicConfig, "Video", "ColorSpace", "601");
UI: Use config file for color format/space/range Allows the color format, color space, and color range to be set by the user. This will need user interface for in the future, though it'll have to be an advanced setting that's hidden from the user by default because I don't feel comfortable exposing this to a typical user.
2015-01-10 04:16:30 +00:00
config_set_default_string(basicConfig, "Video", "ColorRange",
"Partial");
Move basic mode configuration to a separate file Having everything in global.ini meant that if you wanted different settings for studio mode, that it would also overwrite it for basic mode. This way, the settings for each mode are separate, and you can use different settings for each mode.
2014-03-07 04:08:12 +00:00
UI: Add audio monitoring to settings/adv audio props. Adds audio monitoring selection to advanced audio properties, and adds the ability to select the device in advanced settings.
2017-02-06 05:51:50 +00:00
config_set_default_string(basicConfig, "Audio", "MonitoringDeviceId",
"default");
config_set_default_string(basicConfig, "Audio", "MonitoringDeviceName",
Str("Basic.Settings.Advanced.Audio.MonitoringDevice"
".Default"));
Move basic mode configuration to a separate file Having everything in global.ini meant that if you wanted different settings for studio mode, that it would also overwrite it for basic mode. This way, the settings for each mode are separate, and you can use different settings for each mode.
2014-03-07 04:08:12 +00:00
config_set_default_uint (basicConfig, "Audio", "SampleRate", 44100);
config_set_default_string(basicConfig, "Audio", "ChannelSetup",
"Stereo");
return true;
}
bool OBSBasic::InitBasicConfig()
{
UI: Profile initialization
2015-07-11 06:04:12 +00:00
ProfileScope("OBSBasic::InitBasicConfig");
(API Change) Make os_get_config_path safer to use Changed: char *os_get_config_path(const char *name); To: int os_get_config_path(char *dst, size_t size, const char *name); Also added: char *os_get_config_path_ptr(const char *name); I don't like this function returning an allocation by default. Similarly to what was done with the wide character conversion functions, this function now operates on an array argument, and if you really want to just get a pointer for convenience, you use the *_ptr version of the function that clearly indicates that it's returning an allocation.
2015-01-16 07:44:38 +00:00
char configPath[512];
UI: Add Profiles Adds setting profiles to the basic user interface. For each profile, a subdirectory for the profile will be created in [config_dir]/obs-studio/basic/profiles which will contain the settings data for each profile.
2015-06-24 02:38:01 +00: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");
(API Change) Make os_get_config_path safer to use Changed: char *os_get_config_path(const char *name); To: int os_get_config_path(char *dst, size_t size, const char *name); Also added: char *os_get_config_path_ptr(const char *name); I don't like this function returning an allocation by default. Similarly to what was done with the wide character conversion functions, this function now operates on an array argument, and if you really want to just get a pointer for convenience, you use the *_ptr version of the function that clearly indicates that it's returning an allocation.
2015-01-16 07:44:38 +00:00
if (ret <= 0) {
OBSErrorBox(nullptr, "Failed to get base.ini path");
return false;
}
Move basic mode configuration to a separate file Having everything in global.ini meant that if you wanted different settings for studio mode, that it would also overwrite it for basic mode. This way, the settings for each mode are separate, and you can use different settings for each mode.
2014-03-07 04:08:12 +00:00
UI: Add popup warnings for connection failure Also, check for null stream path/key in the RTMP output module.
2014-05-12 22:30:36 +00:00
int code = basicConfig.Open(configPath, CONFIG_OPEN_ALWAYS);
if (code != CONFIG_SUCCESS) {
OBSErrorBox(NULL, "Failed to open basic.ini: %d", code);
Move basic mode configuration to a separate file Having everything in global.ini meant that if you wanted different settings for studio mode, that it would also overwrite it for basic mode. This way, the settings for each mode are separate, and you can use different settings for each mode.
2014-03-07 04:08:12 +00:00
return false;
}
UI: Add Profiles Adds setting profiles to the basic user interface. For each profile, a subdirectory for the profile will be created in [config_dir]/obs-studio/basic/profiles which will contain the settings data for each profile.
2015-06-24 02:38:01 +00: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);
UI: Use saving functions for profiles/scenes Replaces all the json/config loading/saving functions with safe variants to reduce the chance of potential file corruption as much as possible. Also does a minor refactor of json writing by using obs_data_save_json_safe for writing json files instead of manually using obs_data_get_json and os_quick_write_utf8 each time.
2015-08-22 00:56:37 +00:00
basicConfig.SaveSafe("tmp");
UI: Add Profiles Adds setting profiles to the basic user interface. For each profile, a subdirectory for the profile will be created in [config_dir]/obs-studio/basic/profiles which will contain the settings data for each profile.
2015-06-24 02:38:01 +00:00
}
Move basic mode configuration to a separate file Having everything in global.ini meant that if you wanted different settings for studio mode, that it would also overwrite it for basic mode. This way, the settings for each mode are separate, and you can use different settings for each mode.
2014-03-07 04:08:12 +00:00
return InitBasicConfigDefaults();
}
Add (temporary terrible) volume controls - Add volume control These volume controls are basically nothing more than sliders. They look terrible and hopefully will be as temporary as they are terrible. - Allow saving of specific non-user sources via obs_load_source and obs_save_source functions. - Save data of desktop/mic audio sources (sync data, volume data, etc), and load the data on startup. - Make it so that a scene is created by default if first time using the application. On certain operating systems where supported, a default capture will be created. Desktop capture on mac, particularly. Not sure what to do about windows because monitor capture on windows 7 is completely terrible and is bad to start users off with.
2014-05-04 05:54:38 +00:00
void OBSBasic::InitOBSCallbacks()
{
UI: Profile initialization
2015-07-11 06:04:12 +00:00
ProfileScope("OBSBasic::InitOBSCallbacks");
UI: Clear global signals in closeEvent
2015-06-27 07:29:17 +00:00
signalHandlers.reserve(signalHandlers.size() + 6);
signalHandlers.emplace_back(obs_get_signal_handler(), "source_remove",
Add (temporary terrible) volume controls - Add volume control These volume controls are basically nothing more than sliders. They look terrible and hopefully will be as temporary as they are terrible. - Allow saving of specific non-user sources via obs_load_source and obs_save_source functions. - Save data of desktop/mic audio sources (sync data, volume data, etc), and load the data on startup. - Make it so that a scene is created by default if first time using the application. On certain operating systems where supported, a default capture will be created. Desktop capture on mac, particularly. Not sure what to do about windows because monitor capture on windows 7 is completely terrible and is bad to start users off with.
2014-05-04 05:54:38 +00:00
OBSBasic::SourceRemoved, this);
UI: Clear global signals in closeEvent
2015-06-27 07:29:17 +00:00
signalHandlers.emplace_back(obs_get_signal_handler(), "source_activate",
Add (temporary terrible) volume controls - Add volume control These volume controls are basically nothing more than sliders. They look terrible and hopefully will be as temporary as they are terrible. - Allow saving of specific non-user sources via obs_load_source and obs_save_source functions. - Save data of desktop/mic audio sources (sync data, volume data, etc), and load the data on startup. - Make it so that a scene is created by default if first time using the application. On certain operating systems where supported, a default capture will be created. Desktop capture on mac, particularly. Not sure what to do about windows because monitor capture on windows 7 is completely terrible and is bad to start users off with.
2014-05-04 05:54:38 +00:00
OBSBasic::SourceActivated, this);
UI: Clear global signals in closeEvent
2015-06-27 07:29:17 +00:00
signalHandlers.emplace_back(obs_get_signal_handler(), "source_deactivate",
Add (temporary terrible) volume controls - Add volume control These volume controls are basically nothing more than sliders. They look terrible and hopefully will be as temporary as they are terrible. - Allow saving of specific non-user sources via obs_load_source and obs_save_source functions. - Save data of desktop/mic audio sources (sync data, volume data, etc), and load the data on startup. - Make it so that a scene is created by default if first time using the application. On certain operating systems where supported, a default capture will be created. Desktop capture on mac, particularly. Not sure what to do about windows because monitor capture on windows 7 is completely terrible and is bad to start users off with.
2014-05-04 05:54:38 +00:00
OBSBasic::SourceDeactivated, this);
UI: Clear global signals in closeEvent
2015-06-27 07:29:17 +00:00
signalHandlers.emplace_back(obs_get_signal_handler(), "source_rename",
Implement renaming of scenes/sources
2014-06-30 07:06:01 +00:00
OBSBasic::SourceRenamed, this);
Add (temporary terrible) volume controls - Add volume control These volume controls are basically nothing more than sliders. They look terrible and hopefully will be as temporary as they are terrible. - Allow saving of specific non-user sources via obs_load_source and obs_save_source functions. - Save data of desktop/mic audio sources (sync data, volume data, etc), and load the data on startup. - Make it so that a scene is created by default if first time using the application. On certain operating systems where supported, a default capture will be created. Desktop capture on mac, particularly. Not sure what to do about windows because monitor capture on windows 7 is completely terrible and is bad to start users off with.
2014-05-04 05:54:38 +00: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 07:54:48 +00:00
void OBSBasic::InitPrimitives()
{
UI: Profile initialization
2015-07-11 06:04:12 +00:00
ProfileScope("OBSBasic::InitPrimitives");
(API Change) Remove obs_graphics() API Removed: - graphics_t obs_graphics(); Replaced With: - void obs_enter_graphics(); - void obs_leave_graphics(); Description: obs_graphics() was somewhat of a pointless function. The only time that it was ever necessary was to pass it as a parameter to gs_entercontext() followed by a subsequent gs_leavecontext() call after that. So, I felt that it made a bit more sense just to implement obs_enter_graphics() and obs_leave_graphics() functions to do the exact same thing without having to repeat that code. There's really no need to ever "hold" the graphics pointer, though I suppose that could change in the future so having a similar function come back isn't out of the question. Still, this at least reduces the amount of unnecessary repeated code for the time being.
2014-08-04 12:48:58 +00: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 07:54:48 +00:00
(API Change) Improve graphics API consistency Summary: - Prefix all graphics subsystem names with gs_ or GS_ - Unsquish funciton names (for example _setfloat to _set_float) - Changed create functions to be more consistent with the rest of the API elsewhere. For exmaple, instead of gs_create_texture/gs_texture_destroy, it's now gs_texture_create/gs_texture_destroy - Renamed gs_stencil_op enum to gs_stencil_op_type From: To: ----------------------------------------------------------- tvertarray gs_tvertarray vb_data gs_vb_data vbdata_create gs_vbdata_create vbdata_destroy gs_vbdata_destroy shader_param gs_shader_param gs_effect gs_effect effect_technique gs_effect_technique effect_pass gs_effect_pass effect_param gs_effect_param texture_t gs_texture_t stagesurf_t gs_stagesurf_t zstencil_t gs_zstencil_t vertbuffer_t gs_vertbuffer_t indexbuffer_t gs_indexbuffer_t samplerstate_t gs_samplerstate_t swapchain_t gs_swapchain_t texrender_t gs_texrender_t shader_t gs_shader_t sparam_t gs_sparam_t effect_t gs_effect_t technique_t gs_technique_t eparam_t gs_eparam_t device_t gs_device_t graphics_t graphics_t shader_param_type gs_shader_param_type SHADER_PARAM_UNKNOWN GS_SHADER_PARAM_UNKNOWN SHADER_PARAM_BOOL GS_SHADER_PARAM_BOOL SHADER_PARAM_FLOAT GS_SHADER_PARAM_FLOAT SHADER_PARAM_INT GS_SHADER_PARAM_INT SHADER_PARAM_STRING GS_SHADER_PARAM_STRING SHADER_PARAM_VEC2 GS_SHADER_PARAM_VEC2 SHADER_PARAM_VEC3 GS_SHADER_PARAM_VEC3 SHADER_PARAM_VEC4 GS_SHADER_PARAM_VEC4 SHADER_PARAM_MATRIX4X4 GS_SHADER_PARAM_MATRIX4X4 SHADER_PARAM_TEXTURE GS_SHADER_PARAM_TEXTURE shader_param_info gs_shader_param_info shader_type gs_shader_type SHADER_VERTEX GS_SHADER_VERTEX SHADER_PIXEL GS_SHADER_PIXEL shader_destroy gs_shader_destroy shader_numparams gs_shader_get_num_params shader_getparambyidx gs_shader_get_param_by_idx shader_getparambyname gs_shader_get_param_by_name shader_getviewprojmatrix gs_shader_get_viewproj_matrix shader_getworldmatrix gs_shader_get_world_matrix shader_getparaminfo gs_shader_get_param_info shader_setbool gs_shader_set_bool shader_setfloat gs_shader_set_float shader_setint gs_shader_set_int shader_setmatrix3 gs_shader_setmatrix3 shader_setmatrix4 gs_shader_set_matrix4 shader_setvec2 gs_shader_set_vec2 shader_setvec3 gs_shader_set_vec3 shader_setvec4 gs_shader_set_vec4 shader_settexture gs_shader_set_texture shader_setval gs_shader_set_val shader_setdefault gs_shader_set_default effect_property_type gs_effect_property_type EFFECT_NONE GS_EFFECT_NONE EFFECT_BOOL GS_EFFECT_BOOL EFFECT_FLOAT GS_EFFECT_FLOAT EFFECT_COLOR GS_EFFECT_COLOR EFFECT_TEXTURE GS_EFFECT_TEXTURE effect_param_info gs_effect_param_info effect_destroy gs_effect_destroy effect_gettechnique gs_effect_get_technique technique_begin gs_technique_begin technique_end gs_technique_end technique_beginpass gs_technique_begin_pass technique_beginpassbyname gs_technique_begin_pass_by_name technique_endpass gs_technique_end_pass effect_numparams gs_effect_get_num_params effect_getparambyidx gs_effect_get_param_by_idx effect_getparambyname gs_effect_get_param_by_name effect_updateparams gs_effect_update_params effect_getviewprojmatrix gs_effect_get_viewproj_matrix effect_getworldmatrix gs_effect_get_world_matrix effect_getparaminfo gs_effect_get_param_info effect_setbool gs_effect_set_bool effect_setfloat gs_effect_set_float effect_setint gs_effect_set_int effect_setmatrix4 gs_effect_set_matrix4 effect_setvec2 gs_effect_set_vec2 effect_setvec3 gs_effect_set_vec3 effect_setvec4 gs_effect_set_vec4 effect_settexture gs_effect_set_texture effect_setval gs_effect_set_val effect_setdefault gs_effect_set_default texrender_create gs_texrender_create texrender_destroy gs_texrender_destroy texrender_begin gs_texrender_begin texrender_end gs_texrender_end texrender_reset gs_texrender_reset texrender_gettexture gs_texrender_get_texture GS_BUILDMIPMAPS GS_BUILD_MIPMAPS GS_RENDERTARGET GS_RENDER_TARGET gs_device_name gs_get_device_name gs_device_type gs_get_device_type gs_entercontext gs_enter_context gs_leavecontext gs_leave_context gs_getcontext gs_get_context gs_renderstart gs_render_start gs_renderstop gs_render_stop gs_rendersave gs_render_save gs_getinput gs_get_input gs_geteffect gs_get_effect gs_create_effect_from_file gs_effect_create_from_file gs_create_effect gs_effect_create gs_create_vertexshader_from_file gs_vertexshader_create_from_file gs_create_pixelshader_from_file gs_pixelshader_create_from_file gs_create_texture_from_file gs_texture_create_from_file gs_resetviewport gs_reset_viewport gs_set2dmode gs_set_2d_mode gs_set3dmode gs_set_3d_mode gs_create_swapchain gs_swapchain_create gs_getsize gs_get_size gs_getwidth gs_get_width gs_getheight gs_get_height gs_create_texture gs_texture_create gs_create_cubetexture gs_cubetexture_create gs_create_volumetexture gs_voltexture_create gs_create_zstencil gs_zstencil_create gs_create_stagesurface gs_stagesurface_create gs_create_samplerstate gs_samplerstate_create gs_create_vertexshader gs_vertexshader_create gs_create_pixelshader gs_pixelshader_create gs_create_vertexbuffer gs_vertexbuffer_create gs_create_indexbuffer gs_indexbuffer_create gs_gettexturetype gs_get_texture_type gs_load_defaultsamplerstate gs_load_default_samplerstate gs_getvertexshader gs_get_vertex_shader gs_getpixelshader gs_get_pixel_shader gs_getrendertarget gs_get_render_target gs_getzstenciltarget gs_get_zstencil_target gs_setrendertarget gs_set_render_target gs_setcuberendertarget gs_set_cube_render_target gs_beginscene gs_begin_scene gs_draw gs_draw gs_endscene gs_end_scene gs_setcullmode gs_set_cull_mode gs_getcullmode gs_get_cull_mode gs_enable_depthtest gs_enable_depth_test gs_enable_stenciltest gs_enable_stencil_test gs_enable_stencilwrite gs_enable_stencil_write gs_blendfunction gs_blend_function gs_depthfunction gs_depth_function gs_stencilfunction gs_stencil_function gs_stencilop gs_stencil_op gs_setviewport gs_set_viewport gs_getviewport gs_get_viewport gs_setscissorrect gs_set_scissor_rect gs_create_texture_from_iosurface gs_texture_create_from_iosurface gs_create_gdi_texture gs_texture_create_gdi gs_is_compressed_format gs_is_compressed_format gs_num_total_levels gs_get_total_levels texture_setimage gs_texture_set_image cubetexture_setimage gs_cubetexture_set_image swapchain_destroy gs_swapchain_destroy texture_destroy gs_texture_destroy texture_getwidth gs_texture_get_width texture_getheight gs_texture_get_height texture_getcolorformat gs_texture_get_color_format texture_map gs_texture_map texture_unmap gs_texture_unmap texture_isrect gs_texture_is_rect texture_getobj gs_texture_get_obj cubetexture_destroy gs_cubetexture_destroy cubetexture_getsize gs_cubetexture_get_size cubetexture_getcolorformat gs_cubetexture_get_color_format volumetexture_destroy gs_voltexture_destroy volumetexture_getwidth gs_voltexture_get_width volumetexture_getheight gs_voltexture_get_height volumetexture_getdepth gs_voltexture_getdepth volumetexture_getcolorformat gs_voltexture_get_color_format stagesurface_destroy gs_stagesurface_destroy stagesurface_getwidth gs_stagesurface_get_width stagesurface_getheight gs_stagesurface_get_height stagesurface_getcolorformat gs_stagesurface_get_color_format stagesurface_map gs_stagesurface_map stagesurface_unmap gs_stagesurface_unmap zstencil_destroy gs_zstencil_destroy samplerstate_destroy gs_samplerstate_destroy vertexbuffer_destroy gs_vertexbuffer_destroy vertexbuffer_flush gs_vertexbuffer_flush vertexbuffer_getdata gs_vertexbuffer_get_data indexbuffer_destroy gs_indexbuffer_destroy indexbuffer_flush gs_indexbuffer_flush indexbuffer_getdata gs_indexbuffer_get_data indexbuffer_numindices gs_indexbuffer_get_num_indices indexbuffer_gettype gs_indexbuffer_get_type texture_rebind_iosurface gs_texture_rebind_iosurface texture_get_dc gs_texture_get_dc texture_release_dc gs_texture_release_dc
2014-08-08 06:42:07 +00: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 07:54:48 +00: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);
(API Change) Improve graphics API consistency Summary: - Prefix all graphics subsystem names with gs_ or GS_ - Unsquish funciton names (for example _setfloat to _set_float) - Changed create functions to be more consistent with the rest of the API elsewhere. For exmaple, instead of gs_create_texture/gs_texture_destroy, it's now gs_texture_create/gs_texture_destroy - Renamed gs_stencil_op enum to gs_stencil_op_type From: To: ----------------------------------------------------------- tvertarray gs_tvertarray vb_data gs_vb_data vbdata_create gs_vbdata_create vbdata_destroy gs_vbdata_destroy shader_param gs_shader_param gs_effect gs_effect effect_technique gs_effect_technique effect_pass gs_effect_pass effect_param gs_effect_param texture_t gs_texture_t stagesurf_t gs_stagesurf_t zstencil_t gs_zstencil_t vertbuffer_t gs_vertbuffer_t indexbuffer_t gs_indexbuffer_t samplerstate_t gs_samplerstate_t swapchain_t gs_swapchain_t texrender_t gs_texrender_t shader_t gs_shader_t sparam_t gs_sparam_t effect_t gs_effect_t technique_t gs_technique_t eparam_t gs_eparam_t device_t gs_device_t graphics_t graphics_t shader_param_type gs_shader_param_type SHADER_PARAM_UNKNOWN GS_SHADER_PARAM_UNKNOWN SHADER_PARAM_BOOL GS_SHADER_PARAM_BOOL SHADER_PARAM_FLOAT GS_SHADER_PARAM_FLOAT SHADER_PARAM_INT GS_SHADER_PARAM_INT SHADER_PARAM_STRING GS_SHADER_PARAM_STRING SHADER_PARAM_VEC2 GS_SHADER_PARAM_VEC2 SHADER_PARAM_VEC3 GS_SHADER_PARAM_VEC3 SHADER_PARAM_VEC4 GS_SHADER_PARAM_VEC4 SHADER_PARAM_MATRIX4X4 GS_SHADER_PARAM_MATRIX4X4 SHADER_PARAM_TEXTURE GS_SHADER_PARAM_TEXTURE shader_param_info gs_shader_param_info shader_type gs_shader_type SHADER_VERTEX GS_SHADER_VERTEX SHADER_PIXEL GS_SHADER_PIXEL shader_destroy gs_shader_destroy shader_numparams gs_shader_get_num_params shader_getparambyidx gs_shader_get_param_by_idx shader_getparambyname gs_shader_get_param_by_name shader_getviewprojmatrix gs_shader_get_viewproj_matrix shader_getworldmatrix gs_shader_get_world_matrix shader_getparaminfo gs_shader_get_param_info shader_setbool gs_shader_set_bool shader_setfloat gs_shader_set_float shader_setint gs_shader_set_int shader_setmatrix3 gs_shader_setmatrix3 shader_setmatrix4 gs_shader_set_matrix4 shader_setvec2 gs_shader_set_vec2 shader_setvec3 gs_shader_set_vec3 shader_setvec4 gs_shader_set_vec4 shader_settexture gs_shader_set_texture shader_setval gs_shader_set_val shader_setdefault gs_shader_set_default effect_property_type gs_effect_property_type EFFECT_NONE GS_EFFECT_NONE EFFECT_BOOL GS_EFFECT_BOOL EFFECT_FLOAT GS_EFFECT_FLOAT EFFECT_COLOR GS_EFFECT_COLOR EFFECT_TEXTURE GS_EFFECT_TEXTURE effect_param_info gs_effect_param_info effect_destroy gs_effect_destroy effect_gettechnique gs_effect_get_technique technique_begin gs_technique_begin technique_end gs_technique_end technique_beginpass gs_technique_begin_pass technique_beginpassbyname gs_technique_begin_pass_by_name technique_endpass gs_technique_end_pass effect_numparams gs_effect_get_num_params effect_getparambyidx gs_effect_get_param_by_idx effect_getparambyname gs_effect_get_param_by_name effect_updateparams gs_effect_update_params effect_getviewprojmatrix gs_effect_get_viewproj_matrix effect_getworldmatrix gs_effect_get_world_matrix effect_getparaminfo gs_effect_get_param_info effect_setbool gs_effect_set_bool effect_setfloat gs_effect_set_float effect_setint gs_effect_set_int effect_setmatrix4 gs_effect_set_matrix4 effect_setvec2 gs_effect_set_vec2 effect_setvec3 gs_effect_set_vec3 effect_setvec4 gs_effect_set_vec4 effect_settexture gs_effect_set_texture effect_setval gs_effect_set_val effect_setdefault gs_effect_set_default texrender_create gs_texrender_create texrender_destroy gs_texrender_destroy texrender_begin gs_texrender_begin texrender_end gs_texrender_end texrender_reset gs_texrender_reset texrender_gettexture gs_texrender_get_texture GS_BUILDMIPMAPS GS_BUILD_MIPMAPS GS_RENDERTARGET GS_RENDER_TARGET gs_device_name gs_get_device_name gs_device_type gs_get_device_type gs_entercontext gs_enter_context gs_leavecontext gs_leave_context gs_getcontext gs_get_context gs_renderstart gs_render_start gs_renderstop gs_render_stop gs_rendersave gs_render_save gs_getinput gs_get_input gs_geteffect gs_get_effect gs_create_effect_from_file gs_effect_create_from_file gs_create_effect gs_effect_create gs_create_vertexshader_from_file gs_vertexshader_create_from_file gs_create_pixelshader_from_file gs_pixelshader_create_from_file gs_create_texture_from_file gs_texture_create_from_file gs_resetviewport gs_reset_viewport gs_set2dmode gs_set_2d_mode gs_set3dmode gs_set_3d_mode gs_create_swapchain gs_swapchain_create gs_getsize gs_get_size gs_getwidth gs_get_width gs_getheight gs_get_height gs_create_texture gs_texture_create gs_create_cubetexture gs_cubetexture_create gs_create_volumetexture gs_voltexture_create gs_create_zstencil gs_zstencil_create gs_create_stagesurface gs_stagesurface_create gs_create_samplerstate gs_samplerstate_create gs_create_vertexshader gs_vertexshader_create gs_create_pixelshader gs_pixelshader_create gs_create_vertexbuffer gs_vertexbuffer_create gs_create_indexbuffer gs_indexbuffer_create gs_gettexturetype gs_get_texture_type gs_load_defaultsamplerstate gs_load_default_samplerstate gs_getvertexshader gs_get_vertex_shader gs_getpixelshader gs_get_pixel_shader gs_getrendertarget gs_get_render_target gs_getzstenciltarget gs_get_zstencil_target gs_setrendertarget gs_set_render_target gs_setcuberendertarget gs_set_cube_render_target gs_beginscene gs_begin_scene gs_draw gs_draw gs_endscene gs_end_scene gs_setcullmode gs_set_cull_mode gs_getcullmode gs_get_cull_mode gs_enable_depthtest gs_enable_depth_test gs_enable_stenciltest gs_enable_stencil_test gs_enable_stencilwrite gs_enable_stencil_write gs_blendfunction gs_blend_function gs_depthfunction gs_depth_function gs_stencilfunction gs_stencil_function gs_stencilop gs_stencil_op gs_setviewport gs_set_viewport gs_getviewport gs_get_viewport gs_setscissorrect gs_set_scissor_rect gs_create_texture_from_iosurface gs_texture_create_from_iosurface gs_create_gdi_texture gs_texture_create_gdi gs_is_compressed_format gs_is_compressed_format gs_num_total_levels gs_get_total_levels texture_setimage gs_texture_set_image cubetexture_setimage gs_cubetexture_set_image swapchain_destroy gs_swapchain_destroy texture_destroy gs_texture_destroy texture_getwidth gs_texture_get_width texture_getheight gs_texture_get_height texture_getcolorformat gs_texture_get_color_format texture_map gs_texture_map texture_unmap gs_texture_unmap texture_isrect gs_texture_is_rect texture_getobj gs_texture_get_obj cubetexture_destroy gs_cubetexture_destroy cubetexture_getsize gs_cubetexture_get_size cubetexture_getcolorformat gs_cubetexture_get_color_format volumetexture_destroy gs_voltexture_destroy volumetexture_getwidth gs_voltexture_get_width volumetexture_getheight gs_voltexture_get_height volumetexture_getdepth gs_voltexture_getdepth volumetexture_getcolorformat gs_voltexture_get_color_format stagesurface_destroy gs_stagesurface_destroy stagesurface_getwidth gs_stagesurface_get_width stagesurface_getheight gs_stagesurface_get_height stagesurface_getcolorformat gs_stagesurface_get_color_format stagesurface_map gs_stagesurface_map stagesurface_unmap gs_stagesurface_unmap zstencil_destroy gs_zstencil_destroy samplerstate_destroy gs_samplerstate_destroy vertexbuffer_destroy gs_vertexbuffer_destroy vertexbuffer_flush gs_vertexbuffer_flush vertexbuffer_getdata gs_vertexbuffer_get_data indexbuffer_destroy gs_indexbuffer_destroy indexbuffer_flush gs_indexbuffer_flush indexbuffer_getdata gs_indexbuffer_get_data indexbuffer_numindices gs_indexbuffer_get_num_indices indexbuffer_gettype gs_indexbuffer_get_type texture_rebind_iosurface gs_texture_rebind_iosurface texture_get_dc gs_texture_get_dc texture_release_dc gs_texture_release_dc
2014-08-08 06:42:07 +00: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 07:54:48 +00:00
UI: Draw cropped scene item edges as green in preview
2016-03-31 01:44:49 +00: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();
(API Change) Improve graphics API consistency Summary: - Prefix all graphics subsystem names with gs_ or GS_ - Unsquish funciton names (for example _setfloat to _set_float) - Changed create functions to be more consistent with the rest of the API elsewhere. For exmaple, instead of gs_create_texture/gs_texture_destroy, it's now gs_texture_create/gs_texture_destroy - Renamed gs_stencil_op enum to gs_stencil_op_type From: To: ----------------------------------------------------------- tvertarray gs_tvertarray vb_data gs_vb_data vbdata_create gs_vbdata_create vbdata_destroy gs_vbdata_destroy shader_param gs_shader_param gs_effect gs_effect effect_technique gs_effect_technique effect_pass gs_effect_pass effect_param gs_effect_param texture_t gs_texture_t stagesurf_t gs_stagesurf_t zstencil_t gs_zstencil_t vertbuffer_t gs_vertbuffer_t indexbuffer_t gs_indexbuffer_t samplerstate_t gs_samplerstate_t swapchain_t gs_swapchain_t texrender_t gs_texrender_t shader_t gs_shader_t sparam_t gs_sparam_t effect_t gs_effect_t technique_t gs_technique_t eparam_t gs_eparam_t device_t gs_device_t graphics_t graphics_t shader_param_type gs_shader_param_type SHADER_PARAM_UNKNOWN GS_SHADER_PARAM_UNKNOWN SHADER_PARAM_BOOL GS_SHADER_PARAM_BOOL SHADER_PARAM_FLOAT GS_SHADER_PARAM_FLOAT SHADER_PARAM_INT GS_SHADER_PARAM_INT SHADER_PARAM_STRING GS_SHADER_PARAM_STRING SHADER_PARAM_VEC2 GS_SHADER_PARAM_VEC2 SHADER_PARAM_VEC3 GS_SHADER_PARAM_VEC3 SHADER_PARAM_VEC4 GS_SHADER_PARAM_VEC4 SHADER_PARAM_MATRIX4X4 GS_SHADER_PARAM_MATRIX4X4 SHADER_PARAM_TEXTURE GS_SHADER_PARAM_TEXTURE shader_param_info gs_shader_param_info shader_type gs_shader_type SHADER_VERTEX GS_SHADER_VERTEX SHADER_PIXEL GS_SHADER_PIXEL shader_destroy gs_shader_destroy shader_numparams gs_shader_get_num_params shader_getparambyidx gs_shader_get_param_by_idx shader_getparambyname gs_shader_get_param_by_name shader_getviewprojmatrix gs_shader_get_viewproj_matrix shader_getworldmatrix gs_shader_get_world_matrix shader_getparaminfo gs_shader_get_param_info shader_setbool gs_shader_set_bool shader_setfloat gs_shader_set_float shader_setint gs_shader_set_int shader_setmatrix3 gs_shader_setmatrix3 shader_setmatrix4 gs_shader_set_matrix4 shader_setvec2 gs_shader_set_vec2 shader_setvec3 gs_shader_set_vec3 shader_setvec4 gs_shader_set_vec4 shader_settexture gs_shader_set_texture shader_setval gs_shader_set_val shader_setdefault gs_shader_set_default effect_property_type gs_effect_property_type EFFECT_NONE GS_EFFECT_NONE EFFECT_BOOL GS_EFFECT_BOOL EFFECT_FLOAT GS_EFFECT_FLOAT EFFECT_COLOR GS_EFFECT_COLOR EFFECT_TEXTURE GS_EFFECT_TEXTURE effect_param_info gs_effect_param_info effect_destroy gs_effect_destroy effect_gettechnique gs_effect_get_technique technique_begin gs_technique_begin technique_end gs_technique_end technique_beginpass gs_technique_begin_pass technique_beginpassbyname gs_technique_begin_pass_by_name technique_endpass gs_technique_end_pass effect_numparams gs_effect_get_num_params effect_getparambyidx gs_effect_get_param_by_idx effect_getparambyname gs_effect_get_param_by_name effect_updateparams gs_effect_update_params effect_getviewprojmatrix gs_effect_get_viewproj_matrix effect_getworldmatrix gs_effect_get_world_matrix effect_getparaminfo gs_effect_get_param_info effect_setbool gs_effect_set_bool effect_setfloat gs_effect_set_float effect_setint gs_effect_set_int effect_setmatrix4 gs_effect_set_matrix4 effect_setvec2 gs_effect_set_vec2 effect_setvec3 gs_effect_set_vec3 effect_setvec4 gs_effect_set_vec4 effect_settexture gs_effect_set_texture effect_setval gs_effect_set_val effect_setdefault gs_effect_set_default texrender_create gs_texrender_create texrender_destroy gs_texrender_destroy texrender_begin gs_texrender_begin texrender_end gs_texrender_end texrender_reset gs_texrender_reset texrender_gettexture gs_texrender_get_texture GS_BUILDMIPMAPS GS_BUILD_MIPMAPS GS_RENDERTARGET GS_RENDER_TARGET gs_device_name gs_get_device_name gs_device_type gs_get_device_type gs_entercontext gs_enter_context gs_leavecontext gs_leave_context gs_getcontext gs_get_context gs_renderstart gs_render_start gs_renderstop gs_render_stop gs_rendersave gs_render_save gs_getinput gs_get_input gs_geteffect gs_get_effect gs_create_effect_from_file gs_effect_create_from_file gs_create_effect gs_effect_create gs_create_vertexshader_from_file gs_vertexshader_create_from_file gs_create_pixelshader_from_file gs_pixelshader_create_from_file gs_create_texture_from_file gs_texture_create_from_file gs_resetviewport gs_reset_viewport gs_set2dmode gs_set_2d_mode gs_set3dmode gs_set_3d_mode gs_create_swapchain gs_swapchain_create gs_getsize gs_get_size gs_getwidth gs_get_width gs_getheight gs_get_height gs_create_texture gs_texture_create gs_create_cubetexture gs_cubetexture_create gs_create_volumetexture gs_voltexture_create gs_create_zstencil gs_zstencil_create gs_create_stagesurface gs_stagesurface_create gs_create_samplerstate gs_samplerstate_create gs_create_vertexshader gs_vertexshader_create gs_create_pixelshader gs_pixelshader_create gs_create_vertexbuffer gs_vertexbuffer_create gs_create_indexbuffer gs_indexbuffer_create gs_gettexturetype gs_get_texture_type gs_load_defaultsamplerstate gs_load_default_samplerstate gs_getvertexshader gs_get_vertex_shader gs_getpixelshader gs_get_pixel_shader gs_getrendertarget gs_get_render_target gs_getzstenciltarget gs_get_zstencil_target gs_setrendertarget gs_set_render_target gs_setcuberendertarget gs_set_cube_render_target gs_beginscene gs_begin_scene gs_draw gs_draw gs_endscene gs_end_scene gs_setcullmode gs_set_cull_mode gs_getcullmode gs_get_cull_mode gs_enable_depthtest gs_enable_depth_test gs_enable_stenciltest gs_enable_stencil_test gs_enable_stencilwrite gs_enable_stencil_write gs_blendfunction gs_blend_function gs_depthfunction gs_depth_function gs_stencilfunction gs_stencil_function gs_stencilop gs_stencil_op gs_setviewport gs_set_viewport gs_getviewport gs_get_viewport gs_setscissorrect gs_set_scissor_rect gs_create_texture_from_iosurface gs_texture_create_from_iosurface gs_create_gdi_texture gs_texture_create_gdi gs_is_compressed_format gs_is_compressed_format gs_num_total_levels gs_get_total_levels texture_setimage gs_texture_set_image cubetexture_setimage gs_cubetexture_set_image swapchain_destroy gs_swapchain_destroy texture_destroy gs_texture_destroy texture_getwidth gs_texture_get_width texture_getheight gs_texture_get_height texture_getcolorformat gs_texture_get_color_format texture_map gs_texture_map texture_unmap gs_texture_unmap texture_isrect gs_texture_is_rect texture_getobj gs_texture_get_obj cubetexture_destroy gs_cubetexture_destroy cubetexture_getsize gs_cubetexture_get_size cubetexture_getcolorformat gs_cubetexture_get_color_format volumetexture_destroy gs_voltexture_destroy volumetexture_getwidth gs_voltexture_get_width volumetexture_getheight gs_voltexture_get_height volumetexture_getdepth gs_voltexture_getdepth volumetexture_getcolorformat gs_voltexture_get_color_format stagesurface_destroy gs_stagesurface_destroy stagesurface_getwidth gs_stagesurface_get_width stagesurface_getheight gs_stagesurface_get_height stagesurface_getcolorformat gs_stagesurface_get_color_format stagesurface_map gs_stagesurface_map stagesurface_unmap gs_stagesurface_unmap zstencil_destroy gs_zstencil_destroy samplerstate_destroy gs_samplerstate_destroy vertexbuffer_destroy gs_vertexbuffer_destroy vertexbuffer_flush gs_vertexbuffer_flush vertexbuffer_getdata gs_vertexbuffer_get_data indexbuffer_destroy gs_indexbuffer_destroy indexbuffer_flush gs_indexbuffer_flush indexbuffer_getdata gs_indexbuffer_get_data indexbuffer_numindices gs_indexbuffer_get_num_indices indexbuffer_gettype gs_indexbuffer_get_type texture_rebind_iosurface gs_texture_rebind_iosurface texture_get_dc gs_texture_get_dc texture_release_dc gs_texture_release_dc
2014-08-08 06:42:07 +00: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 07:54:48 +00:00
for (int i = 0; i <= 360; i += (360/20)) {
float pos = RAD(float(i));
gs_vertex2f(cosf(pos), sinf(pos));
}
(API Change) Improve graphics API consistency Summary: - Prefix all graphics subsystem names with gs_ or GS_ - Unsquish funciton names (for example _setfloat to _set_float) - Changed create functions to be more consistent with the rest of the API elsewhere. For exmaple, instead of gs_create_texture/gs_texture_destroy, it's now gs_texture_create/gs_texture_destroy - Renamed gs_stencil_op enum to gs_stencil_op_type From: To: ----------------------------------------------------------- tvertarray gs_tvertarray vb_data gs_vb_data vbdata_create gs_vbdata_create vbdata_destroy gs_vbdata_destroy shader_param gs_shader_param gs_effect gs_effect effect_technique gs_effect_technique effect_pass gs_effect_pass effect_param gs_effect_param texture_t gs_texture_t stagesurf_t gs_stagesurf_t zstencil_t gs_zstencil_t vertbuffer_t gs_vertbuffer_t indexbuffer_t gs_indexbuffer_t samplerstate_t gs_samplerstate_t swapchain_t gs_swapchain_t texrender_t gs_texrender_t shader_t gs_shader_t sparam_t gs_sparam_t effect_t gs_effect_t technique_t gs_technique_t eparam_t gs_eparam_t device_t gs_device_t graphics_t graphics_t shader_param_type gs_shader_param_type SHADER_PARAM_UNKNOWN GS_SHADER_PARAM_UNKNOWN SHADER_PARAM_BOOL GS_SHADER_PARAM_BOOL SHADER_PARAM_FLOAT GS_SHADER_PARAM_FLOAT SHADER_PARAM_INT GS_SHADER_PARAM_INT SHADER_PARAM_STRING GS_SHADER_PARAM_STRING SHADER_PARAM_VEC2 GS_SHADER_PARAM_VEC2 SHADER_PARAM_VEC3 GS_SHADER_PARAM_VEC3 SHADER_PARAM_VEC4 GS_SHADER_PARAM_VEC4 SHADER_PARAM_MATRIX4X4 GS_SHADER_PARAM_MATRIX4X4 SHADER_PARAM_TEXTURE GS_SHADER_PARAM_TEXTURE shader_param_info gs_shader_param_info shader_type gs_shader_type SHADER_VERTEX GS_SHADER_VERTEX SHADER_PIXEL GS_SHADER_PIXEL shader_destroy gs_shader_destroy shader_numparams gs_shader_get_num_params shader_getparambyidx gs_shader_get_param_by_idx shader_getparambyname gs_shader_get_param_by_name shader_getviewprojmatrix gs_shader_get_viewproj_matrix shader_getworldmatrix gs_shader_get_world_matrix shader_getparaminfo gs_shader_get_param_info shader_setbool gs_shader_set_bool shader_setfloat gs_shader_set_float shader_setint gs_shader_set_int shader_setmatrix3 gs_shader_setmatrix3 shader_setmatrix4 gs_shader_set_matrix4 shader_setvec2 gs_shader_set_vec2 shader_setvec3 gs_shader_set_vec3 shader_setvec4 gs_shader_set_vec4 shader_settexture gs_shader_set_texture shader_setval gs_shader_set_val shader_setdefault gs_shader_set_default effect_property_type gs_effect_property_type EFFECT_NONE GS_EFFECT_NONE EFFECT_BOOL GS_EFFECT_BOOL EFFECT_FLOAT GS_EFFECT_FLOAT EFFECT_COLOR GS_EFFECT_COLOR EFFECT_TEXTURE GS_EFFECT_TEXTURE effect_param_info gs_effect_param_info effect_destroy gs_effect_destroy effect_gettechnique gs_effect_get_technique technique_begin gs_technique_begin technique_end gs_technique_end technique_beginpass gs_technique_begin_pass technique_beginpassbyname gs_technique_begin_pass_by_name technique_endpass gs_technique_end_pass effect_numparams gs_effect_get_num_params effect_getparambyidx gs_effect_get_param_by_idx effect_getparambyname gs_effect_get_param_by_name effect_updateparams gs_effect_update_params effect_getviewprojmatrix gs_effect_get_viewproj_matrix effect_getworldmatrix gs_effect_get_world_matrix effect_getparaminfo gs_effect_get_param_info effect_setbool gs_effect_set_bool effect_setfloat gs_effect_set_float effect_setint gs_effect_set_int effect_setmatrix4 gs_effect_set_matrix4 effect_setvec2 gs_effect_set_vec2 effect_setvec3 gs_effect_set_vec3 effect_setvec4 gs_effect_set_vec4 effect_settexture gs_effect_set_texture effect_setval gs_effect_set_val effect_setdefault gs_effect_set_default texrender_create gs_texrender_create texrender_destroy gs_texrender_destroy texrender_begin gs_texrender_begin texrender_end gs_texrender_end texrender_reset gs_texrender_reset texrender_gettexture gs_texrender_get_texture GS_BUILDMIPMAPS GS_BUILD_MIPMAPS GS_RENDERTARGET GS_RENDER_TARGET gs_device_name gs_get_device_name gs_device_type gs_get_device_type gs_entercontext gs_enter_context gs_leavecontext gs_leave_context gs_getcontext gs_get_context gs_renderstart gs_render_start gs_renderstop gs_render_stop gs_rendersave gs_render_save gs_getinput gs_get_input gs_geteffect gs_get_effect gs_create_effect_from_file gs_effect_create_from_file gs_create_effect gs_effect_create gs_create_vertexshader_from_file gs_vertexshader_create_from_file gs_create_pixelshader_from_file gs_pixelshader_create_from_file gs_create_texture_from_file gs_texture_create_from_file gs_resetviewport gs_reset_viewport gs_set2dmode gs_set_2d_mode gs_set3dmode gs_set_3d_mode gs_create_swapchain gs_swapchain_create gs_getsize gs_get_size gs_getwidth gs_get_width gs_getheight gs_get_height gs_create_texture gs_texture_create gs_create_cubetexture gs_cubetexture_create gs_create_volumetexture gs_voltexture_create gs_create_zstencil gs_zstencil_create gs_create_stagesurface gs_stagesurface_create gs_create_samplerstate gs_samplerstate_create gs_create_vertexshader gs_vertexshader_create gs_create_pixelshader gs_pixelshader_create gs_create_vertexbuffer gs_vertexbuffer_create gs_create_indexbuffer gs_indexbuffer_create gs_gettexturetype gs_get_texture_type gs_load_defaultsamplerstate gs_load_default_samplerstate gs_getvertexshader gs_get_vertex_shader gs_getpixelshader gs_get_pixel_shader gs_getrendertarget gs_get_render_target gs_getzstenciltarget gs_get_zstencil_target gs_setrendertarget gs_set_render_target gs_setcuberendertarget gs_set_cube_render_target gs_beginscene gs_begin_scene gs_draw gs_draw gs_endscene gs_end_scene gs_setcullmode gs_set_cull_mode gs_getcullmode gs_get_cull_mode gs_enable_depthtest gs_enable_depth_test gs_enable_stenciltest gs_enable_stencil_test gs_enable_stencilwrite gs_enable_stencil_write gs_blendfunction gs_blend_function gs_depthfunction gs_depth_function gs_stencilfunction gs_stencil_function gs_stencilop gs_stencil_op gs_setviewport gs_set_viewport gs_getviewport gs_get_viewport gs_setscissorrect gs_set_scissor_rect gs_create_texture_from_iosurface gs_texture_create_from_iosurface gs_create_gdi_texture gs_texture_create_gdi gs_is_compressed_format gs_is_compressed_format gs_num_total_levels gs_get_total_levels texture_setimage gs_texture_set_image cubetexture_setimage gs_cubetexture_set_image swapchain_destroy gs_swapchain_destroy texture_destroy gs_texture_destroy texture_getwidth gs_texture_get_width texture_getheight gs_texture_get_height texture_getcolorformat gs_texture_get_color_format texture_map gs_texture_map texture_unmap gs_texture_unmap texture_isrect gs_texture_is_rect texture_getobj gs_texture_get_obj cubetexture_destroy gs_cubetexture_destroy cubetexture_getsize gs_cubetexture_get_size cubetexture_getcolorformat gs_cubetexture_get_color_format volumetexture_destroy gs_voltexture_destroy volumetexture_getwidth gs_voltexture_get_width volumetexture_getheight gs_voltexture_get_height volumetexture_getdepth gs_voltexture_getdepth volumetexture_getcolorformat gs_voltexture_get_color_format stagesurface_destroy gs_stagesurface_destroy stagesurface_getwidth gs_stagesurface_get_width stagesurface_getheight gs_stagesurface_get_height stagesurface_getcolorformat gs_stagesurface_get_color_format stagesurface_map gs_stagesurface_map stagesurface_unmap gs_stagesurface_unmap zstencil_destroy gs_zstencil_destroy samplerstate_destroy gs_samplerstate_destroy vertexbuffer_destroy gs_vertexbuffer_destroy vertexbuffer_flush gs_vertexbuffer_flush vertexbuffer_getdata gs_vertexbuffer_get_data indexbuffer_destroy gs_indexbuffer_destroy indexbuffer_flush gs_indexbuffer_flush indexbuffer_getdata gs_indexbuffer_get_data indexbuffer_numindices gs_indexbuffer_get_num_indices indexbuffer_gettype gs_indexbuffer_get_type texture_rebind_iosurface gs_texture_rebind_iosurface texture_get_dc gs_texture_get_dc texture_release_dc gs_texture_release_dc
2014-08-08 06:42:07 +00: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 07:54:48 +00:00
(API Change) Remove obs_graphics() API Removed: - graphics_t obs_graphics(); Replaced With: - void obs_enter_graphics(); - void obs_leave_graphics(); Description: obs_graphics() was somewhat of a pointless function. The only time that it was ever necessary was to pass it as a parameter to gs_entercontext() followed by a subsequent gs_leavecontext() call after that. So, I felt that it made a bit more sense just to implement obs_enter_graphics() and obs_leave_graphics() functions to do the exact same thing without having to repeat that code. There's really no need to ever "hold" the graphics pointer, though I suppose that could change in the future so having a similar function come back isn't out of the question. Still, this at least reduces the amount of unnecessary repeated code for the time being.
2014-08-04 12:48:58 +00: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 07:54:48 +00:00
}
UI: Separate replay buffer from recording Replay buffer and recording should be separate in case the user wants to start recording from a specific point rather being forced to reconfigure for regular recording. Creates a new button on the main window below the recording button for turning on/off the replay buffer.
2016-12-09 22:40:04 +00:00
void OBSBasic::ReplayBufferClicked()
{
if (outputHandler->ReplayBufferActive())
StopReplayBuffer();
else
StartReplayBuffer();
};
UI: Refactor output handling To accommodate multiple types of outputs, there has to be some level of abstraction. The BasicOutputHandler structure will give us a way that we can switch between different output configurations.
2015-02-06 11:17:33 +00:00
void OBSBasic::ResetOutputs()
{
UI: Profile initialization
2015-07-11 06:04:12 +00:00
ProfileScope("OBSBasic::ResetOutputs");
UI: Add advanced output settings Adds an 'advanced' mode to the output settings to allow more powerful and complex streaming and recording options: - Optionally use a different encoder for recording than for streaming to allow the recording to use a different encoder or encoder settings if desired (though at the cost if increased CPU usage depending on the encoders being used) - Use encoders other than x264 - Rescale the recording or streaming encoders in case the user wishes to stream and record at different resolutions - Select the specific mixer to use for recording and for streaming, allowing the stream and recording to use separate mixers (to for example allow a user to stream the game/mic audio but only record the game audio) - Use FFmpeg output for the recording button instead of only recording h264/aac to FLV, allowing the user to output to various different types of file formats or remote URLs, as well as allowing the user to select and use different encoders and encoder settings that are available in the FFmpeg library - Optionally allow the use of multiple audio tracks in a single output if the file formats or stream services support it
2015-01-26 21:41:22 +00:00
const char *mode = config_get_string(basicConfig, "Output", "Mode");
bool advOut = astrcmpi(mode, "Advanced") == 0;
UI: Refactor output handling To accommodate multiple types of outputs, there has to be some level of abstraction. The BasicOutputHandler structure will give us a way that we can switch between different output configurations.
2015-02-06 11:17:33 +00:00
if (!outputHandler || !outputHandler->Active()) {
outputHandler.reset();
UI: Add advanced output settings Adds an 'advanced' mode to the output settings to allow more powerful and complex streaming and recording options: - Optionally use a different encoder for recording than for streaming to allow the recording to use a different encoder or encoder settings if desired (though at the cost if increased CPU usage depending on the encoders being used) - Use encoders other than x264 - Rescale the recording or streaming encoders in case the user wishes to stream and record at different resolutions - Select the specific mixer to use for recording and for streaming, allowing the stream and recording to use separate mixers (to for example allow a user to stream the game/mic audio but only record the game audio) - Use FFmpeg output for the recording button instead of only recording h264/aac to FLV, allowing the user to output to various different types of file formats or remote URLs, as well as allowing the user to select and use different encoders and encoder settings that are available in the FFmpeg library - Optionally allow the use of multiple audio tracks in a single output if the file formats or stream services support it
2015-01-26 21:41:22 +00:00
outputHandler.reset(advOut ?
CreateAdvancedOutputHandler(this) :
CreateSimpleOutputHandler(this));
UI: Add replay buffer options to simple output mode
2016-12-07 13:21:44 +00:00
UI: Separate replay buffer from recording Replay buffer and recording should be separate in case the user wants to start recording from a specific point rather being forced to reconfigure for regular recording. Creates a new button on the main window below the recording button for turning on/off the replay buffer.
2016-12-09 22:40:04 +00:00
delete replayBufferButton;
if (outputHandler->replayBuffer) {
replayBufferButton = new QPushButton(
QTStr("Basic.Main.StartReplayBuffer"),
this);
UI: Fix replay buffer compile issues on older compilers
2016-12-12 05:04:58 +00:00
connect(replayBufferButton.data(),
UI: Separate replay buffer from recording Replay buffer and recording should be separate in case the user wants to start recording from a specific point rather being forced to reconfigure for regular recording. Creates a new button on the main window below the recording button for turning on/off the replay buffer.
2016-12-09 22:40:04 +00:00
&QPushButton::clicked,
this,
&OBSBasic::ReplayBufferClicked);
UI: Add new theme, update theme capabilities I have always felt that the out of the box themes for OBS were quite lacking, and have spent a lot of time going through and sorting out the difficulties with the current setup. I've added a new themeID parameter to several elements that were otherwise impossible to target with QSS in a theme. Since Qt has pushed for the use of QML over QSS at this point, these should be considered workarounds. Included is the theme I was working on that can serve as a base. I'm hoping to encourage others to make their own themes, so we can grow the available themes for OBS. I am happy for any feedback on the theme itself, or other updates that can me made to make creating new themes easier overall.
2017-06-13 19:34:05 +00:00
replayBufferButton->setProperty("themeID", "replayBufferButton");
UI: Separate replay buffer from recording Replay buffer and recording should be separate in case the user wants to start recording from a specific point rather being forced to reconfigure for regular recording. Creates a new button on the main window below the recording button for turning on/off the replay buffer.
2016-12-09 22:40:04 +00:00
ui->buttonsVLayout->insertWidget(2, replayBufferButton);
}
UI: Add replay buffer options to simple output mode
2016-12-07 13:21:44 +00:00
UI: Separate replay buffer from recording Replay buffer and recording should be separate in case the user wants to start recording from a specific point rather being forced to reconfigure for regular recording. Creates a new button on the main window below the recording button for turning on/off the replay buffer.
2016-12-09 22:40:04 +00:00
if (sysTrayReplayBuffer)
sysTrayReplayBuffer->setEnabled(
!!outputHandler->replayBuffer);
UI: Refactor output handling To accommodate multiple types of outputs, there has to be some level of abstraction. The BasicOutputHandler structure will give us a way that we can switch between different output configurations.
2015-02-06 11:17:33 +00:00
} else {
outputHandler->Update();
}
}
UI: Add log separators for both startup and shutdown
2016-08-06 00:44:12 +00:00
#define STARTUP_SEPARATOR \
"==== Startup complete ==============================================="
#define SHUTDOWN_SEPARATOR \
"==== Shutting down =================================================="
UI: Add large separator after obs initialization This makes it so it's a bit more obvious when the primary initialization has completed in the log file.
2015-07-06 06:42:46 +00:00
UI: Add front-end API library Allows manipulating and modifying the front-end via plugins.
2016-08-28 21:24:14 +00:00
extern obs_frontend_callbacks *InitializeAPIInterface(OBSBasic *main);
UI: Clarify startup error messages related to video
2016-12-22 03:17:39 +00:00
#define UNSUPPORTED_ERROR \
"Failed to initialize video:\n\nRequired graphics API functionality " \
"not found. Your GPU may not be supported."
#define UNKNOWN_ERROR \
UI: Fix video initialization failure error message It incorrectly assumed windows systems before, now it uses an appropriate platform-independent error message. Also fixes a missing word.
2016-12-22 14:57:26 +00:00
"Failed to initialize video. Your GPU may not be supported, " \
"or your graphics drivers may need to be updated."
UI: Clarify startup error messages related to video
2016-12-22 03:17:39 +00:00
Add a comment and replace some class references Also, removed some unused headers, and moved the constructor/destructor functions to the top
2014-02-02 22:23:38 +00:00
void OBSBasic::OBSInit()
{
UI: Profile initialization
2015-07-11 06:04:12 +00:00
ProfileScope("OBSBasic::OBSInit");
UI: Add scene collections Adds scene collections to the menu bar, which allows you to duplicate, rename, remove, or add clean new scene collections. Scene files are now stored in ./obs-studio/basic/scenes directory with filesystem-safe names.
2015-06-24 02:29:07 +00:00
const char *sceneCollection = config_get_string(App()->GlobalConfig(),
"Basic", "SceneCollectionFile");
(API Change) Make os_get_config_path safer to use Changed: char *os_get_config_path(const char *name); To: int os_get_config_path(char *dst, size_t size, const char *name); Also added: char *os_get_config_path_ptr(const char *name); I don't like this function returning an allocation by default. Similarly to what was done with the wide character conversion functions, this function now operates on an array argument, and if you really want to just get a pointer for convenience, you use the *_ptr version of the function that clearly indicates that it's returning an allocation.
2015-01-16 07:44:38 +00:00
char savePath[512];
UI: Add scene collections Adds scene collections to the menu bar, which allows you to duplicate, rename, remove, or add clean new scene collections. Scene files are now stored in ./obs-studio/basic/scenes directory with filesystem-safe names.
2015-06-24 02:29:07 +00: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);
(API Change) Make os_get_config_path safer to use Changed: char *os_get_config_path(const char *name); To: int os_get_config_path(char *dst, size_t size, const char *name); Also added: char *os_get_config_path_ptr(const char *name); I don't like this function returning an allocation by default. Similarly to what was done with the wide character conversion functions, this function now operates on an array argument, and if you really want to just get a pointer for convenience, you use the *_ptr version of the function that clearly indicates that it's returning an allocation.
2015-01-16 07:44:38 +00:00
if (ret <= 0)
UI: Add scene collections Adds scene collections to the menu bar, which allows you to duplicate, rename, remove, or add clean new scene collections. Scene files are now stored in ./obs-studio/basic/scenes directory with filesystem-safe names.
2015-06-24 02:29:07 +00: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";
Add (temporary terrible) volume controls - Add volume control These volume controls are basically nothing more than sliders. They look terrible and hopefully will be as temporary as they are terrible. - Allow saving of specific non-user sources via obs_load_source and obs_save_source functions. - Save data of desktop/mic audio sources (sync data, volume data, etc), and load the data on startup. - Make it so that a scene is created by default if first time using the application. On certain operating systems where supported, a default capture will be created. Desktop capture on mac, particularly. Not sure what to do about windows because monitor capture on windows 7 is completely terrible and is bad to start users off with.
2014-05-04 05:54:38 +00:00
Move basic mode configuration to a separate file Having everything in global.ini meant that if you wanted different settings for studio mode, that it would also overwrite it for basic mode. This way, the settings for each mode are separate, and you can use different settings for each mode.
2014-03-07 04:08:12 +00:00
if (!InitBasicConfig())
throw "Failed to load basic.ini";
Fix video reset and apply new video settings This allows the changing of bideo settings without having to completely reset all graphics data. Will recreate internal output/conversion buffers and such and reset the main preview.
2014-02-23 03:14:19 +00:00
if (!ResetAudio())
Add a comment and replace some class references Also, removed some unused headers, and moved the constructor/destructor functions to the top
2014-02-02 22:23:38 +00:00
throw "Failed to initialize audio";
(API Change) Make os_get_config_path safer to use Changed: char *os_get_config_path(const char *name); To: int os_get_config_path(char *dst, size_t size, const char *name); Also added: char *os_get_config_path_ptr(const char *name); I don't like this function returning an allocation by default. Similarly to what was done with the wide character conversion functions, this function now operates on an array argument, and if you really want to just get a pointer for convenience, you use the *_ptr version of the function that clearly indicates that it's returning an allocation.
2015-01-16 07:44:38 +00:00
ret = ResetVideo();
(API Change) obs_reset_video: Use return codes Changed API functions: libobs: obs_reset_video Before, video initialization returned a boolean, but "failed" is too little information, if it fails due to lack of device capabilities or bad video device parameters, the front-end needs to know that. The OBS Basic UI has also been updated to reflect this API change.
2014-07-21 00:40:57 +00:00
switch (ret) {
case OBS_VIDEO_MODULE_NOT_FOUND:
throw "Failed to initialize video: Graphics module not found";
case OBS_VIDEO_NOT_SUPPORTED:
UI: Clarify startup error messages related to video
2016-12-22 03:17:39 +00:00
throw UNSUPPORTED_ERROR;
(API Change) obs_reset_video: Use return codes Changed API functions: libobs: obs_reset_video Before, video initialization returned a boolean, but "failed" is too little information, if it fails due to lack of device capabilities or bad video device parameters, the front-end needs to know that. The OBS Basic UI has also been updated to reflect this API change.
2014-07-21 00:40:57 +00:00
case OBS_VIDEO_INVALID_PARAM:
throw "Failed to initialize video: Invalid parameters";
default:
if (ret != OBS_VIDEO_SUCCESS)
UI: Clarify startup error messages related to video
2016-12-22 03:17:39 +00:00
throw UNKNOWN_ERROR;
(API Change) obs_reset_video: Use return codes Changed API functions: libobs: obs_reset_video Before, video initialization returned a boolean, but "failed" is too little information, if it fails due to lack of device capabilities or bad video device parameters, the front-end needs to know that. The OBS Basic UI has also been updated to reflect this API change.
2014-07-21 00:40:57 +00:00
}
UI: Fix audio monitoring dev. not being set on startup
2017-03-02 19:38:55 +00:00
/* load audio monitoring */
#if defined(_WIN32) || defined(__APPLE__)
const char *device_name = config_get_string(basicConfig, "Audio",
"MonitoringDeviceName");
const char *device_id = config_get_string(basicConfig, "Audio",
"MonitoringDeviceId");
obs_set_audio_monitoring_device(device_name, device_id);
UI: Log audio monitoring dev. on start and when changed
2017-03-02 20:35:37 +00:00
blog(LOG_INFO, "Audio monitoring device:\n\tname: %s\n\tid: %s",
device_name, device_id);
UI: Fix audio monitoring dev. not being set on startup
2017-03-02 19:38:55 +00:00
#endif
Add (temporary terrible) volume controls - Add volume control These volume controls are basically nothing more than sliders. They look terrible and hopefully will be as temporary as they are terrible. - Allow saving of specific non-user sources via obs_load_source and obs_save_source functions. - Save data of desktop/mic audio sources (sync data, volume data, etc), and load the data on startup. - Make it so that a scene is created by default if first time using the application. On certain operating systems where supported, a default capture will be created. Desktop capture on mac, particularly. Not sure what to do about windows because monitor capture on windows 7 is completely terrible and is bad to start users off with.
2014-05-04 05:54:38 +00:00
InitOBSCallbacks();
UI: Add basic hotkey integration
2014-11-01 20:48:58 +00:00
InitHotkeys();
Add a comment and replace some class references Also, removed some unused headers, and moved the constructor/destructor functions to the top
2014-02-02 22:23:38 +00:00
UI: Add front-end API library Allows manipulating and modifying the front-end via plugins.
2016-08-28 21:24:14 +00:00
api = InitializeAPIInterface(this);
Add extra search path for third party plugins The OBSBasic UI will now allow the use of a subdirectory of the user application data directory for third-party plugins. Though I'm not entirely sure if this ideal or not. Regardless, this is one of the first (of many) steps towards a plugin manager. On windows, this is %appdata%/obs-studio/plugins On linux, this is ~/.obs-studio/plugins On mac, this is ~/Library/Application Support/obs-sudio/plugins
2014-07-27 19:48:14 +00:00
AddExtraModulePaths();
UI: Use obs_log_loaded_modules for module logging Makes initialization in logs a bit more clean.
2016-08-06 00:46:00 +00: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 19:00:11 +00:00
obs_load_all_modules();
UI: Use obs_log_loaded_modules for module logging Makes initialization in logs a bit more clean.
2016-08-06 00:46:00 +00:00
blog(LOG_INFO, "---------------------------------");
obs_log_loaded_modules();
libobs: Add post-load module callback This allows the ability for certain types of modules (particularly scripting-related modules) to initialize extra data when all other modules have loaded. Because front-ends may wish to have custom handling for loading modules, the front-end must manually call obs_post_load_modules after it has completed loading all plug-in modules. Closes jp9000/obs-studio#965
2017-07-15 03:26:53 +00:00
blog(LOG_INFO, "---------------------------------");
obs_post_load_modules();
Activate user-selected audio devices - Fix a bug where the initial audio data insertion would cause all audio data to unintentionally clear (mixed up < and > operators, damn human error) - Fixed a potential interdependant lock scenario with channel mutex locks and graphics mutex locks. The main video thread could lock the graphics mutex and then while in the graphics mutex could lock the channels mutex. Meanwhile in another thread, the channel mutex could get locked, and then the graphics mutex would get locked, causing a deadlock. The best way to deal with this is to not let mutexes lock within other mutexes, but sometimes it's difficult to avoid such as in the main video thread. - Audio devices should now be functional, and the devices in the audio settings can now be changed as desired.
2014-03-08 00:03:34 +00:00
UI: Add log separators for both startup and shutdown
2016-08-06 00:44:12 +00:00
blog(LOG_INFO, STARTUP_SEPARATOR);
UI: Add large separator after obs initialization This makes it so it's a bit more obvious when the primary initialization has completed in the log file.
2015-07-06 06:42:46 +00:00
UI: Refactor output handling To accommodate multiple types of outputs, there has to be some level of abstraction. The BasicOutputHandler structure will give us a way that we can switch between different output configurations.
2015-02-06 11:17:33 +00:00
ResetOutputs();
UI: Add Start/Stop Recording/Streaming hotkeys
2014-11-01 20:53:25 +00:00
CreateHotkeys();
UI: Refactor output handling To accommodate multiple types of outputs, there has to be some level of abstraction. The BasicOutputHandler structure will give us a way that we can switch between different output configurations.
2015-02-06 11:17:33 +00: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 08:49:07 +00: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 07:54:48 +00: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 19:19:29 +00: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");
UI: Add more command line options
2017-01-11 19:19:17 +00: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 19:19:29 +00:00
UI: Add "View" menu to control visibility of UI widgets Adds a little improvement to quality-of-life, a typical "View" menu with the ability to show/hide the following (for now): - Listbox toolbars - Status bar - Transitions pane (some people don't really need/use/care about it)
2016-06-30 21:52:56 +00: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("ShowListboxToolbars", toggleListboxToolbars);
SET_VISIBILITY("ShowStatusBar", toggleStatusBar);
#undef SET_VISIBILITY
UI: Profile initialization
2015-07-11 06:04:12 +00:00
{
ProfileScope("OBSBasic::Load");
disableSaving--;
Load(savePath);
disableSaving++;
}
UI: Open properties on user source creation Every time I created a source I found myself in need to actually open up the properties. It was getting somewhat on my nerves, so I decided to just make it automatically pop up when the source is created.
2014-06-17 02:41:36 +00:00
Add basic update checking
2014-07-14 06:56:28 +00:00
TimedCheckForUpdates();
UI: Open properties on user source creation Every time I created a source I found myself in need to actually open up the properties. It was getting somewhat on my nerves, so I decided to just make it automatically pop up when the source is created.
2014-06-17 02:41:36 +00:00
loaded = true;
UI: Save at regular intervals Save the file when "start recording" or "start streaming" is clicked, and also save at every 20 second interval
2015-01-04 16:20:15 +00: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 19:19:29 +00:00
previewEnabled = config_get_bool(App()->GlobalConfig(),
UI: Add context menu to preview Includes the ability to disable the preview and general source context menu options (add/remove/filters/properties/etc)
2015-04-03 04:35:46 +00: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 19:19:29 +00:00
if (!previewEnabled && !IsPreviewProgramMode())
QMetaObject::invokeMethod(this, "EnablePreviewDisplay",
Qt::QueuedConnection,
Q_ARG(bool, previewEnabled));
UI: Add option to disable aero on windows vista/7 On windows vista/7, you cannot really use display capture efficiently without disabling aero, so this will add an option to settings to allow it to be disabled and cause it to be disabled on startup.
2015-05-25 08:37:13 +00:00
#ifdef _WIN32
uint32_t winVer = GetWindowsVersion();
if (winVer > 0 && winVer < 0x602) {
bool disableAero = config_get_bool(basicConfig, "Video",
"DisableAero");
SetAeroEnabled(!disableAero);
}
#endif
UI: Save project only on new changes
2015-06-30 12:49:31 +00:00
UI: Add scene collections Adds scene collections to the menu bar, which allows you to duplicate, rename, remove, or add clean new scene collections. Scene files are now stored in ./obs-studio/basic/scenes directory with filesystem-safe names.
2015-06-24 02:29:07 +00:00
RefreshSceneCollections();
UI: Add Profiles Adds setting profiles to the basic user interface. For each profile, a subdirectory for the profile will be created in [config_dir]/obs-studio/basic/profiles which will contain the settings data for each profile.
2015-06-24 02:38:01 +00:00
RefreshProfiles();
UI: Save project only on new changes
2015-06-30 12:49:31 +00:00
disableSaving--;
UI: Change "main preview" to use OBSQTDisplay (Non-compiling commit: windowless-context branch) Gets rid of all functions/data related to setting up the main preview to be associated with obs_reset_video and instead uses OBSQTDisplay for the main window display (thus associating it with an obs_display object).
2015-08-02 07:02:58 +00: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);
UI: Add "Always On Top" option to file menu
2016-01-22 15:33:29 +00:00
#ifdef _WIN32
UI: Add media/image file drop support
2016-09-26 19:40:23 +00:00
SetWin32DropStyle(this);
UI: Add "Always On Top" option to file menu
2016-01-22 15:33:29 +00:00
show();
#endif
bool alwaysOnTop = config_get_bool(App()->GlobalConfig(), "BasicWindow",
"AlwaysOnTop");
UI: Add command line option for starting up always on top Closes jp9000/obs-studio#853
2017-04-30 14:47:19 +00:00
if (alwaysOnTop || opt_always_on_top) {
UI: Add "Always On Top" option to file menu
2016-01-22 15:33:29 +00:00
SetAlwaysOnTop(this, true);
ui->actionAlwaysOnTop->setChecked(true);
}
#ifndef _WIN32
UI: Change "main preview" to use OBSQTDisplay (Non-compiling commit: windowless-context branch) Gets rid of all functions/data related to setting up the main preview to be associated with obs_reset_video and instead uses OBSQTDisplay for the main window display (thus associating it with an obs_display object).
2015-08-02 07:02:58 +00:00
show();
UI: Add "Always On Top" option to file menu
2016-01-22 15:33:29 +00:00
#endif
UI: Add splitter to main window Allows adjusting the size of the bottom section of the main window
2016-01-09 22:20:46 +00:00
UI: Add modular UI Changes the UI to an adjustable user interface, allowing the user to fully customize how the scenes list, sources list, the mixer, transitions, and the buttons are oriented on the main window window.
2017-07-27 09:40:41 +00:00
const char *dockStateStr = config_get_string(App()->GlobalConfig(),
"BasicWindow", "DockState");
if (!dockStateStr) {
on_resetUI_triggered();
UI: Add splitter to main window Allows adjusting the size of the bottom section of the main window
2016-01-09 22:20:46 +00:00
} else {
UI: Add modular UI Changes the UI to an adjustable user interface, allowing the user to fully customize how the scenes list, sources list, the mixer, transitions, and the buttons are oriented on the main window window.
2017-07-27 09:40:41 +00:00
QByteArray dockState =
QByteArray::fromBase64(QByteArray(dockStateStr));
if (!restoreState(dockState))
on_resetUI_triggered();
UI: Add splitter to main window Allows adjusting the size of the bottom section of the main window
2016-01-09 22:20:46 +00:00
}
UI: Add modular UI Changes the UI to an adjustable user interface, allowing the user to fully customize how the scenes list, sources list, the mixer, transitions, and the buttons are oriented on the main window window.
2017-07-27 09:40:41 +00:00
config_set_default_bool(App()->GlobalConfig(), "BasicWindow",
"DocksLocked", true);
bool docksLocked = config_get_bool(App()->GlobalConfig(),
"BasicWindow", "DocksLocked");
on_lockUI_toggled(docksLocked);
ui->lockUI->blockSignals(true);
ui->lockUI->setChecked(docksLocked);
ui->lockUI->blockSignals(false);
UI: Add system tray capability This adds a system tray when enabled. There is also a option to minimize to the system tray when the app is started. Closes jp9000/obs-studio#595
2016-08-13 14:36:17 +00:00
SystemTray(true);
UI: Add option to save projectors This adds an option to the general settings to save the opened projectors on exit. (Note: Fixed conflicts -Jim) Closes jp9000/obs-studio#743
2016-12-29 15:21:53 +00:00
OpenSavedProjectors();
UI: Add auto-configuration wizard The auto-configuration wizard is designed to allow first-time or novice/uneducated users or to set up video and encoding settings in a very quick and easy way. It'll automatically perform a bandwidth test, and/or test the user's video settings to determine the most ideal settings for streaming and recording (assuming a 1-pc setup).
2017-05-06 19:13:56 +00:00
UI: Add fullscreen UI option to view menu (Edit by Jim: Removed "Fullscreen Preview" because that's already sort of served by the normal fullscreen projector option via the preview context menu) Closes jp9000/obs-studio#846
2017-03-04 14:21:43 +00:00
if (windowState().testFlag(Qt::WindowFullScreen))
fullscreenInterface = true;
UI: Add auto-configuration wizard The auto-configuration wizard is designed to allow first-time or novice/uneducated users or to set up video and encoding settings in a very quick and easy way. It'll automatically perform a bandwidth test, and/or test the user's video settings to determine the most ideal settings for streaming and recording (assuming a 1-pc setup).
2017-05-06 19:13:56 +00:00
bool has_last_version = config_has_user_value(App()->GlobalConfig(),
"General", "LastVersion");
bool first_run = config_get_bool(App()->GlobalConfig(), "General",
"FirstRun");
if (!first_run) {
config_set_bool(App()->GlobalConfig(), "General", "FirstRun",
true);
config_save_safe(App()->GlobalConfig(), "tmp", nullptr);
}
if (!first_run && !has_last_version && !Active()) {
QString msg;
msg = QTStr("Basic.FirstStartup.RunWizard");
msg += "\n\n";
msg += QTStr("Basic.FirstStartup.RunWizard.BetaWarning");
QMessageBox::StandardButton button =
UI: Make sure all message box buttons are translated Instead of QMessageBox::question and QMessageBox::information, use the OBSMessageBox class, which translates all buttons.
2017-05-13 21:06:32 +00:00
OBSMessageBox::question(this, QTStr("Basic.AutoConfig"),
UI: Add auto-configuration wizard The auto-configuration wizard is designed to allow first-time or novice/uneducated users or to set up video and encoding settings in a very quick and easy way. It'll automatically perform a bandwidth test, and/or test the user's video settings to determine the most ideal settings for streaming and recording (assuming a 1-pc setup).
2017-05-06 19:13:56 +00:00
msg);
if (button == QMessageBox::Yes) {
on_autoConfigure_triggered();
} else {
msg = QTStr("Basic.FirstStartup.RunWizard.NoClicked");
UI: Make sure all message box buttons are translated Instead of QMessageBox::question and QMessageBox::information, use the OBSMessageBox class, which translates all buttons.
2017-05-13 21:06:32 +00:00
OBSMessageBox::information(this,
UI: Add auto-configuration wizard The auto-configuration wizard is designed to allow first-time or novice/uneducated users or to set up video and encoding settings in a very quick and easy way. It'll automatically perform a bandwidth test, and/or test the user's video settings to determine the most ideal settings for streaming and recording (assuming a 1-pc setup).
2017-05-06 19:13:56 +00:00
QTStr("Basic.AutoConfig"), msg);
}
}
UI: Add option to show stats on startup to general
2017-05-14 03:47:47 +00:00
if (config_get_bool(basicConfig, "General", "OpenStatsOnStartup"))
on_stats_triggered();
UI: Initialize Stats window values after OBSInit/reset When the statistics window starts up for the first time, it reset values at that very moment so that stray lagged frames due to OBS' startup wouldn't be displayed. However, that's really a bad place to reset those values because the user could want to view the stats window after a long stream, and having those values reset when he/she views the window for the first time would sort of make the point of viewing your stats moot. Instead, reset the values only when applicable, such as after OBSInit or when video is reset.
2017-06-19 22:33:12 +00:00
OBSBasicStats::InitializeValues();
Add a comment and replace some class references Also, removed some unused headers, and moved the constructor/destructor functions to the top
2014-02-02 22:23:38 +00:00
}
UI: Add basic hotkey integration
2014-11-01 20:48:58 +00:00
void OBSBasic::InitHotkeys()
{
UI: Profile initialization
2015-07-11 06:04:12 +00:00
ProfileScope("OBSBasic::InitHotkeys");
UI: Add basic hotkey integration
2014-11-01 20:48:58 +00: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"),
UI: Fix push-to-* localization strings being swapped
2015-05-12 19:36:19 +00:00
Str("Push-to-mute"), Str("Push-to-talk"));
UI: Add basic hotkey integration
2014-11-01 20:48:58 +00: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));
}
UI: Add Start/Stop Recording/Streaming hotkeys
2014-11-01 20:53:25 +00:00
void OBSBasic::CreateHotkeys()
{
UI: Profile initialization
2015-07-11 06:04:12 +00:00
ProfileScope("OBSBasic::CreateHotkeys");
UI: Add Start/Stop Recording/Streaming hotkeys
2014-11-01 20:53:25 +00: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;
};
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00: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);
};
UI: Add Start/Stop Recording/Streaming hotkeys
2014-11-01 20:53:25 +00: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);
};
UI: Log when starting / stopping via hotkey or timer This will help resolve incidents where users accidentally started or stopped their stream without knowing what triggered it (usually from hotkeys that were forgotten about).
2017-10-12 15:20:19 +00:00
#define MAKE_CALLBACK(pred, method, log_action) \
UI: Add Start/Stop Recording/Streaming hotkeys
2014-11-01 20:53:25 +00:00
[](void *data, obs_hotkey_pair_id, obs_hotkey_t*, bool pressed) \
{ \
OBSBasic &basic = *static_cast<OBSBasic*>(data); \
if (pred && pressed) { \
UI: Log when starting / stopping via hotkey or timer This will help resolve incidents where users accidentally started or stopped their stream without knowing what triggered it (usually from hotkeys that were forgotten about).
2017-10-12 15:20:19 +00:00
blog(LOG_INFO, log_action " due to hotkey"); \
UI: Add Start/Stop Recording/Streaming hotkeys
2014-11-01 20:53:25 +00:00
method(); \
return true; \
} \
return false; \
}
streamingHotkeys = obs_hotkey_pair_register_frontend(
"OBSBasic.StartStreaming",
UI: Separate replay buffer from recording Replay buffer and recording should be separate in case the user wants to start recording from a specific point rather being forced to reconfigure for regular recording. Creates a new button on the main window below the recording button for turning on/off the replay buffer.
2016-12-09 22:40:04 +00:00
Str("Basic.Main.StartStreaming"),
UI: Add Start/Stop Recording/Streaming hotkeys
2014-11-01 20:53:25 +00:00
"OBSBasic.StopStreaming",
UI: Separate replay buffer from recording Replay buffer and recording should be separate in case the user wants to start recording from a specific point rather being forced to reconfigure for regular recording. Creates a new button on the main window below the recording button for turning on/off the replay buffer.
2016-12-09 22:40:04 +00:00
Str("Basic.Main.StopStreaming"),
UI: Add Start/Stop Recording/Streaming hotkeys
2014-11-01 20:53:25 +00:00
MAKE_CALLBACK(!basic.outputHandler->StreamingActive(),
UI: Log when starting / stopping via hotkey or timer This will help resolve incidents where users accidentally started or stopped their stream without knowing what triggered it (usually from hotkeys that were forgotten about).
2017-10-12 15:20:19 +00:00
basic.StartStreaming, "Starting stream"),
UI: Add Start/Stop Recording/Streaming hotkeys
2014-11-01 20:53:25 +00:00
MAKE_CALLBACK(basic.outputHandler->StreamingActive(),
UI: Log when starting / stopping via hotkey or timer This will help resolve incidents where users accidentally started or stopped their stream without knowing what triggered it (usually from hotkeys that were forgotten about).
2017-10-12 15:20:19 +00:00
basic.StopStreaming, "Stopping stream"),
UI: Add Start/Stop Recording/Streaming hotkeys
2014-11-01 20:53:25 +00:00
this, this);
LoadHotkeyPair(streamingHotkeys,
"OBSBasic.StartStreaming", "OBSBasic.StopStreaming");
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00: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");
UI: Add Start/Stop Recording/Streaming hotkeys
2014-11-01 20:53:25 +00:00
recordingHotkeys = obs_hotkey_pair_register_frontend(
"OBSBasic.StartRecording",
UI: Separate replay buffer from recording Replay buffer and recording should be separate in case the user wants to start recording from a specific point rather being forced to reconfigure for regular recording. Creates a new button on the main window below the recording button for turning on/off the replay buffer.
2016-12-09 22:40:04 +00:00
Str("Basic.Main.StartRecording"),
UI: Add Start/Stop Recording/Streaming hotkeys
2014-11-01 20:53:25 +00:00
"OBSBasic.StopRecording",
UI: Separate replay buffer from recording Replay buffer and recording should be separate in case the user wants to start recording from a specific point rather being forced to reconfigure for regular recording. Creates a new button on the main window below the recording button for turning on/off the replay buffer.
2016-12-09 22:40:04 +00:00
Str("Basic.Main.StopRecording"),
UI: Add Start/Stop Recording/Streaming hotkeys
2014-11-01 20:53:25 +00:00
MAKE_CALLBACK(!basic.outputHandler->RecordingActive(),
UI: Log when starting / stopping via hotkey or timer This will help resolve incidents where users accidentally started or stopped their stream without knowing what triggered it (usually from hotkeys that were forgotten about).
2017-10-12 15:20:19 +00:00
basic.StartRecording, "Starting recording"),
UI: Add Start/Stop Recording/Streaming hotkeys
2014-11-01 20:53:25 +00:00
MAKE_CALLBACK(basic.outputHandler->RecordingActive(),
UI: Log when starting / stopping via hotkey or timer This will help resolve incidents where users accidentally started or stopped their stream without knowing what triggered it (usually from hotkeys that were forgotten about).
2017-10-12 15:20:19 +00:00
basic.StopRecording, "Stopping recording"),
UI: Add Start/Stop Recording/Streaming hotkeys
2014-11-01 20:53:25 +00:00
this, this);
LoadHotkeyPair(recordingHotkeys,
"OBSBasic.StartRecording", "OBSBasic.StopRecording");
UI: Separate replay buffer from recording Replay buffer and recording should be separate in case the user wants to start recording from a specific point rather being forced to reconfigure for regular recording. Creates a new button on the main window below the recording button for turning on/off the replay buffer.
2016-12-09 22:40:04 +00: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");
UI: Add Start/Stop Recording/Streaming hotkeys
2014-11-01 20:53:25 +00: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 19:19:29 +00: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");
UI: Add Start/Stop Recording/Streaming hotkeys
2014-11-01 20:53:25 +00:00
}
UI: Add OBSBasic::ClearHotkeys function Add a function to clear basic window hotkeys to reduces potential code duplication
2015-06-29 07:47:07 +00:00
void OBSBasic::ClearHotkeys()
{
obs_hotkey_pair_unregister(streamingHotkeys);
obs_hotkey_pair_unregister(recordingHotkeys);
UI: Separate replay buffer from recording Replay buffer and recording should be separate in case the user wants to start recording from a specific point rather being forced to reconfigure for regular recording. Creates a new button on the main window below the recording button for turning on/off the replay buffer.
2016-12-09 22:40:04 +00:00
obs_hotkey_pair_unregister(replayBufHotkeys);
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00: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 19:19:29 +00:00
obs_hotkey_unregister(togglePreviewProgramHotkey);
obs_hotkey_unregister(transitionHotkey);
UI: Add OBSBasic::ClearHotkeys function Add a function to clear basic window hotkeys to reduces potential code duplication
2015-06-29 07:47:07 +00:00
}
Add a comment and replace some class references Also, removed some unused headers, and moved the constructor/destructor functions to the top
2014-02-02 22:23:38 +00:00
OBSBasic::~OBSBasic()
{
UI: Add front-end auto-updater
2017-02-20 12:46:29 +00:00
if (updateCheckThread && updateCheckThread->isRunning())
updateCheckThread->wait();
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 19:19:29 +00:00
delete programOptions;
delete program;
UI: Add context menu to preview Includes the ability to disable the preview and general source context menu options (add/remove/filters/properties/etc)
2015-04-03 04:35:46 +00: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 07:54:48 +00: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. */
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
delete cpuUsageTimer;
Add function to main window to query CPU usage
2014-07-06 23:18:16 +00:00
os_cpu_usage_info_destroy(cpuUsageInfo);
UI: Add basic hotkey integration
2014-11-01 20:48:58 +00:00
obs_hotkey_set_callback_routing_func(nullptr, nullptr);
UI: Add OBSBasic::ClearHotkeys function Add a function to clear basic window hotkeys to reduces potential code duplication
2015-06-29 07:47:07 +00:00
ClearHotkeys();
UI: Add basic hotkey integration
2014-11-01 20:48:58 +00:00
(API Change) libobs: Make obs_service refcounted
2015-05-04 00:07:43 +00:00
service = nullptr;
UI: Refactor output handling To accommodate multiple types of outputs, there has to be some level of abstraction. The BasicOutputHandler structure will give us a way that we can switch between different output configurations.
2015-02-06 11:17:33 +00:00
outputHandler.reset();
Add interaction gui
2014-09-15 23:16:16 +00:00
if (interaction)
delete interaction;
Minor refactor for creation of sub-windows This refactors the sub-window code a bit so that instead of deleting the window pointers, it calls QWidget::close() on them to safely trigger a normal close on them instead (which will also delete them). Moves setting the DeleteOnClose flag from inside of the Dialog classes into the OBSBasic class, to make that behaviour more obvious.
2014-07-22 20:16:57 +00:00
if (properties)
delete properties;
UI: Add user interface for filters
2015-02-26 05:23:57 +00:00
if (filters)
delete filters;
Minor refactor for creation of sub-windows This refactors the sub-window code a bit so that instead of deleting the window pointers, it calls QWidget::close() on them to safely trigger a normal close on them instead (which will also delete them). Moves setting the DeleteOnClose flag from inside of the Dialog classes into the OBSBasic class, to make that behaviour more obvious.
2014-07-22 20:16:57 +00:00
if (transformWindow)
delete transformWindow;
Add source properties window (very preliminary) - Add a properties window for sources so that you can now actually edit the settings for sources. Also, display the source by itself in the window (Note: not working on mac, and possibly not working on linux). When changing the settings for a source, it will call obs_source_update on that source when you have modified any values automatically. - Add a properties 'widget', eventually I want to turn this in to a regular nice properties view like you'd see in the designer, but right now it just uses a form layout in a QScrollArea with regular controls to display the properties. It's clunky but works for the time being. - Make it so that swap chains and the main graphics subsystem will automatically use at least one backbuffer if none was specified - Fix bug where displays weren't added to the main display array - Make it so that you can get the properties of a source via the actual pointer of a source/encoder/output in addition to being able to look up properties via identifier. - When registering source types, check for required functions (wasn't doing it before). getheight/getwidth should not be optional if it's a video source as well. - Add an RAII OBSObj wrapper to obs.hpp for non-reference-counted libobs pointers - Add an RAII OBSSignal wrapper to obs.hpp for libobs signals to automatically disconnect them on destruction - Move the "scale and center" calculation in window-basic-main.cpp to its own function and in its own source file - Add an 'update' callback to WASAPI audio sources
2014-03-23 08:07:54 +00:00
UI: Add advanced audio properties dialog This dialog gives options such as increasing audio past 100%, forcing the audio of a source to mono, and setting the audio sync offset of a source (which was an oft-requested feature)
2014-12-28 08:38:00 +00:00
if (advAudioWindow)
delete advAudioWindow;
UI: Change "main preview" to use OBSQTDisplay (Non-compiling commit: windowless-context branch) Gets rid of all functions/data related to setting up the main preview to be associated with obs_reset_video and instead uses OBSQTDisplay for the main window display (thus associating it with an obs_display object).
2015-08-02 07:02:58 +00:00
obs_display_remove_draw_callback(ui->preview->GetDisplay(),
OBSBasic::RenderMain, this);
(API Change) Remove obs_graphics() API Removed: - graphics_t obs_graphics(); Replaced With: - void obs_enter_graphics(); - void obs_leave_graphics(); Description: obs_graphics() was somewhat of a pointless function. The only time that it was ever necessary was to pass it as a parameter to gs_entercontext() followed by a subsequent gs_leavecontext() call after that. So, I felt that it made a bit more sense just to implement obs_enter_graphics() and obs_leave_graphics() functions to do the exact same thing without having to repeat that code. There's really no need to ever "hold" the graphics pointer, though I suppose that could change in the future so having a similar function come back isn't out of the question. Still, this at least reduces the amount of unnecessary repeated code for the time being.
2014-08-04 12:48:58 +00:00
obs_enter_graphics();
(API Change) Improve graphics API consistency Summary: - Prefix all graphics subsystem names with gs_ or GS_ - Unsquish funciton names (for example _setfloat to _set_float) - Changed create functions to be more consistent with the rest of the API elsewhere. For exmaple, instead of gs_create_texture/gs_texture_destroy, it's now gs_texture_create/gs_texture_destroy - Renamed gs_stencil_op enum to gs_stencil_op_type From: To: ----------------------------------------------------------- tvertarray gs_tvertarray vb_data gs_vb_data vbdata_create gs_vbdata_create vbdata_destroy gs_vbdata_destroy shader_param gs_shader_param gs_effect gs_effect effect_technique gs_effect_technique effect_pass gs_effect_pass effect_param gs_effect_param texture_t gs_texture_t stagesurf_t gs_stagesurf_t zstencil_t gs_zstencil_t vertbuffer_t gs_vertbuffer_t indexbuffer_t gs_indexbuffer_t samplerstate_t gs_samplerstate_t swapchain_t gs_swapchain_t texrender_t gs_texrender_t shader_t gs_shader_t sparam_t gs_sparam_t effect_t gs_effect_t technique_t gs_technique_t eparam_t gs_eparam_t device_t gs_device_t graphics_t graphics_t shader_param_type gs_shader_param_type SHADER_PARAM_UNKNOWN GS_SHADER_PARAM_UNKNOWN SHADER_PARAM_BOOL GS_SHADER_PARAM_BOOL SHADER_PARAM_FLOAT GS_SHADER_PARAM_FLOAT SHADER_PARAM_INT GS_SHADER_PARAM_INT SHADER_PARAM_STRING GS_SHADER_PARAM_STRING SHADER_PARAM_VEC2 GS_SHADER_PARAM_VEC2 SHADER_PARAM_VEC3 GS_SHADER_PARAM_VEC3 SHADER_PARAM_VEC4 GS_SHADER_PARAM_VEC4 SHADER_PARAM_MATRIX4X4 GS_SHADER_PARAM_MATRIX4X4 SHADER_PARAM_TEXTURE GS_SHADER_PARAM_TEXTURE shader_param_info gs_shader_param_info shader_type gs_shader_type SHADER_VERTEX GS_SHADER_VERTEX SHADER_PIXEL GS_SHADER_PIXEL shader_destroy gs_shader_destroy shader_numparams gs_shader_get_num_params shader_getparambyidx gs_shader_get_param_by_idx shader_getparambyname gs_shader_get_param_by_name shader_getviewprojmatrix gs_shader_get_viewproj_matrix shader_getworldmatrix gs_shader_get_world_matrix shader_getparaminfo gs_shader_get_param_info shader_setbool gs_shader_set_bool shader_setfloat gs_shader_set_float shader_setint gs_shader_set_int shader_setmatrix3 gs_shader_setmatrix3 shader_setmatrix4 gs_shader_set_matrix4 shader_setvec2 gs_shader_set_vec2 shader_setvec3 gs_shader_set_vec3 shader_setvec4 gs_shader_set_vec4 shader_settexture gs_shader_set_texture shader_setval gs_shader_set_val shader_setdefault gs_shader_set_default effect_property_type gs_effect_property_type EFFECT_NONE GS_EFFECT_NONE EFFECT_BOOL GS_EFFECT_BOOL EFFECT_FLOAT GS_EFFECT_FLOAT EFFECT_COLOR GS_EFFECT_COLOR EFFECT_TEXTURE GS_EFFECT_TEXTURE effect_param_info gs_effect_param_info effect_destroy gs_effect_destroy effect_gettechnique gs_effect_get_technique technique_begin gs_technique_begin technique_end gs_technique_end technique_beginpass gs_technique_begin_pass technique_beginpassbyname gs_technique_begin_pass_by_name technique_endpass gs_technique_end_pass effect_numparams gs_effect_get_num_params effect_getparambyidx gs_effect_get_param_by_idx effect_getparambyname gs_effect_get_param_by_name effect_updateparams gs_effect_update_params effect_getviewprojmatrix gs_effect_get_viewproj_matrix effect_getworldmatrix gs_effect_get_world_matrix effect_getparaminfo gs_effect_get_param_info effect_setbool gs_effect_set_bool effect_setfloat gs_effect_set_float effect_setint gs_effect_set_int effect_setmatrix4 gs_effect_set_matrix4 effect_setvec2 gs_effect_set_vec2 effect_setvec3 gs_effect_set_vec3 effect_setvec4 gs_effect_set_vec4 effect_settexture gs_effect_set_texture effect_setval gs_effect_set_val effect_setdefault gs_effect_set_default texrender_create gs_texrender_create texrender_destroy gs_texrender_destroy texrender_begin gs_texrender_begin texrender_end gs_texrender_end texrender_reset gs_texrender_reset texrender_gettexture gs_texrender_get_texture GS_BUILDMIPMAPS GS_BUILD_MIPMAPS GS_RENDERTARGET GS_RENDER_TARGET gs_device_name gs_get_device_name gs_device_type gs_get_device_type gs_entercontext gs_enter_context gs_leavecontext gs_leave_context gs_getcontext gs_get_context gs_renderstart gs_render_start gs_renderstop gs_render_stop gs_rendersave gs_render_save gs_getinput gs_get_input gs_geteffect gs_get_effect gs_create_effect_from_file gs_effect_create_from_file gs_create_effect gs_effect_create gs_create_vertexshader_from_file gs_vertexshader_create_from_file gs_create_pixelshader_from_file gs_pixelshader_create_from_file gs_create_texture_from_file gs_texture_create_from_file gs_resetviewport gs_reset_viewport gs_set2dmode gs_set_2d_mode gs_set3dmode gs_set_3d_mode gs_create_swapchain gs_swapchain_create gs_getsize gs_get_size gs_getwidth gs_get_width gs_getheight gs_get_height gs_create_texture gs_texture_create gs_create_cubetexture gs_cubetexture_create gs_create_volumetexture gs_voltexture_create gs_create_zstencil gs_zstencil_create gs_create_stagesurface gs_stagesurface_create gs_create_samplerstate gs_samplerstate_create gs_create_vertexshader gs_vertexshader_create gs_create_pixelshader gs_pixelshader_create gs_create_vertexbuffer gs_vertexbuffer_create gs_create_indexbuffer gs_indexbuffer_create gs_gettexturetype gs_get_texture_type gs_load_defaultsamplerstate gs_load_default_samplerstate gs_getvertexshader gs_get_vertex_shader gs_getpixelshader gs_get_pixel_shader gs_getrendertarget gs_get_render_target gs_getzstenciltarget gs_get_zstencil_target gs_setrendertarget gs_set_render_target gs_setcuberendertarget gs_set_cube_render_target gs_beginscene gs_begin_scene gs_draw gs_draw gs_endscene gs_end_scene gs_setcullmode gs_set_cull_mode gs_getcullmode gs_get_cull_mode gs_enable_depthtest gs_enable_depth_test gs_enable_stenciltest gs_enable_stencil_test gs_enable_stencilwrite gs_enable_stencil_write gs_blendfunction gs_blend_function gs_depthfunction gs_depth_function gs_stencilfunction gs_stencil_function gs_stencilop gs_stencil_op gs_setviewport gs_set_viewport gs_getviewport gs_get_viewport gs_setscissorrect gs_set_scissor_rect gs_create_texture_from_iosurface gs_texture_create_from_iosurface gs_create_gdi_texture gs_texture_create_gdi gs_is_compressed_format gs_is_compressed_format gs_num_total_levels gs_get_total_levels texture_setimage gs_texture_set_image cubetexture_setimage gs_cubetexture_set_image swapchain_destroy gs_swapchain_destroy texture_destroy gs_texture_destroy texture_getwidth gs_texture_get_width texture_getheight gs_texture_get_height texture_getcolorformat gs_texture_get_color_format texture_map gs_texture_map texture_unmap gs_texture_unmap texture_isrect gs_texture_is_rect texture_getobj gs_texture_get_obj cubetexture_destroy gs_cubetexture_destroy cubetexture_getsize gs_cubetexture_get_size cubetexture_getcolorformat gs_cubetexture_get_color_format volumetexture_destroy gs_voltexture_destroy volumetexture_getwidth gs_voltexture_get_width volumetexture_getheight gs_voltexture_get_height volumetexture_getdepth gs_voltexture_getdepth volumetexture_getcolorformat gs_voltexture_get_color_format stagesurface_destroy gs_stagesurface_destroy stagesurface_getwidth gs_stagesurface_get_width stagesurface_getheight gs_stagesurface_get_height stagesurface_getcolorformat gs_stagesurface_get_color_format stagesurface_map gs_stagesurface_map stagesurface_unmap gs_stagesurface_unmap zstencil_destroy gs_zstencil_destroy samplerstate_destroy gs_samplerstate_destroy vertexbuffer_destroy gs_vertexbuffer_destroy vertexbuffer_flush gs_vertexbuffer_flush vertexbuffer_getdata gs_vertexbuffer_get_data indexbuffer_destroy gs_indexbuffer_destroy indexbuffer_flush gs_indexbuffer_flush indexbuffer_getdata gs_indexbuffer_get_data indexbuffer_numindices gs_indexbuffer_get_num_indices indexbuffer_gettype gs_indexbuffer_get_type texture_rebind_iosurface gs_texture_rebind_iosurface texture_get_dc gs_texture_get_dc texture_release_dc gs_texture_release_dc
2014-08-08 06:42:07 +00:00
gs_vertexbuffer_destroy(box);
UI: Draw cropped scene item edges as green in preview
2016-03-31 01:44:49 +00:00
gs_vertexbuffer_destroy(boxLeft);
gs_vertexbuffer_destroy(boxTop);
gs_vertexbuffer_destroy(boxRight);
gs_vertexbuffer_destroy(boxBottom);
(API Change) Improve graphics API consistency Summary: - Prefix all graphics subsystem names with gs_ or GS_ - Unsquish funciton names (for example _setfloat to _set_float) - Changed create functions to be more consistent with the rest of the API elsewhere. For exmaple, instead of gs_create_texture/gs_texture_destroy, it's now gs_texture_create/gs_texture_destroy - Renamed gs_stencil_op enum to gs_stencil_op_type From: To: ----------------------------------------------------------- tvertarray gs_tvertarray vb_data gs_vb_data vbdata_create gs_vbdata_create vbdata_destroy gs_vbdata_destroy shader_param gs_shader_param gs_effect gs_effect effect_technique gs_effect_technique effect_pass gs_effect_pass effect_param gs_effect_param texture_t gs_texture_t stagesurf_t gs_stagesurf_t zstencil_t gs_zstencil_t vertbuffer_t gs_vertbuffer_t indexbuffer_t gs_indexbuffer_t samplerstate_t gs_samplerstate_t swapchain_t gs_swapchain_t texrender_t gs_texrender_t shader_t gs_shader_t sparam_t gs_sparam_t effect_t gs_effect_t technique_t gs_technique_t eparam_t gs_eparam_t device_t gs_device_t graphics_t graphics_t shader_param_type gs_shader_param_type SHADER_PARAM_UNKNOWN GS_SHADER_PARAM_UNKNOWN SHADER_PARAM_BOOL GS_SHADER_PARAM_BOOL SHADER_PARAM_FLOAT GS_SHADER_PARAM_FLOAT SHADER_PARAM_INT GS_SHADER_PARAM_INT SHADER_PARAM_STRING GS_SHADER_PARAM_STRING SHADER_PARAM_VEC2 GS_SHADER_PARAM_VEC2 SHADER_PARAM_VEC3 GS_SHADER_PARAM_VEC3 SHADER_PARAM_VEC4 GS_SHADER_PARAM_VEC4 SHADER_PARAM_MATRIX4X4 GS_SHADER_PARAM_MATRIX4X4 SHADER_PARAM_TEXTURE GS_SHADER_PARAM_TEXTURE shader_param_info gs_shader_param_info shader_type gs_shader_type SHADER_VERTEX GS_SHADER_VERTEX SHADER_PIXEL GS_SHADER_PIXEL shader_destroy gs_shader_destroy shader_numparams gs_shader_get_num_params shader_getparambyidx gs_shader_get_param_by_idx shader_getparambyname gs_shader_get_param_by_name shader_getviewprojmatrix gs_shader_get_viewproj_matrix shader_getworldmatrix gs_shader_get_world_matrix shader_getparaminfo gs_shader_get_param_info shader_setbool gs_shader_set_bool shader_setfloat gs_shader_set_float shader_setint gs_shader_set_int shader_setmatrix3 gs_shader_setmatrix3 shader_setmatrix4 gs_shader_set_matrix4 shader_setvec2 gs_shader_set_vec2 shader_setvec3 gs_shader_set_vec3 shader_setvec4 gs_shader_set_vec4 shader_settexture gs_shader_set_texture shader_setval gs_shader_set_val shader_setdefault gs_shader_set_default effect_property_type gs_effect_property_type EFFECT_NONE GS_EFFECT_NONE EFFECT_BOOL GS_EFFECT_BOOL EFFECT_FLOAT GS_EFFECT_FLOAT EFFECT_COLOR GS_EFFECT_COLOR EFFECT_TEXTURE GS_EFFECT_TEXTURE effect_param_info gs_effect_param_info effect_destroy gs_effect_destroy effect_gettechnique gs_effect_get_technique technique_begin gs_technique_begin technique_end gs_technique_end technique_beginpass gs_technique_begin_pass technique_beginpassbyname gs_technique_begin_pass_by_name technique_endpass gs_technique_end_pass effect_numparams gs_effect_get_num_params effect_getparambyidx gs_effect_get_param_by_idx effect_getparambyname gs_effect_get_param_by_name effect_updateparams gs_effect_update_params effect_getviewprojmatrix gs_effect_get_viewproj_matrix effect_getworldmatrix gs_effect_get_world_matrix effect_getparaminfo gs_effect_get_param_info effect_setbool gs_effect_set_bool effect_setfloat gs_effect_set_float effect_setint gs_effect_set_int effect_setmatrix4 gs_effect_set_matrix4 effect_setvec2 gs_effect_set_vec2 effect_setvec3 gs_effect_set_vec3 effect_setvec4 gs_effect_set_vec4 effect_settexture gs_effect_set_texture effect_setval gs_effect_set_val effect_setdefault gs_effect_set_default texrender_create gs_texrender_create texrender_destroy gs_texrender_destroy texrender_begin gs_texrender_begin texrender_end gs_texrender_end texrender_reset gs_texrender_reset texrender_gettexture gs_texrender_get_texture GS_BUILDMIPMAPS GS_BUILD_MIPMAPS GS_RENDERTARGET GS_RENDER_TARGET gs_device_name gs_get_device_name gs_device_type gs_get_device_type gs_entercontext gs_enter_context gs_leavecontext gs_leave_context gs_getcontext gs_get_context gs_renderstart gs_render_start gs_renderstop gs_render_stop gs_rendersave gs_render_save gs_getinput gs_get_input gs_geteffect gs_get_effect gs_create_effect_from_file gs_effect_create_from_file gs_create_effect gs_effect_create gs_create_vertexshader_from_file gs_vertexshader_create_from_file gs_create_pixelshader_from_file gs_pixelshader_create_from_file gs_create_texture_from_file gs_texture_create_from_file gs_resetviewport gs_reset_viewport gs_set2dmode gs_set_2d_mode gs_set3dmode gs_set_3d_mode gs_create_swapchain gs_swapchain_create gs_getsize gs_get_size gs_getwidth gs_get_width gs_getheight gs_get_height gs_create_texture gs_texture_create gs_create_cubetexture gs_cubetexture_create gs_create_volumetexture gs_voltexture_create gs_create_zstencil gs_zstencil_create gs_create_stagesurface gs_stagesurface_create gs_create_samplerstate gs_samplerstate_create gs_create_vertexshader gs_vertexshader_create gs_create_pixelshader gs_pixelshader_create gs_create_vertexbuffer gs_vertexbuffer_create gs_create_indexbuffer gs_indexbuffer_create gs_gettexturetype gs_get_texture_type gs_load_defaultsamplerstate gs_load_default_samplerstate gs_getvertexshader gs_get_vertex_shader gs_getpixelshader gs_get_pixel_shader gs_getrendertarget gs_get_render_target gs_getzstenciltarget gs_get_zstencil_target gs_setrendertarget gs_set_render_target gs_setcuberendertarget gs_set_cube_render_target gs_beginscene gs_begin_scene gs_draw gs_draw gs_endscene gs_end_scene gs_setcullmode gs_set_cull_mode gs_getcullmode gs_get_cull_mode gs_enable_depthtest gs_enable_depth_test gs_enable_stenciltest gs_enable_stencil_test gs_enable_stencilwrite gs_enable_stencil_write gs_blendfunction gs_blend_function gs_depthfunction gs_depth_function gs_stencilfunction gs_stencil_function gs_stencilop gs_stencil_op gs_setviewport gs_set_viewport gs_getviewport gs_get_viewport gs_setscissorrect gs_set_scissor_rect gs_create_texture_from_iosurface gs_texture_create_from_iosurface gs_create_gdi_texture gs_texture_create_gdi gs_is_compressed_format gs_is_compressed_format gs_num_total_levels gs_get_total_levels texture_setimage gs_texture_set_image cubetexture_setimage gs_cubetexture_set_image swapchain_destroy gs_swapchain_destroy texture_destroy gs_texture_destroy texture_getwidth gs_texture_get_width texture_getheight gs_texture_get_height texture_getcolorformat gs_texture_get_color_format texture_map gs_texture_map texture_unmap gs_texture_unmap texture_isrect gs_texture_is_rect texture_getobj gs_texture_get_obj cubetexture_destroy gs_cubetexture_destroy cubetexture_getsize gs_cubetexture_get_size cubetexture_getcolorformat gs_cubetexture_get_color_format volumetexture_destroy gs_voltexture_destroy volumetexture_getwidth gs_voltexture_get_width volumetexture_getheight gs_voltexture_get_height volumetexture_getdepth gs_voltexture_getdepth volumetexture_getcolorformat gs_voltexture_get_color_format stagesurface_destroy gs_stagesurface_destroy stagesurface_getwidth gs_stagesurface_get_width stagesurface_getheight gs_stagesurface_get_height stagesurface_getcolorformat gs_stagesurface_get_color_format stagesurface_map gs_stagesurface_map stagesurface_unmap gs_stagesurface_unmap zstencil_destroy gs_zstencil_destroy samplerstate_destroy gs_samplerstate_destroy vertexbuffer_destroy gs_vertexbuffer_destroy vertexbuffer_flush gs_vertexbuffer_flush vertexbuffer_getdata gs_vertexbuffer_get_data indexbuffer_destroy gs_indexbuffer_destroy indexbuffer_flush gs_indexbuffer_flush indexbuffer_getdata gs_indexbuffer_get_data indexbuffer_numindices gs_indexbuffer_get_num_indices indexbuffer_gettype gs_indexbuffer_get_type texture_rebind_iosurface gs_texture_rebind_iosurface texture_get_dc gs_texture_get_dc texture_release_dc gs_texture_release_dc
2014-08-08 06:42:07 +00:00
gs_vertexbuffer_destroy(circle);
(API Change) Remove obs_graphics() API Removed: - graphics_t obs_graphics(); Replaced With: - void obs_enter_graphics(); - void obs_leave_graphics(); Description: obs_graphics() was somewhat of a pointless function. The only time that it was ever necessary was to pass it as a parameter to gs_entercontext() followed by a subsequent gs_leavecontext() call after that. So, I felt that it made a bit more sense just to implement obs_enter_graphics() and obs_leave_graphics() functions to do the exact same thing without having to repeat that code. There's really no need to ever "hold" the graphics pointer, though I suppose that could change in the future so having a similar function come back isn't out of the question. Still, this at least reduces the amount of unnecessary repeated code for the time being.
2014-08-04 12:48:58 +00: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 07:54:48 +00:00
UI: Flush event queue before obs_shutdown Sometimes events with rogue source references are in the event queue when the program is shutting down. This can cause the program to reference freed data. Processing those remaining events before shutting down solves the issue.
2015-03-18 13:31:08 +00: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);
Save last version to global.ini on exit
2014-07-13 19:38:58 +00:00
config_set_int(App()->GlobalConfig(), "General", "LastVersion",
LIBOBS_API_VER);
UI: Store proper window pos/size Only store the last restored (non-maximized and non-minimized) window position and size on exit.
2015-03-19 02:37:34 +00:00
UI: Add "Always On Top" option to file menu
2016-01-22 15:33:29 +00:00
bool alwaysOnTop = IsAlwaysOnTop(this);
UI: Store proper window pos/size Only store the last restored (non-maximized and non-minimized) window position and size on exit.
2015-03-19 02:37:34 +00:00
UI: Add context menu to preview Includes the ability to disable the preview and general source context menu options (add/remove/filters/properties/etc)
2015-04-03 04:35:46 +00:00
config_set_bool(App()->GlobalConfig(), "BasicWindow", "PreviewEnabled",
previewEnabled);
UI: Add "Always On Top" option to file menu
2016-01-22 15:33:29 +00: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 19:19:29 +00: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());
UI: Add modular UI Changes the UI to an adjustable user interface, allowing the user to fully customize how the scenes list, sources list, the mixer, transitions, and the buttons are oriented on the main window window.
2017-07-27 09:40:41 +00:00
config_set_bool(App()->GlobalConfig(), "BasicWindow",
"DocksLocked", ui->lockUI->isChecked());
UI: Use saving functions for profiles/scenes Replaces all the json/config loading/saving functions with safe variants to reduce the chance of potential file corruption as much as possible. Also does a minor refactor of json writing by using obs_data_save_json_safe for writing json files instead of manually using obs_data_get_json and os_quick_write_utf8 each time.
2015-08-22 00:56:37 +00:00
config_save_safe(App()->GlobalConfig(), "tmp", nullptr);
UI: Add option to disable aero on windows vista/7 On windows vista/7, you cannot really use display capture efficiently without disabling aero, so this will add an option to settings to allow it to be disabled and cause it to be disabled on startup.
2015-05-25 08:37:13 +00: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
Add a comment and replace some class references Also, removed some unused headers, and moved the constructor/destructor functions to the top
2014-02-02 22:23:38 +00:00
}
UI: Add SaveProjectNow function This adds a function that allows saving the project now instead of deferring it.
2015-07-09 17:51:22 +00:00
void OBSBasic::SaveProjectNow()
{
if (disableSaving)
return;
projectChanged = true;
SaveProjectDeferred();
}
UI: Implement SaveProject function
2015-01-04 16:16:59 +00:00
void OBSBasic::SaveProject()
{
UI: Save project only on new changes
2015-06-30 12:49:31 +00:00
if (disableSaving)
return;
UI: Fix potential deadlocks when saving SaveProject calls obs functions that locks certain mutexes, and because I made it so that SaveProject was being called inside of certain signal handlers (which could already be locked in other mutexes), it could cause a mutual deadlock with other threads. This fix puts the main project saving code in to SaveProjectDeferred, then pushes it on to the Qt message queue to safely save outside of those locks. It's a function that's perfectly safe to put on the message queue because it will automatically be disabled in certain circumstances where it would be unsafe to call, such as on shutdown. This code will also make it so that the project will not needlessly be saved more than once if the SaveProjectDeferred call was pushed multiple times on to the queue.
2015-07-06 16:02:13 +00:00
projectChanged = true;
QMetaObject::invokeMethod(this, "SaveProjectDeferred",
Qt::QueuedConnection);
}
void OBSBasic::SaveProjectDeferred()
{
if (disableSaving)
return;
if (!projectChanged)
return;
projectChanged = false;
UI: Add scene collections Adds scene collections to the menu bar, which allows you to duplicate, rename, remove, or add clean new scene collections. Scene files are now stored in ./obs-studio/basic/scenes directory with filesystem-safe names.
2015-06-24 02:29:07 +00:00
const char *sceneCollection = config_get_string(App()->GlobalConfig(),
"Basic", "SceneCollectionFile");
(API Change) Make os_get_config_path safer to use Changed: char *os_get_config_path(const char *name); To: int os_get_config_path(char *dst, size_t size, const char *name); Also added: char *os_get_config_path_ptr(const char *name); I don't like this function returning an allocation by default. Similarly to what was done with the wide character conversion functions, this function now operates on an array argument, and if you really want to just get a pointer for convenience, you use the *_ptr version of the function that clearly indicates that it's returning an allocation.
2015-01-16 07:44:38 +00:00
char savePath[512];
UI: Add scene collections Adds scene collections to the menu bar, which allows you to duplicate, rename, remove, or add clean new scene collections. Scene files are now stored in ./obs-studio/basic/scenes directory with filesystem-safe names.
2015-06-24 02:29:07 +00: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);
(API Change) Make os_get_config_path safer to use Changed: char *os_get_config_path(const char *name); To: int os_get_config_path(char *dst, size_t size, const char *name); Also added: char *os_get_config_path_ptr(const char *name); I don't like this function returning an allocation by default. Similarly to what was done with the wide character conversion functions, this function now operates on an array argument, and if you really want to just get a pointer for convenience, you use the *_ptr version of the function that clearly indicates that it's returning an allocation.
2015-01-16 07:44:38 +00:00
if (ret <= 0)
return;
UI: Implement SaveProject function
2015-01-04 16:16:59 +00:00
Save(savePath);
}
Improve thread safety in UI code - Implemented better C++ classes for handling scenes/sources/items in obs.hpp, allowing them to automatically increment and decrement the references of each, as well as assign them to QVariants. - Because QVariants are now using the C++ classes, remove the pointer QVariant wrapper. - Use the new C++ classes with the QVariant user data of list box items, both for the sake of thread safety and to ensure that the data referenced is not freed until removed. NOTE: still might need some testing. - Implemented a source-remove signal from libobs, and start using that signal instead of the source-destroy signal for signalling item removal.
2014-02-02 21:26:23 +00:00
OBSScene OBSBasic::GetCurrentScene()
Implemented adding sources to scenes via GUI Sources can now be added to scenes via user interface. It's a little convoluted because everything has to work through OBS signals to ensure that plugins/etc can modify the scenes/sources exernally. Also, when switching scenes, it will properly list sources for the scene you changed to.
2014-01-04 20:53:36 +00: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 18:53:55 +00:00
QListWidgetItem *item = ui->scenes->currentItem();
UI: Add QtDataRole enum This introduces the OBSSignals data role, which will be used to store signal handlers in stock Qt objects
2015-06-28 01:21:45 +00:00
return item ? GetOBSRef<OBSScene>(item) : nullptr;
Implemented adding sources to scenes via GUI Sources can now be added to scenes via user interface. It's a little convoluted because everything has to work through OBS signals to ensure that plugins/etc can modify the scenes/sources exernally. Also, when switching scenes, it will properly list sources for the scene you changed to.
2014-01-04 20:53:36 +00:00
}
Add helper function to get specific scene item
2014-09-15 23:04:22 +00:00
OBSSceneItem OBSBasic::GetSceneItem(QListWidgetItem *item)
Improve thread safety for scene items Scene items previously were removed by calling obs_sceneitem_destroy, but this proved to be a potential race condition where two different threads could try to destroy the same scene item at the same time. Instead of doing that, reference counting is now used on scene items, and an explicit obs_sceneitem_remove function is used instead for item removal, which sets a 'removed' variable to ensure it can only be called exactly one time.
2014-01-30 08:31:52 +00:00
{
UI: Add QtDataRole enum This introduces the OBSSignals data role, which will be used to store signal handlers in stock Qt objects
2015-06-28 01:21:45 +00:00
return item ? GetOBSRef<OBSSceneItem>(item) : nullptr;
Improve thread safety for scene items Scene items previously were removed by calling obs_sceneitem_destroy, but this proved to be a potential race condition where two different threads could try to destroy the same scene item at the same time. Instead of doing that, reference counting is now used on scene items, and an explicit obs_sceneitem_remove function is used instead for item removal, which sets a 'removed' variable to ensure it can only be called exactly one time.
2014-01-30 08:31:52 +00:00
}
Add helper function to get specific scene item
2014-09-15 23:04:22 +00:00
OBSSceneItem OBSBasic::GetCurrentSceneItem()
{
UI: Fix preview right-click menu getting wrong source When right-clicking items in the preview window and getting context menus for them, it would often make the wrong scene item be associated with the context menu because of the fact that it was using QListWidget::currentItem instead of querying the actual selected list. You must query the actual selection list via QListWidget::selectedItems because QListWidget::currentItem does not work properly for multi-selection list widgets.
2016-01-23 19:02:22 +00:00
return GetSceneItem(GetTopSelectedSourceItem());
Add helper function to get specific scene item
2014-09-15 23:04:22 +00:00
}
UI: Add preview scaling options Adds preview scaling to the right-click context menu for the preview pane. This allows the ability to, for example, zoom the preview and edit the preview 1:1 (canvas/base resolution). This was a missing parity feature. Additionally, also allows scaling to the "output/scaled" resolution the program is set to. When the preview is in scale mode and is the focused widget, you can hold space and drag with left click to change the zoomed position. (Notes added by Jim) Closes jp9000/obs-studio#687
2016-11-05 16:48:46 +00:00
void OBSBasic::UpdatePreviewScalingMenu()
{
UI: Allow zoom with the scroll wheel Adds the ability to zoom into the preview when fixed scaling mode is enabled. (Edit by Jim: Also now saves zoom and scroll position) Closes jp9000/obs-studio#917
2017-05-13 17:13:55 +00:00
bool fixedScaling = ui->preview->IsFixedScaling();
float scalingAmount = ui->preview->GetScalingAmount();
if (!fixedScaling) {
ui->actionScaleWindow->setChecked(true);
ui->actionScaleCanvas->setChecked(false);
ui->actionScaleOutput->setChecked(false);
return;
}
obs_video_info ovi;
obs_get_video_info(&ovi);
ui->actionScaleWindow->setChecked(false);
ui->actionScaleCanvas->setChecked(scalingAmount == 1.0f);
UI: Add preview scaling options Adds preview scaling to the right-click context menu for the preview pane. This allows the ability to, for example, zoom the preview and edit the preview 1:1 (canvas/base resolution). This was a missing parity feature. Additionally, also allows scaling to the "output/scaled" resolution the program is set to. When the preview is in scale mode and is the focused widget, you can hold space and drag with left click to change the zoomed position. (Notes added by Jim) Closes jp9000/obs-studio#687
2016-11-05 16:48:46 +00:00
ui->actionScaleOutput->setChecked(
UI: Allow zoom with the scroll wheel Adds the ability to zoom into the preview when fixed scaling mode is enabled. (Edit by Jim: Also now saves zoom and scroll position) Closes jp9000/obs-studio#917
2017-05-13 17:13:55 +00:00
scalingAmount == float(ovi.output_width) / float(ovi.base_width));
UI: Add preview scaling options Adds preview scaling to the right-click context menu for the preview pane. This allows the ability to, for example, zoom the preview and edit the preview 1:1 (canvas/base resolution). This was a missing parity feature. Additionally, also allows scaling to the "output/scaled" resolution the program is set to. When the preview is in scale mode and is the focused widget, you can hold space and drag with left click to change the zoomed position. (Notes added by Jim) Closes jp9000/obs-studio#687
2016-11-05 16:48:46 +00:00
}
Use QMetaObject::invokeMethod in libobs callbacks Doing this ensures Qt thread safety when adding/removing sources and scenes, because it will defer the function call to the main thread.
2014-02-03 00:03:55 +00:00
void OBSBasic::UpdateSources(OBSScene scene)
{
UI: Manually delete visibility item widgets
2015-06-28 01:18:40 +00:00
ClearListItems(ui->sources);
Use QMetaObject::invokeMethod in libobs callbacks Doing this ensures Qt thread safety when adding/removing sources and scenes, because it will defer the function call to the main thread.
2014-02-03 00:03:55 +00:00
obs_scene_enum_items(scene,
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
[] (obs_scene_t *scene, obs_sceneitem_t *item, void *p)
Use QMetaObject::invokeMethod in libobs callbacks Doing this ensures Qt thread safety when adding/removing sources and scenes, because it will defer the function call to the main thread.
2014-02-03 00:03:55 +00:00
{
OBSBasic *window = static_cast<OBSBasic*>(p);
Simplify and extend callback/signalling system - Signals and dynamic callbacks now require declarations to be made before being used. What this does is allows us to get information about the functions dynamically which can be relayed to the user and plugins for future extended usage (this should have big implications later for scripting in particular, hopefully). - Reduced the number of types calldata uses from "everything I could think of" to simply integer, float, bool, pointer/object, string. Integer data is now stored as long long. Floats are now stored as doubles (check em). - Use a more consistent naming scheme for lexer error/warning macros. - Fixed a rather nasty bug where switching to an existing scene would cause it to increment sourceSceneRefs, which would mean that it would never end up never properly removing the source when the user clicks removed (stayed in limbo, obs_source_remove never got called)
2014-03-01 12:54:55 +00:00
window->InsertSceneItem(item);
Remove majority of warnings There were a *lot* of warnings, managed to remove most of them. Also, put warning flags before C_FLAGS and CXX_FLAGS, rather than after, as -Wall -Wextra was overwriting flags that came before it.
2014-02-14 22:13:36 +00:00
UNUSED_PARAMETER(scene);
Use QMetaObject::invokeMethod in libobs callbacks Doing this ensures Qt thread safety when adding/removing sources and scenes, because it will defer the function call to the main thread.
2014-02-03 00:03:55 +00:00
return true;
}, this);
}
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
void OBSBasic::InsertSceneItem(obs_sceneitem_t *item)
Simplify and extend callback/signalling system - Signals and dynamic callbacks now require declarations to be made before being used. What this does is allows us to get information about the functions dynamically which can be relayed to the user and plugins for future extended usage (this should have big implications later for scripting in particular, hopefully). - Reduced the number of types calldata uses from "everything I could think of" to simply integer, float, bool, pointer/object, string. Integer data is now stored as long long. Floats are now stored as doubles (check em). - Use a more consistent naming scheme for lexer error/warning macros. - Fixed a rather nasty bug where switching to an existing scene would cause it to increment sourceSceneRefs, which would mean that it would never end up never properly removing the source when the user clicks removed (stayed in limbo, obs_source_remove never got called)
2014-03-01 12:54:55 +00:00
{
UI: Add visibility checkbox to main sources list Adds a visibility checkbox to the main sources list so that users can temporarily disable/re-enable sources. Only applies to scene items, not the sources themselves.
2015-03-23 03:51:21 +00:00
QListWidgetItem *listItem = new QListWidgetItem();
UI: Add QtDataRole enum This introduces the OBSSignals data role, which will be used to store signal handlers in stock Qt objects
2015-06-28 01:21:45 +00:00
SetOBSRef(listItem, OBSSceneItem(item));
Simplify and extend callback/signalling system - Signals and dynamic callbacks now require declarations to be made before being used. What this does is allows us to get information about the functions dynamically which can be relayed to the user and plugins for future extended usage (this should have big implications later for scripting in particular, hopefully). - Reduced the number of types calldata uses from "everything I could think of" to simply integer, float, bool, pointer/object, string. Integer data is now stored as long long. Floats are now stored as doubles (check em). - Use a more consistent naming scheme for lexer error/warning macros. - Fixed a rather nasty bug where switching to an existing scene would cause it to increment sourceSceneRefs, which would mean that it would never end up never properly removing the source when the user clicks removed (stayed in limbo, obs_source_remove never got called)
2014-03-01 12:54:55 +00:00
ui->sources->insertItem(0, listItem);
UI: Ensure only one source is selected on startup
2015-06-28 02:29:26 +00:00
ui->sources->setCurrentRow(0, QItemSelectionModel::ClearAndSelect);
UI: Open properties on user source creation Every time I created a source I found myself in need to actually open up the properties. It was getting somewhat on my nerves, so I decided to just make it automatically pop up when the source is created.
2014-06-17 02:41:36 +00:00
UI: Add visibility checkbox to main sources list Adds a visibility checkbox to the main sources list so that users can temporarily disable/re-enable sources. Only applies to scene items, not the sources themselves.
2015-03-23 03:51:21 +00:00
SetupVisibilityItem(ui->sources, listItem, item);
Minor refactor for creation of sub-windows This refactors the sub-window code a bit so that instead of deleting the window pointers, it calls QWidget::close() on them to safely trigger a normal close on them instead (which will also delete them). Moves setting the DeleteOnClose flag from inside of the Dialog classes into the OBSBasic class, to make that behaviour more obvious.
2014-07-22 20:16:57 +00:00
}
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
void OBSBasic::CreateInteractionWindow(obs_source_t *source)
Add interaction gui
2014-09-15 23:16:16 +00:00
{
if (interaction)
interaction->close();
interaction = new OBSBasicInteraction(this, source);
interaction->Init();
interaction->setAttribute(Qt::WA_DeleteOnClose, true);
}
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
void OBSBasic::CreatePropertiesWindow(obs_source_t *source)
Minor refactor for creation of sub-windows This refactors the sub-window code a bit so that instead of deleting the window pointers, it calls QWidget::close() on them to safely trigger a normal close on them instead (which will also delete them). Moves setting the DeleteOnClose flag from inside of the Dialog classes into the OBSBasic class, to make that behaviour more obvious.
2014-07-22 20:16:57 +00:00
{
if (properties)
properties->close();
properties = new OBSBasicProperties(this, source);
properties->Init();
properties->setAttribute(Qt::WA_DeleteOnClose, true);
Simplify and extend callback/signalling system - Signals and dynamic callbacks now require declarations to be made before being used. What this does is allows us to get information about the functions dynamically which can be relayed to the user and plugins for future extended usage (this should have big implications later for scripting in particular, hopefully). - Reduced the number of types calldata uses from "everything I could think of" to simply integer, float, bool, pointer/object, string. Integer data is now stored as long long. Floats are now stored as doubles (check em). - Use a more consistent naming scheme for lexer error/warning macros. - Fixed a rather nasty bug where switching to an existing scene would cause it to increment sourceSceneRefs, which would mean that it would never end up never properly removing the source when the user clicks removed (stayed in limbo, obs_source_remove never got called)
2014-03-01 12:54:55 +00:00
}
UI: Add user interface for filters
2015-02-26 05:23:57 +00: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);
}
Use QMetaObject::invokeMethod in libobs callbacks Doing this ensures Qt thread safety when adding/removing sources and scenes, because it will defer the function call to the main thread.
2014-02-03 00:03:55 +00:00
/* Qt callbacks for invokeMethod */
void OBSBasic::AddScene(OBSSource source)
implement scene adding callbacks, make a few API tweaks
2013-12-28 12:33:16 +00:00
{
(API Change) Unsquish libobs (base) names Previous names: New names: ----------------------------------------------------------- obs_view_setsource obs_view_set_source obs_view_getsource obs_view_get_source obs_source_getdisplayname obs_source_get_display_name obs_source_getwidth obs_source_get_width obs_source_getheight obs_source_get_height obs_filter_getparent obs_filter_get_parent obs_filter_gettarget obs_filter_get_target obs_source_filter_setorder obs_source_filter_set_order obs_source_getsettings obs_source_get_settings obs_source_getname obs_source_get_name obs_source_setname obs_source_set_name obs_source_setvolume obs_source_set_volume obs_source_getvolume obs_source_get_volume obs_scene_getsource obs_scene_get_source obs_scene_fromsource obs_scene_from_source obs_scene_findsource obs_scene_find_source obs_output_getdisplayname obs_output_get_display_name obs_output_getname obs_output_get_name obs_encoder_getname obs_encoder_get_name obs_service_getdisplayname obs_service_get_display_name obs_service_getname obs_service_get_name
2014-08-04 15:41:15 +00:00
const char *name = obs_source_get_name(source);
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00: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 18:53:55 +00:00
QListWidgetItem *item = new QListWidgetItem(QT_UTF8(name));
UI: Add QtDataRole enum This introduces the OBSSignals data role, which will be used to store signal handlers in stock Qt objects
2015-06-28 01:21:45 +00: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 18:53:55 +00:00
ui->scenes->addItem(item);
Implemented adding sources to scenes via GUI Sources can now be added to scenes via user interface. It's a little convoluted because everything has to work through OBS signals to ensure that plugins/etc can modify the scenes/sources exernally. Also, when switching scenes, it will properly list sources for the scene you changed to.
2014-01-04 20:53:36 +00:00
UI: Add SelectScene hotkey UI supplied per scene hotkey to allow switching between scenes; this has to be done in the UI since it's up to the application to define what exactly "changing/selecting a scene" means (changing the output of channel 0 may not be enough for other applications)
2014-11-01 20:53:05 +00: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 19:19:29 +00:00
OBSBasic *main =
reinterpret_cast<OBSBasic*>(App()->GetMainWindow());
UI: Add SelectScene hotkey UI supplied per scene hotkey to allow switching between scenes; this has to be done in the UI since it's up to the application to define what exactly "changing/selecting a scene" means (changing the output of channel 0 may not be enough for other applications)
2014-11-01 20:53:05 +00: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 19:19:29 +00:00
main->SetCurrentScene(source);
UI: Add SelectScene hotkey UI supplied per scene hotkey to allow switching between scenes; this has to be done in the UI since it's up to the application to define what exactly "changing/selecting a scene" means (changing the output of channel 0 may not be enough for other applications)
2014-11-01 20:53:05 +00:00
obs_source_release(source);
}, static_cast<obs_source_t*>(source));
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
signal_handler_t *handler = obs_source_get_signal_handler(source);
UI: Remove scene signal handlers in closeEvent
2015-06-27 07:28:40 +00:00
UI: Hold ref when storing signals (skip) (Note: This commit breaks UI compilation. Skip if bisecting) Ensures that a reference is kept until the signals associated with that reference are disconnected.
2015-12-05 13:53:38 +00:00
SignalContainer<OBSScene> container;
container.ref = scene;
container.handlers.assign({
UI: Remove scene signal handlers in closeEvent
2015-06-27 07:28:40 +00: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),
UI: Hold ref when storing signals (skip) (Note: This commit breaks UI compilation. Skip if bisecting) Ensures that a reference is kept until the signals associated with that reference are disconnected.
2015-12-05 13:53:38 +00:00
});
UI: Remove scene signal handlers in closeEvent
2015-06-27 07:28:40 +00:00
item->setData(static_cast<int>(QtDataRole::OBSSignals),
UI: Hold ref when storing signals (skip) (Note: This commit breaks UI compilation. Skip if bisecting) Ensures that a reference is kept until the signals associated with that reference are disconnected.
2015-12-05 13:53:38 +00:00
QVariant::fromValue(container));
UI: Save project only on new changes
2015-06-30 12:49:31 +00:00
UI: Implement scene duplication (context menu)
2015-08-28 22:01:39 +00: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);
UI: Save project only on new changes
2015-06-30 12:49:31 +00:00
SaveProject();
UI: Log when user adds/removes/renames sources/filters
2016-08-06 01:43:04 +00:00
if (!disableSaving) {
obs_source_t *source = obs_scene_get_source(scene);
blog(LOG_INFO, "User added scene '%s'",
obs_source_get_name(source));
}
UI: Fix frontend-api event call for adding scenes Added missing frontend-api event call for AddScene and removed thus obsolete event call in DuplicateSelectedScene.
2016-12-02 18:05:57 +00:00
if (api)
api->on_event(OBS_FRONTEND_EVENT_SCENE_LIST_CHANGED);
implement scene adding callbacks, make a few API tweaks
2013-12-28 12:33:16 +00:00
}
Use QMetaObject::invokeMethod in libobs callbacks Doing this ensures Qt thread safety when adding/removing sources and scenes, because it will defer the function call to the main thread.
2014-02-03 00:03:55 +00:00
void OBSBasic::RemoveScene(OBSSource source)
added a SceneRemoved handler
2013-12-29 05:29:13 +00:00
{
UI: Fix removing wrong scene from list RemoveScene would always remove the currently selected item from the scenes list, even if that item didn't reference the actual scene being removed; finding the proper item via its OBSRef fixes this issue. How to reproduce the original issue: Create two scenes "a" and "b", set a hotkey for switching to scene "a", select scene "b" and press the remove scene button, then while the confirmation dialog is up press the hotkey while the UI is out of focus. The active scene should have switched to "a", while the dialog still displays "b" as its target; now confirm the removal of "b". Note how "a" was removed from the scenes list instead. Reported at https://obsproject.com/mantis/view.php?id=333
2015-09-24 08:11:38 +00:00
obs_scene_t *scene = obs_scene_from_source(source);
QListWidgetItem *sel = nullptr;
int count = ui->scenes->count();
UI: Add workaround to fix deleting final scene bug
2017-03-13 17:17:01 +00:00
UI: Fix removing wrong scene from list RemoveScene would always remove the currently selected item from the scenes list, even if that item didn't reference the actual scene being removed; finding the proper item via its OBSRef fixes this issue. How to reproduce the original issue: Create two scenes "a" and "b", set a hotkey for switching to scene "a", select scene "b" and press the remove scene button, then while the confirmation dialog is up press the hotkey while the UI is out of focus. The active scene should have switched to "a", while the dialog still displays "b" as its target; now confirm the removal of "b". Note how "a" was removed from the scenes list instead. Reported at https://obsproject.com/mantis/view.php?id=333
2015-09-24 08:11:38 +00:00
for (int i = 0; i < count; i++) {
auto item = ui->scenes->item(i);
auto cur_scene = GetOBSRef<OBSScene>(item);
if (cur_scene != scene)
continue;
added a SceneRemoved handler
2013-12-29 05:29:13 +00:00
UI: Fix removing wrong scene from list RemoveScene would always remove the currently selected item from the scenes list, even if that item didn't reference the actual scene being removed; finding the proper item via its OBSRef fixes this issue. How to reproduce the original issue: Create two scenes "a" and "b", set a hotkey for switching to scene "a", select scene "b" and press the remove scene button, then while the confirmation dialog is up press the hotkey while the UI is out of focus. The active scene should have switched to "a", while the dialog still displays "b" as its target; now confirm the removal of "b". Note how "a" was removed from the scenes list instead. Reported at https://obsproject.com/mantis/view.php?id=333
2015-09-24 08:11:38 +00:00
sel = item;
break;
}
Handle source adding/removal better - Made it so that when a source is added or removed from a scene it will add a reference to sourceSceneRefs (std::unordered_map). Each source adds a reference to that every time they are added to a scene, and releases a reference from it when they are removed from a scene. When the value reaches 0, the source is no longer in any scenes, and is then marked for removal and destroyed. Before, I was using the source internal reference counter, which is a really bad thing to do because I don't know what might actually be referencing it. So using a separate discrete reference counter for the number of scenes it's in is better in this case.
2014-01-07 03:20:18 +00: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 18:53:55 +00:00
if (sel != nullptr) {
UI: Fix removing wrong scene from list RemoveScene would always remove the currently selected item from the scenes list, even if that item didn't reference the actual scene being removed; finding the proper item via its OBSRef fixes this issue. How to reproduce the original issue: Create two scenes "a" and "b", set a hotkey for switching to scene "a", select scene "b" and press the remove scene button, then while the confirmation dialog is up press the hotkey while the UI is out of focus. The active scene should have switched to "a", while the dialog still displays "b" as its target; now confirm the removal of "b". Note how "a" was removed from the scenes list instead. Reported at https://obsproject.com/mantis/view.php?id=333
2015-09-24 08:11:38 +00:00
if (sel == ui->scenes->currentItem())
UI: Manually delete visibility item widgets
2015-06-28 01:18:40 +00: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 18:53:55 +00:00
delete sel;
Handle source adding/removal better - Made it so that when a source is added or removed from a scene it will add a reference to sourceSceneRefs (std::unordered_map). Each source adds a reference to that every time they are added to a scene, and releases a reference from it when they are removed from a scene. When the value reaches 0, the source is no longer in any scenes, and is then marked for removal and destroyed. Before, I was using the source internal reference counter, which is a really bad thing to do because I don't know what might actually be referencing it. So using a separate discrete reference counter for the number of scenes it's in is better in this case.
2014-01-07 03:20:18 +00:00
}
UI: Save project only on new changes
2015-06-30 12:49:31 +00:00
SaveProject();
UI: Log when user adds/removes/renames sources/filters
2016-08-06 01:43:04 +00:00
if (!disableSaving) {
blog(LOG_INFO, "User Removed scene '%s'",
obs_source_get_name(source));
}
UI: Trigger scene list change event when scene removed
2017-02-23 08:43:20 +00:00
if (api)
api->on_event(OBS_FRONTEND_EVENT_SCENE_LIST_CHANGED);
Implemented adding sources to scenes via GUI Sources can now be added to scenes via user interface. It's a little convoluted because everything has to work through OBS signals to ensure that plugins/etc can modify the scenes/sources exernally. Also, when switching scenes, it will properly list sources for the scene you changed to.
2014-01-04 20:53:36 +00:00
}
Use QMetaObject::invokeMethod in libobs callbacks Doing this ensures Qt thread safety when adding/removing sources and scenes, because it will defer the function call to the main thread.
2014-02-03 00:03:55 +00:00
void OBSBasic::AddSceneItem(OBSSceneItem item)
Implemented adding sources to scenes via GUI Sources can now be added to scenes via user interface. It's a little convoluted because everything has to work through OBS signals to ensure that plugins/etc can modify the scenes/sources exernally. Also, when switching scenes, it will properly list sources for the scene you changed to.
2014-01-04 20:53:36 +00:00
{
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
obs_scene_t *scene = obs_sceneitem_get_scene(item);
Handle source adding/removal better - Made it so that when a source is added or removed from a scene it will add a reference to sourceSceneRefs (std::unordered_map). Each source adds a reference to that every time they are added to a scene, and releases a reference from it when they are removed from a scene. When the value reaches 0, the source is no longer in any scenes, and is then marked for removal and destroyed. Before, I was using the source internal reference counter, which is a really bad thing to do because I don't know what might actually be referencing it. So using a separate discrete reference counter for the number of scenes it's in is better in this case.
2014-01-07 03:20:18 +00:00
Simplify and extend callback/signalling system - Signals and dynamic callbacks now require declarations to be made before being used. What this does is allows us to get information about the functions dynamically which can be relayed to the user and plugins for future extended usage (this should have big implications later for scripting in particular, hopefully). - Reduced the number of types calldata uses from "everything I could think of" to simply integer, float, bool, pointer/object, string. Integer data is now stored as long long. Floats are now stored as doubles (check em). - Use a more consistent naming scheme for lexer error/warning macros. - Fixed a rather nasty bug where switching to an existing scene would cause it to increment sourceSceneRefs, which would mean that it would never end up never properly removing the source when the user clicks removed (stayed in limbo, obs_source_remove never got called)
2014-03-01 12:54:55 +00:00
if (GetCurrentScene() == scene)
InsertSceneItem(item);
Handle source adding/removal better - Made it so that when a source is added or removed from a scene it will add a reference to sourceSceneRefs (std::unordered_map). Each source adds a reference to that every time they are added to a scene, and releases a reference from it when they are removed from a scene. When the value reaches 0, the source is no longer in any scenes, and is then marked for removal and destroyed. Before, I was using the source internal reference counter, which is a really bad thing to do because I don't know what might actually be referencing it. So using a separate discrete reference counter for the number of scenes it's in is better in this case.
2014-01-07 03:20:18 +00:00
UI: Save project only on new changes
2015-06-30 12:49:31 +00:00
SaveProject();
UI: Log when user adds/removes/renames sources/filters
2016-08-06 01:43:04 +00: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));
}
Implemented adding sources to scenes via GUI Sources can now be added to scenes via user interface. It's a little convoluted because everything has to work through OBS signals to ensure that plugins/etc can modify the scenes/sources exernally. Also, when switching scenes, it will properly list sources for the scene you changed to.
2014-01-04 20:53:36 +00:00
}
Use QMetaObject::invokeMethod in libobs callbacks Doing this ensures Qt thread safety when adding/removing sources and scenes, because it will defer the function call to the main thread.
2014-02-03 00:03:55 +00:00
void OBSBasic::RemoveSceneItem(OBSSceneItem item)
Implemented adding sources to scenes via GUI Sources can now be added to scenes via user interface. It's a little convoluted because everything has to work through OBS signals to ensure that plugins/etc can modify the scenes/sources exernally. Also, when switching scenes, it will properly list sources for the scene you changed to.
2014-01-04 20:53:36 +00:00
{
UI: Don't do scene check when removing scene items The scene check prevents the ability to remove scene items that have been detached from their scene, which can happen when scenes are used as scene items and the scene is deleted elsewhere.
2016-07-09 13:31:34 +00:00
for (int i = 0; i < ui->sources->count(); i++) {
QListWidgetItem *listItem = ui->sources->item(i);
Implemented adding sources to scenes via GUI Sources can now be added to scenes via user interface. It's a little convoluted because everything has to work through OBS signals to ensure that plugins/etc can modify the scenes/sources exernally. Also, when switching scenes, it will properly list sources for the scene you changed to.
2014-01-04 20:53:36 +00:00
UI: Don't do scene check when removing scene items The scene check prevents the ability to remove scene items that have been detached from their scene, which can happen when scenes are used as scene items and the scene is deleted elsewhere.
2016-07-09 13:31:34 +00:00
if (GetOBSRef<OBSSceneItem>(listItem) == item) {
DeleteListItem(ui->sources, listItem);
break;
Remove from list based upon data, not string - Added an extra comment regarding source removal - Made is so that when a scene item is removed from the sources list box, it removes the item based upon the GetClientData rather than by its string name. This is done because there may be duplicate sources in a particular scene, and it's important to remove the right one.
2014-01-05 02:26:15 +00:00
}
}
Handle source adding/removal better - Made it so that when a source is added or removed from a scene it will add a reference to sourceSceneRefs (std::unordered_map). Each source adds a reference to that every time they are added to a scene, and releases a reference from it when they are removed from a scene. When the value reaches 0, the source is no longer in any scenes, and is then marked for removal and destroyed. Before, I was using the source internal reference counter, which is a really bad thing to do because I don't know what might actually be referencing it. So using a separate discrete reference counter for the number of scenes it's in is better in this case.
2014-01-07 03:20:18 +00:00
UI: Save project only on new changes
2015-06-30 12:49:31 +00:00
SaveProject();
UI: Log when user adds/removes/renames sources/filters
2016-08-06 01:43:04 +00: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));
}
Implemented adding sources to scenes via GUI Sources can now be added to scenes via user interface. It's a little convoluted because everything has to work through OBS signals to ensure that plugins/etc can modify the scenes/sources exernally. Also, when switching scenes, it will properly list sources for the scene you changed to.
2014-01-04 20:53:36 +00:00
}
Use QMetaObject::invokeMethod in libobs callbacks Doing this ensures Qt thread safety when adding/removing sources and scenes, because it will defer the function call to the main thread.
2014-02-03 00:03:55 +00:00
void OBSBasic::UpdateSceneSelection(OBSSource source)
Implemented adding sources to scenes via GUI Sources can now be added to scenes via user interface. It's a little convoluted because everything has to work through OBS signals to ensure that plugins/etc can modify the scenes/sources exernally. Also, when switching scenes, it will properly list sources for the scene you changed to.
2014-01-04 20:53:36 +00:00
{
if (source) {
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
obs_scene_t *scene = obs_scene_from_source(source);
(API Change) Unsquish libobs (base) names Previous names: New names: ----------------------------------------------------------- obs_view_setsource obs_view_set_source obs_view_getsource obs_view_get_source obs_source_getdisplayname obs_source_get_display_name obs_source_getwidth obs_source_get_width obs_source_getheight obs_source_get_height obs_filter_getparent obs_filter_get_parent obs_filter_gettarget obs_filter_get_target obs_source_filter_setorder obs_source_filter_set_order obs_source_getsettings obs_source_get_settings obs_source_getname obs_source_get_name obs_source_setname obs_source_set_name obs_source_setvolume obs_source_set_volume obs_source_getvolume obs_source_get_volume obs_scene_getsource obs_scene_get_source obs_scene_fromsource obs_scene_from_source obs_scene_findsource obs_scene_find_source obs_output_getdisplayname obs_output_get_display_name obs_output_getname obs_output_get_name obs_encoder_getname obs_encoder_get_name obs_service_getdisplayname obs_service_get_display_name obs_service_getname obs_service_get_name
2014-08-04 15:41:15 +00: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 18:53:55 +00:00
Add preliminary saving/loading of scene/sources This saves scenes/sources from json on exit, and properly loads it back up when starting up the program again, as well as the currently active scene. I had to add a 'load' and 'save' callback to the source interface structure because I realizes that certain sources (such as scenes) operate different with their saved data; scenes for example would have to keep track of their settings information constantly, and that was somewhat unacceptable to make it functional. The optional 'load' callback will be called only after having loaded setttings specifically from file/imported data, and the 'save' function will be called only specifically when data actually needs to be saved. I also had to adjust the obs_scene code so that it's a regular input source type now, and I also modified it so that it doesn't have some strange custom creation code anymore. The obs_scene_create function is now simply just a wrapper for obs_source_create. You could even create a scene with obs_source_create manually as well.
2014-04-27 06:47:50 +00: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 18:53:55 +00:00
QList<QListWidgetItem*> items =
ui->scenes->findItems(QT_UTF8(name), Qt::MatchExactly);
Implement source activation/deactivation Now sources will be properly activated and deactivated when they are in use or not in use. Had to figure out a way to handle child sources, and children of children, just ended up implementing simple functions that parents use to signal adding/removal to help with hierarchial activation and deactivation of child sources. To prevent the source activate/deactivate callbacks from being called more than once, added an activation reference counter. The first increment will call the activate callback, and the last decrement will call the deactivate callback. Added "source-activate" and "source-deactivate" signals to the main obs signal handler, and "activate" and "deactivate" to individual source signal handlers. Also, fixed the main window so it properly selects a source when the current active scene has been changed.
2014-02-21 05:04:14 +00: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 18:53:55 +00:00
UpdateSources(scene);
Implemented adding sources to scenes via GUI Sources can now be added to scenes via user interface. It's a little convoluted because everything has to work through OBS signals to ensure that plugins/etc can modify the scenes/sources exernally. Also, when switching scenes, it will properly list sources for the scene you changed to.
2014-01-04 20:53:36 +00:00
}
added a SceneRemoved handler
2013-12-29 05:29:13 +00:00
}
Implemented adding sources to scenes via GUI Sources can now be added to scenes via user interface. It's a little convoluted because everything has to work through OBS signals to ensure that plugins/etc can modify the scenes/sources exernally. Also, when switching scenes, it will properly list sources for the scene you changed to.
2014-01-04 20:53:36 +00:00
}
Implement renaming of scenes/sources
2014-06-30 07:06:01 +00: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);
Rename volume control if audio source renamed
2014-07-08 18:58:48 +00:00
for (size_t i = 0; i < volumes.size(); i++) {
if (volumes[i]->GetName().compare(prevName) == 0)
volumes[i]->SetName(newName);
}
UI: Save project only on new changes
2015-06-30 12:49:31 +00:00
UI: Add option to save projectors This adds an option to the general settings to save the opened projectors on exit. (Note: Fixed conflicts -Jim) Closes jp9000/obs-studio#743
2016-12-29 15:21:53 +00: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;
}
UI: Save project only on new changes
2015-06-30 12:49:31 +00:00
SaveProject();
Implement renaming of scenes/sources
2014-06-30 07:06:01 +00:00
}
Propagate preview window selection to sources list
2014-10-13 20:14:06 +00:00
void OBSBasic::SelectSceneItem(OBSScene scene, OBSSceneItem item, bool select)
{
UI: Fix multi-item selection Allows changing item selection via list box or via preview window, and keeps their selection status in sync with each other.
2015-11-15 16:39:50 +00:00
SignalBlocker sourcesSignalBlocker(ui->sources);
UI: Ignore sources selection self-update roundtrips
2015-06-27 01:32:33 +00:00
if (scene != GetCurrentScene() || ignoreSelectionUpdate)
Propagate preview window selection to sources list
2014-10-13 20:14:06 +00:00
return;
for (int i = 0; i < ui->sources->count(); i++) {
QListWidgetItem *witem = ui->sources->item(i);
UI: Add QtDataRole enum This introduces the OBSSignals data role, which will be used to store signal handlers in stock Qt objects
2015-06-28 01:21:45 +00:00
QVariant data =
witem->data(static_cast<int>(QtDataRole::OBSRef));
Propagate preview window selection to sources list
2014-10-13 20:14:06 +00:00
if (!data.canConvert<OBSSceneItem>())
continue;
if (item != data.value<OBSSceneItem>())
continue;
UI: Fix multi-item selection Allows changing item selection via list box or via preview window, and keeps their selection status in sync with each other.
2015-11-15 16:39:50 +00:00
witem->setSelected(select);
Propagate preview window selection to sources list
2014-10-13 20:14:06 +00:00
break;
}
}
UI: Allow hiding/unhiding sources in the mixer Allows the ability to hide/unhide sources in the mixer that the user doesn't care about or doesn't necessarily want to see (such as video sources that have audio but don't have any audio playing). If all sources are hidden, the user can right-click the mixer's empty area and choose "unhide all" via a context menu. Closes jp9000/obs-studio#1002
2017-09-14 04:10:45 +00:00
static inline bool SourceMixerHidden(obs_source_t *source)
{
obs_data_t *priv_settings = obs_source_get_private_settings(source);
bool hidden = obs_data_get_bool(priv_settings, "mixer_hidden");
obs_data_release(priv_settings);
return hidden;
}
static inline void SetSourceMixerHidden(obs_source_t *source, bool hidden)
{
obs_data_t *priv_settings = obs_source_get_private_settings(source);
obs_data_set_bool(priv_settings, "mixer_hidden", hidden);
obs_data_release(priv_settings);
}
UI: Show popup menu w/ vol. control config button Use the config button on volume controls to allow the ability for filters/properties to be accessed via the mixer. Particularly useful for the purpose of accessing filters/properties of global audio outputs that are added via audio settings.
2015-06-21 01:57:06 +00: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);
}
UI: Allow hiding/unhiding sources in the mixer Allows the ability to hide/unhide sources in the mixer that the user doesn't care about or doesn't necessarily want to see (such as video sources that have audio but don't have any audio playing). If all sources are hidden, the user can right-click the mixer's empty area and choose "unhide all" via a context menu. Closes jp9000/obs-studio#1002
2017-09-14 04:10:45 +00:00
void OBSBasic::HideAudioControl()
{
QAction *action = reinterpret_cast<QAction*>(sender());
VolControl *vol = action->property("volControl").value<VolControl*>();
obs_source_t *source = vol->GetSource();
if (!SourceMixerHidden(source)) {
SetSourceMixerHidden(source, true);
DeactivateAudioSource(source);
}
}
void OBSBasic::UnhideAllAudioControls()
{
auto UnhideAudioMixer = [this] (obs_source_t *source) /* -- */
{
if (!obs_source_active(source))
return true;
if (!SourceMixerHidden(source))
return true;
SetSourceMixerHidden(source, false);
ActivateAudioSource(source);
return true;
};
using UnhideAudioMixer_t = decltype(UnhideAudioMixer);
auto PreEnum = [] (void *data, obs_source_t *source) -> bool /* -- */
{
return (*reinterpret_cast<UnhideAudioMixer_t *>(data))(source);
};
obs_enum_sources(PreEnum, &UnhideAudioMixer);
}
void OBSBasic::ToggleHideMixer()
{
OBSSceneItem item = GetCurrentSceneItem();
OBSSource source = obs_sceneitem_get_source(item);
if (!SourceMixerHidden(source)) {
SetSourceMixerHidden(source, true);
DeactivateAudioSource(source);
} else {
SetSourceMixerHidden(source, false);
ActivateAudioSource(source);
}
}
UI: Show popup menu w/ vol. control config button Use the config button on volume controls to allow the ability for filters/properties to be accessed via the mixer. Particularly useful for the purpose of accessing filters/properties of global audio outputs that are added via audio settings.
2015-06-21 01:57:06 +00:00
void OBSBasic::VolControlContextMenu()
{
VolControl *vol = reinterpret_cast<VolControl*>(sender());
UI: Allow hiding/unhiding sources in the mixer Allows the ability to hide/unhide sources in the mixer that the user doesn't care about or doesn't necessarily want to see (such as video sources that have audio but don't have any audio playing). If all sources are hidden, the user can right-click the mixer's empty area and choose "unhide all" via a context menu. Closes jp9000/obs-studio#1002
2017-09-14 04:10:45 +00:00
/* ------------------- */
QAction hideAction(QTStr("Hide"), this);
QAction unhideAllAction(QTStr("UnhideAll"), this);
UI: Show popup menu w/ vol. control config button Use the config button on volume controls to allow the ability for filters/properties to be accessed via the mixer. Particularly useful for the purpose of accessing filters/properties of global audio outputs that are added via audio settings.
2015-06-21 01:57:06 +00:00
QAction filtersAction(QTStr("Filters"), this);
QAction propertiesAction(QTStr("Properties"), this);
UI: Move adv. audio props. to each audio config button Instead of having an extra config button that essentially wastes valuable window space, allow the ability to open advanced audio properties from each audio meter config button.
2017-08-06 04:20:08 +00:00
QAction advPropAction(QTStr("Basic.MainMenu.Edit.AdvAudio"), this);
UI: Show popup menu w/ vol. control config button Use the config button on volume controls to allow the ability for filters/properties to be accessed via the mixer. Particularly useful for the purpose of accessing filters/properties of global audio outputs that are added via audio settings.
2015-06-21 01:57:06 +00:00
UI: Allow hiding/unhiding sources in the mixer Allows the ability to hide/unhide sources in the mixer that the user doesn't care about or doesn't necessarily want to see (such as video sources that have audio but don't have any audio playing). If all sources are hidden, the user can right-click the mixer's empty area and choose "unhide all" via a context menu. Closes jp9000/obs-studio#1002
2017-09-14 04:10:45 +00:00
/* ------------------- */
connect(&hideAction, &QAction::triggered,
this, &OBSBasic::HideAudioControl,
Qt::DirectConnection);
connect(&unhideAllAction, &QAction::triggered,
this, &OBSBasic::UnhideAllAudioControls,
Qt::DirectConnection);
UI: Show popup menu w/ vol. control config button Use the config button on volume controls to allow the ability for filters/properties to be accessed via the mixer. Particularly useful for the purpose of accessing filters/properties of global audio outputs that are added via audio settings.
2015-06-21 01:57:06 +00:00
connect(&filtersAction, &QAction::triggered,
this, &OBSBasic::GetAudioSourceFilters,
Qt::DirectConnection);
connect(&propertiesAction, &QAction::triggered,
this, &OBSBasic::GetAudioSourceProperties,
Qt::DirectConnection);
UI: Move adv. audio props. to each audio config button Instead of having an extra config button that essentially wastes valuable window space, allow the ability to open advanced audio properties from each audio meter config button.
2017-08-06 04:20:08 +00:00
connect(&advPropAction, &QAction::triggered,
this, &OBSBasic::on_actionAdvAudioProperties_triggered,
Qt::DirectConnection);
UI: Show popup menu w/ vol. control config button Use the config button on volume controls to allow the ability for filters/properties to be accessed via the mixer. Particularly useful for the purpose of accessing filters/properties of global audio outputs that are added via audio settings.
2015-06-21 01:57:06 +00:00
UI: Allow hiding/unhiding sources in the mixer Allows the ability to hide/unhide sources in the mixer that the user doesn't care about or doesn't necessarily want to see (such as video sources that have audio but don't have any audio playing). If all sources are hidden, the user can right-click the mixer's empty area and choose "unhide all" via a context menu. Closes jp9000/obs-studio#1002
2017-09-14 04:10:45 +00:00
/* ------------------- */
hideAction.setProperty("volControl",
QVariant::fromValue<VolControl*>(vol));
UI: Show popup menu w/ vol. control config button Use the config button on volume controls to allow the ability for filters/properties to be accessed via the mixer. Particularly useful for the purpose of accessing filters/properties of global audio outputs that are added via audio settings.
2015-06-21 01:57:06 +00:00
filtersAction.setProperty("volControl",
QVariant::fromValue<VolControl*>(vol));
propertiesAction.setProperty("volControl",
QVariant::fromValue<VolControl*>(vol));
UI: Allow hiding/unhiding sources in the mixer Allows the ability to hide/unhide sources in the mixer that the user doesn't care about or doesn't necessarily want to see (such as video sources that have audio but don't have any audio playing). If all sources are hidden, the user can right-click the mixer's empty area and choose "unhide all" via a context menu. Closes jp9000/obs-studio#1002
2017-09-14 04:10:45 +00:00
/* ------------------- */
UI: Show popup menu w/ vol. control config button Use the config button on volume controls to allow the ability for filters/properties to be accessed via the mixer. Particularly useful for the purpose of accessing filters/properties of global audio outputs that are added via audio settings.
2015-06-21 01:57:06 +00:00
QMenu popup(this);
UI: Allow hiding/unhiding sources in the mixer Allows the ability to hide/unhide sources in the mixer that the user doesn't care about or doesn't necessarily want to see (such as video sources that have audio but don't have any audio playing). If all sources are hidden, the user can right-click the mixer's empty area and choose "unhide all" via a context menu. Closes jp9000/obs-studio#1002
2017-09-14 04:10:45 +00:00
popup.addAction(&unhideAllAction);
popup.addAction(&hideAction);
popup.addSeparator();
UI: Show popup menu w/ vol. control config button Use the config button on volume controls to allow the ability for filters/properties to be accessed via the mixer. Particularly useful for the purpose of accessing filters/properties of global audio outputs that are added via audio settings.
2015-06-21 01:57:06 +00:00
popup.addAction(&filtersAction);
popup.addAction(&propertiesAction);
UI: Move adv. audio props. to each audio config button Instead of having an extra config button that essentially wastes valuable window space, allow the ability to open advanced audio properties from each audio meter config button.
2017-08-06 04:20:08 +00:00
popup.addAction(&advPropAction);
UI: Show popup menu w/ vol. control config button Use the config button on volume controls to allow the ability for filters/properties to be accessed via the mixer. Particularly useful for the purpose of accessing filters/properties of global audio outputs that are added via audio settings.
2015-06-21 01:57:06 +00:00
popup.exec(QCursor::pos());
}
UI: Allow hiding/unhiding sources in the mixer Allows the ability to hide/unhide sources in the mixer that the user doesn't care about or doesn't necessarily want to see (such as video sources that have audio but don't have any audio playing). If all sources are hidden, the user can right-click the mixer's empty area and choose "unhide all" via a context menu. Closes jp9000/obs-studio#1002
2017-09-14 04:10:45 +00:00
void OBSBasic::on_mixerScrollArea_customContextMenuRequested()
{
QAction unhideAllAction(QTStr("UnhideAll"), this);
UI: Add missing option to context menu Add 'Advanced Audio Properties' option to context menu over empty area of the Mixer's pane.
2017-09-14 13:01:15 +00:00
QAction advPropAction(QTStr("Basic.MainMenu.Edit.AdvAudio"), this);
/* ------------------- */
UI: Allow hiding/unhiding sources in the mixer Allows the ability to hide/unhide sources in the mixer that the user doesn't care about or doesn't necessarily want to see (such as video sources that have audio but don't have any audio playing). If all sources are hidden, the user can right-click the mixer's empty area and choose "unhide all" via a context menu. Closes jp9000/obs-studio#1002
2017-09-14 04:10:45 +00:00
connect(&unhideAllAction, &QAction::triggered,
this, &OBSBasic::UnhideAllAudioControls,
Qt::DirectConnection);
UI: Add missing option to context menu Add 'Advanced Audio Properties' option to context menu over empty area of the Mixer's pane.
2017-09-14 13:01:15 +00:00
connect(&advPropAction, &QAction::triggered,
this, &OBSBasic::on_actionAdvAudioProperties_triggered,
Qt::DirectConnection);
/* ------------------- */
UI: Allow hiding/unhiding sources in the mixer Allows the ability to hide/unhide sources in the mixer that the user doesn't care about or doesn't necessarily want to see (such as video sources that have audio but don't have any audio playing). If all sources are hidden, the user can right-click the mixer's empty area and choose "unhide all" via a context menu. Closes jp9000/obs-studio#1002
2017-09-14 04:10:45 +00:00
QMenu popup(this);
popup.addAction(&unhideAllAction);
UI: Add missing option to context menu Add 'Advanced Audio Properties' option to context menu over empty area of the Mixer's pane.
2017-09-14 13:01:15 +00:00
popup.addSeparator();
popup.addAction(&advPropAction);
UI: Allow hiding/unhiding sources in the mixer Allows the ability to hide/unhide sources in the mixer that the user doesn't care about or doesn't necessarily want to see (such as video sources that have audio but don't have any audio playing). If all sources are hidden, the user can right-click the mixer's empty area and choose "unhide all" via a context menu. Closes jp9000/obs-studio#1002
2017-09-14 04:10:45 +00:00
popup.exec(QCursor::pos());
}
Add (temporary terrible) volume controls - Add volume control These volume controls are basically nothing more than sliders. They look terrible and hopefully will be as temporary as they are terrible. - Allow saving of specific non-user sources via obs_load_source and obs_save_source functions. - Save data of desktop/mic audio sources (sync data, volume data, etc), and load the data on startup. - Make it so that a scene is created by default if first time using the application. On certain operating systems where supported, a default capture will be created. Desktop capture on mac, particularly. Not sure what to do about windows because monitor capture on windows 7 is completely terrible and is bad to start users off with.
2014-05-04 05:54:38 +00:00
void OBSBasic::ActivateAudioSource(OBSSource source)
{
UI: Allow hiding/unhiding sources in the mixer Allows the ability to hide/unhide sources in the mixer that the user doesn't care about or doesn't necessarily want to see (such as video sources that have audio but don't have any audio playing). If all sources are hidden, the user can right-click the mixer's empty area and choose "unhide all" via a context menu. Closes jp9000/obs-studio#1002
2017-09-14 04:10:45 +00:00
if (SourceMixerHidden(source))
return;
UI: Show popup menu w/ vol. control config button Use the config button on volume controls to allow the ability for filters/properties to be accessed via the mixer. Particularly useful for the purpose of accessing filters/properties of global audio outputs that are added via audio settings.
2015-06-21 01:57:06 +00:00
VolControl *vol = new VolControl(source, true);
UI: Allow right-clicking mixer sources to bring up menu Allows bringing up properties/filters/etc via right-clicking mixer items in addition instead of only being able to click the gear icon. Minor QoL improvement.
2017-09-14 04:08:27 +00:00
vol->setContextMenuPolicy(Qt::CustomContextMenu);
connect(vol, &QWidget::customContextMenuRequested,
this, &OBSBasic::VolControlContextMenu);
UI: Show popup menu w/ vol. control config button Use the config button on volume controls to allow the ability for filters/properties to be accessed via the mixer. Particularly useful for the purpose of accessing filters/properties of global audio outputs that are added via audio settings.
2015-06-21 01:57:06 +00:00
connect(vol, &VolControl::ConfigClicked,
this, &OBSBasic::VolControlContextMenu);
Add (temporary terrible) volume controls - Add volume control These volume controls are basically nothing more than sliders. They look terrible and hopefully will be as temporary as they are terrible. - Allow saving of specific non-user sources via obs_load_source and obs_save_source functions. - Save data of desktop/mic audio sources (sync data, volume data, etc), and load the data on startup. - Make it so that a scene is created by default if first time using the application. On certain operating systems where supported, a default capture will be created. Desktop capture on mac, particularly. Not sure what to do about windows because monitor capture on windows 7 is completely terrible and is bad to start users off with.
2014-05-04 05:54:38 +00: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;
}
}
}
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
bool OBSBasic::QueryRemoveSource(obs_source_t *source)
Implement context menu on 'sources' box
2014-06-30 08:13:32 +00:00
{
UI: Fix bug where items can't be deleted in last scene Bug introduced in jp9000/obs-studio#861
2017-03-25 14:36:46 +00:00
if (obs_source_get_type(source) == OBS_SOURCE_TYPE_SCENE) {
int count = ui->scenes->count();
if (count == 1) {
UI: Make sure all message box buttons are translated Instead of QMessageBox::question and QMessageBox::information, use the OBSMessageBox class, which translates all buttons.
2017-05-13 21:06:32 +00:00
OBSMessageBox::information(this,
UI: Fix bug where items can't be deleted in last scene Bug introduced in jp9000/obs-studio#861
2017-03-25 14:36:46 +00:00
QTStr("FinalScene.Title"),
QTStr("FinalScene.Text"));
return false;
}
UI: Add workaround to fix deleting final scene bug
2017-03-13 17:17:01 +00:00
}
(API Change) Unsquish libobs (base) names Previous names: New names: ----------------------------------------------------------- obs_view_setsource obs_view_set_source obs_view_getsource obs_view_get_source obs_source_getdisplayname obs_source_get_display_name obs_source_getwidth obs_source_get_width obs_source_getheight obs_source_get_height obs_filter_getparent obs_filter_get_parent obs_filter_gettarget obs_filter_get_target obs_source_filter_setorder obs_source_filter_set_order obs_source_getsettings obs_source_get_settings obs_source_getname obs_source_get_name obs_source_setname obs_source_set_name obs_source_setvolume obs_source_set_volume obs_source_getvolume obs_source_get_volume obs_scene_getsource obs_scene_get_source obs_scene_fromsource obs_scene_from_source obs_scene_findsource obs_scene_find_source obs_output_getdisplayname obs_output_get_display_name obs_output_getname obs_output_get_name obs_encoder_getname obs_encoder_get_name obs_service_getdisplayname obs_service_get_display_name obs_service_getname obs_service_get_name
2014-08-04 15:41:15 +00:00
const char *name = obs_source_get_name(source);
Make 'remove' toolbar buttons query for removal
2014-06-30 20:45:58 +00:00
QString text = QTStr("ConfirmRemove.Text");
text.replace("$1", QT_UTF8(name));
Implement context menu on 'sources' box
2014-06-30 08:13:32 +00:00
UI: Fix missing widget parent from constructor The styling isn't applied if the widget doesn't have a parent
2015-01-16 09:21:11 +00:00
QMessageBox remove_source(this);
Don't use informative text for message box The informative text is meant to be additional information, not the main information. If you use informative text without using regular text, it causes the message box to get all squishy.
2014-08-24 15:56:50 +00:00
remove_source.setText(text);
QAbstractButton *Yes = remove_source.addButton(QTStr("Yes"),
QMessageBox::YesRole);
Fix Remove Dialog Remove failed test and add other Messagebox to correct Text with Language support Add Title again -,-
2014-08-15 17:07:00 +00: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();
Make 'remove' toolbar buttons query for removal
2014-06-30 20:45:58 +00:00
}
Implement context menu on 'sources' box
2014-06-30 08:13:32 +00:00
Add basic update checking
2014-07-14 06:56:28 +00:00
#define UPDATE_CHECK_INTERVAL (60*60*24*4) /* 4 days */
Add option to use Sparkle for updates OBS Sparkle feeds have two extensions to vanilla Sparkle feeds: - There can be two kinds of items per feed: (zipped) .app and .mpkg via <ce:packageType>app|mpkg</ce:packageType> (default is mpkg) - Feed items can be disabled via <ce:deployed>false</ce:deployed>; these items will not be considered for updates unless "[General] UpdateToUndeployed=1" is set the global config Unlike other Sparkle implementations the FeedURL cannot be updated via user preferences because we support multiple app packages with the same package identifier but different FeedURL settings on the same machine
2014-10-05 22:32:18 +00:00
#ifdef UPDATE_SPARKLE
void init_sparkle_updater(bool update_to_undeployed);
void trigger_sparkle_update();
#endif
Add basic update checking
2014-07-14 06:56:28 +00:00
void OBSBasic::TimedCheckForUpdates()
{
UI: Add front-end auto-updater
2017-02-20 12:46:29 +00:00
if (!config_get_bool(App()->GlobalConfig(), "General",
"EnableAutoUpdates"))
return;
Add option to use Sparkle for updates OBS Sparkle feeds have two extensions to vanilla Sparkle feeds: - There can be two kinds of items per feed: (zipped) .app and .mpkg via <ce:packageType>app|mpkg</ce:packageType> (default is mpkg) - Feed items can be disabled via <ce:deployed>false</ce:deployed>; these items will not be considered for updates unless "[General] UpdateToUndeployed=1" is set the global config Unlike other Sparkle implementations the FeedURL cannot be updated via user preferences because we support multiple app packages with the same package identifier but different FeedURL settings on the same machine
2014-10-05 22:32:18 +00:00
#ifdef UPDATE_SPARKLE
init_sparkle_updater(config_get_bool(App()->GlobalConfig(), "General",
"UpdateToUndeployed"));
UI: Add front-end auto-updater
2017-02-20 12:46:29 +00:00
#elif ENABLE_WIN_UPDATER
Add basic update checking
2014-07-14 06:56:28 +00: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)
UI: Add front-end auto-updater
2017-02-20 12:46:29 +00:00
CheckForUpdates(false);
Add option to use Sparkle for updates OBS Sparkle feeds have two extensions to vanilla Sparkle feeds: - There can be two kinds of items per feed: (zipped) .app and .mpkg via <ce:packageType>app|mpkg</ce:packageType> (default is mpkg) - Feed items can be disabled via <ce:deployed>false</ce:deployed>; these items will not be considered for updates unless "[General] UpdateToUndeployed=1" is set the global config Unlike other Sparkle implementations the FeedURL cannot be updated via user preferences because we support multiple app packages with the same package identifier but different FeedURL settings on the same machine
2014-10-05 22:32:18 +00:00
#endif
Add basic update checking
2014-07-14 06:56:28 +00:00
}
UI: Add front-end auto-updater
2017-02-20 12:46:29 +00:00
void OBSBasic::CheckForUpdates(bool manualUpdate)
Add basic update checking
2014-07-14 06:56:28 +00:00
{
Add option to use Sparkle for updates OBS Sparkle feeds have two extensions to vanilla Sparkle feeds: - There can be two kinds of items per feed: (zipped) .app and .mpkg via <ce:packageType>app|mpkg</ce:packageType> (default is mpkg) - Feed items can be disabled via <ce:deployed>false</ce:deployed>; these items will not be considered for updates unless "[General] UpdateToUndeployed=1" is set the global config Unlike other Sparkle implementations the FeedURL cannot be updated via user preferences because we support multiple app packages with the same package identifier but different FeedURL settings on the same machine
2014-10-05 22:32:18 +00:00
#ifdef UPDATE_SPARKLE
trigger_sparkle_update();
UI: Add front-end auto-updater
2017-02-20 12:46:29 +00:00
#elif ENABLE_WIN_UPDATER
Add basic update checking
2014-07-14 06:56:28 +00:00
ui->actionCheckForUpdates->setEnabled(false);
UI: Add front-end auto-updater
2017-02-20 12:46:29 +00:00
if (updateCheckThread && updateCheckThread->isRunning())
return;
Set User-Agent value of update check to OBS ver.
2014-07-14 15:51:57 +00:00
UI: Add front-end auto-updater
2017-02-20 12:46:29 +00:00
updateCheckThread = new AutoUpdateThread(manualUpdate);
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-24 06:39:39 +00:00
updateCheckThread->start();
Add option to use Sparkle for updates OBS Sparkle feeds have two extensions to vanilla Sparkle feeds: - There can be two kinds of items per feed: (zipped) .app and .mpkg via <ce:packageType>app|mpkg</ce:packageType> (default is mpkg) - Feed items can be disabled via <ce:deployed>false</ce:deployed>; these items will not be considered for updates unless "[General] UpdateToUndeployed=1" is set the global config Unlike other Sparkle implementations the FeedURL cannot be updated via user preferences because we support multiple app packages with the same package identifier but different FeedURL settings on the same machine
2014-10-05 22:32:18 +00:00
#endif
libobs/plugins/UI: Suppress unused variables warnings Closes jp9000/obs-studio#937
2017-06-01 06:58:42 +00:00
UNUSED_PARAMETER(manualUpdate);
Add basic update checking
2014-07-14 06:56:28 +00:00
}
UI: Add front-end auto-updater
2017-02-20 12:46:29 +00:00
void OBSBasic::updateCheckFinished()
Add basic update checking
2014-07-14 06:56:28 +00:00
{
ui->actionCheckForUpdates->setEnabled(true);
}
UI: Implement scene duplication (context menu)
2015-08-28 22:01:39 +00: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()) {
UI: Make sure all message box buttons are translated Instead of QMessageBox::question and QMessageBox::information, use the OBSMessageBox class, which translates all buttons.
2017-05-13 21:06:32 +00:00
OBSMessageBox::information(this,
UI: Implement scene duplication (context menu)
2015-08-28 22:01:39 +00:00
QTStr("NoNameEntered.Title"),
QTStr("NoNameEntered.Text"));
continue;
}
obs_source_t *source = obs_get_source_by_name(name.c_str());
if (source) {
UI: Make sure all message box buttons are translated Instead of QMessageBox::question and QMessageBox::information, use the OBSMessageBox class, which translates all buttons.
2017-05-13 21:06:32 +00:00
OBSMessageBox::information(this,
UI: Implement scene duplication (context menu)
2015-08-28 22:01:39 +00:00
QTStr("NameExists.Title"),
QTStr("NameExists.Text"));
obs_source_release(source);
continue;
}
obs_scene_t *scene = obs_scene_duplicate(curScene,
(API Change) libobs: Add 'type' to obs_scene_duplicate (Note: This commit also modifies the UI) Allows the ability to duplicate sources fully copied, and/or have the scene and its duplicates be private sources
2016-01-13 01:04:01 +00:00
name.c_str(), OBS_SCENE_DUP_REFS);
UI: Implement scene duplication (context menu)
2015-08-28 22:01:39 +00: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 19:19:29 +00:00
AddScene(source);
SetCurrentScene(source, true);
UI: Implement scene duplication (context menu)
2015-08-28 22:01:39 +00:00
obs_scene_release(scene);
UI: Add front-end API library Allows manipulating and modifying the front-end via plugins.
2016-08-28 21:24:14 +00: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 19:19:29 +00:00
break;
UI: Implement scene duplication (context menu)
2015-08-28 22:01:39 +00:00
}
}
Make 'remove' toolbar buttons query for removal
2014-06-30 20:45:58 +00:00
void OBSBasic::RemoveSelectedScene()
{
OBSScene scene = GetCurrentScene();
if (scene) {
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
obs_source_t *source = obs_scene_get_source(scene);
UI: Add front-end API library Allows manipulating and modifying the front-end via plugins.
2016-08-28 21:24:14 +00:00
if (QueryRemoveSource(source)) {
Make 'remove' toolbar buttons query for removal
2014-06-30 20:45:58 +00:00
obs_source_remove(source);
UI: Add front-end API library Allows manipulating and modifying the front-end via plugins.
2016-08-28 21:24:14 +00:00
if (api)
api->on_event(OBS_FRONTEND_EVENT_SCENE_LIST_CHANGED);
}
Make 'remove' toolbar buttons query for removal
2014-06-30 20:45:58 +00:00
}
}
void OBSBasic::RemoveSelectedSceneItem()
{
OBSSceneItem item = GetCurrentSceneItem();
if (item) {
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
obs_source_t *source = obs_sceneitem_get_source(item);
Make 'remove' toolbar buttons query for removal
2014-06-30 20:45:58 +00:00
if (QueryRemoveSource(source))
Implement context menu on 'sources' box
2014-06-30 08:13:32 +00:00
obs_sceneitem_remove(item);
}
}
UI: Use 'reorder' signal for scene item reordering The old signals for for reordering have been removed; the new signal to use is the 'reorder' signal, which means that the list needs to be refreshed.
2015-02-19 19:02:54 +00: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);
UI: Add QtDataRole enum This introduces the OBSSignals data role, which will be used to store signal handlers in stock Qt objects
2015-06-28 01:21:45 +00:00
OBSSceneItem sceneItem = GetOBSRef<OBSSceneItem>(listItem);
UI: Use 'reorder' signal for scene item reordering The old signals for for reordering have been removed; the new signal to use is the 'reorder' signal, which means that the list needs to be refreshed.
2015-02-19 19:02:54 +00:00
if (sceneItem == item) {
if ((int)idx_inv != i) {
bool sel = (ui->sources->currentRow() == i);
UI: Manually delete visibility item widgets
2015-06-28 01:18:40 +00:00
listItem = TakeListItem(ui->sources, i);
UI: Use 'reorder' signal for scene item reordering The old signals for for reordering have been removed; the new signal to use is the 'reorder' signal, which means that the list needs to be refreshed.
2015-02-19 19:02:54 +00:00
if (listItem) {
ui->sources->insertItem(idx_inv,
listItem);
UI: Add visibility checkbox to main sources list Adds a visibility checkbox to the main sources list so that users can temporarily disable/re-enable sources. Only applies to scene items, not the sources themselves.
2015-03-23 03:51:21 +00:00
SetupVisibilityItem(ui->sources,
listItem, item);
UI: Use 'reorder' signal for scene item reordering The old signals for for reordering have been removed; the new signal to use is the 'reorder' signal, which means that the list needs to be refreshed.
2015-02-19 19:02:54 +00:00
if (sel)
ui->sources->setCurrentRow(
idx_inv);
}
}
break;
}
}
}
void OBSBasic::ReorderSources(OBSScene scene)
{
ReorderInfo info(this);
UI: Ignore reorder signals from drag&drop reordering Not ignoring these signals doesn't seem to break anything, but it shouldn't be necessary to process them either
2015-06-27 02:00:24 +00:00
if (scene != GetCurrentScene() || ui->sources->IgnoreReorder())
UI: Use 'reorder' signal for scene item reordering The old signals for for reordering have been removed; the new signal to use is the 'reorder' signal, which means that the list needs to be refreshed.
2015-02-19 19:02:54 +00: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);
UI: Save project only on new changes
2015-06-30 12:49:31 +00:00
SaveProject();
UI: Use 'reorder' signal for scene item reordering The old signals for for reordering have been removed; the new signal to use is the 'reorder' signal, which means that the list needs to be refreshed.
2015-02-19 19:02:54 +00:00
}
Implemented adding sources to scenes via GUI Sources can now be added to scenes via user interface. It's a little convoluted because everything has to work through OBS signals to ensure that plugins/etc can modify the scenes/sources exernally. Also, when switching scenes, it will properly list sources for the scene you changed to.
2014-01-04 20:53:36 +00:00
/* OBS Callbacks */
UI: Use 'reorder' signal for scene item reordering The old signals for for reordering have been removed; the new signal to use is the 'reorder' signal, which means that the list needs to be refreshed.
2015-02-19 19:02:54 +00: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)));
}
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
void OBSBasic::SceneItemAdded(void *data, calldata_t *params)
Implemented adding sources to scenes via GUI Sources can now be added to scenes via user interface. It's a little convoluted because everything has to work through OBS signals to ensure that plugins/etc can modify the scenes/sources exernally. Also, when switching scenes, it will properly list sources for the scene you changed to.
2014-01-04 20:53:36 +00:00
{
OBSBasic *window = static_cast<OBSBasic*>(data);
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
obs_sceneitem_t *item = (obs_sceneitem_t*)calldata_ptr(params, "item");
added a SceneRemoved handler
2013-12-29 05:29:13 +00:00
Use QMetaObject::invokeMethod in libobs callbacks Doing this ensures Qt thread safety when adding/removing sources and scenes, because it will defer the function call to the main thread.
2014-02-03 00:03:55 +00:00
QMetaObject::invokeMethod(window, "AddSceneItem",
Q_ARG(OBSSceneItem, OBSSceneItem(item)));
added a SceneRemoved handler
2013-12-29 05:29:13 +00:00
}
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
void OBSBasic::SceneItemRemoved(void *data, calldata_t *params)
implement scene adding callbacks, make a few API tweaks
2013-12-28 12:33:16 +00:00
{
Implemented adding sources to scenes via GUI Sources can now be added to scenes via user interface. It's a little convoluted because everything has to work through OBS signals to ensure that plugins/etc can modify the scenes/sources exernally. Also, when switching scenes, it will properly list sources for the scene you changed to.
2014-01-04 20:53:36 +00:00
OBSBasic *window = static_cast<OBSBasic*>(data);
implement scene adding callbacks, make a few API tweaks
2013-12-28 12:33:16 +00:00
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
obs_sceneitem_t *item = (obs_sceneitem_t*)calldata_ptr(params, "item");
Implemented adding sources to scenes via GUI Sources can now be added to scenes via user interface. It's a little convoluted because everything has to work through OBS signals to ensure that plugins/etc can modify the scenes/sources exernally. Also, when switching scenes, it will properly list sources for the scene you changed to.
2014-01-04 20:53:36 +00:00
Use QMetaObject::invokeMethod in libobs callbacks Doing this ensures Qt thread safety when adding/removing sources and scenes, because it will defer the function call to the main thread.
2014-02-03 00:03:55 +00:00
QMetaObject::invokeMethod(window, "RemoveSceneItem",
Q_ARG(OBSSceneItem, OBSSceneItem(item)));
Implemented adding sources to scenes via GUI Sources can now be added to scenes via user interface. It's a little convoluted because everything has to work through OBS signals to ensure that plugins/etc can modify the scenes/sources exernally. Also, when switching scenes, it will properly list sources for the scene you changed to.
2014-01-04 20:53:36 +00:00
}
Propagate preview window selection to sources list
2014-10-13 20:14:06 +00: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));
}
(API Change) libobs: Don't use signal for obs_load_sources (Note: This commit also changes the UI) Changed: ------------------- void obs_load_sources(obs_data_array_t *sources_list); To: ------------------- void obs_load_sources(obs_data_array_t *sources_list, obs_source_load_cb callback, void *private_data); Signals should really never be required to use to make some function work properly. The "source_load" signal was required for the obs_load_sources function, but it's meant more for loading private data in the settings, not for general loading of sources. This changes it so that a callback is explicitly required to load the sources.
2016-03-04 20:56:09 +00:00
void OBSBasic::SourceLoaded(void *data, obs_source_t *source)
Implemented adding sources to scenes via GUI Sources can now be added to scenes via user interface. It's a little convoluted because everything has to work through OBS signals to ensure that plugins/etc can modify the scenes/sources exernally. Also, when switching scenes, it will properly list sources for the scene you changed to.
2014-01-04 20:53:36 +00:00
{
Add 'source selection' dialog Add a 'source selection' dialog to replace the 'enter a name' dialog. This new dialog allows you to make new instances of pre-existing sources so that you can add a pre-existing source to a different scene, or in to the same scene more than once. Also started implementing locale. Comtemplating switching to JSON-based locale later, so we can add things like descriptions/disambiguation, and so we can use jansson's built-in hash table when doing the string lookup.
2014-05-11 01:47:48 +00:00
OBSBasic *window = static_cast<OBSBasic*>(data);
implement scene adding callbacks, make a few API tweaks
2013-12-28 12:33:16 +00:00
(API Change) Unsquish libobs (base) names Previous names: New names: ----------------------------------------------------------- obs_view_setsource obs_view_set_source obs_view_getsource obs_view_get_source obs_source_getdisplayname obs_source_get_display_name obs_source_getwidth obs_source_get_width obs_source_getheight obs_source_get_height obs_filter_getparent obs_filter_get_parent obs_filter_gettarget obs_filter_get_target obs_source_filter_setorder obs_source_filter_set_order obs_source_getsettings obs_source_get_settings obs_source_getname obs_source_get_name obs_source_setname obs_source_set_name obs_source_setvolume obs_source_set_volume obs_source_getvolume obs_source_get_volume obs_scene_getsource obs_scene_get_source obs_scene_fromsource obs_scene_from_source obs_scene_findsource obs_scene_find_source obs_output_getdisplayname obs_output_get_display_name obs_output_getname obs_output_get_name obs_encoder_getname obs_encoder_get_name obs_service_getdisplayname obs_service_get_display_name obs_service_getname obs_service_get_name
2014-08-04 15:41:15 +00:00
if (obs_scene_from_source(source) != NULL)
Add 'source selection' dialog Add a 'source selection' dialog to replace the 'enter a name' dialog. This new dialog allows you to make new instances of pre-existing sources so that you can add a pre-existing source to a different scene, or in to the same scene more than once. Also started implementing locale. Comtemplating switching to JSON-based locale later, so we can add things like descriptions/disambiguation, and so we can use jansson's built-in hash table when doing the string lookup.
2014-05-11 01:47:48 +00:00
QMetaObject::invokeMethod(window,
Use QMetaObject::invokeMethod in libobs callbacks Doing this ensures Qt thread safety when adding/removing sources and scenes, because it will defer the function call to the main thread.
2014-02-03 00:03:55 +00:00
"AddScene",
Q_ARG(OBSSource, OBSSource(source)));
implement scene adding callbacks, make a few API tweaks
2013-12-28 12:33:16 +00:00
}
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
void OBSBasic::SourceRemoved(void *data, calldata_t *params)
implement scene adding callbacks, make a few API tweaks
2013-12-28 12:33:16 +00:00
{
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
obs_source_t *source = (obs_source_t*)calldata_ptr(params, "source");
implement scene adding callbacks, make a few API tweaks
2013-12-28 12:33:16 +00:00
(API Change) Unsquish libobs (base) names Previous names: New names: ----------------------------------------------------------- obs_view_setsource obs_view_set_source obs_view_getsource obs_view_get_source obs_source_getdisplayname obs_source_get_display_name obs_source_getwidth obs_source_get_width obs_source_getheight obs_source_get_height obs_filter_getparent obs_filter_get_parent obs_filter_gettarget obs_filter_get_target obs_source_filter_setorder obs_source_filter_set_order obs_source_getsettings obs_source_get_settings obs_source_getname obs_source_get_name obs_source_setname obs_source_set_name obs_source_setvolume obs_source_set_volume obs_source_getvolume obs_source_get_volume obs_scene_getsource obs_scene_get_source obs_scene_fromsource obs_scene_from_source obs_scene_findsource obs_scene_find_source obs_output_getdisplayname obs_output_get_display_name obs_output_getname obs_output_get_name obs_encoder_getname obs_encoder_get_name obs_service_getdisplayname obs_service_get_display_name obs_service_getname obs_service_get_name
2014-08-04 15:41:15 +00:00
if (obs_scene_from_source(source) != NULL)
Use QMetaObject::invokeMethod in libobs callbacks Doing this ensures Qt thread safety when adding/removing sources and scenes, because it will defer the function call to the main thread.
2014-02-03 00:03:55 +00:00
QMetaObject::invokeMethod(static_cast<OBSBasic*>(data),
"RemoveScene",
Q_ARG(OBSSource, OBSSource(source)));
implement scene adding callbacks, make a few API tweaks
2013-12-28 12:33:16 +00:00
}
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
void OBSBasic::SourceActivated(void *data, calldata_t *params)
Add (temporary terrible) volume controls - Add volume control These volume controls are basically nothing more than sliders. They look terrible and hopefully will be as temporary as they are terrible. - Allow saving of specific non-user sources via obs_load_source and obs_save_source functions. - Save data of desktop/mic audio sources (sync data, volume data, etc), and load the data on startup. - Make it so that a scene is created by default if first time using the application. On certain operating systems where supported, a default capture will be created. Desktop capture on mac, particularly. Not sure what to do about windows because monitor capture on windows 7 is completely terrible and is bad to start users off with.
2014-05-04 05:54:38 +00:00
{
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
obs_source_t *source = (obs_source_t*)calldata_ptr(params, "source");
Add (temporary terrible) volume controls - Add volume control These volume controls are basically nothing more than sliders. They look terrible and hopefully will be as temporary as they are terrible. - Allow saving of specific non-user sources via obs_load_source and obs_save_source functions. - Save data of desktop/mic audio sources (sync data, volume data, etc), and load the data on startup. - Make it so that a scene is created by default if first time using the application. On certain operating systems where supported, a default capture will be created. Desktop capture on mac, particularly. Not sure what to do about windows because monitor capture on windows 7 is completely terrible and is bad to start users off with.
2014-05-04 05:54:38 +00: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)));
}
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
void OBSBasic::SourceDeactivated(void *data, calldata_t *params)
Add (temporary terrible) volume controls - Add volume control These volume controls are basically nothing more than sliders. They look terrible and hopefully will be as temporary as they are terrible. - Allow saving of specific non-user sources via obs_load_source and obs_save_source functions. - Save data of desktop/mic audio sources (sync data, volume data, etc), and load the data on startup. - Make it so that a scene is created by default if first time using the application. On certain operating systems where supported, a default capture will be created. Desktop capture on mac, particularly. Not sure what to do about windows because monitor capture on windows 7 is completely terrible and is bad to start users off with.
2014-05-04 05:54:38 +00:00
{
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
obs_source_t *source = (obs_source_t*)calldata_ptr(params, "source");
Add (temporary terrible) volume controls - Add volume control These volume controls are basically nothing more than sliders. They look terrible and hopefully will be as temporary as they are terrible. - Allow saving of specific non-user sources via obs_load_source and obs_save_source functions. - Save data of desktop/mic audio sources (sync data, volume data, etc), and load the data on startup. - Make it so that a scene is created by default if first time using the application. On certain operating systems where supported, a default capture will be created. Desktop capture on mac, particularly. Not sure what to do about windows because monitor capture on windows 7 is completely terrible and is bad to start users off with.
2014-05-04 05:54:38 +00: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)));
}
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
void OBSBasic::SourceRenamed(void *data, calldata_t *params)
Implement renaming of scenes/sources
2014-06-30 07:06:01 +00: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)));
UI: Log when user adds/removes/renames sources/filters
2016-08-06 01:43:04 +00:00
blog(LOG_INFO, "Source '%s' renamed to '%s'", prevName, newName);
Implement renaming of scenes/sources
2014-06-30 07:06:01 +00:00
}
UI: Add padding to scene edges for editing Add a 10 pixel padding to the sides and remove viewport cutting to ensure that the editing rectangles are visible even when in the upper corners. Also, add a black background for the actual 'scene' in the preview window so that the scene boundries are actually visible in relation to the rest of the preview space.
2014-06-16 02:48:02 +00:00
void OBSBasic::DrawBackdrop(float cx, float cy)
{
if (!box)
return;
(API Change) libobs: Use single func for base effects API removed: -------------------- gs_effect_t *obs_get_default_effect(void); gs_effect_t *obs_get_default_rect_effect(void); gs_effect_t *obs_get_opaque_effect(void); gs_effect_t *obs_get_solid_effect(void); gs_effect_t *obs_get_bicubic_effect(void); gs_effect_t *obs_get_lanczos_effect(void); gs_effect_t *obs_get_bilinear_lowres_effect(void); API added: -------------------- gs_effect_t *obs_get_base_effect(enum obs_base_effect effect); Summary: -------------------- Combines multiple near-identical functions into a single function with an enum parameter.
2015-10-16 14:31:52 +00:00
gs_effect_t *solid = obs_get_base_effect(OBS_EFFECT_SOLID);
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
gs_eparam_t *color = gs_effect_get_param_by_name(solid, "color");
gs_technique_t *tech = gs_effect_get_technique(solid, "Solid");
UI: Add padding to scene edges for editing Add a 10 pixel padding to the sides and remove viewport cutting to ensure that the editing rectangles are visible even when in the upper corners. Also, add a black background for the actual 'scene' in the preview window so that the scene boundries are actually visible in relation to the rest of the preview space.
2014-06-16 02:48:02 +00:00
vec4 colorVal;
vec4_set(&colorVal, 0.0f, 0.0f, 0.0f, 1.0f);
(API Change) Improve graphics API consistency Summary: - Prefix all graphics subsystem names with gs_ or GS_ - Unsquish funciton names (for example _setfloat to _set_float) - Changed create functions to be more consistent with the rest of the API elsewhere. For exmaple, instead of gs_create_texture/gs_texture_destroy, it's now gs_texture_create/gs_texture_destroy - Renamed gs_stencil_op enum to gs_stencil_op_type From: To: ----------------------------------------------------------- tvertarray gs_tvertarray vb_data gs_vb_data vbdata_create gs_vbdata_create vbdata_destroy gs_vbdata_destroy shader_param gs_shader_param gs_effect gs_effect effect_technique gs_effect_technique effect_pass gs_effect_pass effect_param gs_effect_param texture_t gs_texture_t stagesurf_t gs_stagesurf_t zstencil_t gs_zstencil_t vertbuffer_t gs_vertbuffer_t indexbuffer_t gs_indexbuffer_t samplerstate_t gs_samplerstate_t swapchain_t gs_swapchain_t texrender_t gs_texrender_t shader_t gs_shader_t sparam_t gs_sparam_t effect_t gs_effect_t technique_t gs_technique_t eparam_t gs_eparam_t device_t gs_device_t graphics_t graphics_t shader_param_type gs_shader_param_type SHADER_PARAM_UNKNOWN GS_SHADER_PARAM_UNKNOWN SHADER_PARAM_BOOL GS_SHADER_PARAM_BOOL SHADER_PARAM_FLOAT GS_SHADER_PARAM_FLOAT SHADER_PARAM_INT GS_SHADER_PARAM_INT SHADER_PARAM_STRING GS_SHADER_PARAM_STRING SHADER_PARAM_VEC2 GS_SHADER_PARAM_VEC2 SHADER_PARAM_VEC3 GS_SHADER_PARAM_VEC3 SHADER_PARAM_VEC4 GS_SHADER_PARAM_VEC4 SHADER_PARAM_MATRIX4X4 GS_SHADER_PARAM_MATRIX4X4 SHADER_PARAM_TEXTURE GS_SHADER_PARAM_TEXTURE shader_param_info gs_shader_param_info shader_type gs_shader_type SHADER_VERTEX GS_SHADER_VERTEX SHADER_PIXEL GS_SHADER_PIXEL shader_destroy gs_shader_destroy shader_numparams gs_shader_get_num_params shader_getparambyidx gs_shader_get_param_by_idx shader_getparambyname gs_shader_get_param_by_name shader_getviewprojmatrix gs_shader_get_viewproj_matrix shader_getworldmatrix gs_shader_get_world_matrix shader_getparaminfo gs_shader_get_param_info shader_setbool gs_shader_set_bool shader_setfloat gs_shader_set_float shader_setint gs_shader_set_int shader_setmatrix3 gs_shader_setmatrix3 shader_setmatrix4 gs_shader_set_matrix4 shader_setvec2 gs_shader_set_vec2 shader_setvec3 gs_shader_set_vec3 shader_setvec4 gs_shader_set_vec4 shader_settexture gs_shader_set_texture shader_setval gs_shader_set_val shader_setdefault gs_shader_set_default effect_property_type gs_effect_property_type EFFECT_NONE GS_EFFECT_NONE EFFECT_BOOL GS_EFFECT_BOOL EFFECT_FLOAT GS_EFFECT_FLOAT EFFECT_COLOR GS_EFFECT_COLOR EFFECT_TEXTURE GS_EFFECT_TEXTURE effect_param_info gs_effect_param_info effect_destroy gs_effect_destroy effect_gettechnique gs_effect_get_technique technique_begin gs_technique_begin technique_end gs_technique_end technique_beginpass gs_technique_begin_pass technique_beginpassbyname gs_technique_begin_pass_by_name technique_endpass gs_technique_end_pass effect_numparams gs_effect_get_num_params effect_getparambyidx gs_effect_get_param_by_idx effect_getparambyname gs_effect_get_param_by_name effect_updateparams gs_effect_update_params effect_getviewprojmatrix gs_effect_get_viewproj_matrix effect_getworldmatrix gs_effect_get_world_matrix effect_getparaminfo gs_effect_get_param_info effect_setbool gs_effect_set_bool effect_setfloat gs_effect_set_float effect_setint gs_effect_set_int effect_setmatrix4 gs_effect_set_matrix4 effect_setvec2 gs_effect_set_vec2 effect_setvec3 gs_effect_set_vec3 effect_setvec4 gs_effect_set_vec4 effect_settexture gs_effect_set_texture effect_setval gs_effect_set_val effect_setdefault gs_effect_set_default texrender_create gs_texrender_create texrender_destroy gs_texrender_destroy texrender_begin gs_texrender_begin texrender_end gs_texrender_end texrender_reset gs_texrender_reset texrender_gettexture gs_texrender_get_texture GS_BUILDMIPMAPS GS_BUILD_MIPMAPS GS_RENDERTARGET GS_RENDER_TARGET gs_device_name gs_get_device_name gs_device_type gs_get_device_type gs_entercontext gs_enter_context gs_leavecontext gs_leave_context gs_getcontext gs_get_context gs_renderstart gs_render_start gs_renderstop gs_render_stop gs_rendersave gs_render_save gs_getinput gs_get_input gs_geteffect gs_get_effect gs_create_effect_from_file gs_effect_create_from_file gs_create_effect gs_effect_create gs_create_vertexshader_from_file gs_vertexshader_create_from_file gs_create_pixelshader_from_file gs_pixelshader_create_from_file gs_create_texture_from_file gs_texture_create_from_file gs_resetviewport gs_reset_viewport gs_set2dmode gs_set_2d_mode gs_set3dmode gs_set_3d_mode gs_create_swapchain gs_swapchain_create gs_getsize gs_get_size gs_getwidth gs_get_width gs_getheight gs_get_height gs_create_texture gs_texture_create gs_create_cubetexture gs_cubetexture_create gs_create_volumetexture gs_voltexture_create gs_create_zstencil gs_zstencil_create gs_create_stagesurface gs_stagesurface_create gs_create_samplerstate gs_samplerstate_create gs_create_vertexshader gs_vertexshader_create gs_create_pixelshader gs_pixelshader_create gs_create_vertexbuffer gs_vertexbuffer_create gs_create_indexbuffer gs_indexbuffer_create gs_gettexturetype gs_get_texture_type gs_load_defaultsamplerstate gs_load_default_samplerstate gs_getvertexshader gs_get_vertex_shader gs_getpixelshader gs_get_pixel_shader gs_getrendertarget gs_get_render_target gs_getzstenciltarget gs_get_zstencil_target gs_setrendertarget gs_set_render_target gs_setcuberendertarget gs_set_cube_render_target gs_beginscene gs_begin_scene gs_draw gs_draw gs_endscene gs_end_scene gs_setcullmode gs_set_cull_mode gs_getcullmode gs_get_cull_mode gs_enable_depthtest gs_enable_depth_test gs_enable_stenciltest gs_enable_stencil_test gs_enable_stencilwrite gs_enable_stencil_write gs_blendfunction gs_blend_function gs_depthfunction gs_depth_function gs_stencilfunction gs_stencil_function gs_stencilop gs_stencil_op gs_setviewport gs_set_viewport gs_getviewport gs_get_viewport gs_setscissorrect gs_set_scissor_rect gs_create_texture_from_iosurface gs_texture_create_from_iosurface gs_create_gdi_texture gs_texture_create_gdi gs_is_compressed_format gs_is_compressed_format gs_num_total_levels gs_get_total_levels texture_setimage gs_texture_set_image cubetexture_setimage gs_cubetexture_set_image swapchain_destroy gs_swapchain_destroy texture_destroy gs_texture_destroy texture_getwidth gs_texture_get_width texture_getheight gs_texture_get_height texture_getcolorformat gs_texture_get_color_format texture_map gs_texture_map texture_unmap gs_texture_unmap texture_isrect gs_texture_is_rect texture_getobj gs_texture_get_obj cubetexture_destroy gs_cubetexture_destroy cubetexture_getsize gs_cubetexture_get_size cubetexture_getcolorformat gs_cubetexture_get_color_format volumetexture_destroy gs_voltexture_destroy volumetexture_getwidth gs_voltexture_get_width volumetexture_getheight gs_voltexture_get_height volumetexture_getdepth gs_voltexture_getdepth volumetexture_getcolorformat gs_voltexture_get_color_format stagesurface_destroy gs_stagesurface_destroy stagesurface_getwidth gs_stagesurface_get_width stagesurface_getheight gs_stagesurface_get_height stagesurface_getcolorformat gs_stagesurface_get_color_format stagesurface_map gs_stagesurface_map stagesurface_unmap gs_stagesurface_unmap zstencil_destroy gs_zstencil_destroy samplerstate_destroy gs_samplerstate_destroy vertexbuffer_destroy gs_vertexbuffer_destroy vertexbuffer_flush gs_vertexbuffer_flush vertexbuffer_getdata gs_vertexbuffer_get_data indexbuffer_destroy gs_indexbuffer_destroy indexbuffer_flush gs_indexbuffer_flush indexbuffer_getdata gs_indexbuffer_get_data indexbuffer_numindices gs_indexbuffer_get_num_indices indexbuffer_gettype gs_indexbuffer_get_type texture_rebind_iosurface gs_texture_rebind_iosurface texture_get_dc gs_texture_get_dc texture_release_dc gs_texture_release_dc
2014-08-08 06:42:07 +00:00
gs_effect_set_vec4(color, &colorVal);
UI: Add padding to scene edges for editing Add a 10 pixel padding to the sides and remove viewport cutting to ensure that the editing rectangles are visible even when in the upper corners. Also, add a black background for the actual 'scene' in the preview window so that the scene boundries are actually visible in relation to the rest of the preview space.
2014-06-16 02:48:02 +00:00
(API Change) Improve graphics API consistency Summary: - Prefix all graphics subsystem names with gs_ or GS_ - Unsquish funciton names (for example _setfloat to _set_float) - Changed create functions to be more consistent with the rest of the API elsewhere. For exmaple, instead of gs_create_texture/gs_texture_destroy, it's now gs_texture_create/gs_texture_destroy - Renamed gs_stencil_op enum to gs_stencil_op_type From: To: ----------------------------------------------------------- tvertarray gs_tvertarray vb_data gs_vb_data vbdata_create gs_vbdata_create vbdata_destroy gs_vbdata_destroy shader_param gs_shader_param gs_effect gs_effect effect_technique gs_effect_technique effect_pass gs_effect_pass effect_param gs_effect_param texture_t gs_texture_t stagesurf_t gs_stagesurf_t zstencil_t gs_zstencil_t vertbuffer_t gs_vertbuffer_t indexbuffer_t gs_indexbuffer_t samplerstate_t gs_samplerstate_t swapchain_t gs_swapchain_t texrender_t gs_texrender_t shader_t gs_shader_t sparam_t gs_sparam_t effect_t gs_effect_t technique_t gs_technique_t eparam_t gs_eparam_t device_t gs_device_t graphics_t graphics_t shader_param_type gs_shader_param_type SHADER_PARAM_UNKNOWN GS_SHADER_PARAM_UNKNOWN SHADER_PARAM_BOOL GS_SHADER_PARAM_BOOL SHADER_PARAM_FLOAT GS_SHADER_PARAM_FLOAT SHADER_PARAM_INT GS_SHADER_PARAM_INT SHADER_PARAM_STRING GS_SHADER_PARAM_STRING SHADER_PARAM_VEC2 GS_SHADER_PARAM_VEC2 SHADER_PARAM_VEC3 GS_SHADER_PARAM_VEC3 SHADER_PARAM_VEC4 GS_SHADER_PARAM_VEC4 SHADER_PARAM_MATRIX4X4 GS_SHADER_PARAM_MATRIX4X4 SHADER_PARAM_TEXTURE GS_SHADER_PARAM_TEXTURE shader_param_info gs_shader_param_info shader_type gs_shader_type SHADER_VERTEX GS_SHADER_VERTEX SHADER_PIXEL GS_SHADER_PIXEL shader_destroy gs_shader_destroy shader_numparams gs_shader_get_num_params shader_getparambyidx gs_shader_get_param_by_idx shader_getparambyname gs_shader_get_param_by_name shader_getviewprojmatrix gs_shader_get_viewproj_matrix shader_getworldmatrix gs_shader_get_world_matrix shader_getparaminfo gs_shader_get_param_info shader_setbool gs_shader_set_bool shader_setfloat gs_shader_set_float shader_setint gs_shader_set_int shader_setmatrix3 gs_shader_setmatrix3 shader_setmatrix4 gs_shader_set_matrix4 shader_setvec2 gs_shader_set_vec2 shader_setvec3 gs_shader_set_vec3 shader_setvec4 gs_shader_set_vec4 shader_settexture gs_shader_set_texture shader_setval gs_shader_set_val shader_setdefault gs_shader_set_default effect_property_type gs_effect_property_type EFFECT_NONE GS_EFFECT_NONE EFFECT_BOOL GS_EFFECT_BOOL EFFECT_FLOAT GS_EFFECT_FLOAT EFFECT_COLOR GS_EFFECT_COLOR EFFECT_TEXTURE GS_EFFECT_TEXTURE effect_param_info gs_effect_param_info effect_destroy gs_effect_destroy effect_gettechnique gs_effect_get_technique technique_begin gs_technique_begin technique_end gs_technique_end technique_beginpass gs_technique_begin_pass technique_beginpassbyname gs_technique_begin_pass_by_name technique_endpass gs_technique_end_pass effect_numparams gs_effect_get_num_params effect_getparambyidx gs_effect_get_param_by_idx effect_getparambyname gs_effect_get_param_by_name effect_updateparams gs_effect_update_params effect_getviewprojmatrix gs_effect_get_viewproj_matrix effect_getworldmatrix gs_effect_get_world_matrix effect_getparaminfo gs_effect_get_param_info effect_setbool gs_effect_set_bool effect_setfloat gs_effect_set_float effect_setint gs_effect_set_int effect_setmatrix4 gs_effect_set_matrix4 effect_setvec2 gs_effect_set_vec2 effect_setvec3 gs_effect_set_vec3 effect_setvec4 gs_effect_set_vec4 effect_settexture gs_effect_set_texture effect_setval gs_effect_set_val effect_setdefault gs_effect_set_default texrender_create gs_texrender_create texrender_destroy gs_texrender_destroy texrender_begin gs_texrender_begin texrender_end gs_texrender_end texrender_reset gs_texrender_reset texrender_gettexture gs_texrender_get_texture GS_BUILDMIPMAPS GS_BUILD_MIPMAPS GS_RENDERTARGET GS_RENDER_TARGET gs_device_name gs_get_device_name gs_device_type gs_get_device_type gs_entercontext gs_enter_context gs_leavecontext gs_leave_context gs_getcontext gs_get_context gs_renderstart gs_render_start gs_renderstop gs_render_stop gs_rendersave gs_render_save gs_getinput gs_get_input gs_geteffect gs_get_effect gs_create_effect_from_file gs_effect_create_from_file gs_create_effect gs_effect_create gs_create_vertexshader_from_file gs_vertexshader_create_from_file gs_create_pixelshader_from_file gs_pixelshader_create_from_file gs_create_texture_from_file gs_texture_create_from_file gs_resetviewport gs_reset_viewport gs_set2dmode gs_set_2d_mode gs_set3dmode gs_set_3d_mode gs_create_swapchain gs_swapchain_create gs_getsize gs_get_size gs_getwidth gs_get_width gs_getheight gs_get_height gs_create_texture gs_texture_create gs_create_cubetexture gs_cubetexture_create gs_create_volumetexture gs_voltexture_create gs_create_zstencil gs_zstencil_create gs_create_stagesurface gs_stagesurface_create gs_create_samplerstate gs_samplerstate_create gs_create_vertexshader gs_vertexshader_create gs_create_pixelshader gs_pixelshader_create gs_create_vertexbuffer gs_vertexbuffer_create gs_create_indexbuffer gs_indexbuffer_create gs_gettexturetype gs_get_texture_type gs_load_defaultsamplerstate gs_load_default_samplerstate gs_getvertexshader gs_get_vertex_shader gs_getpixelshader gs_get_pixel_shader gs_getrendertarget gs_get_render_target gs_getzstenciltarget gs_get_zstencil_target gs_setrendertarget gs_set_render_target gs_setcuberendertarget gs_set_cube_render_target gs_beginscene gs_begin_scene gs_draw gs_draw gs_endscene gs_end_scene gs_setcullmode gs_set_cull_mode gs_getcullmode gs_get_cull_mode gs_enable_depthtest gs_enable_depth_test gs_enable_stenciltest gs_enable_stencil_test gs_enable_stencilwrite gs_enable_stencil_write gs_blendfunction gs_blend_function gs_depthfunction gs_depth_function gs_stencilfunction gs_stencil_function gs_stencilop gs_stencil_op gs_setviewport gs_set_viewport gs_getviewport gs_get_viewport gs_setscissorrect gs_set_scissor_rect gs_create_texture_from_iosurface gs_texture_create_from_iosurface gs_create_gdi_texture gs_texture_create_gdi gs_is_compressed_format gs_is_compressed_format gs_num_total_levels gs_get_total_levels texture_setimage gs_texture_set_image cubetexture_setimage gs_cubetexture_set_image swapchain_destroy gs_swapchain_destroy texture_destroy gs_texture_destroy texture_getwidth gs_texture_get_width texture_getheight gs_texture_get_height texture_getcolorformat gs_texture_get_color_format texture_map gs_texture_map texture_unmap gs_texture_unmap texture_isrect gs_texture_is_rect texture_getobj gs_texture_get_obj cubetexture_destroy gs_cubetexture_destroy cubetexture_getsize gs_cubetexture_get_size cubetexture_getcolorformat gs_cubetexture_get_color_format volumetexture_destroy gs_voltexture_destroy volumetexture_getwidth gs_voltexture_get_width volumetexture_getheight gs_voltexture_get_height volumetexture_getdepth gs_voltexture_getdepth volumetexture_getcolorformat gs_voltexture_get_color_format stagesurface_destroy gs_stagesurface_destroy stagesurface_getwidth gs_stagesurface_get_width stagesurface_getheight gs_stagesurface_get_height stagesurface_getcolorformat gs_stagesurface_get_color_format stagesurface_map gs_stagesurface_map stagesurface_unmap gs_stagesurface_unmap zstencil_destroy gs_zstencil_destroy samplerstate_destroy gs_samplerstate_destroy vertexbuffer_destroy gs_vertexbuffer_destroy vertexbuffer_flush gs_vertexbuffer_flush vertexbuffer_getdata gs_vertexbuffer_get_data indexbuffer_destroy gs_indexbuffer_destroy indexbuffer_flush gs_indexbuffer_flush indexbuffer_getdata gs_indexbuffer_get_data indexbuffer_numindices gs_indexbuffer_get_num_indices indexbuffer_gettype gs_indexbuffer_get_type texture_rebind_iosurface gs_texture_rebind_iosurface texture_get_dc gs_texture_get_dc texture_release_dc gs_texture_release_dc
2014-08-08 06:42:07 +00:00
gs_technique_begin(tech);
gs_technique_begin_pass(tech, 0);
UI: Add padding to scene edges for editing Add a 10 pixel padding to the sides and remove viewport cutting to ensure that the editing rectangles are visible even when in the upper corners. Also, add a black background for the actual 'scene' in the preview window so that the scene boundries are actually visible in relation to the rest of the preview space.
2014-06-16 02:48:02 +00: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();
(API Change) Improve graphics API consistency Summary: - Prefix all graphics subsystem names with gs_ or GS_ - Unsquish funciton names (for example _setfloat to _set_float) - Changed create functions to be more consistent with the rest of the API elsewhere. For exmaple, instead of gs_create_texture/gs_texture_destroy, it's now gs_texture_create/gs_texture_destroy - Renamed gs_stencil_op enum to gs_stencil_op_type From: To: ----------------------------------------------------------- tvertarray gs_tvertarray vb_data gs_vb_data vbdata_create gs_vbdata_create vbdata_destroy gs_vbdata_destroy shader_param gs_shader_param gs_effect gs_effect effect_technique gs_effect_technique effect_pass gs_effect_pass effect_param gs_effect_param texture_t gs_texture_t stagesurf_t gs_stagesurf_t zstencil_t gs_zstencil_t vertbuffer_t gs_vertbuffer_t indexbuffer_t gs_indexbuffer_t samplerstate_t gs_samplerstate_t swapchain_t gs_swapchain_t texrender_t gs_texrender_t shader_t gs_shader_t sparam_t gs_sparam_t effect_t gs_effect_t technique_t gs_technique_t eparam_t gs_eparam_t device_t gs_device_t graphics_t graphics_t shader_param_type gs_shader_param_type SHADER_PARAM_UNKNOWN GS_SHADER_PARAM_UNKNOWN SHADER_PARAM_BOOL GS_SHADER_PARAM_BOOL SHADER_PARAM_FLOAT GS_SHADER_PARAM_FLOAT SHADER_PARAM_INT GS_SHADER_PARAM_INT SHADER_PARAM_STRING GS_SHADER_PARAM_STRING SHADER_PARAM_VEC2 GS_SHADER_PARAM_VEC2 SHADER_PARAM_VEC3 GS_SHADER_PARAM_VEC3 SHADER_PARAM_VEC4 GS_SHADER_PARAM_VEC4 SHADER_PARAM_MATRIX4X4 GS_SHADER_PARAM_MATRIX4X4 SHADER_PARAM_TEXTURE GS_SHADER_PARAM_TEXTURE shader_param_info gs_shader_param_info shader_type gs_shader_type SHADER_VERTEX GS_SHADER_VERTEX SHADER_PIXEL GS_SHADER_PIXEL shader_destroy gs_shader_destroy shader_numparams gs_shader_get_num_params shader_getparambyidx gs_shader_get_param_by_idx shader_getparambyname gs_shader_get_param_by_name shader_getviewprojmatrix gs_shader_get_viewproj_matrix shader_getworldmatrix gs_shader_get_world_matrix shader_getparaminfo gs_shader_get_param_info shader_setbool gs_shader_set_bool shader_setfloat gs_shader_set_float shader_setint gs_shader_set_int shader_setmatrix3 gs_shader_setmatrix3 shader_setmatrix4 gs_shader_set_matrix4 shader_setvec2 gs_shader_set_vec2 shader_setvec3 gs_shader_set_vec3 shader_setvec4 gs_shader_set_vec4 shader_settexture gs_shader_set_texture shader_setval gs_shader_set_val shader_setdefault gs_shader_set_default effect_property_type gs_effect_property_type EFFECT_NONE GS_EFFECT_NONE EFFECT_BOOL GS_EFFECT_BOOL EFFECT_FLOAT GS_EFFECT_FLOAT EFFECT_COLOR GS_EFFECT_COLOR EFFECT_TEXTURE GS_EFFECT_TEXTURE effect_param_info gs_effect_param_info effect_destroy gs_effect_destroy effect_gettechnique gs_effect_get_technique technique_begin gs_technique_begin technique_end gs_technique_end technique_beginpass gs_technique_begin_pass technique_beginpassbyname gs_technique_begin_pass_by_name technique_endpass gs_technique_end_pass effect_numparams gs_effect_get_num_params effect_getparambyidx gs_effect_get_param_by_idx effect_getparambyname gs_effect_get_param_by_name effect_updateparams gs_effect_update_params effect_getviewprojmatrix gs_effect_get_viewproj_matrix effect_getworldmatrix gs_effect_get_world_matrix effect_getparaminfo gs_effect_get_param_info effect_setbool gs_effect_set_bool effect_setfloat gs_effect_set_float effect_setint gs_effect_set_int effect_setmatrix4 gs_effect_set_matrix4 effect_setvec2 gs_effect_set_vec2 effect_setvec3 gs_effect_set_vec3 effect_setvec4 gs_effect_set_vec4 effect_settexture gs_effect_set_texture effect_setval gs_effect_set_val effect_setdefault gs_effect_set_default texrender_create gs_texrender_create texrender_destroy gs_texrender_destroy texrender_begin gs_texrender_begin texrender_end gs_texrender_end texrender_reset gs_texrender_reset texrender_gettexture gs_texrender_get_texture GS_BUILDMIPMAPS GS_BUILD_MIPMAPS GS_RENDERTARGET GS_RENDER_TARGET gs_device_name gs_get_device_name gs_device_type gs_get_device_type gs_entercontext gs_enter_context gs_leavecontext gs_leave_context gs_getcontext gs_get_context gs_renderstart gs_render_start gs_renderstop gs_render_stop gs_rendersave gs_render_save gs_getinput gs_get_input gs_geteffect gs_get_effect gs_create_effect_from_file gs_effect_create_from_file gs_create_effect gs_effect_create gs_create_vertexshader_from_file gs_vertexshader_create_from_file gs_create_pixelshader_from_file gs_pixelshader_create_from_file gs_create_texture_from_file gs_texture_create_from_file gs_resetviewport gs_reset_viewport gs_set2dmode gs_set_2d_mode gs_set3dmode gs_set_3d_mode gs_create_swapchain gs_swapchain_create gs_getsize gs_get_size gs_getwidth gs_get_width gs_getheight gs_get_height gs_create_texture gs_texture_create gs_create_cubetexture gs_cubetexture_create gs_create_volumetexture gs_voltexture_create gs_create_zstencil gs_zstencil_create gs_create_stagesurface gs_stagesurface_create gs_create_samplerstate gs_samplerstate_create gs_create_vertexshader gs_vertexshader_create gs_create_pixelshader gs_pixelshader_create gs_create_vertexbuffer gs_vertexbuffer_create gs_create_indexbuffer gs_indexbuffer_create gs_gettexturetype gs_get_texture_type gs_load_defaultsamplerstate gs_load_default_samplerstate gs_getvertexshader gs_get_vertex_shader gs_getpixelshader gs_get_pixel_shader gs_getrendertarget gs_get_render_target gs_getzstenciltarget gs_get_zstencil_target gs_setrendertarget gs_set_render_target gs_setcuberendertarget gs_set_cube_render_target gs_beginscene gs_begin_scene gs_draw gs_draw gs_endscene gs_end_scene gs_setcullmode gs_set_cull_mode gs_getcullmode gs_get_cull_mode gs_enable_depthtest gs_enable_depth_test gs_enable_stenciltest gs_enable_stencil_test gs_enable_stencilwrite gs_enable_stencil_write gs_blendfunction gs_blend_function gs_depthfunction gs_depth_function gs_stencilfunction gs_stencil_function gs_stencilop gs_stencil_op gs_setviewport gs_set_viewport gs_getviewport gs_get_viewport gs_setscissorrect gs_set_scissor_rect gs_create_texture_from_iosurface gs_texture_create_from_iosurface gs_create_gdi_texture gs_texture_create_gdi gs_is_compressed_format gs_is_compressed_format gs_num_total_levels gs_get_total_levels texture_setimage gs_texture_set_image cubetexture_setimage gs_cubetexture_set_image swapchain_destroy gs_swapchain_destroy texture_destroy gs_texture_destroy texture_getwidth gs_texture_get_width texture_getheight gs_texture_get_height texture_getcolorformat gs_texture_get_color_format texture_map gs_texture_map texture_unmap gs_texture_unmap texture_isrect gs_texture_is_rect texture_getobj gs_texture_get_obj cubetexture_destroy gs_cubetexture_destroy cubetexture_getsize gs_cubetexture_get_size cubetexture_getcolorformat gs_cubetexture_get_color_format volumetexture_destroy gs_voltexture_destroy volumetexture_getwidth gs_voltexture_get_width volumetexture_getheight gs_voltexture_get_height volumetexture_getdepth gs_voltexture_getdepth volumetexture_getcolorformat gs_voltexture_get_color_format stagesurface_destroy gs_stagesurface_destroy stagesurface_getwidth gs_stagesurface_get_width stagesurface_getheight gs_stagesurface_get_height stagesurface_getcolorformat gs_stagesurface_get_color_format stagesurface_map gs_stagesurface_map stagesurface_unmap gs_stagesurface_unmap zstencil_destroy gs_zstencil_destroy samplerstate_destroy gs_samplerstate_destroy vertexbuffer_destroy gs_vertexbuffer_destroy vertexbuffer_flush gs_vertexbuffer_flush vertexbuffer_getdata gs_vertexbuffer_get_data indexbuffer_destroy gs_indexbuffer_destroy indexbuffer_flush gs_indexbuffer_flush indexbuffer_getdata gs_indexbuffer_get_data indexbuffer_numindices gs_indexbuffer_get_num_indices indexbuffer_gettype gs_indexbuffer_get_type texture_rebind_iosurface gs_texture_rebind_iosurface texture_get_dc gs_texture_get_dc texture_release_dc gs_texture_release_dc
2014-08-08 06:42:07 +00:00
gs_technique_end_pass(tech);
gs_technique_end(tech);
UI: Add padding to scene edges for editing Add a 10 pixel padding to the sides and remove viewport cutting to ensure that the editing rectangles are visible even when in the upper corners. Also, add a black background for the actual 'scene' in the preview window so that the scene boundries are actually visible in relation to the rest of the preview space.
2014-06-16 02:48:02 +00:00
gs_load_vertexbuffer(nullptr);
}
Revamp rendering system to allow custom rendering Originally, the rendering system was designed to only display sources and such, but I realized there would be a flaw; if you wanted to render the main viewport in a custom way, or maybe even the entire application as a graphics-based front end, you wouldn't have been able to do that. Displays have now been separated in to viewports and displays. A viewport is used to store and draw sources, a display is used to handle draw callbacks. You can even use displays without using viewports to draw custom render displays containing graphics calls if you wish, but usually they would be used in combination with source viewports at least. This requires a tiny bit more work to create simple source displays, but in the end its worth it for the added flexibility and options it brings.
2014-02-13 15:58:31 +00:00
void OBSBasic::RenderMain(void *data, uint32_t cx, uint32_t cy)
{
Use only one widget for preview Modify the obs_display API so that it always uses an orthographic projection that is the size of the display, rather than OBS' base size. Having it do an orthographic projection to OBS' base size was silly because it meant that everything would be skewed if you wanted to draw 1:1 in the display. This deoes mean that the callbacks must handle resizing the images, but it's worth it to ensure 1:1 draw sizes. As for the preview widget, instead of making some funky widget within widget that resizes, it's just going to be a widget within the entire top layout. Also changed the preview padding color to gray.
2014-03-07 17:19:03 +00:00
OBSBasic *window = static_cast<OBSBasic*>(data);
Fix draw callback for main/properties views Drawing position wasn't being calculated correctly, viewport/ortho should have been used instead. It would cause items to render out of position on the main viewport (though not on the actual output)
2014-04-22 18:24:05 +00: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 07:54:48 +00:00
window->previewCX = int(window->previewScale * float(ovi.base_width));
window->previewCY = int(window->previewScale * float(ovi.base_height));
Fix draw callback for main/properties views Drawing position wasn't being calculated correctly, viewport/ortho should have been used instead. It would cause items to render out of position on the main viewport (though not on the actual output)
2014-04-22 18:24:05 +00:00
gs_viewport_push();
gs_projection_push();
UI: Add padding to scene edges for editing Add a 10 pixel padding to the sides and remove viewport cutting to ensure that the editing rectangles are visible even when in the upper corners. Also, add a black background for the actual 'scene' in the preview window so that the scene boundries are actually visible in relation to the rest of the preview space.
2014-06-16 02:48:02 +00:00
/* --------------------------------------- */
Fix draw callback for main/properties views Drawing position wasn't being calculated correctly, viewport/ortho should have been used instead. It would cause items to render out of position on the main viewport (though not on the actual output)
2014-04-22 18:24:05 +00:00
gs_ortho(0.0f, float(ovi.base_width), 0.0f, float(ovi.base_height),
-100.0f, 100.0f);
(API Change) Improve graphics API consistency Summary: - Prefix all graphics subsystem names with gs_ or GS_ - Unsquish funciton names (for example _setfloat to _set_float) - Changed create functions to be more consistent with the rest of the API elsewhere. For exmaple, instead of gs_create_texture/gs_texture_destroy, it's now gs_texture_create/gs_texture_destroy - Renamed gs_stencil_op enum to gs_stencil_op_type From: To: ----------------------------------------------------------- tvertarray gs_tvertarray vb_data gs_vb_data vbdata_create gs_vbdata_create vbdata_destroy gs_vbdata_destroy shader_param gs_shader_param gs_effect gs_effect effect_technique gs_effect_technique effect_pass gs_effect_pass effect_param gs_effect_param texture_t gs_texture_t stagesurf_t gs_stagesurf_t zstencil_t gs_zstencil_t vertbuffer_t gs_vertbuffer_t indexbuffer_t gs_indexbuffer_t samplerstate_t gs_samplerstate_t swapchain_t gs_swapchain_t texrender_t gs_texrender_t shader_t gs_shader_t sparam_t gs_sparam_t effect_t gs_effect_t technique_t gs_technique_t eparam_t gs_eparam_t device_t gs_device_t graphics_t graphics_t shader_param_type gs_shader_param_type SHADER_PARAM_UNKNOWN GS_SHADER_PARAM_UNKNOWN SHADER_PARAM_BOOL GS_SHADER_PARAM_BOOL SHADER_PARAM_FLOAT GS_SHADER_PARAM_FLOAT SHADER_PARAM_INT GS_SHADER_PARAM_INT SHADER_PARAM_STRING GS_SHADER_PARAM_STRING SHADER_PARAM_VEC2 GS_SHADER_PARAM_VEC2 SHADER_PARAM_VEC3 GS_SHADER_PARAM_VEC3 SHADER_PARAM_VEC4 GS_SHADER_PARAM_VEC4 SHADER_PARAM_MATRIX4X4 GS_SHADER_PARAM_MATRIX4X4 SHADER_PARAM_TEXTURE GS_SHADER_PARAM_TEXTURE shader_param_info gs_shader_param_info shader_type gs_shader_type SHADER_VERTEX GS_SHADER_VERTEX SHADER_PIXEL GS_SHADER_PIXEL shader_destroy gs_shader_destroy shader_numparams gs_shader_get_num_params shader_getparambyidx gs_shader_get_param_by_idx shader_getparambyname gs_shader_get_param_by_name shader_getviewprojmatrix gs_shader_get_viewproj_matrix shader_getworldmatrix gs_shader_get_world_matrix shader_getparaminfo gs_shader_get_param_info shader_setbool gs_shader_set_bool shader_setfloat gs_shader_set_float shader_setint gs_shader_set_int shader_setmatrix3 gs_shader_setmatrix3 shader_setmatrix4 gs_shader_set_matrix4 shader_setvec2 gs_shader_set_vec2 shader_setvec3 gs_shader_set_vec3 shader_setvec4 gs_shader_set_vec4 shader_settexture gs_shader_set_texture shader_setval gs_shader_set_val shader_setdefault gs_shader_set_default effect_property_type gs_effect_property_type EFFECT_NONE GS_EFFECT_NONE EFFECT_BOOL GS_EFFECT_BOOL EFFECT_FLOAT GS_EFFECT_FLOAT EFFECT_COLOR GS_EFFECT_COLOR EFFECT_TEXTURE GS_EFFECT_TEXTURE effect_param_info gs_effect_param_info effect_destroy gs_effect_destroy effect_gettechnique gs_effect_get_technique technique_begin gs_technique_begin technique_end gs_technique_end technique_beginpass gs_technique_begin_pass technique_beginpassbyname gs_technique_begin_pass_by_name technique_endpass gs_technique_end_pass effect_numparams gs_effect_get_num_params effect_getparambyidx gs_effect_get_param_by_idx effect_getparambyname gs_effect_get_param_by_name effect_updateparams gs_effect_update_params effect_getviewprojmatrix gs_effect_get_viewproj_matrix effect_getworldmatrix gs_effect_get_world_matrix effect_getparaminfo gs_effect_get_param_info effect_setbool gs_effect_set_bool effect_setfloat gs_effect_set_float effect_setint gs_effect_set_int effect_setmatrix4 gs_effect_set_matrix4 effect_setvec2 gs_effect_set_vec2 effect_setvec3 gs_effect_set_vec3 effect_setvec4 gs_effect_set_vec4 effect_settexture gs_effect_set_texture effect_setval gs_effect_set_val effect_setdefault gs_effect_set_default texrender_create gs_texrender_create texrender_destroy gs_texrender_destroy texrender_begin gs_texrender_begin texrender_end gs_texrender_end texrender_reset gs_texrender_reset texrender_gettexture gs_texrender_get_texture GS_BUILDMIPMAPS GS_BUILD_MIPMAPS GS_RENDERTARGET GS_RENDER_TARGET gs_device_name gs_get_device_name gs_device_type gs_get_device_type gs_entercontext gs_enter_context gs_leavecontext gs_leave_context gs_getcontext gs_get_context gs_renderstart gs_render_start gs_renderstop gs_render_stop gs_rendersave gs_render_save gs_getinput gs_get_input gs_geteffect gs_get_effect gs_create_effect_from_file gs_effect_create_from_file gs_create_effect gs_effect_create gs_create_vertexshader_from_file gs_vertexshader_create_from_file gs_create_pixelshader_from_file gs_pixelshader_create_from_file gs_create_texture_from_file gs_texture_create_from_file gs_resetviewport gs_reset_viewport gs_set2dmode gs_set_2d_mode gs_set3dmode gs_set_3d_mode gs_create_swapchain gs_swapchain_create gs_getsize gs_get_size gs_getwidth gs_get_width gs_getheight gs_get_height gs_create_texture gs_texture_create gs_create_cubetexture gs_cubetexture_create gs_create_volumetexture gs_voltexture_create gs_create_zstencil gs_zstencil_create gs_create_stagesurface gs_stagesurface_create gs_create_samplerstate gs_samplerstate_create gs_create_vertexshader gs_vertexshader_create gs_create_pixelshader gs_pixelshader_create gs_create_vertexbuffer gs_vertexbuffer_create gs_create_indexbuffer gs_indexbuffer_create gs_gettexturetype gs_get_texture_type gs_load_defaultsamplerstate gs_load_default_samplerstate gs_getvertexshader gs_get_vertex_shader gs_getpixelshader gs_get_pixel_shader gs_getrendertarget gs_get_render_target gs_getzstenciltarget gs_get_zstencil_target gs_setrendertarget gs_set_render_target gs_setcuberendertarget gs_set_cube_render_target gs_beginscene gs_begin_scene gs_draw gs_draw gs_endscene gs_end_scene gs_setcullmode gs_set_cull_mode gs_getcullmode gs_get_cull_mode gs_enable_depthtest gs_enable_depth_test gs_enable_stenciltest gs_enable_stencil_test gs_enable_stencilwrite gs_enable_stencil_write gs_blendfunction gs_blend_function gs_depthfunction gs_depth_function gs_stencilfunction gs_stencil_function gs_stencilop gs_stencil_op gs_setviewport gs_set_viewport gs_getviewport gs_get_viewport gs_setscissorrect gs_set_scissor_rect gs_create_texture_from_iosurface gs_texture_create_from_iosurface gs_create_gdi_texture gs_texture_create_gdi gs_is_compressed_format gs_is_compressed_format gs_num_total_levels gs_get_total_levels texture_setimage gs_texture_set_image cubetexture_setimage gs_cubetexture_set_image swapchain_destroy gs_swapchain_destroy texture_destroy gs_texture_destroy texture_getwidth gs_texture_get_width texture_getheight gs_texture_get_height texture_getcolorformat gs_texture_get_color_format texture_map gs_texture_map texture_unmap gs_texture_unmap texture_isrect gs_texture_is_rect texture_getobj gs_texture_get_obj cubetexture_destroy gs_cubetexture_destroy cubetexture_getsize gs_cubetexture_get_size cubetexture_getcolorformat gs_cubetexture_get_color_format volumetexture_destroy gs_voltexture_destroy volumetexture_getwidth gs_voltexture_get_width volumetexture_getheight gs_voltexture_get_height volumetexture_getdepth gs_voltexture_getdepth volumetexture_getcolorformat gs_voltexture_get_color_format stagesurface_destroy gs_stagesurface_destroy stagesurface_getwidth gs_stagesurface_get_width stagesurface_getheight gs_stagesurface_get_height stagesurface_getcolorformat gs_stagesurface_get_color_format stagesurface_map gs_stagesurface_map stagesurface_unmap gs_stagesurface_unmap zstencil_destroy gs_zstencil_destroy samplerstate_destroy gs_samplerstate_destroy vertexbuffer_destroy gs_vertexbuffer_destroy vertexbuffer_flush gs_vertexbuffer_flush vertexbuffer_getdata gs_vertexbuffer_get_data indexbuffer_destroy gs_indexbuffer_destroy indexbuffer_flush gs_indexbuffer_flush indexbuffer_getdata gs_indexbuffer_get_data indexbuffer_numindices gs_indexbuffer_get_num_indices indexbuffer_gettype gs_indexbuffer_get_type texture_rebind_iosurface gs_texture_rebind_iosurface texture_get_dc gs_texture_get_dc texture_release_dc gs_texture_release_dc
2014-08-08 06:42:07 +00: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 07:54:48 +00:00
window->previewCX, window->previewCY);
Fix draw callback for main/properties views Drawing position wasn't being calculated correctly, viewport/ortho should have been used instead. It would cause items to render out of position on the main viewport (though not on the actual output)
2014-04-22 18:24:05 +00:00
UI: Add padding to scene edges for editing Add a 10 pixel padding to the sides and remove viewport cutting to ensure that the editing rectangles are visible even when in the upper corners. Also, add a black background for the actual 'scene' in the preview window so that the scene boundries are actually visible in relation to the rest of the preview space.
2014-06-16 02:48:02 +00: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 19:19:29 +00: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();
}
UI: Add padding to scene edges for editing Add a 10 pixel padding to the sides and remove viewport cutting to ensure that the editing rectangles are visible even when in the upper corners. Also, add a black background for the actual 'scene' in the preview window so that the scene boundries are actually visible in relation to the rest of the preview space.
2014-06-16 02:48:02 +00:00
gs_load_vertexbuffer(nullptr);
Fix draw callback for main/properties views Drawing position wasn't being calculated correctly, viewport/ortho should have been used instead. It would cause items to render out of position on the main viewport (though not on the actual output)
2014-04-22 18:24:05 +00:00
UI: Add padding to scene edges for editing Add a 10 pixel padding to the sides and remove viewport cutting to ensure that the editing rectangles are visible even when in the upper corners. Also, add a black background for the actual 'scene' in the preview window so that the scene boundries are actually visible in relation to the rest of the preview space.
2014-06-16 02:48:02 +00:00
/* --------------------------------------- */
Fix scene editing for device pixel ratios ≠ 1 Fixes #177
2014-07-16 00:01:59 +00:00
QSize previewSize = GetPixelSize(window->ui->preview);
float right = float(previewSize.width()) - window->previewX;
float bottom = float(previewSize.height()) - window->previewY;
UI: Add padding to scene edges for editing Add a 10 pixel padding to the sides and remove viewport cutting to ensure that the editing rectangles are visible even when in the upper corners. Also, add a black background for the actual 'scene' in the preview window so that the scene boundries are actually visible in relation to the rest of the preview space.
2014-06-16 02:48:02 +00:00
gs_ortho(-window->previewX, right,
-window->previewY, bottom,
-100.0f, 100.0f);
(API Change) Improve graphics API consistency Summary: - Prefix all graphics subsystem names with gs_ or GS_ - Unsquish funciton names (for example _setfloat to _set_float) - Changed create functions to be more consistent with the rest of the API elsewhere. For exmaple, instead of gs_create_texture/gs_texture_destroy, it's now gs_texture_create/gs_texture_destroy - Renamed gs_stencil_op enum to gs_stencil_op_type From: To: ----------------------------------------------------------- tvertarray gs_tvertarray vb_data gs_vb_data vbdata_create gs_vbdata_create vbdata_destroy gs_vbdata_destroy shader_param gs_shader_param gs_effect gs_effect effect_technique gs_effect_technique effect_pass gs_effect_pass effect_param gs_effect_param texture_t gs_texture_t stagesurf_t gs_stagesurf_t zstencil_t gs_zstencil_t vertbuffer_t gs_vertbuffer_t indexbuffer_t gs_indexbuffer_t samplerstate_t gs_samplerstate_t swapchain_t gs_swapchain_t texrender_t gs_texrender_t shader_t gs_shader_t sparam_t gs_sparam_t effect_t gs_effect_t technique_t gs_technique_t eparam_t gs_eparam_t device_t gs_device_t graphics_t graphics_t shader_param_type gs_shader_param_type SHADER_PARAM_UNKNOWN GS_SHADER_PARAM_UNKNOWN SHADER_PARAM_BOOL GS_SHADER_PARAM_BOOL SHADER_PARAM_FLOAT GS_SHADER_PARAM_FLOAT SHADER_PARAM_INT GS_SHADER_PARAM_INT SHADER_PARAM_STRING GS_SHADER_PARAM_STRING SHADER_PARAM_VEC2 GS_SHADER_PARAM_VEC2 SHADER_PARAM_VEC3 GS_SHADER_PARAM_VEC3 SHADER_PARAM_VEC4 GS_SHADER_PARAM_VEC4 SHADER_PARAM_MATRIX4X4 GS_SHADER_PARAM_MATRIX4X4 SHADER_PARAM_TEXTURE GS_SHADER_PARAM_TEXTURE shader_param_info gs_shader_param_info shader_type gs_shader_type SHADER_VERTEX GS_SHADER_VERTEX SHADER_PIXEL GS_SHADER_PIXEL shader_destroy gs_shader_destroy shader_numparams gs_shader_get_num_params shader_getparambyidx gs_shader_get_param_by_idx shader_getparambyname gs_shader_get_param_by_name shader_getviewprojmatrix gs_shader_get_viewproj_matrix shader_getworldmatrix gs_shader_get_world_matrix shader_getparaminfo gs_shader_get_param_info shader_setbool gs_shader_set_bool shader_setfloat gs_shader_set_float shader_setint gs_shader_set_int shader_setmatrix3 gs_shader_setmatrix3 shader_setmatrix4 gs_shader_set_matrix4 shader_setvec2 gs_shader_set_vec2 shader_setvec3 gs_shader_set_vec3 shader_setvec4 gs_shader_set_vec4 shader_settexture gs_shader_set_texture shader_setval gs_shader_set_val shader_setdefault gs_shader_set_default effect_property_type gs_effect_property_type EFFECT_NONE GS_EFFECT_NONE EFFECT_BOOL GS_EFFECT_BOOL EFFECT_FLOAT GS_EFFECT_FLOAT EFFECT_COLOR GS_EFFECT_COLOR EFFECT_TEXTURE GS_EFFECT_TEXTURE effect_param_info gs_effect_param_info effect_destroy gs_effect_destroy effect_gettechnique gs_effect_get_technique technique_begin gs_technique_begin technique_end gs_technique_end technique_beginpass gs_technique_begin_pass technique_beginpassbyname gs_technique_begin_pass_by_name technique_endpass gs_technique_end_pass effect_numparams gs_effect_get_num_params effect_getparambyidx gs_effect_get_param_by_idx effect_getparambyname gs_effect_get_param_by_name effect_updateparams gs_effect_update_params effect_getviewprojmatrix gs_effect_get_viewproj_matrix effect_getworldmatrix gs_effect_get_world_matrix effect_getparaminfo gs_effect_get_param_info effect_setbool gs_effect_set_bool effect_setfloat gs_effect_set_float effect_setint gs_effect_set_int effect_setmatrix4 gs_effect_set_matrix4 effect_setvec2 gs_effect_set_vec2 effect_setvec3 gs_effect_set_vec3 effect_setvec4 gs_effect_set_vec4 effect_settexture gs_effect_set_texture effect_setval gs_effect_set_val effect_setdefault gs_effect_set_default texrender_create gs_texrender_create texrender_destroy gs_texrender_destroy texrender_begin gs_texrender_begin texrender_end gs_texrender_end texrender_reset gs_texrender_reset texrender_gettexture gs_texrender_get_texture GS_BUILDMIPMAPS GS_BUILD_MIPMAPS GS_RENDERTARGET GS_RENDER_TARGET gs_device_name gs_get_device_name gs_device_type gs_get_device_type gs_entercontext gs_enter_context gs_leavecontext gs_leave_context gs_getcontext gs_get_context gs_renderstart gs_render_start gs_renderstop gs_render_stop gs_rendersave gs_render_save gs_getinput gs_get_input gs_geteffect gs_get_effect gs_create_effect_from_file gs_effect_create_from_file gs_create_effect gs_effect_create gs_create_vertexshader_from_file gs_vertexshader_create_from_file gs_create_pixelshader_from_file gs_pixelshader_create_from_file gs_create_texture_from_file gs_texture_create_from_file gs_resetviewport gs_reset_viewport gs_set2dmode gs_set_2d_mode gs_set3dmode gs_set_3d_mode gs_create_swapchain gs_swapchain_create gs_getsize gs_get_size gs_getwidth gs_get_width gs_getheight gs_get_height gs_create_texture gs_texture_create gs_create_cubetexture gs_cubetexture_create gs_create_volumetexture gs_voltexture_create gs_create_zstencil gs_zstencil_create gs_create_stagesurface gs_stagesurface_create gs_create_samplerstate gs_samplerstate_create gs_create_vertexshader gs_vertexshader_create gs_create_pixelshader gs_pixelshader_create gs_create_vertexbuffer gs_vertexbuffer_create gs_create_indexbuffer gs_indexbuffer_create gs_gettexturetype gs_get_texture_type gs_load_defaultsamplerstate gs_load_default_samplerstate gs_getvertexshader gs_get_vertex_shader gs_getpixelshader gs_get_pixel_shader gs_getrendertarget gs_get_render_target gs_getzstenciltarget gs_get_zstencil_target gs_setrendertarget gs_set_render_target gs_setcuberendertarget gs_set_cube_render_target gs_beginscene gs_begin_scene gs_draw gs_draw gs_endscene gs_end_scene gs_setcullmode gs_set_cull_mode gs_getcullmode gs_get_cull_mode gs_enable_depthtest gs_enable_depth_test gs_enable_stenciltest gs_enable_stencil_test gs_enable_stencilwrite gs_enable_stencil_write gs_blendfunction gs_blend_function gs_depthfunction gs_depth_function gs_stencilfunction gs_stencil_function gs_stencilop gs_stencil_op gs_setviewport gs_set_viewport gs_getviewport gs_get_viewport gs_setscissorrect gs_set_scissor_rect gs_create_texture_from_iosurface gs_texture_create_from_iosurface gs_create_gdi_texture gs_texture_create_gdi gs_is_compressed_format gs_is_compressed_format gs_num_total_levels gs_get_total_levels texture_setimage gs_texture_set_image cubetexture_setimage gs_cubetexture_set_image swapchain_destroy gs_swapchain_destroy texture_destroy gs_texture_destroy texture_getwidth gs_texture_get_width texture_getheight gs_texture_get_height texture_getcolorformat gs_texture_get_color_format texture_map gs_texture_map texture_unmap gs_texture_unmap texture_isrect gs_texture_is_rect texture_getobj gs_texture_get_obj cubetexture_destroy gs_cubetexture_destroy cubetexture_getsize gs_cubetexture_get_size cubetexture_getcolorformat gs_cubetexture_get_color_format volumetexture_destroy gs_voltexture_destroy volumetexture_getwidth gs_voltexture_get_width volumetexture_getheight gs_voltexture_get_height volumetexture_getdepth gs_voltexture_getdepth volumetexture_getcolorformat gs_voltexture_get_color_format stagesurface_destroy gs_stagesurface_destroy stagesurface_getwidth gs_stagesurface_get_width stagesurface_getheight gs_stagesurface_get_height stagesurface_getcolorformat gs_stagesurface_get_color_format stagesurface_map gs_stagesurface_map stagesurface_unmap gs_stagesurface_unmap zstencil_destroy gs_zstencil_destroy samplerstate_destroy gs_samplerstate_destroy vertexbuffer_destroy gs_vertexbuffer_destroy vertexbuffer_flush gs_vertexbuffer_flush vertexbuffer_getdata gs_vertexbuffer_get_data indexbuffer_destroy gs_indexbuffer_destroy indexbuffer_flush gs_indexbuffer_flush indexbuffer_getdata gs_indexbuffer_get_data indexbuffer_numindices gs_indexbuffer_get_num_indices indexbuffer_gettype gs_indexbuffer_get_type texture_rebind_iosurface gs_texture_rebind_iosurface texture_get_dc gs_texture_get_dc texture_release_dc gs_texture_release_dc
2014-08-08 06:42:07 +00: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 07:54:48 +00:00
window->ui->preview->DrawSceneEditing();
UI: Add padding to scene edges for editing Add a 10 pixel padding to the sides and remove viewport cutting to ensure that the editing rectangles are visible even when in the upper corners. Also, add a black background for the actual 'scene' in the preview window so that the scene boundries are actually visible in relation to the rest of the preview space.
2014-06-16 02:48:02 +00:00
/* --------------------------------------- */
Fix draw callback for main/properties views Drawing position wasn't being calculated correctly, viewport/ortho should have been used instead. It would cause items to render out of position on the main viewport (though not on the actual output)
2014-04-22 18:24:05 +00:00
gs_projection_pop();
gs_viewport_pop();
Remove majority of warnings There were a *lot* of warnings, managed to remove most of them. Also, put warning flags before C_FLAGS and CXX_FLAGS, rather than after, as -Wall -Wextra was overwriting flags that came before it.
2014-02-14 22:13:36 +00:00
UNUSED_PARAMETER(cx);
UNUSED_PARAMETER(cy);
Revamp rendering system to allow custom rendering Originally, the rendering system was designed to only display sources and such, but I realized there would be a flaw; if you wanted to render the main viewport in a custom way, or maybe even the entire application as a graphics-based front end, you wouldn't have been able to do that. Displays have now been separated in to viewports and displays. A viewport is used to store and draw sources, a display is used to handle draw callbacks. You can even use displays without using viewports to draw custom render displays containing graphics calls if you wish, but usually they would be used in combination with source viewports at least. This requires a tiny bit more work to create simple source displays, but in the end its worth it for the added flexibility and options it brings.
2014-02-13 15:58:31 +00:00
}
Implemented adding sources to scenes via GUI Sources can now be added to scenes via user interface. It's a little convoluted because everything has to work through OBS signals to ensure that plugins/etc can modify the scenes/sources exernally. Also, when switching scenes, it will properly list sources for the scene you changed to.
2014-01-04 20:53:36 +00:00
/* Main class functions */
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00: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 08:49:07 +00:00
{
(API Change) libobs: Make obs_service refcounted
2015-05-04 00:07:43 +00:00
if (!service) {
(API Change) libobs: Add hotkey data to *_create functions
2014-11-01 20:41:17 +00:00
service = obs_service_create("rtmp_common", NULL, NULL,
nullptr);
(API Change) libobs: Make obs_service refcounted
2015-05-04 00:07:43 +00: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 08:49:07 +00:00
return service;
}
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00: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 08:49:07 +00:00
{
(API Change) libobs: Make obs_service refcounted
2015-05-04 00:07:43 +00: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 08:49:07 +00:00
service = newService;
}
UI: Add process priority option for windows
2016-07-01 17:27:27 +00:00
bool OBSBasic::StreamingActive() const
UI: Make service settings use OK/Apply/Cancel Currently service settings are updated in real time via the properties view, which means that OK/Cancel/Apply have no effect. This fixes that by using the new type of properties view that operates only on settings data, not an object.
2015-02-07 16:09:57 +00:00
{
if (!outputHandler)
return false;
return outputHandler->StreamingActive();
}
UI: Add process priority option for windows
2016-07-01 17:27:27 +00:00
bool OBSBasic::Active() const
{
if (!outputHandler)
return false;
return outputHandler->Active();
}
If Direct3D doesn't initialize, try OpenGL
2014-07-21 00:49:54 +00:00
#ifdef _WIN32
#define IS_WIN32 1
#else
#define IS_WIN32 0
#endif
Check for valid sizes when initializing video
2014-07-21 00:49:09 +00:00
static inline int AttemptToResetVideo(struct obs_video_info *ovi)
{
UI: Change "main preview" to use OBSQTDisplay (Non-compiling commit: windowless-context branch) Gets rid of all functions/data related to setting up the main preview to be associated with obs_reset_video and instead uses OBSQTDisplay for the main window display (thus associating it with an obs_display object).
2015-08-02 07:02:58 +00:00
return obs_reset_video(ovi);
Check for valid sizes when initializing video
2014-07-21 00:49:09 +00:00
}
UI: Add video scale filters to basic settings
2014-12-15 09:08:46 +00: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;
}
UI: Use config file for color format/space/range Allows the color format, color space, and color range to be set by the user. This will need user interface for in the future, though it'll have to be an advanced setting that's hidden from the user by default because I don't feel comfortable exposing this to a typical user.
2015-01-10 04:16:30 +00: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;
UI: Add YUV 4:4:4 format option
2015-04-17 09:46:48 +00:00
else if (astrcmpi(name, "I444") == 0)
return VIDEO_FORMAT_I444;
UI: Use config file for color format/space/range Allows the color format, color space, and color range to be set by the user. This will need user interface for in the future, though it'll have to be an advanced setting that's hidden from the user by default because I don't feel comfortable exposing this to a typical user.
2015-01-10 04:16:30 +00: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
UI: Make RGB output use RGB, not BGR Noticed that the red and blue channels were inverted when testing.
2015-04-16 01:42:06 +00:00
return VIDEO_FORMAT_RGBA;
UI: Use config file for color format/space/range Allows the color format, color space, and color range to be set by the user. This will need user interface for in the future, though it'll have to be an advanced setting that's hidden from the user by default because I don't feel comfortable exposing this to a typical user.
2015-01-10 04:16:30 +00:00
}
(API Change) obs_reset_video: Use return codes Changed API functions: libobs: obs_reset_video Before, video initialization returned a boolean, but "failed" is too little information, if it fails due to lack of device capabilities or bad video device parameters, the front-end needs to know that. The OBS Basic UI has also been updated to reflect this API change.
2014-07-21 00:40:57 +00:00
int OBSBasic::ResetVideo()
apply configure video settings on startup
2013-12-23 06:40:07 +00:00
{
UI: Fix misleading log message when updating settings While an output is active, the user may try to reset the settings in the settings window, causing a misleading error message to be thrown in the log indicating that it's "falling back" to OpenGL. Instead, if an output is currently active, do not reset video.
2017-05-15 21:13:12 +00:00
if (outputHandler && outputHandler->Active())
return OBS_VIDEO_CURRENTLY_ACTIVE;
UI: Profile initialization
2015-07-11 06:04:12 +00:00
ProfileScope("OBSBasic::ResetVideo");
apply configure video settings on startup
2013-12-23 06:40:07 +00:00
struct obs_video_info ovi;
(API Change) obs_reset_video: Use return codes Changed API functions: libobs: obs_reset_video Before, video initialization returned a boolean, but "failed" is too little information, if it fails due to lack of device capabilities or bad video device parameters, the front-end needs to know that. The OBS Basic UI has also been updated to reflect this API change.
2014-07-21 00:40:57 +00: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 18:53:55 +00:00
Move basic mode configuration to a separate file Having everything in global.ini meant that if you wanted different settings for studio mode, that it would also overwrite it for basic mode. This way, the settings for each mode are separate, and you can use different settings for each mode.
2014-03-07 04:08:12 +00: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 18:53:55 +00:00
UI: Use config file for color format/space/range Allows the color format, color space, and color range to be set by the user. This will need user interface for in the future, though it'll have to be an advanced setting that's hidden from the user by default because I don't feel comfortable exposing this to a typical user.
2015-01-10 04:16:30 +00: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 18:53:55 +00:00
ovi.graphics_module = App()->GetRenderModule();
Move basic mode configuration to a separate file Having everything in global.ini meant that if you wanted different settings for studio mode, that it would also overwrite it for basic mode. This way, the settings for each mode are separate, and you can use different settings for each mode.
2014-03-07 04:08:12 +00:00
ovi.base_width = (uint32_t)config_get_uint(basicConfig,
apply configure video settings on startup
2013-12-23 06:40:07 +00:00
"Video", "BaseCX");
Move basic mode configuration to a separate file Having everything in global.ini meant that if you wanted different settings for studio mode, that it would also overwrite it for basic mode. This way, the settings for each mode are separate, and you can use different settings for each mode.
2014-03-07 04:08:12 +00:00
ovi.base_height = (uint32_t)config_get_uint(basicConfig,
apply configure video settings on startup
2013-12-23 06:40:07 +00:00
"Video", "BaseCY");
Move basic mode configuration to a separate file Having everything in global.ini meant that if you wanted different settings for studio mode, that it would also overwrite it for basic mode. This way, the settings for each mode are separate, and you can use different settings for each mode.
2014-03-07 04:08:12 +00:00
ovi.output_width = (uint32_t)config_get_uint(basicConfig,
apply configure video settings on startup
2013-12-23 06:40:07 +00:00
"Video", "OutputCX");
Move basic mode configuration to a separate file Having everything in global.ini meant that if you wanted different settings for studio mode, that it would also overwrite it for basic mode. This way, the settings for each mode are separate, and you can use different settings for each mode.
2014-03-07 04:08:12 +00:00
ovi.output_height = (uint32_t)config_get_uint(basicConfig,
apply configure video settings on startup
2013-12-23 06:40:07 +00:00
"Video", "OutputCY");
UI: Use config file for color format/space/range Allows the color format, color space, and color range to be set by the user. This will need user interface for in the future, though it'll have to be an advanced setting that's hidden from the user by default because I don't feel comfortable exposing this to a typical user.
2015-01-10 04:16:30 +00: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;
UI: Add ini option to use different graphics adapters Allows setting a specific graphics adapter index to use for Direct3D 11. This is currently meant to be sort of "undocumented" in implementing it this way due to the fact that users will be guaranteed to break their configurations if this is implemented in the UI (even if in advanced settings).
2017-10-07 10:02:14 +00:00
ovi.adapter = config_get_uint(App()->GlobalConfig(),
"Video", "AdapterIdx");
Make a number of key optimizations - Changed glMapBuffer to glMapBufferRange to allow invalidation. Using just glMapBuffer alone was causing some unacceptable stalls. - Changed dynamic buffers from GL_DYNAMIC_WRITE to GL_STREAM_WRITE because I had misunderstood the OpenGL specification - Added _OPENGL and _D3D11 builtin preprocessor macros to effects to allow special processing if needed - Added fmod support to shaders (NOTE: D3D and GL do not function identically with negative numbers when using this. Positive numbers however function identically) - Created a planar conversion shader that converts from packed YUV to planar 420 right on the GPU without any CPU processing. Reduces required GPU download size to approximately 37.5% of its normal rate as well. GPU usage down by 10 entire percentage points despite the extra required pass.
2014-02-17 02:28:21 +00:00
ovi.gpu_conversion = true;
UI: Add video scale filters to basic settings
2014-12-15 09:08:46 +00:00
ovi.scale_type = GetScaleType(basicConfig);
Cleaned up a bit, reverted API back to normal
2014-01-10 01:51:51 +00:00
UI: Prevent video init with bad video settings A lot of people had the problem where they'd initialize video settings with 0 width or height on their output resolution value. This just changes it so that the user always has a valid resolution so video initialization doesn't just outright fail.
2016-02-04 22:42:46 +00: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);
}
Check for valid sizes when initializing video
2014-07-21 00:49:09 +00:00
ret = AttemptToResetVideo(&ovi);
If Direct3D doesn't initialize, try OpenGL
2014-07-21 00:49:54 +00:00
if (IS_WIN32 && ret != OBS_VIDEO_SUCCESS) {
UI: Fix misleading log message when updating settings While an output is active, the user may try to reset the settings in the settings window, causing a misleading error message to be thrown in the log indicating that it's "falling back" to OpenGL. Instead, if an output is currently active, do not reset video.
2017-05-15 21:13:12 +00:00
if (ret == OBS_VIDEO_CURRENTLY_ACTIVE) {
blog(LOG_WARNING, "Tried to reset when "
"already active");
return ret;
}
If Direct3D doesn't initialize, try OpenGL
2014-07-21 00:49:54 +00:00
/* Try OpenGL if DirectX fails on windows */
Add SOVERSION to libobs-opengl Because libobs-opengl is a public library, it's customary to have SONAME embedded in the library file. Also remove the prefix override and remove the prefixing "lib" from the output name. This also requires us to pass the library file name to dlopen invocations.
2015-01-09 19:19:22 +00:00
if (astrcmpi(ovi.graphics_module, DL_OPENGL) != 0) {
Log warning when falling back to OpenGL on windows
2014-10-14 16:07:49 +00:00
blog(LOG_WARNING, "Failed to initialize obs video (%d) "
"with graphics_module='%s', retrying "
"with graphics_module='%s'",
ret, ovi.graphics_module,
Add SOVERSION to libobs-opengl Because libobs-opengl is a public library, it's customary to have SONAME embedded in the library file. Also remove the prefix override and remove the prefixing "lib" from the output name. This also requires us to pass the library file name to dlopen invocations.
2015-01-09 19:19:22 +00:00
DL_OPENGL);
ovi.graphics_module = DL_OPENGL;
If Direct3D doesn't initialize, try OpenGL
2014-07-21 00:49:54 +00:00
ret = AttemptToResetVideo(&ovi);
}
UI: Recalculate main preview scale on video reset Fixes a minor bug introduced by the windowless graphics context merge. When setting a new base resolution, it would not recalculate the preview size, and the preview would display the wrong size until the main window was resized by the user. This patch makes it so that it calls the recalculation function when the base resolution is changed to prevent that from happening.
2015-08-08 07:55:46 +00:00
} else if (ret == OBS_VIDEO_SUCCESS) {
ResizePreview(ovi.base_width, ovi.base_height);
UI: Resize program view if resolution settings changed
2016-01-31 00:59:22 +00:00
if (program)
ResizeProgram(ovi.base_width, ovi.base_height);
If Direct3D doesn't initialize, try OpenGL
2014-07-21 00:49:54 +00:00
}
UI: Fix potential crash with unsupported video cards If a video card is unsupported, it will attempt to initialize the stats window, querying values from a video subsystem that doesn't exist, and crash instead of alerting the user that their hardware is unsupported.
2017-06-24 16:14:46 +00:00
if (ret == OBS_VIDEO_SUCCESS)
OBSBasicStats::InitializeValues();
UI: Initialize Stats window values after OBSInit/reset When the statistics window starts up for the first time, it reset values at that very moment so that stray lagged frames due to OBS' startup wouldn't be displayed. However, that's really a bad place to reset those values because the user could want to view the stats window after a long stream, and having those values reset when he/she views the window for the first time would sort of make the point of viewing your stats moot. Instead, reset the values only when applicable, such as after OBSInit or when video is reset.
2017-06-19 22:33:12 +00:00
(API Change) obs_reset_video: Use return codes Changed API functions: libobs: obs_reset_video Before, video initialization returned a boolean, but "failed" is too little information, if it fails due to lack of device capabilities or bad video device parameters, the front-end needs to know that. The OBS Basic UI has also been updated to reflect this API change.
2014-07-21 00:40:57 +00:00
return ret;
Add preliminary audio processing - Mixing still isn't implemented, but the audio system should be able to start up, and mix at least once audio line for the time being. Will have to write some test audio sources to verify things are working properly, and build the rest of the output functionality.
2014-01-10 02:08:20 +00:00
}
fix startup resize issue on osx
2013-12-31 11:02:07 +00:00
Fix video reset and apply new video settings This allows the changing of bideo settings without having to completely reset all graphics data. Will recreate internal output/conversion buffers and such and reset the main preview.
2014-02-23 03:14:19 +00:00
bool OBSBasic::ResetAudio()
Add preliminary audio processing - Mixing still isn't implemented, but the audio system should be able to start up, and mix at least once audio line for the time being. Will have to write some test audio sources to verify things are working properly, and build the rest of the output functionality.
2014-01-10 02:08:20 +00:00
{
UI: Profile initialization
2015-07-11 06:04:12 +00:00
ProfileScope("OBSBasic::ResetAudio");
(API Change) Always use planar float audio output Core API functions changed: ----------------------------- EXPORT bool obs_reset_audio(struct audio_output_info *aoi); EXPORT bool obs_get_audio_info(struct audio_output_info *aoi); To: ----------------------------- EXPORT bool obs_reset_audio(const struct obs_audio_info *oai); EXPORT bool obs_get_audio_info(struct obs_audio_info *oai); Core structure added: ----------------------------- struct obs_audio_info { uint32_t samples_per_sec; enum speaker_layout speakers; uint64_t buffer_ms; }; Non-interleaved (planar) floating point output is standard with audio filtering, so to prevent audio filters from having to worry about different audio format implementations and for the sake consistency between user interfaces, make it so that audio is always set to non-interleaved floating point output.
2015-03-07 12:47:12 +00:00
struct obs_audio_info ai;
Move basic mode configuration to a separate file Having everything in global.ini meant that if you wanted different settings for studio mode, that it would also overwrite it for basic mode. This way, the settings for each mode are separate, and you can use different settings for each mode.
2014-03-07 04:08:12 +00:00
ai.samples_per_sec = config_get_uint(basicConfig, "Audio",
Implement a few more audio options/functions Implement a few audio options in to the user interface as well as a few inline audio functions in audio-io.h. Make it so ffmpeg plugin automatically converts to the desired format. Use regular interleaved float internally for audio instead of planar float.
2014-02-23 23:27:19 +00:00
"SampleRate");
Move basic mode configuration to a separate file Having everything in global.ini meant that if you wanted different settings for studio mode, that it would also overwrite it for basic mode. This way, the settings for each mode are separate, and you can use different settings for each mode.
2014-03-07 04:08:12 +00:00
const char *channelSetupStr = config_get_string(basicConfig,
Implement a few more audio options/functions Implement a few audio options in to the user interface as well as a few inline audio functions in audio-io.h. Make it so ffmpeg plugin automatically converts to the desired format. Use regular interleaved float internally for audio instead of planar float.
2014-02-23 23:27:19 +00:00
"Audio", "ChannelSetup");
if (strcmp(channelSetupStr, "Mono") == 0)
ai.speakers = SPEAKERS_MONO;
else
ai.speakers = SPEAKERS_STEREO;
Add preliminary audio processing - Mixing still isn't implemented, but the audio system should be able to start up, and mix at least once audio line for the time being. Will have to write some test audio sources to verify things are working properly, and build the rest of the output functionality.
2014-01-10 02:08:20 +00:00
return obs_reset_audio(&ai);
apply configure video settings on startup
2013-12-23 06:40:07 +00:00
}
UI: Store global audio sources in scenes file only Right now, information about global audio sources is stored in both scene files and in the config. These must be separated; there's no need to store them in both when they can just be stored in the scenes file.
2015-06-24 01:47:22 +00:00
void OBSBasic::ResetAudioDevice(const char *sourceId, const char *deviceId,
UI: Add popup warnings for connection failure Also, check for null stream path/key in the RTMP output module.
2014-05-12 22:30:36 +00:00
const char *deviceDesc, int channel)
Activate user-selected audio devices - Fix a bug where the initial audio data insertion would cause all audio data to unintentionally clear (mixed up < and > operators, damn human error) - Fixed a potential interdependant lock scenario with channel mutex locks and graphics mutex locks. The main video thread could lock the graphics mutex and then while in the graphics mutex could lock the channels mutex. Meanwhile in another thread, the channel mutex could get locked, and then the graphics mutex would get locked, causing a deadlock. The best way to deal with this is to not let mutexes lock within other mutexes, but sometimes it's difficult to avoid such as in the main video thread. - Audio devices should now be functional, and the devices in the audio settings can now be changed as desired.
2014-03-08 00:03:34 +00:00
{
UI: Preserve source if audio settings device changed If the user changes one of the devices in audio settings, it would reset all of its data, including settings, filters, flags, and all that. This changes the handling so that the source and all of its other settings are preserved if the user just changes the device. (Note that if the user disables the device, settings will be lost; this only applies to when the user changes the device to a different device for whatever reason)
2017-06-21 07:03:14 +00:00
bool disable = deviceId && strcmp(deviceId, "disabled") == 0;
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
obs_source_t *source;
obs_data_t *settings;
Activate user-selected audio devices - Fix a bug where the initial audio data insertion would cause all audio data to unintentionally clear (mixed up < and > operators, damn human error) - Fixed a potential interdependant lock scenario with channel mutex locks and graphics mutex locks. The main video thread could lock the graphics mutex and then while in the graphics mutex could lock the channels mutex. Meanwhile in another thread, the channel mutex could get locked, and then the graphics mutex would get locked, causing a deadlock. The best way to deal with this is to not let mutexes lock within other mutexes, but sometimes it's difficult to avoid such as in the main video thread. - Audio devices should now be functional, and the devices in the audio settings can now be changed as desired.
2014-03-08 00:03:34 +00:00
source = obs_get_output_source(channel);
if (source) {
UI: Preserve source if audio settings device changed If the user changes one of the devices in audio settings, it would reset all of its data, including settings, filters, flags, and all that. This changes the handling so that the source and all of its other settings are preserved if the user just changes the device. (Note that if the user disables the device, settings will be lost; this only applies to when the user changes the device to a different device for whatever reason)
2017-06-21 07:03:14 +00:00
if (disable) {
obs_set_output_source(channel, nullptr);
} else {
settings = obs_source_get_settings(source);
const char *oldId = obs_data_get_string(settings,
"device_id");
if (strcmp(oldId, deviceId) != 0) {
obs_data_set_string(settings, "device_id",
deviceId);
obs_source_update(source, settings);
}
obs_data_release(settings);
}
Activate user-selected audio devices - Fix a bug where the initial audio data insertion would cause all audio data to unintentionally clear (mixed up < and > operators, damn human error) - Fixed a potential interdependant lock scenario with channel mutex locks and graphics mutex locks. The main video thread could lock the graphics mutex and then while in the graphics mutex could lock the channels mutex. Meanwhile in another thread, the channel mutex could get locked, and then the graphics mutex would get locked, causing a deadlock. The best way to deal with this is to not let mutexes lock within other mutexes, but sometimes it's difficult to avoid such as in the main video thread. - Audio devices should now be functional, and the devices in the audio settings can now be changed as desired.
2014-03-08 00:03:34 +00:00
obs_source_release(source);
UI: Preserve source if audio settings device changed If the user changes one of the devices in audio settings, it would reset all of its data, including settings, filters, flags, and all that. This changes the handling so that the source and all of its other settings are preserved if the user just changes the device. (Note that if the user disables the device, settings will be lost; this only applies to when the user changes the device to a different device for whatever reason)
2017-06-21 07:03:14 +00:00
} else if (!disable) {
settings = obs_data_create();
(API Change) Unsquish obs_data_* names Changed: To: ----------------------------------------------- obs_data_getjson obs_data_get_json obs_data_getstring obs_data_get_string obs_data_getint obs_data_get_int obs_data_getdouble obs_data_get_double obs_data_getbool obs_data_get_bool obs_data_getobj obs_data_get_obj obs_data_getarray obs_data_get_array obs_data_setstring obs_data_set_string obs_data_setint obs_data_set_int obs_data_setdouble obs_data_set_double obs_data_setbool obs_data_set_bool obs_data_setobj obs_data_set_obj obs_data_setarray obs_data_set_array obs_data_item_getstring obs_data_item_get_string obs_data_item_getint obs_data_item_get_int obs_data_item_getdouble obs_data_item_get_double obs_data_item_getbool obs_data_item_get_bool obs_data_item_getobj obs_data_item_get_obj obs_data_item_getarray obs_data_item_get_array obs_data_item_setstring obs_data_item_set_string obs_data_item_setint obs_data_item_set_int obs_data_item_setdouble obs_data_item_set_double obs_data_item_setbool obs_data_item_set_bool obs_data_item_setobj obs_data_item_set_obj obs_data_item_setarray obs_data_item_set_array
2014-08-05 18:09:29 +00:00
obs_data_set_string(settings, "device_id", deviceId);
(API Change) libobs: Remove source_type param from functions (Note: test and UI are also modified by this commit) API Changed (removed "enum obs_source_type type" parameter): ------------------------- obs_source_get_display_name obs_source_create obs_get_source_output_flags obs_get_source_defaults obs_get_source_properties Removes the "type" parameter from these functions. The "type" parameter really doesn't serve much of a purpose being a parameter in any of these cases, the type is just to indicate what it's used for.
2015-12-29 23:25:45 +00:00
source = obs_source_create(sourceId, deviceDesc, settings,
nullptr);
Activate user-selected audio devices - Fix a bug where the initial audio data insertion would cause all audio data to unintentionally clear (mixed up < and > operators, damn human error) - Fixed a potential interdependant lock scenario with channel mutex locks and graphics mutex locks. The main video thread could lock the graphics mutex and then while in the graphics mutex could lock the channels mutex. Meanwhile in another thread, the channel mutex could get locked, and then the graphics mutex would get locked, causing a deadlock. The best way to deal with this is to not let mutexes lock within other mutexes, but sometimes it's difficult to avoid such as in the main video thread. - Audio devices should now be functional, and the devices in the audio settings can now be changed as desired.
2014-03-08 00:03:34 +00:00
obs_data_release(settings);
obs_set_output_source(channel, source);
obs_source_release(source);
}
}
fix startup resize issue on osx
2013-12-31 11:02:07 +00:00
void OBSBasic::ResizePreview(uint32_t cx, uint32_t cy)
made it so that preview panel scales based upon window size
2013-12-06 13:39:19 +00:00
{
Fix render issues with main preview widget - I seem to have fixed ths issues with the main preview widget. It seems you just need to set the right window attributes to stop it from breaking. Though when opengl is enabled, there appears to be a weird background glitch in the Qt stuff -- I'm not entirely sure what's going on. Bug in Qt? Also fixed the layout issues, and the widget now properly resizes and centers in to its parent widget. - Prevent the render loop from accessing data if the data isn't valid. Because obs->data is freed before the graphics stuff, it can cause the graphics to keep trying to query the obs->data.displays_mutex after it had already been destroyed.
2014-01-24 00:00:42 +00:00
QSize targetSize;
UI: Allow zoom with the scroll wheel Adds the ability to zoom into the preview when fixed scaling mode is enabled. (Edit by Jim: Also now saves zoom and scroll position) Closes jp9000/obs-studio#917
2017-05-13 17:13:55 +00:00
bool isFixedScaling;
UI: Add preview scaling options Adds preview scaling to the right-click context menu for the preview pane. This allows the ability to, for example, zoom the preview and edit the preview 1:1 (canvas/base resolution). This was a missing parity feature. Additionally, also allows scaling to the "output/scaled" resolution the program is set to. When the preview is in scale mode and is the focused widget, you can hold space and drag with left click to change the zoomed position. (Notes added by Jim) Closes jp9000/obs-studio#687
2016-11-05 16:48:46 +00:00
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 18:53:55 +00:00
change naming for some main program files for consistency
2013-12-06 16:16:33 +00:00
/* resize preview panel to fix to the top section of the window */
Ensure sizes passed to OBS are actual pixel sizes This should fix GS rendering on surfaces on HiDPI displays; moving windows between displays with differing pixel ratios currently requires a manual resize
2014-04-16 18:28:02 +00:00
targetSize = GetPixelSize(ui->preview);
UI: Add preview scaling options Adds preview scaling to the right-click context menu for the preview pane. This allows the ability to, for example, zoom the preview and edit the preview 1:1 (canvas/base resolution). This was a missing parity feature. Additionally, also allows scaling to the "output/scaled" resolution the program is set to. When the preview is in scale mode and is the focused widget, you can hold space and drag with left click to change the zoomed position. (Notes added by Jim) Closes jp9000/obs-studio#687
2016-11-05 16:48:46 +00:00
UI: Allow zoom with the scroll wheel Adds the ability to zoom into the preview when fixed scaling mode is enabled. (Edit by Jim: Also now saves zoom and scroll position) Closes jp9000/obs-studio#917
2017-05-13 17:13:55 +00:00
isFixedScaling = ui->preview->IsFixedScaling();
UI: Add preview scaling options Adds preview scaling to the right-click context menu for the preview pane. This allows the ability to, for example, zoom the preview and edit the preview 1:1 (canvas/base resolution). This was a missing parity feature. Additionally, also allows scaling to the "output/scaled" resolution the program is set to. When the preview is in scale mode and is the focused widget, you can hold space and drag with left click to change the zoomed position. (Notes added by Jim) Closes jp9000/obs-studio#687
2016-11-05 16:48:46 +00:00
obs_get_video_info(&ovi);
UI: Allow zoom with the scroll wheel Adds the ability to zoom into the preview when fixed scaling mode is enabled. (Edit by Jim: Also now saves zoom and scroll position) Closes jp9000/obs-studio#917
2017-05-13 17:13:55 +00:00
if (isFixedScaling) {
previewScale = ui->preview->GetScalingAmount();
UI: Add preview scaling options Adds preview scaling to the right-click context menu for the preview pane. This allows the ability to, for example, zoom the preview and edit the preview 1:1 (canvas/base resolution). This was a missing parity feature. Additionally, also allows scaling to the "output/scaled" resolution the program is set to. When the preview is in scale mode and is the focused widget, you can hold space and drag with left click to change the zoomed position. (Notes added by Jim) Closes jp9000/obs-studio#687
2016-11-05 16:48:46 +00:00
GetCenterPosFromFixedScale(int(cx), int(cy),
targetSize.width() - PREVIEW_EDGE_SIZE * 2,
targetSize.height() - PREVIEW_EDGE_SIZE * 2,
previewX, previewY, previewScale);
UI: Allow zoom with the scroll wheel Adds the ability to zoom into the preview when fixed scaling mode is enabled. (Edit by Jim: Also now saves zoom and scroll position) Closes jp9000/obs-studio#917
2017-05-13 17:13:55 +00:00
previewX += ui->preview->GetScrollX();
previewY += ui->preview->GetScrollY();
UI: Add preview scaling options Adds preview scaling to the right-click context menu for the preview pane. This allows the ability to, for example, zoom the preview and edit the preview 1:1 (canvas/base resolution). This was a missing parity feature. Additionally, also allows scaling to the "output/scaled" resolution the program is set to. When the preview is in scale mode and is the focused widget, you can hold space and drag with left click to change the zoomed position. (Notes added by Jim) Closes jp9000/obs-studio#687
2016-11-05 16:48:46 +00:00
} 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 18:53:55 +00:00
UI: Add padding to scene edges for editing Add a 10 pixel padding to the sides and remove viewport cutting to ensure that the editing rectangles are visible even when in the upper corners. Also, add a black background for the actual 'scene' in the preview window so that the scene boundries are actually visible in relation to the rest of the preview space.
2014-06-16 02:48:02 +00:00
previewX += float(PREVIEW_EDGE_SIZE);
previewY += float(PREVIEW_EDGE_SIZE);
fix startup resize issue on osx
2013-12-31 11:02:07 +00:00
}
UI: Add ClearSceneData to clean up all obs data Add a central function for clearing all data: scenes, sources, widgets such as lists that may contain source references in their sub-items, dialogs which may contain source references. In certain circumstances this data must be fully released and manually freed to ensure that there are no outstanding references to obs data (such as on shutdown, where all data should be properly freed).
2015-07-02 23:12:47 +00: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();
}
}
UI: Add ability to output to window Closes jp9000/obs-studio#841
2017-03-02 04:08:49 +00:00
for (QPointer<QWidget> &projector : windowProjectors) {
delete projector;
projector.clear();
}
UI: Add ClearSceneData to clean up all obs data Add a central function for clearing all data: scenes, sources, widgets such as lists that may contain source references in their sub-items, dialogs which may contain source references. In certain circumstances this data must be fully released and manually freed to ensure that there are no outstanding references to obs data (such as on shutdown, where all data should be properly freed).
2015-07-02 23:12:47 +00:00
for (QPointer<QWidget> &projector : projectors) {
delete projector;
projector.clear();
}
UI: Add stats dialog Shows performance stats, and streaming/recording stats, and helps warn the user when they have less-than-optimal values with coloring on the values (e.g. yellow when getting low on disk space, red when getting really low)
2017-05-11 02:37:45 +00:00
UI: Fix stats window geometry saving on shutdown Possible fix for: https://obsproject.com/mantis/view.php?id=923 If you close whole application (not just stats window) it skips the close event and thus saving of the geometry. The Qt::WA_DeleteOnClose was set earlier. Closes jp9000/obs-studio#984
2017-08-02 16:15:10 +00:00
if (!stats.isNull()) stats->close(); //call close to save Stats geometry
UI: Add ClearSceneData to clean up all obs data Add a central function for clearing all data: scenes, sources, widgets such as lists that may contain source references in their sub-items, dialogs which may contain source references. In certain circumstances this data must be fully released and manually freed to ensure that there are no outstanding references to obs data (such as on shutdown, where all data should be properly freed).
2015-07-02 23:12:47 +00:00
}
UI: Hide/show dialogs when minimizing to tray Hides dialogs when minimizing to tray, and shows again when restoring from tray. Closes jp9000/obs-studio#737
2017-01-25 08:39:18 +00: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);
}
}
UI: Add ClearSceneData to clean up all obs data Add a central function for clearing all data: scenes, sources, widgets such as lists that may contain source references in their sub-items, dialogs which may contain source references. In certain circumstances this data must be fully released and manually freed to ensure that there are no outstanding references to obs data (such as on shutdown, where all data should be properly freed).
2015-07-02 23:12:47 +00:00
void OBSBasic::ClearSceneData()
{
UI: Save project only on new changes
2015-06-30 12:49:31 +00:00
disableSaving++;
UI: Add ClearSceneData to clean up all obs data Add a central function for clearing all data: scenes, sources, widgets such as lists that may contain source references in their sub-items, dialogs which may contain source references. In certain circumstances this data must be fully released and manually freed to ensure that there are no outstanding references to obs data (such as on shutdown, where all data should be properly freed).
2015-07-02 23:12:47 +00: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 19:19:29 +00:00
ClearQuickTransitions();
ui->transitions->clear();
UI: Add ClearSceneData to clean up all obs data Add a central function for clearing all data: scenes, sources, widgets such as lists that may contain source references in their sub-items, dialogs which may contain source references. In certain circumstances this data must be fully released and manually freed to ensure that there are no outstanding references to obs data (such as on shutdown, where all data should be properly freed).
2015-07-02 23:12:47 +00: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 19:19:29 +00:00
lastScene = nullptr;
swapScene = nullptr;
programScene = nullptr;
UI: Add ClearSceneData to clean up all obs data Add a central function for clearing all data: scenes, sources, widgets such as lists that may contain source references in their sub-items, dialogs which may contain source references. In certain circumstances this data must be fully released and manually freed to ensure that there are no outstanding references to obs data (such as on shutdown, where all data should be properly freed).
2015-07-02 23:12:47 +00:00
auto cb = [](void *unused, obs_source_t *source)
{
obs_source_remove(source);
UNUSED_PARAMETER(unused);
return true;
};
obs_enum_sources(cb, nullptr);
UI: Save project only on new changes
2015-06-30 12:49:31 +00:00
disableSaving--;
UI: Fix logging for profiles/scene collections This makes it so that the log message for altering scene collections and/or profiles is now below, and then the separator below that. This makes it a bit more apparent that any loading/clearing/etc that happens before the log message are associated with the log message.
2015-07-06 06:39:05 +00:00
blog(LOG_INFO, "All scene data cleared");
blog(LOG_INFO, "------------------------------------------------");
UI: Add ClearSceneData to clean up all obs data Add a central function for clearing all data: scenes, sources, widgets such as lists that may contain source references in their sub-items, dialogs which may contain source references. In certain circumstances this data must be fully released and manually freed to ensure that there are no outstanding references to obs data (such as on shutdown, where all data should be properly freed).
2015-07-02 23:12:47 +00: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 18:53:55 +00:00
void OBSBasic::closeEvent(QCloseEvent *event)
fix startup resize issue on osx
2013-12-31 11:02:07 +00:00
{
UI: Fix window size/pos not saving on exit
2016-09-28 08:56:10 +00:00
if (isVisible())
config_set_string(App()->GlobalConfig(),
"BasicWindow", "geometry",
saveGeometry().toBase64().constData());
UI: Add modular UI Changes the UI to an adjustable user interface, allowing the user to fully customize how the scenes list, sources list, the mixer, transitions, and the buttons are oriented on the main window window.
2017-07-27 09:40:41 +00:00
config_set_string(App()->GlobalConfig(),
"BasicWindow", "DockState",
saveState().toBase64().constData());
UI: If active, prompt user before exiting Precautionary measure to prevent the user from accidentally clicking the 'exit' buttons
2015-02-07 11:39:16 +00:00
if (outputHandler && outputHandler->Active()) {
UI: Add system tray capability This adds a system tray when enabled. There is also a option to minimize to the system tray when the app is started. Closes jp9000/obs-studio#595
2016-08-13 14:36:17 +00:00
SetShowing(true);
UI: Make sure all message box buttons are translated Instead of QMessageBox::question and QMessageBox::information, use the OBSMessageBox class, which translates all buttons.
2017-05-13 21:06:32 +00:00
QMessageBox::StandardButton button = OBSMessageBox::question(
UI: If active, prompt user before exiting Precautionary measure to prevent the user from accidentally clicking the 'exit' buttons
2015-02-07 11:39:16 +00:00
this, QTStr("ConfirmExit.Title"),
QTStr("ConfirmExit.Text"));
if (button == QMessageBox::No) {
event->ignore();
return;
}
}
Fix crash when closing windows via the X title bar button On OSX clicking the X title bar button immediately destroys "all" native windows (after sending a close event) which causes [NSSurface _disposeSurface] to crash if invoked while GL is using the surface
2014-04-17 15:18:51 +00:00
QWidget::closeEvent(event);
if (!event->isAccepted())
return;
UI: Only use shutdown separator upon successful close Fixes an issue where the shutdown separator in the log file would always appear even when the user decides not to shut down the program after clicking close when still streaming/recording.
2016-08-21 18:29:56 +00: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-24 06:39:39 +00:00
if (updateCheckThread)
updateCheckThread->wait();
if (logUploadThread)
logUploadThread->wait();
UI: Clear global signals in closeEvent
2015-06-27 07:29:17 +00:00
signalHandlers.clear();
UI: Add SaveProjectNow function This adds a function that allows saving the project now instead of deferring it.
2015-07-09 17:51:22 +00:00
SaveProjectNow();
UI: Add front-end API library Allows manipulating and modifying the front-end via plugins.
2016-08-28 21:24:14 +00:00
if (api)
api->on_event(OBS_FRONTEND_EVENT_EXIT);
UI: Save project only on new changes
2015-06-30 12:49:31 +00:00
disableSaving++;
UI: Clear list boxes in ::closeEvent Ensures that ->deleteLater events are put in to the event queue before the destructor is called.
2015-03-18 14:02:58 +00:00
UI: Add ClearSceneData to clean up all obs data Add a central function for clearing all data: scenes, sources, widgets such as lists that may contain source references in their sub-items, dialogs which may contain source references. In certain circumstances this data must be fully released and manually freed to ensure that there are no outstanding references to obs data (such as on shutdown, where all data should be properly freed).
2015-07-02 23:12:47 +00:00
/* Clear all scene data (dialogs, widgets, widget sub-items, scenes,
* sources, etc) so that all references are released before shutdown */
ClearSceneData();
UI: Don't use "quit on last window closed" Instead, quit only when the main window has been fully closed (and not minimized to tray). Fixes a bug where if the main window is minimized to tray and another non-child window is open (for example, the stats window), and then that window is closed, would cause the program to prematurely exit and crash.
2017-05-14 20:03:46 +00:00
App()->quit();
create a sizing callback for the preview panel specifically, apparently on macos the window size isn't guaranteed to be the size it's set to in the main window size handler
2013-12-31 14:10:47 +00: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 18:53:55 +00:00
void OBSBasic::changeEvent(QEvent *event)
create a sizing callback for the preview panel specifically, apparently on macos the window size isn't guaranteed to be the size it's set to in the main window size handler
2013-12-31 14:10:47 +00:00
{
UI: Add option to always minimize to tray Closes jp9000/obs-studio#737
2017-01-25 07:01:24 +00:00
if (event->type() == QEvent::WindowStateChange &&
isMinimized() &&
UI: Fix segfault when no system tray exists
2017-03-10 13:15:35 +00:00
trayIcon &&
UI: Add option to always minimize to tray Closes jp9000/obs-studio#737
2017-01-25 07:01:24 +00:00
trayIcon->isVisible() &&
sysTrayMinimizeToTray()) {
ToggleShowHide();
}
added initial config file stuff, set up a 'dummy' window to cause the graphics system to persist through window changes
2013-11-24 06:38:52 +00:00
}
Add File -> "Show Recordings" menu entry
2014-08-22 01:18:42 +00:00
void OBSBasic::on_actionShow_Recordings_triggered()
{
UI: Use correct output folder for Show/Remux Ensures that the "Show Recordings" an "Remux Recordings" file menu items will open the recordings folder from the currently active output mode rather than always the simple output mode.
2015-06-04 18:15:56 +00: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");
Add File -> "Show Recordings" menu entry
2014-08-22 01:18:42 +00:00
QDesktopServices::openUrl(QUrl::fromLocalFile(path));
}
Add UI for remuxing recordings via FFmpeg
2014-09-03 02:11:55 +00:00
void OBSBasic::on_actionRemux_triggered()
{
UI: Use correct output folder for Show/Remux Ensures that the "Show Recordings" an "Remux Recordings" file menu items will open the recordings folder from the currently active output mode rather than always the simple output mode.
2015-06-04 18:15:56 +00: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");
Add UI for remuxing recordings via FFmpeg
2014-09-03 02:11:55 +00:00
OBSRemux remux(path, this);
remux.exec();
}
Add Settings entry to File menu This automagically creates a (localized?) Preferences entry on OSX as well
2014-04-15 12:19:59 +00:00
void OBSBasic::on_action_Settings_triggered()
{
OBSBasicSettings settings(this);
settings.exec();
UI: Add system tray capability This adds a system tray when enabled. There is also a option to minimize to the system tray when the app is started. Closes jp9000/obs-studio#595
2016-08-13 14:36:17 +00:00
SystemTray(false);
Add Settings entry to File menu This automagically creates a (localized?) Preferences entry on OSX as well
2014-04-15 12:19:59 +00:00
}
UI: Add advanced audio properties dialog This dialog gives options such as increasing audio past 100%, forcing the audio of a source to mono, and setting the audio sync offset of a source (which was an oft-requested feature)
2014-12-28 08:38:00 +00:00
void OBSBasic::on_actionAdvAudioProperties_triggered()
{
UI: Ensure only one advanced audio settings window Add a check to prevent that the advanced audio settings dialog is only once. When the dialog is already present raise it to the top instead.
2015-02-13 12:06:55 +00:00
if (advAudioWindow != nullptr) {
advAudioWindow->raise();
return;
}
UI: Add advanced audio properties dialog This dialog gives options such as increasing audio past 100%, forcing the audio of a source to mono, and setting the audio sync offset of a source (which was an oft-requested feature)
2014-12-28 08:38:00 +00:00
advAudioWindow = new OBSBasicAdvAudio(this);
advAudioWindow->show();
advAudioWindow->setAttribute(Qt::WA_DeleteOnClose, true);
UI: Ensure only one advanced audio settings window Add a check to prevent that the advanced audio settings dialog is only once. When the dialog is already present raise it to the top instead.
2015-02-13 12:06:55 +00:00
connect(advAudioWindow, SIGNAL(destroyed()),
this, SLOT(on_advAudioProps_destroyed()));
UI: Add advanced audio properties dialog This dialog gives options such as increasing audio past 100%, forcing the audio of a source to mono, and setting the audio sync offset of a source (which was an oft-requested feature)
2014-12-28 08:38:00 +00:00
}
UI: Add button for adv. audio properties Add a button to the main window to access advanced audio properties to make it a bit more visible to users. To facilitate this, the bottom part of the window was switched to a grid layout.
2015-02-07 10:11:42 +00:00
void OBSBasic::on_advAudioProps_clicked()
{
on_actionAdvAudioProperties_triggered();
}
UI: Ensure only one advanced audio settings window Add a check to prevent that the advanced audio settings dialog is only once. When the dialog is already present raise it to the top instead.
2015-02-13 12:06:55 +00:00
void OBSBasic::on_advAudioProps_destroyed()
{
advAudioWindow = nullptr;
}
Implement source activation/deactivation Now sources will be properly activated and deactivated when they are in use or not in use. Had to figure out a way to handle child sources, and children of children, just ended up implementing simple functions that parents use to signal adding/removal to help with hierarchial activation and deactivation of child sources. To prevent the source activate/deactivate callbacks from being called more than once, added an activation reference counter. The first increment will call the activate callback, and the last decrement will call the deactivate callback. Added "source-activate" and "source-deactivate" signals to the main obs signal handler, and "activate" and "deactivate" to individual source signal handlers. Also, fixed the main window so it properly selects a source when the current active scene has been changed.
2014-02-21 05:04:14 +00:00
void OBSBasic::on_scenes_currentItemChanged(QListWidgetItem *current,
QListWidgetItem *prev)
make it so that when a scene is clicked it becomes active
2013-12-30 08:17:57 +00:00
{
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00: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 18:53:55 +00:00
Implement source activation/deactivation Now sources will be properly activated and deactivated when they are in use or not in use. Had to figure out a way to handle child sources, and children of children, just ended up implementing simple functions that parents use to signal adding/removal to help with hierarchial activation and deactivation of child sources. To prevent the source activate/deactivate callbacks from being called more than once, added an activation reference counter. The first increment will call the activate callback, and the last decrement will call the deactivate callback. Added "source-activate" and "source-deactivate" signals to the main obs signal handler, and "activate" and "deactivate" to individual source signal handlers. Also, fixed the main window so it properly selects a source when the current active scene has been changed.
2014-02-21 05:04:14 +00:00
if (sceneChanging)
return;
if (current) {
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00: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 18:53:55 +00:00
UI: Add QtDataRole enum This introduces the OBSSignals data role, which will be used to store signal handlers in stock Qt objects
2015-06-28 01:21:45 +00:00
scene = GetOBSRef<OBSScene>(current);
(API Change) Unsquish libobs (base) names Previous names: New names: ----------------------------------------------------------- obs_view_setsource obs_view_set_source obs_view_getsource obs_view_get_source obs_source_getdisplayname obs_source_get_display_name obs_source_getwidth obs_source_get_width obs_source_getheight obs_source_get_height obs_filter_getparent obs_filter_get_parent obs_filter_gettarget obs_filter_get_target obs_source_filter_setorder obs_source_filter_set_order obs_source_getsettings obs_source_get_settings obs_source_getname obs_source_get_name obs_source_setname obs_source_set_name obs_source_setvolume obs_source_set_volume obs_source_getvolume obs_source_get_volume obs_scene_getsource obs_scene_get_source obs_scene_fromsource obs_scene_from_source obs_scene_findsource obs_scene_find_source obs_output_getdisplayname obs_output_get_display_name obs_output_getname obs_output_get_name obs_encoder_getname obs_encoder_get_name obs_service_getdisplayname obs_service_get_display_name obs_service_getname obs_service_get_name
2014-08-04 15:41:15 +00:00
source = obs_scene_get_source(scene);
make it so that when a scene is clicked it becomes active
2013-12-30 08:17:57 +00: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 19:19:29 +00:00
SetCurrentScene(source);
Implement source activation/deactivation Now sources will be properly activated and deactivated when they are in use or not in use. Had to figure out a way to handle child sources, and children of children, just ended up implementing simple functions that parents use to signal adding/removal to help with hierarchial activation and deactivation of child sources. To prevent the source activate/deactivate callbacks from being called more than once, added an activation reference counter. The first increment will call the activate callback, and the last decrement will call the deactivate callback. Added "source-activate" and "source-deactivate" signals to the main obs signal handler, and "activate" and "deactivate" to individual source signal handlers. Also, fixed the main window so it properly selects a source when the current active scene has been changed.
2014-02-21 05:04:14 +00:00
UNUSED_PARAMETER(prev);
make it so that when a scene is clicked it becomes active
2013-12-30 08:17:57 +00:00
}
Implement context menu on 'sources' box
2014-06-30 08:13:32 +00:00
void OBSBasic::EditSceneName()
{
Disable double click renaming for both scenes and sources
2014-10-15 20:05:21 +00:00
QListWidgetItem *item = ui->scenes->currentItem();
Qt::ItemFlags flags = item->flags();
item->setFlags(flags | Qt::ItemIsEditable);
ui->scenes->editItem(item);
item->setFlags(flags);
Implement context menu on 'sources' box
2014-06-30 08:13:32 +00:00
}
UI: Add fullscreen projector options Add the ability to use a fullscreen projector for scenes, sources, and the preview display.
2015-04-04 08:40:15 +00:00
static void AddProjectorMenuMonitors(QMenu *parent, QObject *target,
const char *slot)
{
QAction *action;
UI: Use Qt lib for screen info instead of x11 libs All of the monitor discovery logic can be implemented with Qt. This change removes all the x11 implementations in favor of Qt and removes a fair amount of platform specific code.
2016-10-04 06:50:13 +00:00
QList<QScreen*> screens = QGuiApplication::screens();
for (int i = 0; i < screens.size(); i++) {
UI: Fix full screen projector on screens that have reserved areas QScreen::availableGeometry() does not return the full screen size on X11 if areas of the screen are reserved by the window manager. In this case the full screen projector does not cover the whole screen. Using QScreen::geometry() instead fixes this issue.
2016-10-20 13:29:43 +00:00
QRect screenGeometry = screens[i]->geometry();
UI: Add fullscreen projector options Add the ability to use a fullscreen projector for scenes, sources, and the preview display.
2015-04-04 08:40:15 +00:00
QString str = QString("%1 %2: %3x%4 @ %5,%6").
arg(QTStr("Display"),
QString::number(i),
UI: Use Qt lib for screen info instead of x11 libs All of the monitor discovery logic can be implemented with Qt. This change removes all the x11 implementations in favor of Qt and removes a fair amount of platform specific code.
2016-10-04 06:50:13 +00:00
QString::number((int)screenGeometry.width()),
QString::number((int)screenGeometry.height()),
QString::number((int)screenGeometry.x()),
QString::number((int)screenGeometry.y()));
UI: Add fullscreen projector options Add the ability to use a fullscreen projector for scenes, sources, and the preview display.
2015-04-04 08:40:15 +00: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 18:53:55 +00:00
void OBSBasic::on_scenes_customContextMenuRequested(const QPoint &pos)
added initial main program and directshow files, finally have a UI functioning
2013-11-07 23:45:03 +00:00
{
Implement 'scenes' list context menu
2014-06-30 23:03:12 +00:00
QListWidgetItem *item = ui->scenes->itemAt(pos);
UI: Add fullscreen projector options Add the ability to use a fullscreen projector for scenes, sources, and the preview display.
2015-04-04 08:40:15 +00:00
QPointer<QMenu> sceneProjectorMenu;
Implement 'scenes' list context menu
2014-06-30 23:03:12 +00:00
UI: Fix missing widget parent from constructor The styling isn't applied if the widget doesn't have a parent
2015-01-16 09:21:11 +00:00
QMenu popup(this);
UI: Implement scene reordering This simply saves/loads the actual list widget item order. The reason why this is done is because internally, libobs doesn't have a list of scenes, it only has a list of sources. The list of scenes is actually something artificially implemented by the basic window user interface.
2015-06-25 10:53:48 +00:00
QMenu order(QTStr("Basic.MainMenu.Edit.Order"), this);
Implement 'scenes' list context menu
2014-06-30 23:03:12 +00:00
popup.addAction(QTStr("Add"),
this, SLOT(on_actionAddScene_triggered()));
Add "Rename" entry to scenes context menu
2014-10-15 20:04:31 +00:00
if (item) {
popup.addSeparator();
UI: Implement scene duplication (context menu)
2015-08-28 22:01:39 +00:00
popup.addAction(QTStr("Duplicate"),
this, SLOT(DuplicateSelectedScene()));
Add "Rename" entry to scenes context menu
2014-10-15 20:04:31 +00:00
popup.addAction(QTStr("Rename"),
this, SLOT(EditSceneName()));
Implement 'scenes' list context menu
2014-06-30 23:03:12 +00:00
popup.addAction(QTStr("Remove"),
Add "Remove" shortcut to scenes context menu
2014-10-15 20:01:49 +00:00
this, SLOT(RemoveSelectedScene()),
DeleteKeys.front());
UI: Allow scenes to use filters
2015-03-18 22:09:44 +00:00
popup.addSeparator();
UI: Implement scene reordering This simply saves/loads the actual list widget item order. The reason why this is done is because internally, libobs doesn't have a list of scenes, it only has a list of sources. The list of scenes is actually something artificially implemented by the basic window user interface.
2015-06-25 10:53:48 +00: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();
UI: Add fullscreen projector options Add the ability to use a fullscreen projector for scenes, sources, and the preview display.
2015-04-04 08:40:15 +00:00
sceneProjectorMenu = new QMenu(QTStr("SceneProjector"));
AddProjectorMenuMonitors(sceneProjectorMenu, this,
SLOT(OpenSceneProjector()));
popup.addMenu(sceneProjectorMenu);
UI: Add ability to output to window Closes jp9000/obs-studio#841
2017-03-02 04:08:49 +00:00
QAction *sceneWindow = popup.addAction(
QTStr("SceneWindow"),
this, SLOT(OpenSceneWindow()));
popup.addAction(sceneWindow);
UI: Add fullscreen projector options Add the ability to use a fullscreen projector for scenes, sources, and the preview display.
2015-04-04 08:40:15 +00:00
popup.addSeparator();
UI: Allow scenes to use filters
2015-03-18 22:09:44 +00:00
popup.addAction(QTStr("Filters"), this,
SLOT(OpenSceneFilters()));
Add "Rename" entry to scenes context menu
2014-10-15 20:04:31 +00:00
}
Implement 'scenes' list context menu
2014-06-30 23:03:12 +00:00
popup.exec(QCursor::pos());
added initial main program and directshow files, finally have a UI functioning
2013-11-07 23:45:03 +00: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 18:53:55 +00:00
void OBSBasic::on_actionAddScene_triggered()
added initial main program and directshow files, finally have a UI functioning
2013-11-07 23:45:03 +00:00
{
change obs_scene_destroy to obs_scene_release, add ability to add scenes, fix name dialog sizing
2013-12-29 15:54:06 +00:00
string name;
Auto suggest scene and source names. NameDialog can have placeholder text. Localize scene number. Pre-select scene and source text.
2014-05-09 22:09:17 +00:00
QString format{QTStr("Basic.Main.DefaultSceneName.Text")};
Handle scene name generation collisions
2014-05-14 18:58:15 +00:00
UI: If scene/source names exist, start from 2 Currently if you have a scene, "Scene" for example, and you create a new scene, the dialog will pop up with a default name, but it'll start with "Scene 1" instead of "Scene 2". Same thing occurs with sources. This fixes that to start from 2 instead.
2017-02-26 16:23:31 +00:00
int i = 2;
Handle scene name generation collisions
2014-05-14 18:58:15 +00:00
QString placeHolderText = format.arg(i);
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
obs_source_t *source = nullptr;
Release sources after name check
2014-05-14 20:20:08 +00:00
while ((source = obs_get_source_by_name(QT_TO_UTF8(placeHolderText)))) {
obs_source_release(source);
Handle scene name generation collisions
2014-05-14 18:58:15 +00:00
placeHolderText = format.arg(++i);
Release sources after name check
2014-05-14 20:20:08 +00:00
}
Auto suggest scene and source names. NameDialog can have placeholder text. Localize scene number. Pre-select scene and source text.
2014-05-09 22:09:17 +00: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 18:53:55 +00:00
bool accepted = NameDialog::AskForName(this,
UI: Add popup warnings for connection failure Also, check for null stream path/key in the RTMP output module.
2014-05-12 22:30:36 +00:00
QTStr("Basic.Main.AddSceneDlg.Title"),
QTStr("Basic.Main.AddSceneDlg.Text"),
Auto suggest scene and source names. NameDialog can have placeholder text. Localize scene number. Pre-select scene and source text.
2014-05-09 22:09:17 +00:00
name,
placeHolderText);
change obs_scene_destroy to obs_scene_release, add ability to add scenes, fix name dialog sizing
2013-12-29 15:54:06 +00: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 18:53:55 +00:00
if (accepted) {
Ensure names are valid Ensure that a source has a valid name. Duplicates aren't a big deal internally, but sources without a name are probably something that should be avoided. Made is so that if a source is programmatically created without a name, it's assigned an index based name. In the main basic-mode window, made it check to make sure the name was valid as well.
2014-03-10 20:39:51 +00:00
if (name.empty()) {
UI: Make sure all message box buttons are translated Instead of QMessageBox::question and QMessageBox::information, use the OBSMessageBox class, which translates all buttons.
2017-05-13 21:06:32 +00:00
OBSMessageBox::information(this,
Alert user when using existing source name.
2014-08-12 19:09:19 +00:00
QTStr("NoNameEntered.Title"),
QTStr("NoNameEntered.Text"));
Ensure names are valid Ensure that a source has a valid name. Duplicates aren't a big deal internally, but sources without a name are probably something that should be avoided. Made is so that if a source is programmatically created without a name, it's assigned an index based name. In the main basic-mode window, made it check to make sure the name was valid as well.
2014-03-10 20:39:51 +00:00
on_actionAddScene_triggered();
return;
}
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
obs_source_t *source = obs_get_source_by_name(name.c_str());
make sure another source by the same name doesn't already exist when choosing a name for that scene
2013-12-29 16:17:00 +00:00
if (source) {
UI: Make sure all message box buttons are translated Instead of QMessageBox::question and QMessageBox::information, use the OBSMessageBox class, which translates all buttons.
2017-05-13 21:06:32 +00:00
OBSMessageBox::information(this,
UI: Add popup warnings for connection failure Also, check for null stream path/key in the RTMP output module.
2014-05-12 22:30:36 +00:00
QTStr("NameExists.Title"),
QTStr("NameExists.Text"));
make sure another source by the same name doesn't already exist when choosing a name for that scene
2013-12-29 16:17:00 +00: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 18:53:55 +00:00
on_actionAddScene_triggered();
make sure another source by the same name doesn't already exist when choosing a name for that scene
2013-12-29 16:17:00 +00:00
return;
}
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
obs_scene_t *scene = obs_scene_create(name.c_str());
(API Change) Unsquish libobs (base) names Previous names: New names: ----------------------------------------------------------- obs_view_setsource obs_view_set_source obs_view_getsource obs_view_get_source obs_source_getdisplayname obs_source_get_display_name obs_source_getwidth obs_source_get_width obs_source_getheight obs_source_get_height obs_filter_getparent obs_filter_get_parent obs_filter_gettarget obs_filter_get_target obs_source_filter_setorder obs_source_filter_set_order obs_source_getsettings obs_source_get_settings obs_source_getname obs_source_get_name obs_source_setname obs_source_set_name obs_source_setvolume obs_source_set_volume obs_source_getvolume obs_source_get_volume obs_scene_getsource obs_scene_get_source obs_scene_fromsource obs_scene_from_source obs_scene_findsource obs_scene_find_source obs_output_getdisplayname obs_output_get_display_name obs_output_getname obs_output_get_name obs_encoder_getname obs_encoder_get_name obs_service_getdisplayname obs_service_get_display_name obs_service_getname obs_service_get_name
2014-08-04 15:41:15 +00:00
source = obs_scene_get_source(scene);
UI: Remove obs_source_add and sourceSceneRefs variable Prunes code used to workaround libobs "user sources" (such as sourceSceneRefs) and instead simply holds its own references and saves sources it chooses with obs_save_sources_filtered.
2015-12-05 13:58:05 +00: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 19:19:29 +00:00
SetCurrentScene(source);
UI: Remove obs_source_add and sourceSceneRefs variable Prunes code used to workaround libobs "user sources" (such as sourceSceneRefs) and instead simply holds its own references and saves sources it chooses with obs_save_sources_filtered.
2015-12-05 13:58:05 +00:00
obs_scene_release(scene);
change obs_scene_destroy to obs_scene_release, add ability to add scenes, fix name dialog sizing
2013-12-29 15:54:06 +00:00
}
added initial main program and directshow files, finally have a UI functioning
2013-11-07 23:45:03 +00: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 18:53:55 +00:00
void OBSBasic::on_actionRemoveScene_triggered()
added initial main program and directshow files, finally have a UI functioning
2013-11-07 23:45:03 +00:00
{
Make 'remove' toolbar buttons query for removal
2014-06-30 20:45:58 +00:00
OBSScene scene = GetCurrentScene();
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
obs_source_t *source = obs_scene_get_source(scene);
Make 'remove' toolbar buttons query for removal
2014-06-30 20:45:58 +00:00
if (source && QueryRemoveSource(source))
obs_source_remove(source);
added initial main program and directshow files, finally have a UI functioning
2013-11-07 23:45:03 +00:00
}
UI: Implement scene reordering This simply saves/loads the actual list widget item order. The reason why this is done is because internally, libobs doesn't have a list of scenes, it only has a list of sources. The list of scenes is actually something artificially implemented by the basic window user interface.
2015-06-25 10:53:48 +00: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 18:53:55 +00:00
void OBSBasic::on_actionSceneUp_triggered()
added initial main program and directshow files, finally have a UI functioning
2013-11-07 23:45:03 +00:00
{
UI: Implement scene reordering This simply saves/loads the actual list widget item order. The reason why this is done is because internally, libobs doesn't have a list of scenes, it only has a list of sources. The list of scenes is actually something artificially implemented by the basic window user interface.
2015-06-25 10:53:48 +00:00
ChangeSceneIndex(true, -1, 0);
added initial main program and directshow files, finally have a UI functioning
2013-11-07 23:45:03 +00: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 18:53:55 +00:00
void OBSBasic::on_actionSceneDown_triggered()
make it so that when a scene is clicked it becomes active
2013-12-30 08:17:57 +00:00
{
UI: Implement scene reordering This simply saves/loads the actual list widget item order. The reason why this is done is because internally, libobs doesn't have a list of scenes, it only has a list of sources. The list of scenes is actually something artificially implemented by the basic window user interface.
2015-06-25 10:53:48 +00: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);
make it so that when a scene is clicked it becomes active
2013-12-30 08:17:57 +00:00
}
UI: Fix multi-item selection Allows changing item selection via list box or via preview window, and keeps their selection status in sync with each other.
2015-11-15 16:39:50 +00:00
void OBSBasic::on_sources_itemSelectionChanged()
make it so that when a scene is clicked it becomes active
2013-12-30 08:17:57 +00:00
{
UI: Fix multi-item selection Allows changing item selection via list box or via preview window, and keeps their selection status in sync with each other.
2015-11-15 16:39:50 +00:00
SignalBlocker sourcesSignalBlocker(ui->sources);
Do not visually select audio-only sources
2014-07-04 17:58:03 +00:00
UI: Fix multi-item selection Allows changing item selection via list box or via preview window, and keeps their selection status in sync with each other.
2015-11-15 16:39:50 +00:00
auto updateItemSelection = [&]()
UI: Ignore sources selection self-update roundtrips
2015-06-27 01:32:33 +00:00
{
ignoreSelectionUpdate = true;
UI: Fix multi-item selection Allows changing item selection via list box or via preview window, and keeps their selection status in sync with each other.
2015-11-15 16:39:50 +00: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());
}
UI: Ignore sources selection self-update roundtrips
2015-06-27 01:32:33 +00:00
ignoreSelectionUpdate = false;
};
UI: Fix multi-item selection Allows changing item selection via list box or via preview window, and keeps their selection status in sync with each other.
2015-11-15 16:39:50 +00:00
using updateItemSelection_t = decltype(updateItemSelection);
UI: Ignore sources selection self-update roundtrips
2015-06-27 01:32:33 +00:00
obs_scene_atomic_update(GetCurrentScene(),
UI: Fix multi-item selection Allows changing item selection via list box or via preview window, and keeps their selection status in sync with each other.
2015-11-15 16:39:50 +00:00
[](void *data, obs_scene_t *)
UI: Ignore sources selection self-update roundtrips
2015-06-27 01:32:33 +00:00
{
UI: Fix multi-item selection Allows changing item selection via list box or via preview window, and keeps their selection status in sync with each other.
2015-11-15 16:39:50 +00:00
(*static_cast<updateItemSelection_t*>(data))();
}, static_cast<void*>(&updateItemSelection));
make it so that when a scene is clicked it becomes active
2013-12-30 08:17:57 +00:00
}
Implement context menu on 'sources' box
2014-06-30 08:13:32 +00:00
void OBSBasic::EditSceneItemName()
{
UI: Fix preview right-click menu getting wrong source When right-clicking items in the preview window and getting context menus for them, it would often make the wrong scene item be associated with the context menu because of the fact that it was using QListWidget::currentItem instead of querying the actual selected list. You must query the actual selection list via QListWidget::selectedItems because QListWidget::currentItem does not work properly for multi-selection list widgets.
2016-01-23 19:02:22 +00:00
QListWidgetItem *item = GetTopSelectedSourceItem();
Disable double click renaming for both scenes and sources
2014-10-15 20:05:21 +00:00
Qt::ItemFlags flags = item->flags();
UI: Add QtDataRole enum This introduces the OBSSignals data role, which will be used to store signal handlers in stock Qt objects
2015-06-28 01:21:45 +00:00
OBSSceneItem sceneItem= GetOBSRef<OBSSceneItem>(item);
UI: Add visibility checkbox to main sources list Adds a visibility checkbox to the main sources list so that users can temporarily disable/re-enable sources. Only applies to scene items, not the sources themselves.
2015-03-23 03:51:21 +00:00
obs_source_t *source = obs_sceneitem_get_source(sceneItem);
const char *name = obs_source_get_name(source);
Disable double click renaming for both scenes and sources
2014-10-15 20:05:21 +00:00
UI: Add visibility checkbox to main sources list Adds a visibility checkbox to the main sources list so that users can temporarily disable/re-enable sources. Only applies to scene items, not the sources themselves.
2015-03-23 03:51:21 +00:00
item->setText(QT_UTF8(name));
Disable double click renaming for both scenes and sources
2014-10-15 20:05:21 +00:00
item->setFlags(flags | Qt::ItemIsEditable);
UI: Add visibility checkbox to main sources list Adds a visibility checkbox to the main sources list so that users can temporarily disable/re-enable sources. Only applies to scene items, not the sources themselves.
2015-03-23 03:51:21 +00:00
ui->sources->removeItemWidget(item);
Disable double click renaming for both scenes and sources
2014-10-15 20:05:21 +00:00
ui->sources->editItem(item);
item->setFlags(flags);
Implement context menu on 'sources' box
2014-06-30 08:13:32 +00:00
}
UI: Add deinterlacing to UI Accessible via the context menu of a source.
2016-03-16 03:55:40 +00: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;
}
UI: Add scaling filter options for scene items to UI Adds scale filtering options to the scene item right-click context menu.
2016-06-29 14:08:02 +00: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;
}
UI: Add context menu to preview Includes the ability to disable the preview and general source context menu options (add/remove/filters/properties/etc)
2015-04-03 04:35:46 +00:00
void OBSBasic::CreateSourcePopupMenu(QListWidgetItem *item, bool preview)
added initial main program and directshow files, finally have a UI functioning
2013-11-07 23:45:03 +00:00
{
UI: Fix missing widget parent from constructor The styling isn't applied if the widget doesn't have a parent
2015-01-16 09:21:11 +00:00
QMenu popup(this);
UI: Add fullscreen projector options Add the ability to use a fullscreen projector for scenes, sources, and the preview display.
2015-04-04 08:40:15 +00:00
QPointer<QMenu> previewProjector;
QPointer<QMenu> sourceProjector;
UI: Add context menu to preview Includes the ability to disable the preview and general source context menu options (add/remove/filters/properties/etc)
2015-04-03 04:35:46 +00:00
if (preview) {
QAction *action = popup.addAction(
QTStr("Basic.Main.PreviewConextMenu.Enable"),
this, SLOT(TogglePreview()));
action->setCheckable(true);
UI: Change "main preview" to use OBSQTDisplay (Non-compiling commit: windowless-context branch) Gets rid of all functions/data related to setting up the main preview to be associated with obs_reset_video and instead uses OBSQTDisplay for the main window display (thus associating it with an obs_display object).
2015-08-02 07:02:58 +00: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 19:19:29 +00:00
if (IsPreviewProgramMode())
action->setEnabled(false);
UI: Add context menu to preview Includes the ability to disable the preview and general source context menu options (add/remove/filters/properties/etc)
2015-04-03 04:35:46 +00:00
UI: Add preview scaling options Adds preview scaling to the right-click context menu for the preview pane. This allows the ability to, for example, zoom the preview and edit the preview 1:1 (canvas/base resolution). This was a missing parity feature. Additionally, also allows scaling to the "output/scaled" resolution the program is set to. When the preview is in scale mode and is the focused widget, you can hold space and drag with left click to change the zoomed position. (Notes added by Jim) Closes jp9000/obs-studio#687
2016-11-05 16:48:46 +00:00
popup.addAction(ui->actionLockPreview);
popup.addMenu(ui->scalingMenu);
UI: Add ability to lock preview Adds the ability to lock the preview so sources can't be edited. This feature is typically used in the case where the user wants to prevent accidentally clicking and dragging on sources.
2016-07-26 08:32:43 +00:00
UI: Add fullscreen projector options Add the ability to use a fullscreen projector for scenes, sources, and the preview display.
2015-04-04 08:40:15 +00:00
previewProjector = new QMenu(QTStr("PreviewProjector"));
AddProjectorMenuMonitors(previewProjector, this,
SLOT(OpenPreviewProjector()));
popup.addMenu(previewProjector);
UI: Add ability to output to window Closes jp9000/obs-studio#841
2017-03-02 04:08:49 +00:00
QAction *previewWindow = popup.addAction(
QTStr("PreviewWindow"),
this, SLOT(OpenPreviewWindow()));
popup.addAction(previewWindow);
UI: Add context menu to preview Includes the ability to disable the preview and general source context menu options (add/remove/filters/properties/etc)
2015-04-03 04:35:46 +00:00
popup.addSeparator();
}
Implement context menu on 'sources' box
2014-06-30 08:13:32 +00:00
QPointer<QMenu> addSourceMenu = CreateAddSourcePopupMenu();
if (addSourceMenu)
popup.addMenu(addSourceMenu);
UI: Add copying/pasting of sources/filters Closes jp9000/obs-studio#860
2017-03-25 11:19:29 +00:00
ui->actionCopyFilters->setEnabled(false);
popup.addSeparator();
popup.addAction(ui->actionCopySource);
popup.addAction(ui->actionPasteRef);
popup.addAction(ui->actionPasteDup);
popup.addSeparator();
popup.addSeparator();
popup.addAction(ui->actionCopyFilters);
popup.addAction(ui->actionPasteFilters);
popup.addSeparator();
Implement context menu on 'sources' box
2014-06-30 08:13:32 +00:00
if (item) {
if (addSourceMenu)
popup.addSeparator();
Add interaction gui
2014-09-15 23:16:16 +00:00
OBSSceneItem sceneItem = GetSceneItem(item);
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
obs_source_t *source = obs_sceneitem_get_source(sceneItem);
UI: Add deinterlacing to UI Accessible via the context menu of a source.
2016-03-16 03:55:40 +00:00
uint32_t flags = obs_source_get_output_flags(source);
bool isAsyncVideo = (flags & OBS_SOURCE_ASYNC_VIDEO) ==
OBS_SOURCE_ASYNC_VIDEO;
UI: Allow hiding/unhiding sources in the mixer Allows the ability to hide/unhide sources in the mixer that the user doesn't care about or doesn't necessarily want to see (such as video sources that have audio but don't have any audio playing). If all sources are hidden, the user can right-click the mixer's empty area and choose "unhide all" via a context menu. Closes jp9000/obs-studio#1002
2017-09-14 04:10:45 +00:00
bool hasAudio = (flags & OBS_SOURCE_AUDIO) ==
OBS_SOURCE_AUDIO;
Add interaction gui
2014-09-15 23:16:16 +00:00
QAction *action;
Implement context menu on 'sources' box
2014-06-30 08:13:32 +00:00
popup.addAction(QTStr("Rename"), this,
SLOT(EditSceneItemName()));
Remove 'remove item' action, clean up code The removeItemAction just for a keyboard shortcut was unnecessary. Instead, use the toolbar button to associate a shortcut with, and remove the removeItemAction object.
2014-07-01 01:21:40 +00:00
popup.addAction(QTStr("Remove"), this,
SLOT(on_actionRemoveSource_triggered()),
Fix sources context menu "Remove" shortcut for OSX
2014-10-15 20:00:43 +00:00
DeleteKeys.front());
Implement 'Order' menu Contains Move Up, Move Down, Move to Top, Move to Bottom. Also assigns Ctrl-Up, Ctrl-Down, Ctrl-Home, Ctrl-End to each action. This was also added to the right-click context menu popup for sources.
2014-07-01 02:47:06 +00:00
popup.addSeparator();
popup.addMenu(ui->orderMenu);
Implement context menu on 'sources' box
2014-06-30 08:13:32 +00:00
popup.addMenu(ui->transformMenu);
UI: Add fullscreen projector options Add the ability to use a fullscreen projector for scenes, sources, and the preview display.
2015-04-04 08:40:15 +00:00
sourceProjector = new QMenu(QTStr("SourceProjector"));
AddProjectorMenuMonitors(sourceProjector, this,
SLOT(OpenSourceProjector()));
UI: Add ability to output to window Closes jp9000/obs-studio#841
2017-03-02 04:08:49 +00:00
QAction *sourceWindow = popup.addAction(
QTStr("SourceWindow"),
this, SLOT(OpenSourceWindow()));
popup.addAction(sourceWindow);
UI: Add fullscreen projector options Add the ability to use a fullscreen projector for scenes, sources, and the preview display.
2015-04-04 08:40:15 +00:00
popup.addSeparator();
UI: Allow hiding/unhiding sources in the mixer Allows the ability to hide/unhide sources in the mixer that the user doesn't care about or doesn't necessarily want to see (such as video sources that have audio but don't have any audio playing). If all sources are hidden, the user can right-click the mixer's empty area and choose "unhide all" via a context menu. Closes jp9000/obs-studio#1002
2017-09-14 04:10:45 +00:00
if (hasAudio) {
QAction *actionHideMixer = popup.addAction(
QTStr("HideMixer"),
this, SLOT(ToggleHideMixer()));
actionHideMixer->setCheckable(true);
actionHideMixer->setChecked(SourceMixerHidden(source));
}
UI: Add deinterlacing to UI Accessible via the context menu of a source.
2016-03-16 03:55:40 +00:00
if (isAsyncVideo) {
popup.addMenu(AddDeinterlacingMenu(source));
popup.addSeparator();
}
UI: Add scaling filter options for scene items to UI Adds scale filtering options to the scene item right-click context menu.
2016-06-29 14:08:02 +00:00
popup.addMenu(AddScaleFilteringMenu(sceneItem));
popup.addSeparator();
UI: Add fullscreen projector options Add the ability to use a fullscreen projector for scenes, sources, and the preview display.
2015-04-04 08:40:15 +00:00
popup.addMenu(sourceProjector);
UI: Add ability to output to window Closes jp9000/obs-studio#841
2017-03-02 04:08:49 +00:00
popup.addAction(sourceWindow);
Implement context menu on 'sources' box
2014-06-30 08:13:32 +00:00
popup.addSeparator();
Add interaction gui
2014-09-15 23:16:16 +00:00
action = popup.addAction(QTStr("Interact"), this,
SLOT(on_actionInteract_triggered()));
action->setEnabled(obs_source_get_output_flags(source) &
OBS_SOURCE_INTERACTION);
UI: Add user interface for filters
2015-02-26 05:23:57 +00:00
popup.addAction(QTStr("Filters"), this,
SLOT(OpenFilters()));
Implement context menu on 'sources' box
2014-06-30 08:13:32 +00:00
popup.addAction(QTStr("Properties"), this,
SLOT(on_actionSourceProperties_triggered()));
UI: Add copying/pasting of sources/filters Closes jp9000/obs-studio#860
2017-03-25 11:19:29 +00:00
ui->actionCopyFilters->setEnabled(true);
Implement context menu on 'sources' box
2014-06-30 08:13:32 +00:00
}
popup.exec(QCursor::pos());
added initial main program and directshow files, finally have a UI functioning
2013-11-07 23:45:03 +00:00
}
UI: Add context menu to preview Includes the ability to disable the preview and general source context menu options (add/remove/filters/properties/etc)
2015-04-03 04:35:46 +00:00
void OBSBasic::on_sources_customContextMenuRequested(const QPoint &pos)
{
UI: Don't create sources popup menu if no scenes Closes jp9000/obs-studio#499
2016-01-03 05:01:48 +00:00
if (ui->scenes->count())
CreateSourcePopupMenu(ui->sources->itemAt(pos), false);
UI: Add context menu to preview Includes the ability to disable the preview and general source context menu options (add/remove/filters/properties/etc)
2015-04-03 04:35:46 +00:00
}
Open source properties on double click
2014-10-15 20:05:56 +00: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);
}
Add 'source selection' dialog Add a 'source selection' dialog to replace the 'enter a name' dialog. This new dialog allows you to make new instances of pre-existing sources so that you can add a pre-existing source to a different scene, or in to the same scene more than once. Also started implementing locale. Comtemplating switching to JSON-based locale later, so we can add things like descriptions/disambiguation, and so we can use jansson's built-in hash table when doing the string lookup.
2014-05-11 01:47:48 +00:00
void OBSBasic::AddSource(const char *id)
update API and implement preliminary ability to add sources to scenes
2013-12-30 13:56:39 +00:00
{
Use signal/slot when creating a source via popup I realized that there's no other way to share the menu if I want to add it as a sub-menu somewhere else.
2014-06-30 00:33:40 +00:00
if (id && *id) {
OBSBasicSourceSelect sourceSelect(this, id);
sourceSelect.exec();
UI: Move properties window creation for new sources Currently creating new sources can cause a deadlock: OBSBasicSourceSelect locks the scene mutex when adding a new source (required to add invisible sources), and later OBSBasic tries to lock the graphics mutex (via CreatePropertiesWindow); meanwhile the graphics thread is holding the graphics mutex and tries to lock each scene as it renders them, resulting in a (non-obvious from the code) lock ordering conflict. Moving the CreatePropertiesWindow call out of the locked scene mutex restores the previous lock ordering; in addition, the requirement for keeping sourceSceneRefs for opening that initial properties window is removed
2015-10-24 14:07:05 +00:00
if (sourceSelect.newSource)
CreatePropertiesWindow(sourceSelect.newSource);
Use signal/slot when creating a source via popup I realized that there's no other way to share the menu if I want to add it as a sub-menu somewhere else.
2014-06-30 00:33:40 +00:00
}
update API and implement preliminary ability to add sources to scenes
2013-12-30 13:56:39 +00:00
}
Use signal/slot when creating a source via popup I realized that there's no other way to share the menu if I want to add it as a sub-menu somewhere else.
2014-06-30 00:33:40 +00:00
QMenu *OBSBasic::CreateAddSourcePopupMenu()
added initial main program and directshow files, finally have a UI functioning
2013-11-07 23:45:03 +00:00
{
update API and implement preliminary ability to add sources to scenes
2013-12-30 13:56:39 +00: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 18:53:55 +00:00
bool foundValues = false;
UI: Allow the ability to use deprecated sources
2016-11-03 19:28:33 +00: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 18:53:55 +00:00
size_t idx = 0;
update API and implement preliminary ability to add sources to scenes
2013-12-30 13:56:39 +00:00
UI: Fix missing widget parent from constructor The styling isn't applied if the widget doesn't have a parent
2015-01-16 09:21:11 +00:00
QMenu *popup = new QMenu(QTStr("Add"), this);
UI: Allow the ability to use deprecated sources
2016-11-03 19:28:33 +00:00
QMenu *deprecated = new QMenu(QTStr("Deprecated"), popup);
Add preliminary saving/loading of scene/sources This saves scenes/sources from json on exit, and properly loads it back up when starting up the program again, as well as the currently active scene. I had to add a 'load' and 'save' callback to the source interface structure because I realizes that certain sources (such as scenes) operate different with their saved data; scenes for example would have to keep track of their settings information constantly, and that was somewhat unacceptable to make it functional. The optional 'load' callback will be called only after having loaded setttings specifically from file/imported data, and the 'save' function will be called only specifically when data actually needs to be saved. I also had to adjust the obs_scene code so that it's a regular input source type now, and I also modified it so that it doesn't have some strange custom creation code anymore. The obs_scene_create function is now simply just a wrapper for obs_source_create. You could even create a scene with obs_source_create manually as well.
2014-04-27 06:47:50 +00:00
UI: Sort 'Add' source popup menu
2016-09-14 23:27:04 +00: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 18:53:55 +00:00
popupItem->setData(QT_UTF8(type));
Use signal/slot when creating a source via popup I realized that there's no other way to share the menu if I want to add it as a sub-menu somewhere else.
2014-06-30 00:33:40 +00:00
connect(popupItem, SIGNAL(triggered(bool)),
this, SLOT(AddSourceFromAction()));
UI: Sort 'Add' source popup menu
2016-09-14 23:27:04 +00:00
QAction *after = getActionAfter(popup, qname);
popup->insertAction(after, popupItem);
UI: Allow adding scenes as scene items Allows adding scenes as scene items. Note that you will not be able to add scenes if it detects infinite recursion (i.e. adding scene A to scene B, then adding scene B to scene A), in that case it will just fail to create the scene item.
2016-07-01 22:23:06 +00:00
};
update API and implement preliminary ability to add sources to scenes
2013-12-30 13:56:39 +00:00
UI: Allow adding scenes as scene items Allows adding scenes as scene items. Note that you will not be able to add scenes if it detects infinite recursion (i.e. adding scene A to scene B, then adding scene B to scene A), in that case it will just fail to create the scene item.
2016-07-01 22:23:06 +00:00
while (obs_enum_input_types(idx++, &type)) {
const char *name = obs_source_get_display_name(type);
UI: Hide deprecated sources from add source popup menu
2016-09-14 23:32:56 +00:00
uint32_t caps = obs_get_source_output_flags(type);
UI: Allow adding scenes as scene items Allows adding scenes as scene items. Note that you will not be able to add scenes if it detects infinite recursion (i.e. adding scene A to scene B, then adding scene B to scene A), in that case it will just fail to create the scene item.
2016-07-01 22:23:06 +00:00
UI: Hide deprecated sources from add source popup menu
2016-09-14 23:32:56 +00:00
if ((caps & OBS_SOURCE_DEPRECATED) == 0) {
addSource(popup, type, name);
UI: Allow the ability to use deprecated sources
2016-11-03 19:28:33 +00:00
} else {
addSource(deprecated, type, name);
foundDeprecated = true;
UI: Hide deprecated sources from add source popup menu
2016-09-14 23:32:56 +00:00
}
UI: Allow the ability to use deprecated sources
2016-11-03 19:28:33 +00:00
foundValues = true;
update API and implement preliminary ability to add sources to scenes
2013-12-30 13:56:39 +00:00
}
UI: Sort 'Add' source popup menu
2016-09-14 23:27:04 +00:00
addSource(popup, "scene", Str("Basic.Scene"));
UI: Allow adding scenes as scene items Allows adding scenes as scene items. Note that you will not be able to add scenes if it detects infinite recursion (i.e. adding scene A to scene B, then adding scene B to scene A), in that case it will just fail to create the scene item.
2016-07-01 22:23:06 +00:00
UI: Allow the ability to use deprecated sources
2016-11-03 19:28:33 +00:00
if (!foundDeprecated) {
delete deprecated;
deprecated = nullptr;
}
Use signal/slot when creating a source via popup I realized that there's no other way to share the menu if I want to add it as a sub-menu somewhere else.
2014-06-30 00:33:40 +00:00
if (!foundValues) {
delete popup;
popup = nullptr;
UI: Allow the ability to use deprecated sources
2016-11-03 19:28:33 +00:00
} else if (foundDeprecated) {
popup->addMenu(deprecated);
update API and implement preliminary ability to add sources to scenes
2013-12-30 13:56:39 +00:00
}
Use signal/slot when creating a source via popup I realized that there's no other way to share the menu if I want to add it as a sub-menu somewhere else.
2014-06-30 00:33:40 +00: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).
UI: Make sure all message box buttons are translated Instead of QMessageBox::question and QMessageBox::information, use the OBSMessageBox class, which translates all buttons.
2017-05-13 21:06:32 +00:00
OBSMessageBox::information(this,
Use signal/slot when creating a source via popup I realized that there's no other way to share the menu if I want to add it as a sub-menu somewhere else.
2014-06-30 00:33:40 +00:00
QTStr("Basic.Main.AddSourceHelp.Title"),
QTStr("Basic.Main.AddSourceHelp.Text"));
return;
}
QPointer<QMenu> popup = CreateAddSourcePopupMenu();
if (popup)
popup->exec(pos);
update API and implement preliminary ability to add sources to scenes
2013-12-30 13:56:39 +00: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 18:53:55 +00:00
void OBSBasic::on_actionAddSource_triggered()
update API and implement preliminary ability to add sources to scenes
2013-12-30 13:56:39 +00: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 18:53:55 +00:00
AddSourcePopupMenu(QCursor::pos());
added initial main program and directshow files, finally have a UI functioning
2013-11-07 23:45:03 +00: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 18:53:55 +00:00
void OBSBasic::on_actionRemoveSource_triggered()
added initial main program and directshow files, finally have a UI functioning
2013-11-07 23:45:03 +00:00
{
UI: Allow removing multiple selected scene items
2016-07-02 22:44:24 +00:00
vector<OBSSceneItem> items;
Make 'remove' toolbar buttons query for removal
2014-06-30 20:45:58 +00:00
UI: Allow removing multiple selected scene items
2016-07-02 22:44:24 +00: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);
}
}
added initial main program and directshow files, finally have a UI functioning
2013-11-07 23:45:03 +00:00
}
Add interaction gui
2014-09-15 23:16:16 +00: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 18:53:55 +00:00
void OBSBasic::on_actionSourceProperties_triggered()
added initial main program and directshow files, finally have a UI functioning
2013-11-07 23:45:03 +00:00
{
Add source properties window (very preliminary) - Add a properties window for sources so that you can now actually edit the settings for sources. Also, display the source by itself in the window (Note: not working on mac, and possibly not working on linux). When changing the settings for a source, it will call obs_source_update on that source when you have modified any values automatically. - Add a properties 'widget', eventually I want to turn this in to a regular nice properties view like you'd see in the designer, but right now it just uses a form layout in a QScrollArea with regular controls to display the properties. It's clunky but works for the time being. - Make it so that swap chains and the main graphics subsystem will automatically use at least one backbuffer if none was specified - Fix bug where displays weren't added to the main display array - Make it so that you can get the properties of a source via the actual pointer of a source/encoder/output in addition to being able to look up properties via identifier. - When registering source types, check for required functions (wasn't doing it before). getheight/getwidth should not be optional if it's a video source as well. - Add an RAII OBSObj wrapper to obs.hpp for non-reference-counted libobs pointers - Add an RAII OBSSignal wrapper to obs.hpp for libobs signals to automatically disconnect them on destruction - Move the "scale and center" calculation in window-basic-main.cpp to its own function and in its own source file - Add an 'update' callback to WASAPI audio sources
2014-03-23 08:07:54 +00:00
OBSSceneItem item = GetCurrentSceneItem();
(API Change) Un-squish obs_sceneitem_* Renamed: To: ----------------------------------------------------------- obs_sceneitem_getscene obs_sceneitem_get_scene obs_sceneitem_getsource obs_sceneitem_get_source obs_sceneitem_setpos obs_sceneitem_set_pos obs_sceneitem_setrot obs_sceneitem_set_rot obs_sceneitem_setscale obs_sceneitem_set_scale obs_sceneitem_setalignment obs_sceneitem_set_alignment obs_sceneitem_setorder obs_sceneitem_set_order obs_sceneitem_getpos obs_sceneitem_get_pos obs_sceneitem_getrot obs_sceneitem_get_rot obs_sceneitem_getscale obs_sceneitem_get_scale obs_sceneitem_getalignment obs_sceneitem_get_alignment
2014-08-03 21:39:19 +00:00
OBSSource source = obs_sceneitem_get_source(item);
Add source properties window (very preliminary) - Add a properties window for sources so that you can now actually edit the settings for sources. Also, display the source by itself in the window (Note: not working on mac, and possibly not working on linux). When changing the settings for a source, it will call obs_source_update on that source when you have modified any values automatically. - Add a properties 'widget', eventually I want to turn this in to a regular nice properties view like you'd see in the designer, but right now it just uses a form layout in a QScrollArea with regular controls to display the properties. It's clunky but works for the time being. - Make it so that swap chains and the main graphics subsystem will automatically use at least one backbuffer if none was specified - Fix bug where displays weren't added to the main display array - Make it so that you can get the properties of a source via the actual pointer of a source/encoder/output in addition to being able to look up properties via identifier. - When registering source types, check for required functions (wasn't doing it before). getheight/getwidth should not be optional if it's a video source as well. - Add an RAII OBSObj wrapper to obs.hpp for non-reference-counted libobs pointers - Add an RAII OBSSignal wrapper to obs.hpp for libobs signals to automatically disconnect them on destruction - Move the "scale and center" calculation in window-basic-main.cpp to its own function and in its own source file - Add an 'update' callback to WASAPI audio sources
2014-03-23 08:07:54 +00:00
Minor refactor for creation of sub-windows This refactors the sub-window code a bit so that instead of deleting the window pointers, it calls QWidget::close() on them to safely trigger a normal close on them instead (which will also delete them). Moves setting the DeleteOnClose flag from inside of the Dialog classes into the OBSBasic class, to make that behaviour more obvious.
2014-07-22 20:16:57 +00:00
if (source)
CreatePropertiesWindow(source);
added initial main program and directshow files, finally have a UI functioning
2013-11-07 23:45:03 +00: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 18:53:55 +00:00
void OBSBasic::on_actionSourceUp_triggered()
added initial main program and directshow files, finally have a UI functioning
2013-11-07 23:45:03 +00:00
{
Add ability to move source up/down/etc
2014-05-16 00:40:53 +00:00
OBSSceneItem item = GetCurrentSceneItem();
(API Change) Un-squish obs_sceneitem_* Renamed: To: ----------------------------------------------------------- obs_sceneitem_getscene obs_sceneitem_get_scene obs_sceneitem_getsource obs_sceneitem_get_source obs_sceneitem_setpos obs_sceneitem_set_pos obs_sceneitem_setrot obs_sceneitem_set_rot obs_sceneitem_setscale obs_sceneitem_set_scale obs_sceneitem_setalignment obs_sceneitem_set_alignment obs_sceneitem_setorder obs_sceneitem_set_order obs_sceneitem_getpos obs_sceneitem_get_pos obs_sceneitem_getrot obs_sceneitem_get_rot obs_sceneitem_getscale obs_sceneitem_get_scale obs_sceneitem_getalignment obs_sceneitem_get_alignment
2014-08-03 21:39:19 +00:00
obs_sceneitem_set_order(item, OBS_ORDER_MOVE_UP);
added initial main program and directshow files, finally have a UI functioning
2013-11-07 23:45:03 +00:00
}
added more button callbacks
2013-12-10 18:22:33 +00: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 18:53:55 +00:00
void OBSBasic::on_actionSourceDown_triggered()
change a few names for some of the control callbacks
2013-12-11 04:14:45 +00:00
{
Add ability to move source up/down/etc
2014-05-16 00:40:53 +00:00
OBSSceneItem item = GetCurrentSceneItem();
(API Change) Un-squish obs_sceneitem_* Renamed: To: ----------------------------------------------------------- obs_sceneitem_getscene obs_sceneitem_get_scene obs_sceneitem_getsource obs_sceneitem_get_source obs_sceneitem_setpos obs_sceneitem_set_pos obs_sceneitem_setrot obs_sceneitem_set_rot obs_sceneitem_setscale obs_sceneitem_set_scale obs_sceneitem_setalignment obs_sceneitem_set_alignment obs_sceneitem_setorder obs_sceneitem_set_order obs_sceneitem_getpos obs_sceneitem_get_pos obs_sceneitem_getrot obs_sceneitem_get_rot obs_sceneitem_getscale obs_sceneitem_get_scale obs_sceneitem_getalignment obs_sceneitem_get_alignment
2014-08-03 21:39:19 +00:00
obs_sceneitem_set_order(item, OBS_ORDER_MOVE_DOWN);
change a few names for some of the control callbacks
2013-12-11 04:14:45 +00:00
}
Implement 'Order' menu Contains Move Up, Move Down, Move to Top, Move to Bottom. Also assigns Ctrl-Up, Ctrl-Down, Ctrl-Home, Ctrl-End to each action. This was also added to the right-click context menu popup for sources.
2014-07-01 02:47:06 +00:00
void OBSBasic::on_actionMoveUp_triggered()
{
OBSSceneItem item = GetCurrentSceneItem();
(API Change) Un-squish obs_sceneitem_* Renamed: To: ----------------------------------------------------------- obs_sceneitem_getscene obs_sceneitem_get_scene obs_sceneitem_getsource obs_sceneitem_get_source obs_sceneitem_setpos obs_sceneitem_set_pos obs_sceneitem_setrot obs_sceneitem_set_rot obs_sceneitem_setscale obs_sceneitem_set_scale obs_sceneitem_setalignment obs_sceneitem_set_alignment obs_sceneitem_setorder obs_sceneitem_set_order obs_sceneitem_getpos obs_sceneitem_get_pos obs_sceneitem_getrot obs_sceneitem_get_rot obs_sceneitem_getscale obs_sceneitem_get_scale obs_sceneitem_getalignment obs_sceneitem_get_alignment
2014-08-03 21:39:19 +00:00
obs_sceneitem_set_order(item, OBS_ORDER_MOVE_UP);
Implement 'Order' menu Contains Move Up, Move Down, Move to Top, Move to Bottom. Also assigns Ctrl-Up, Ctrl-Down, Ctrl-Home, Ctrl-End to each action. This was also added to the right-click context menu popup for sources.
2014-07-01 02:47:06 +00:00
}
void OBSBasic::on_actionMoveDown_triggered()
{
OBSSceneItem item = GetCurrentSceneItem();
(API Change) Un-squish obs_sceneitem_* Renamed: To: ----------------------------------------------------------- obs_sceneitem_getscene obs_sceneitem_get_scene obs_sceneitem_getsource obs_sceneitem_get_source obs_sceneitem_setpos obs_sceneitem_set_pos obs_sceneitem_setrot obs_sceneitem_set_rot obs_sceneitem_setscale obs_sceneitem_set_scale obs_sceneitem_setalignment obs_sceneitem_set_alignment obs_sceneitem_setorder obs_sceneitem_set_order obs_sceneitem_getpos obs_sceneitem_get_pos obs_sceneitem_getrot obs_sceneitem_get_rot obs_sceneitem_getscale obs_sceneitem_get_scale obs_sceneitem_getalignment obs_sceneitem_get_alignment
2014-08-03 21:39:19 +00:00
obs_sceneitem_set_order(item, OBS_ORDER_MOVE_DOWN);
Implement 'Order' menu Contains Move Up, Move Down, Move to Top, Move to Bottom. Also assigns Ctrl-Up, Ctrl-Down, Ctrl-Home, Ctrl-End to each action. This was also added to the right-click context menu popup for sources.
2014-07-01 02:47:06 +00:00
}
void OBSBasic::on_actionMoveToTop_triggered()
{
OBSSceneItem item = GetCurrentSceneItem();
(API Change) Un-squish obs_sceneitem_* Renamed: To: ----------------------------------------------------------- obs_sceneitem_getscene obs_sceneitem_get_scene obs_sceneitem_getsource obs_sceneitem_get_source obs_sceneitem_setpos obs_sceneitem_set_pos obs_sceneitem_setrot obs_sceneitem_set_rot obs_sceneitem_setscale obs_sceneitem_set_scale obs_sceneitem_setalignment obs_sceneitem_set_alignment obs_sceneitem_setorder obs_sceneitem_set_order obs_sceneitem_getpos obs_sceneitem_get_pos obs_sceneitem_getrot obs_sceneitem_get_rot obs_sceneitem_getscale obs_sceneitem_get_scale obs_sceneitem_getalignment obs_sceneitem_get_alignment
2014-08-03 21:39:19 +00:00
obs_sceneitem_set_order(item, OBS_ORDER_MOVE_TOP);
Implement 'Order' menu Contains Move Up, Move Down, Move to Top, Move to Bottom. Also assigns Ctrl-Up, Ctrl-Down, Ctrl-Home, Ctrl-End to each action. This was also added to the right-click context menu popup for sources.
2014-07-01 02:47:06 +00:00
}
void OBSBasic::on_actionMoveToBottom_triggered()
{
OBSSceneItem item = GetCurrentSceneItem();
(API Change) Un-squish obs_sceneitem_* Renamed: To: ----------------------------------------------------------- obs_sceneitem_getscene obs_sceneitem_get_scene obs_sceneitem_getsource obs_sceneitem_get_source obs_sceneitem_setpos obs_sceneitem_set_pos obs_sceneitem_setrot obs_sceneitem_set_rot obs_sceneitem_setscale obs_sceneitem_set_scale obs_sceneitem_setalignment obs_sceneitem_set_alignment obs_sceneitem_setorder obs_sceneitem_set_order obs_sceneitem_getpos obs_sceneitem_get_pos obs_sceneitem_getrot obs_sceneitem_get_rot obs_sceneitem_getscale obs_sceneitem_get_scale obs_sceneitem_getalignment obs_sceneitem_get_alignment
2014-08-03 21:39:19 +00:00
obs_sceneitem_set_order(item, OBS_ORDER_MOVE_BOTTOM);
Implement 'Order' menu Contains Move Up, Move Down, Move to Top, Move to Bottom. Also assigns Ctrl-Up, Ctrl-Down, Ctrl-Home, Ctrl-End to each action. This was also added to the right-click context menu popup for sources.
2014-07-01 02:47:06 +00:00
}
Refactor log upload to create JSON via obs_data
2014-08-24 00:02:45 +00:00
static BPtr<char> ReadLogFile(const char *log)
Add help menu with log file uploading Added github gist API uploading to the help menu to help make problems a bit easier to debug in the future. It's somewhat vital that this functionality be implemented before any release in order to analyze any given problem a user may be experiencing.
2014-05-19 00:44:10 +00:00
{
(API Change) Make os_get_config_path safer to use Changed: char *os_get_config_path(const char *name); To: int os_get_config_path(char *dst, size_t size, const char *name); Also added: char *os_get_config_path_ptr(const char *name); I don't like this function returning an allocation by default. Similarly to what was done with the wide character conversion functions, this function now operates on an array argument, and if you really want to just get a pointer for convenience, you use the *_ptr version of the function that clearly indicates that it's returning an allocation.
2015-01-16 07:44:38 +00:00
char logDir[512];
UI: Replace os_get_config_path with GetConfigPath This allows the UI to be able to use a custom config path for cases such as portable mode, where the config path is relative to the executable.
2015-06-01 23:11:57 +00:00
if (GetConfigPath(logDir, sizeof(logDir), "obs-studio/logs") <= 0)
(API Change) Make os_get_config_path safer to use Changed: char *os_get_config_path(const char *name); To: int os_get_config_path(char *dst, size_t size, const char *name); Also added: char *os_get_config_path_ptr(const char *name); I don't like this function returning an allocation by default. Similarly to what was done with the wide character conversion functions, this function now operates on an array argument, and if you really want to just get a pointer for convenience, you use the *_ptr version of the function that clearly indicates that it's returning an allocation.
2015-01-16 07:44:38 +00:00
return nullptr;
Add help menu with log file uploading Added github gist API uploading to the help menu to help make problems a bit easier to debug in the future. It's somewhat vital that this functionality be implemented before any release in order to analyze any given problem a user may be experiencing.
2014-05-19 00:44:10 +00:00
string path = (char*)logDir;
path += "/";
path += log;
Refactor log upload to create JSON via obs_data
2014-08-24 00:02:45 +00:00
BPtr<char> file = os_quick_read_utf8_file(path.c_str());
Add help menu with log file uploading Added github gist API uploading to the help menu to help make problems a bit easier to debug in the future. It's somewhat vital that this functionality be implemented before any release in order to analyze any given problem a user may be experiencing.
2014-05-19 00:44:10 +00:00
if (!file)
blog(LOG_WARNING, "Failed to read log file %s", path.c_str());
return file;
}
void OBSBasic::UploadLog(const char *file)
{
Refactor log upload to create JSON via obs_data
2014-08-24 00:02:45 +00:00
BPtr<char> fileString{ReadLogFile(file)};
Add help menu with log file uploading Added github gist API uploading to the help menu to help make problems a bit easier to debug in the future. It's somewhat vital that this functionality be implemented before any release in order to analyze any given problem a user may be experiencing.
2014-05-19 00:44:10 +00:00
Refactor log upload to create JSON via obs_data
2014-08-24 00:02:45 +00:00
if (!fileString)
Add help menu with log file uploading Added github gist API uploading to the help menu to help make problems a bit easier to debug in the future. It's somewhat vital that this functionality be implemented before any release in order to analyze any given problem a user may be experiencing.
2014-05-19 00:44:10 +00:00
return;
Refactor log upload to create JSON via obs_data
2014-08-24 00:02:45 +00:00
if (!*fileString)
Add help menu with log file uploading Added github gist API uploading to the help menu to help make problems a bit easier to debug in the future. It's somewhat vital that this functionality be implemented before any release in order to analyze any given problem a user may be experiencing.
2014-05-19 00:44:10 +00:00
return;
ui->menuLogFiles->setEnabled(false);
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
auto data_deleter = [](obs_data_t *d) { obs_data_release(d); };
Refactor log upload to create JSON via obs_data
2014-08-24 00:02:45 +00:00
using data_t = unique_ptr<struct obs_data, decltype(data_deleter)>;
Add help menu with log file uploading Added github gist API uploading to the help menu to help make problems a bit easier to debug in the future. It's somewhat vital that this functionality be implemented before any release in order to analyze any given problem a user may be experiencing.
2014-05-19 00:44:10 +00:00
Refactor log upload to create JSON via obs_data
2014-08-24 00:02:45 +00: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};
Add help menu with log file uploading Added github gist API uploading to the help menu to help make problems a bit easier to debug in the future. It's somewhat vital that this functionality be implemented before any release in order to analyze any given problem a user may be experiencing.
2014-05-19 00:44:10 +00:00
Refactor log upload to create JSON via obs_data
2014-08-24 00:02:45 +00:00
obs_data_set_string(content.get(), "content", fileString);
Add help menu with log file uploading Added github gist API uploading to the help menu to help make problems a bit easier to debug in the future. It's somewhat vital that this functionality be implemented before any release in order to analyze any given problem a user may be experiencing.
2014-05-19 00:44:10 +00:00
Refactor log upload to create JSON via obs_data
2014-08-24 00:02:45 +00: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());
Fix typo in log upload
2014-08-25 20:22:57 +00:00
if (!json) {
Refactor log upload to create JSON via obs_data
2014-08-24 00:02:45 +00:00
blog(LOG_ERROR, "Failed to get JSON data for log upload");
return;
}
obs: Refactor network requests. Remove unneeded class members for request and buffer handling. Let Qt do all the hard work here, keeping track of requests and associated data.
2014-08-25 19:22:58 +00: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-24 06:39:39 +00:00
if (logUploadThread) {
logUploadThread->wait();
delete logUploadThread;
}
obs: Refactor network requests. Remove unneeded class members for request and buffer handling. Let Qt do all the hard work here, keeping track of requests and associated data.
2014-08-25 19:22:58 +00: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-24 06:39:39 +00:00
RemoteTextThread *thread = new RemoteTextThread(
"https://api.github.com/gists",
"application/json", json);
logUploadThread = thread;
connect(thread, &RemoteTextThread::Result,
this, &OBSBasic::logUploadFinished);
logUploadThread->start();
Add help menu with log file uploading Added github gist API uploading to the help menu to help make problems a bit easier to debug in the future. It's somewhat vital that this functionality be implemented before any release in order to analyze any given problem a user may be experiencing.
2014-05-19 00:44:10 +00:00
}
Add Help -> "Show Log Files" menu entry
2014-08-22 01:19:19 +00:00
void OBSBasic::on_actionShowLogs_triggered()
{
(API Change) Make os_get_config_path safer to use Changed: char *os_get_config_path(const char *name); To: int os_get_config_path(char *dst, size_t size, const char *name); Also added: char *os_get_config_path_ptr(const char *name); I don't like this function returning an allocation by default. Similarly to what was done with the wide character conversion functions, this function now operates on an array argument, and if you really want to just get a pointer for convenience, you use the *_ptr version of the function that clearly indicates that it's returning an allocation.
2015-01-16 07:44:38 +00:00
char logDir[512];
UI: Replace os_get_config_path with GetConfigPath This allows the UI to be able to use a custom config path for cases such as portable mode, where the config path is relative to the executable.
2015-06-01 23:11:57 +00:00
if (GetConfigPath(logDir, sizeof(logDir), "obs-studio/logs") <= 0)
(API Change) Make os_get_config_path safer to use Changed: char *os_get_config_path(const char *name); To: int os_get_config_path(char *dst, size_t size, const char *name); Also added: char *os_get_config_path_ptr(const char *name); I don't like this function returning an allocation by default. Similarly to what was done with the wide character conversion functions, this function now operates on an array argument, and if you really want to just get a pointer for convenience, you use the *_ptr version of the function that clearly indicates that it's returning an allocation.
2015-01-16 07:44:38 +00:00
return;
Add Help -> "Show Log Files" menu entry
2014-08-22 01:19:19 +00:00
QUrl url = QUrl::fromLocalFile(QT_UTF8(logDir));
QDesktopServices::openUrl(url);
}
Add help menu with log file uploading Added github gist API uploading to the help menu to help make problems a bit easier to debug in the future. It's somewhat vital that this functionality be implemented before any release in order to analyze any given problem a user may be experiencing.
2014-05-19 00:44:10 +00:00
void OBSBasic::on_actionUploadCurrentLog_triggered()
{
UploadLog(App()->GetCurrentLog());
}
void OBSBasic::on_actionUploadLastLog_triggered()
{
UploadLog(App()->GetLastLog());
}
UI: View Log menu entry in Help -> Log Files menu Since the file being logged to changes with each run, opening a log file is a tad more involved than desirable when it's necessary to view the log each time OBS is run. This new menu entry shortcuts opening the file from the file system manually.
2015-02-24 06:04:19 +00:00
void OBSBasic::on_actionViewCurrentLog_triggered()
{
char logDir[512];
UI: Replace os_get_config_path with GetConfigPath This allows the UI to be able to use a custom config path for cases such as portable mode, where the config path is relative to the executable.
2015-06-01 23:11:57 +00:00
if (GetConfigPath(logDir, sizeof(logDir), "obs-studio/logs") <= 0)
UI: View Log menu entry in Help -> Log Files menu Since the file being logged to changes with each run, opening a log file is a tad more involved than desirable when it's necessary to view the log each time OBS is run. This new menu entry shortcuts opening the file from the file system manually.
2015-02-24 06:04:19 +00: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);
}
Add basic update checking
2014-07-14 06:56:28 +00:00
void OBSBasic::on_actionCheckForUpdates_triggered()
{
UI: Add front-end auto-updater
2017-02-20 12:46:29 +00:00
CheckForUpdates(true);
Add basic update checking
2014-07-14 06:56:28 +00: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-24 06:39:39 +00:00
void OBSBasic::logUploadFinished(const QString &text, const QString &error)
Add help menu with log file uploading Added github gist API uploading to the help menu to help make problems a bit easier to debug in the future. It's somewhat vital that this functionality be implemented before any release in order to analyze any given problem a user may be experiencing.
2014-05-19 00:44:10 +00: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-24 06:39:39 +00:00
if (text.isEmpty()) {
UI: Make sure all message box buttons are translated Instead of QMessageBox::question and QMessageBox::information, use the OBSMessageBox class, which translates all buttons.
2017-05-13 21:06:32 +00:00
OBSMessageBox::information(this,
Add help menu with log file uploading Added github gist API uploading to the help menu to help make problems a bit easier to debug in the future. It's somewhat vital that this functionality be implemented before any release in order to analyze any given problem a user may be experiencing.
2014-05-19 00:44:10 +00:00
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-24 06:39:39 +00:00
error);
Add help menu with log file uploading Added github gist API uploading to the help menu to help make problems a bit easier to debug in the future. It's somewhat vital that this functionality be implemented before any release in order to analyze any given problem a user may be experiencing.
2014-05-19 00:44:10 +00: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-24 06:39:39 +00:00
obs_data_t *returnData = obs_data_create_from_json(QT_TO_UTF8(text));
obs: Refactor network requests. Remove unneeded class members for request and buffer handling. Let Qt do all the hard work here, keeping track of requests and associated data.
2014-08-25 19:22:58 +00:00
QString logURL = obs_data_get_string(returnData, "html_url");
Add help menu with log file uploading Added github gist API uploading to the help menu to help make problems a bit easier to debug in the future. It's somewhat vital that this functionality be implemented before any release in order to analyze any given problem a user may be experiencing.
2014-05-19 00:44:10 +00:00
obs_data_release(returnData);
OBSLogReply logDialog(this, logURL);
logDialog.exec();
}
Basic UI: Fix formatting
2014-08-25 17:10:58 +00:00
static void RenameListItem(OBSBasic *parent, QListWidget *listWidget,
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
obs_source_t *source, const string &name)
Fix renaming bugs, deny if empty, and simplify I screwed it up a bit originally, using && instead of ||. Use 'trimmed' function to prevent sources with leading or trailing whitespace. Also, do not allow an empty value.
2014-06-30 08:05:33 +00:00
{
Do not display name exists dialog if source name does not change
2014-10-13 16:09:06 +00:00
const char *prevName = obs_source_get_name(source);
if (name == prevName)
return;
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
obs_source_t *foundSource = obs_get_source_by_name(name.c_str());
Do not display name exists dialog if source name does not change
2014-10-13 16:09:06 +00:00
QListWidgetItem *listItem = listWidget->currentItem();
Fix renaming bugs, deny if empty, and simplify I screwed it up a bit originally, using && instead of ||. Use 'trimmed' function to prevent sources with leading or trailing whitespace. Also, do not allow an empty value.
2014-06-30 08:05:33 +00:00
Do not display name exists dialog if source name does not change
2014-10-13 16:09:06 +00:00
if (foundSource || name.empty()) {
Fix renaming bugs, deny if empty, and simplify I screwed it up a bit originally, using && instead of ||. Use 'trimmed' function to prevent sources with leading or trailing whitespace. Also, do not allow an empty value.
2014-06-30 08:05:33 +00:00
listItem->setText(QT_UTF8(prevName));
Alert user when using existing source name.
2014-08-12 19:09:19 +00:00
Do not display name exists dialog if source name does not change
2014-10-13 16:09:06 +00:00
if (foundSource) {
UI: Make sure all message box buttons are translated Instead of QMessageBox::question and QMessageBox::information, use the OBSMessageBox class, which translates all buttons.
2017-05-13 21:06:32 +00:00
OBSMessageBox::information(parent,
Alert user when using existing source name.
2014-08-12 19:09:19 +00:00
QTStr("NameExists.Title"),
QTStr("NameExists.Text"));
} else if (name.empty()) {
UI: Make sure all message box buttons are translated Instead of QMessageBox::question and QMessageBox::information, use the OBSMessageBox class, which translates all buttons.
2017-05-13 21:06:32 +00:00
OBSMessageBox::information(parent,
Alert user when using existing source name.
2014-08-12 19:09:19 +00:00
QTStr("NoNameEntered.Title"),
QTStr("NoNameEntered.Text"));
}
Fix renaming bugs, deny if empty, and simplify I screwed it up a bit originally, using && instead of ||. Use 'trimmed' function to prevent sources with leading or trailing whitespace. Also, do not allow an empty value.
2014-06-30 08:05:33 +00:00
obs_source_release(foundSource);
} else {
listItem->setText(QT_UTF8(name.c_str()));
(API Change) Unsquish libobs (base) names Previous names: New names: ----------------------------------------------------------- obs_view_setsource obs_view_set_source obs_view_getsource obs_view_get_source obs_source_getdisplayname obs_source_get_display_name obs_source_getwidth obs_source_get_width obs_source_getheight obs_source_get_height obs_filter_getparent obs_filter_get_parent obs_filter_gettarget obs_filter_get_target obs_source_filter_setorder obs_source_filter_set_order obs_source_getsettings obs_source_get_settings obs_source_getname obs_source_get_name obs_source_setname obs_source_set_name obs_source_setvolume obs_source_set_volume obs_source_getvolume obs_source_get_volume obs_scene_getsource obs_scene_get_source obs_scene_fromsource obs_scene_from_source obs_scene_findsource obs_scene_find_source obs_output_getdisplayname obs_output_get_display_name obs_output_getname obs_output_get_name obs_encoder_getname obs_encoder_get_name obs_service_getdisplayname obs_service_get_display_name obs_service_getname obs_service_get_name
2014-08-04 15:41:15 +00:00
obs_source_set_name(source, name.c_str());
Fix renaming bugs, deny if empty, and simplify I screwed it up a bit originally, using && instead of ||. Use 'trimmed' function to prevent sources with leading or trailing whitespace. Also, do not allow an empty value.
2014-06-30 08:05:33 +00:00
}
}
Implement renaming of scenes/sources
2014-06-30 07:06:01 +00:00
void OBSBasic::SceneNameEdited(QWidget *editor,
QAbstractItemDelegate::EndEditHint endHint)
{
OBSScene scene = GetCurrentScene();
QLineEdit *edit = qobject_cast<QLineEdit*>(editor);
Fix renaming bugs, deny if empty, and simplify I screwed it up a bit originally, using && instead of ||. Use 'trimmed' function to prevent sources with leading or trailing whitespace. Also, do not allow an empty value.
2014-06-30 08:05:33 +00:00
string text = QT_TO_UTF8(edit->text().trimmed());
Implement renaming of scenes/sources
2014-06-30 07:06:01 +00:00
if (!scene)
return;
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
obs_source_t *source = obs_scene_get_source(scene);
Alert user when using existing source name.
2014-08-12 19:09:19 +00:00
RenameListItem(this, ui->scenes, source, text);
Implement renaming of scenes/sources
2014-06-30 07:06:01 +00:00
UI: Add front-end API library Allows manipulating and modifying the front-end via plugins.
2016-08-28 21:24:14 +00:00
if (api)
api->on_event(OBS_FRONTEND_EVENT_SCENE_LIST_CHANGED);
Implement renaming of scenes/sources
2014-06-30 07:06:01 +00:00
UNUSED_PARAMETER(endHint);
}
void OBSBasic::SceneItemNameEdited(QWidget *editor,
QAbstractItemDelegate::EndEditHint endHint)
{
OBSSceneItem item = GetCurrentSceneItem();
QLineEdit *edit = qobject_cast<QLineEdit*>(editor);
Fix renaming bugs, deny if empty, and simplify I screwed it up a bit originally, using && instead of ||. Use 'trimmed' function to prevent sources with leading or trailing whitespace. Also, do not allow an empty value.
2014-06-30 08:05:33 +00:00
string text = QT_TO_UTF8(edit->text().trimmed());
Implement renaming of scenes/sources
2014-06-30 07:06:01 +00:00
if (!item)
return;
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
obs_source_t *source = obs_sceneitem_get_source(item);
Alert user when using existing source name.
2014-08-12 19:09:19 +00:00
RenameListItem(this, ui->sources, source, text);
Implement renaming of scenes/sources
2014-06-30 07:06:01 +00:00
UI: Add visibility checkbox to main sources list Adds a visibility checkbox to the main sources list so that users can temporarily disable/re-enable sources. Only applies to scene items, not the sources themselves.
2015-03-23 03:51:21 +00:00
QListWidgetItem *listItem = ui->sources->currentItem();
listItem->setText(QString());
SetupVisibilityItem(ui->sources, listItem, item);
Implement renaming of scenes/sources
2014-06-30 07:06:01 +00:00
UNUSED_PARAMETER(endHint);
}
UI: Add user interface for filters
2015-02-26 05:23:57 +00:00
void OBSBasic::OpenFilters()
{
OBSSceneItem item = GetCurrentSceneItem();
OBSSource source = obs_sceneitem_get_source(item);
CreateFiltersWindow(source);
}
UI: Allow scenes to use filters
2015-03-18 22:09:44 +00:00
void OBSBasic::OpenSceneFilters()
{
OBSScene scene = GetCurrentScene();
OBSSource source = obs_scene_get_source(scene);
CreateFiltersWindow(source);
}
UI: Log when output starts/stops
2015-06-30 14:58:29 +00:00
#define RECORDING_START \
"==== Recording Start ==============================================="
#define RECORDING_STOP \
"==== Recording Stop ================================================"
UI: Separate replay buffer from recording Replay buffer and recording should be separate in case the user wants to start recording from a specific point rather being forced to reconfigure for regular recording. Creates a new button on the main window below the recording button for turning on/off the replay buffer.
2016-12-09 22:40:04 +00:00
#define REPLAY_BUFFER_START \
"==== Replay Buffer Start ==========================================="
#define REPLAY_BUFFER_STOP \
"==== Replay Buffer Stop ============================================"
UI: Log when output starts/stops
2015-06-30 14:58:29 +00:00
#define STREAMING_START \
"==== Streaming Start ==============================================="
#define STREAMING_STOP \
"==== Streaming Stop ================================================"
UI: Add OBSBasic::StartStreaming/StopStreaming
2014-10-26 00:03:13 +00:00
void OBSBasic::StartStreaming()
{
UI: Add front-end API library Allows manipulating and modifying the front-end via plugins.
2016-08-28 21:24:14 +00:00
if (outputHandler->StreamingActive())
return;
UI: Change output blocking bool to integer ref counter
2017-05-15 21:15:25 +00:00
if (disableOutputsRef)
UI: Add function to enable/disable outputs
2017-04-28 10:58:53 +00:00
return;
UI: Add front-end API library Allows manipulating and modifying the front-end via plugins.
2016-08-28 21:24:14 +00:00
if (api)
api->on_event(OBS_FRONTEND_EVENT_STREAMING_STARTING);
UI: Add OBSBasic::StartStreaming/StopStreaming
2014-10-26 00:03:13 +00:00
SaveProject();
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00:00
ui->streamButton->setEnabled(false);
ui->streamButton->setText(QTStr("Basic.Main.Connecting"));
UI: Fix sys. tray crashes when sys. tray not available When the system tray is not available, the system tray variables would still be used despite not being initialized. Fixes mantis bug 640 on linux systems in particular that may not always have system tray available.
2016-10-19 12:29:34 +00:00
if (sysTrayStream) {
sysTrayStream->setEnabled(false);
sysTrayStream->setText(ui->streamButton->text());
}
UI: Add OBSBasic::StartStreaming/StopStreaming
2014-10-26 00:03:13 +00:00
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00:00
if (!outputHandler->StartStreaming(service)) {
ui->streamButton->setText(QTStr("Basic.Main.StartStreaming"));
ui->streamButton->setEnabled(true);
UI: Fix sys. tray crashes when sys. tray not available When the system tray is not available, the system tray variables would still be used despite not being initialized. Fixes mantis bug 640 on linux systems in particular that may not always have system tray available.
2016-10-19 12:29:34 +00:00
if (sysTrayStream) {
sysTrayStream->setText(ui->streamButton->text());
sysTrayStream->setEnabled(true);
}
UI: Add warning if starting the output fails This is mainly to give visual feedback to those affected by NVENC not working with older driver versions. Currenlty obs fails silently which could go unnoticed for users who are using hotkeys as well as confuse users who are not trained to read their logs when issues occur. Closes jp9000/obs-studio#788
2017-02-04 04:29:09 +00:00
QMessageBox::critical(this,
QTStr("Output.StartStreamFailed"),
QTStr("Output.StartFailedGeneric"));
return;
UI: Add OBSBasic::StartStreaming/StopStreaming
2014-10-26 00:03:13 +00:00
}
UI: Add option to automatically record while streaming Allows the ability for users to make it so recording automatically starts when they start streaming. Also adds the option to allow the recording to continue when stream is stopped. Closes jp9000/obs-studio#554
2016-06-16 17:59:36 +00:00
bool recordWhenStreaming = config_get_bool(GetGlobalConfig(),
"BasicWindow", "RecordWhenStreaming");
if (recordWhenStreaming)
StartRecording();
UI: Add auto-start replay buf. opt. when stream starts Closes jp9000/obs-studio#748
2017-01-04 21:11:52 +00:00
bool replayBufferWhileStreaming = config_get_bool(GetGlobalConfig(),
"BasicWindow", "ReplayBufferWhileStreaming");
if (replayBufferWhileStreaming)
StartReplayBuffer();
UI: Add OBSBasic::StartStreaming/StopStreaming
2014-10-26 00:03:13 +00:00
}
UI: Add process priority option for windows
2016-07-01 17:27:27 +00: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
UI: Refactor dup. code from stream/recording start/stop The code to enable/disable the profile menu along with incrementing/decrementing the sleep inhibitor was duplicated more times than necessary.
2016-08-21 19:05:25 +00:00
inline void OBSBasic::OnActivate()
UI: Add OBSBasic::StartStreaming/StopStreaming
2014-10-26 00:03:13 +00:00
{
UI: Refactor dup. code from stream/recording start/stop The code to enable/disable the profile menu along with incrementing/decrementing the sleep inhibitor was duplicated more times than necessary.
2016-08-21 19:05:25 +00:00
if (ui->profileMenu->isEnabled()) {
ui->profileMenu->setEnabled(false);
UI: Add auto-configuration wizard The auto-configuration wizard is designed to allow first-time or novice/uneducated users or to set up video and encoding settings in a very quick and easy way. It'll automatically perform a bandwidth test, and/or test the user's video settings to determine the most ideal settings for streaming and recording (assuming a 1-pc setup).
2017-05-06 19:13:56 +00:00
ui->autoConfigure->setEnabled(false);
UI: Refactor dup. code from stream/recording start/stop The code to enable/disable the profile menu along with incrementing/decrementing the sleep inhibitor was duplicated more times than necessary.
2016-08-21 19:05:25 +00:00
App()->IncrementSleepInhibition();
UpdateProcessPriority();
UI: Add system tray capability This adds a system tray when enabled. There is also a option to minimize to the system tray when the app is started. Closes jp9000/obs-studio#595
2016-08-13 14:36:17 +00:00
UI: Fix poor handling of system tray pointers The original pull request that added the system tray feature was riddled with bad pointer usage. Bare pointers that are never properly freed, never contained within a QPointer or unique_ptr. These have now been changed to use QPointer variables, and to always check when the variables are valid before using. The order of destruction for QMenu that uses the actions has now been prioritized first before the actions.
2016-10-19 13:44:02 +00:00
if (trayIcon)
trayIcon->setIcon(QIcon(":/res/images/tray_active.png"));
UI: Refactor dup. code from stream/recording start/stop The code to enable/disable the profile menu along with incrementing/decrementing the sleep inhibitor was duplicated more times than necessary.
2016-08-21 19:05:25 +00:00
}
}
UI: Log when output starts/stops
2015-06-30 14:58:29 +00:00
UI: Refactor dup. code from stream/recording start/stop The code to enable/disable the profile menu along with incrementing/decrementing the sleep inhibitor was duplicated more times than necessary.
2016-08-21 19:05:25 +00:00
inline void OBSBasic::OnDeactivate()
{
UI: Only inhibit when active or if projector open Having sleep or screensavers inhibited at all times was causing some annoyances for people. Sleep/screensavers are now only inhibited when the program is active or when a projector is open.
2015-11-16 17:08:55 +00:00
if (!outputHandler->Active() && !ui->profileMenu->isEnabled()) {
UI: Add Profiles Adds setting profiles to the basic user interface. For each profile, a subdirectory for the profile will be created in [config_dir]/obs-studio/basic/profiles which will contain the settings data for each profile.
2015-06-24 02:38:01 +00:00
ui->profileMenu->setEnabled(true);
UI: Add auto-configuration wizard The auto-configuration wizard is designed to allow first-time or novice/uneducated users or to set up video and encoding settings in a very quick and easy way. It'll automatically perform a bandwidth test, and/or test the user's video settings to determine the most ideal settings for streaming and recording (assuming a 1-pc setup).
2017-05-06 19:13:56 +00:00
ui->autoConfigure->setEnabled(true);
UI: Only inhibit when active or if projector open Having sleep or screensavers inhibited at all times was causing some annoyances for people. Sleep/screensavers are now only inhibited when the program is active or when a projector is open.
2015-11-16 17:08:55 +00:00
App()->DecrementSleepInhibition();
UI: Add process priority option for windows
2016-07-01 17:27:27 +00:00
ClearProcessPriority();
UI: Add system tray capability This adds a system tray when enabled. There is also a option to minimize to the system tray when the app is started. Closes jp9000/obs-studio#595
2016-08-13 14:36:17 +00:00
UI: Fix poor handling of system tray pointers The original pull request that added the system tray feature was riddled with bad pointer usage. Bare pointers that are never properly freed, never contained within a QPointer or unique_ptr. These have now been changed to use QPointer variables, and to always check when the variables are valid before using. The order of destruction for QMenu that uses the actions has now been prioritized first before the actions.
2016-10-19 13:44:02 +00:00
if (trayIcon)
trayIcon->setIcon(QIcon(":/res/images/obs.png"));
UI: Log when output starts/stops
2015-06-30 14:58:29 +00:00
}
UI: Refactor dup. code from stream/recording start/stop The code to enable/disable the profile menu along with incrementing/decrementing the sleep inhibitor was duplicated more times than necessary.
2016-08-21 19:05:25 +00:00
}
void OBSBasic::StopStreaming()
{
SaveProject();
if (outputHandler->StreamingActive())
UI: Add ability to forcibly stop streams/recordings If the user hits the "stop stream" button it'll transition in to "stopping stream..." and will continue to output until the stream reaches the timing in which "stop" was pressed. However, if there is significant congestion, stopping the stream can take far longer than the user may like. So there needs to be an option to forcibly stop the stream in that case; pushing the "stop" button a second time should allow the user to tell the stream/recording to stop right away instead of waiting for the precise stop timing.
2016-09-09 14:37:54 +00:00
outputHandler->StopStreaming(streamingStopping);
UI: Refactor dup. code from stream/recording start/stop The code to enable/disable the profile menu along with incrementing/decrementing the sleep inhibitor was duplicated more times than necessary.
2016-08-21 19:05:25 +00:00
OnDeactivate();
UI: Add option to automatically record while streaming Allows the ability for users to make it so recording automatically starts when they start streaming. Also adds the option to allow the recording to continue when stream is stopped. Closes jp9000/obs-studio#554
2016-06-16 17:59:36 +00:00
bool recordWhenStreaming = config_get_bool(GetGlobalConfig(),
"BasicWindow", "RecordWhenStreaming");
bool keepRecordingWhenStreamStops = config_get_bool(GetGlobalConfig(),
"BasicWindow", "KeepRecordingWhenStreamStops");
if (recordWhenStreaming && !keepRecordingWhenStreamStops)
StopRecording();
UI: Add auto-start replay buf. opt. when stream starts Closes jp9000/obs-studio#748
2017-01-04 21:11:52 +00:00
bool replayBufferWhileStreaming = config_get_bool(GetGlobalConfig(),
"BasicWindow", "ReplayBufferWhileStreaming");
bool keepReplayBufferStreamStops = config_get_bool(GetGlobalConfig(),
"BasicWindow", "KeepReplayBufferStreamStops");
if (replayBufferWhileStreaming && !keepReplayBufferStreamStops)
StopReplayBuffer();
UI: Add OBSBasic::StartStreaming/StopStreaming
2014-10-26 00:03:13 +00:00
}
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00:00
void OBSBasic::ForceStopStreaming()
{
SaveProject();
if (outputHandler->StreamingActive())
UI: Add ability to forcibly stop streams/recordings If the user hits the "stop stream" button it'll transition in to "stopping stream..." and will continue to output until the stream reaches the timing in which "stop" was pressed. However, if there is significant congestion, stopping the stream can take far longer than the user may like. So there needs to be an option to forcibly stop the stream in that case; pushing the "stop" button a second time should allow the user to tell the stream/recording to stop right away instead of waiting for the precise stop timing.
2016-09-09 14:37:54 +00:00
outputHandler->StopStreaming(true);
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00:00
UI: Refactor dup. code from stream/recording start/stop The code to enable/disable the profile menu along with incrementing/decrementing the sleep inhibitor was duplicated more times than necessary.
2016-08-21 19:05:25 +00:00
OnDeactivate();
UI: Add option to automatically record while streaming Allows the ability for users to make it so recording automatically starts when they start streaming. Also adds the option to allow the recording to continue when stream is stopped. Closes jp9000/obs-studio#554
2016-06-16 17:59:36 +00:00
bool recordWhenStreaming = config_get_bool(GetGlobalConfig(),
"BasicWindow", "RecordWhenStreaming");
bool keepRecordingWhenStreamStops = config_get_bool(GetGlobalConfig(),
"BasicWindow", "KeepRecordingWhenStreamStops");
if (recordWhenStreaming && !keepRecordingWhenStreamStops)
StopRecording();
UI: Add auto-start replay buf. opt. when stream starts Closes jp9000/obs-studio#748
2017-01-04 21:11:52 +00:00
bool replayBufferWhileStreaming = config_get_bool(GetGlobalConfig(),
"BasicWindow", "ReplayBufferWhileStreaming");
bool keepReplayBufferStreamStops = config_get_bool(GetGlobalConfig(),
"BasicWindow", "KeepReplayBufferStreamStops");
if (replayBufferWhileStreaming && !keepReplayBufferStreamStops)
StopReplayBuffer();
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00:00
}
void OBSBasic::StreamDelayStarting(int sec)
{
ui->streamButton->setText(QTStr("Basic.Main.StopStreaming"));
ui->streamButton->setEnabled(true);
UI: Fix sys. tray crashes when sys. tray not available When the system tray is not available, the system tray variables would still be used despite not being initialized. Fixes mantis bug 640 on linux systems in particular that may not always have system tray available.
2016-10-19 12:29:34 +00:00
if (sysTrayStream) {
sysTrayStream->setText(ui->streamButton->text());
sysTrayStream->setEnabled(true);
}
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00: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);
UI: Only inhibit when active or if projector open Having sleep or screensavers inhibited at all times was causing some annoyances for people. Sleep/screensavers are now only inhibited when the program is active or when a projector is open.
2015-11-16 17:08:55 +00:00
UI: Refactor dup. code from stream/recording start/stop The code to enable/disable the profile menu along with incrementing/decrementing the sleep inhibitor was duplicated more times than necessary.
2016-08-21 19:05:25 +00:00
OnActivate();
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00:00
}
void OBSBasic::StreamDelayStopping(int sec)
{
ui->streamButton->setText(QTStr("Basic.Main.StartStreaming"));
ui->streamButton->setEnabled(true);
UI: Fix sys. tray crashes when sys. tray not available When the system tray is not available, the system tray variables would still be used despite not being initialized. Fixes mantis bug 640 on linux systems in particular that may not always have system tray available.
2016-10-19 12:29:34 +00:00
if (sysTrayStream) {
sysTrayStream->setText(ui->streamButton->text());
sysTrayStream->setEnabled(true);
}
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00: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 08:49:07 +00: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-08 05:00:10 +00:00
{
Use the "Stop Streaming" translated text
2014-07-12 12:34:23 +00:00
ui->streamButton->setText(QTStr("Basic.Main.StopStreaming"));
UI: Add name/version to window title Also, make the 'start stream' button say 'connecting...' when it's initially trying to connect.
2014-05-15 21:04:18 +00:00
ui->streamButton->setEnabled(true);
UI: Refactor output handling To accommodate multiple types of outputs, there has to be some level of abstraction. The BasicOutputHandler structure will give us a way that we can switch between different output configurations.
2015-02-06 11:17:33 +00:00
ui->statusbar->StreamStarted(outputHandler->streamOutput);
UI: Fix sys. tray crashes when sys. tray not available When the system tray is not available, the system tray variables would still be used despite not being initialized. Fixes mantis bug 640 on linux systems in particular that may not always have system tray available.
2016-10-19 12:29:34 +00:00
if (sysTrayStream) {
sysTrayStream->setText(ui->streamButton->text());
sysTrayStream->setEnabled(true);
}
UI: Only inhibit when active or if projector open Having sleep or screensavers inhibited at all times was causing some annoyances for people. Sleep/screensavers are now only inhibited when the program is active or when a projector is open.
2015-11-16 17:08:55 +00:00
UI: Add front-end API library Allows manipulating and modifying the front-end via plugins.
2016-08-28 21:24:14 +00:00
if (api)
api->on_event(OBS_FRONTEND_EVENT_STREAMING_STARTED);
UI: Refactor dup. code from stream/recording start/stop The code to enable/disable the profile menu along with incrementing/decrementing the sleep inhibitor was duplicated more times than necessary.
2016-08-21 19:05:25 +00:00
OnActivate();
UI: Only inhibit when active or if projector open Having sleep or screensavers inhibited at all times was causing some annoyances for people. Sleep/screensavers are now only inhibited when the program is active or when a projector is open.
2015-11-16 17:08:55 +00:00
UI: Fix stream/recording startup/stop logging I actually made the mistake of making these messages only display if all outputs were no longer active.
2015-07-06 06:48:29 +00:00
blog(LOG_INFO, STREAMING_START);
Add preliminary streaming code for testing - Add some temporary streaming code using FFmpeg. FFmpeg itself is not very ideal for streaming; lack of direct control of the sockets and no framedrop handling means that FFmpeg is definitely not something you want to use without wrapper code. I'd prefer writing my own network framework in this particular case just because you give away so much control of the network interface. Wasted an entire day trying to go through FFmpeg issues. There's just no way FFmpeg should be used for real streaming (at least without being patched or submitting some sort of patch, but I'm sort of feeling "meh" on that idea) I had to end up writing multiple threads just to handle both connecting and writing, because av_interleaved_write_frame blocks every call, stalling the main encoder thread, and thus also stalling draw signals. - Add some temporary user interface for streaming settings. This is just temporary for the time being. It's in the outputs section of the basic-mode settings - Make it so that dynamic arrays do not free all their data when the size just happens to be reduced to 0. This prevents constant reallocation when an array keeps going from 1 item to 0 items. Also, it was bad to become dependent upon that functionality. You must now always explicitly call "free" on it to ensure the data is free, and that's how it should be. Implicit functionality can lead to confusion and maintainability issues.
2014-03-10 20:10:35 +00:00
}
UI: Show "stopping" text on buttons when waiting for stop The new cutoff timing fix means that streaming/recording has to remain active for bit until the stream/recording has reached the expecting stop timestamp. This means that the buttons would continue to say "Stop streaming/recording" while waiting for the output to stop itself at the appropriate timing. So instead of letting it do that and confusing the user, the buttons will now say "stopping" when the button is pressed to indicate to the user that the stream/recording is in the process of stopping.
2016-06-22 08:47:08 +00:00
void OBSBasic::StreamStopping()
{
ui->streamButton->setText(QTStr("Basic.Main.StoppingStreaming"));
UI: Fix sys. tray crashes when sys. tray not available When the system tray is not available, the system tray variables would still be used despite not being initialized. Fixes mantis bug 640 on linux systems in particular that may not always have system tray available.
2016-10-19 12:29:34 +00:00
if (sysTrayStream)
sysTrayStream->setText(ui->streamButton->text());
UI: Add front-end API library Allows manipulating and modifying the front-end via plugins.
2016-08-28 21:24:14 +00:00
UI: Add ability to forcibly stop streams/recordings If the user hits the "stop stream" button it'll transition in to "stopping stream..." and will continue to output until the stream reaches the timing in which "stop" was pressed. However, if there is significant congestion, stopping the stream can take far longer than the user may like. So there needs to be an option to forcibly stop the stream in that case; pushing the "stop" button a second time should allow the user to tell the stream/recording to stop right away instead of waiting for the precise stop timing.
2016-09-09 14:37:54 +00:00
streamingStopping = true;
UI: Add front-end API library Allows manipulating and modifying the front-end via plugins.
2016-08-28 21:24:14 +00:00
if (api)
api->on_event(OBS_FRONTEND_EVENT_STREAMING_STOPPING);
UI: Show "stopping" text on buttons when waiting for stop The new cutoff timing fix means that streaming/recording has to remain active for bit until the stream/recording has reached the expecting stop timestamp. This means that the buttons would continue to say "Stop streaming/recording" while waiting for the output to stop itself at the appropriate timing. So instead of letting it do that and confusing the user, the buttons will now say "stopping" when the button is pressed to indicate to the user that the stream/recording is in the process of stopping.
2016-06-22 08:47:08 +00:00
}
UI: Add support for showing output error messages
2017-05-15 10:03:00 +00:00
void OBSBasic::StreamingStop(int code, QString last_error)
Add preliminary streaming code for testing - Add some temporary streaming code using FFmpeg. FFmpeg itself is not very ideal for streaming; lack of direct control of the sockets and no framedrop handling means that FFmpeg is definitely not something you want to use without wrapper code. I'd prefer writing my own network framework in this particular case just because you give away so much control of the network interface. Wasted an entire day trying to go through FFmpeg issues. There's just no way FFmpeg should be used for real streaming (at least without being patched or submitting some sort of patch, but I'm sort of feeling "meh" on that idea) I had to end up writing multiple threads just to handle both connecting and writing, because av_interleaved_write_frame blocks every call, stalling the main encoder thread, and thus also stalling draw signals. - Add some temporary user interface for streaming settings. This is just temporary for the time being. It's in the outputs section of the basic-mode settings - Make it so that dynamic arrays do not free all their data when the size just happens to be reduced to 0. This prevents constant reallocation when an array keeps going from 1 item to 0 items. Also, it was bad to become dependent upon that functionality. You must now always explicitly call "free" on it to ensure the data is free, and that's how it should be. Implicit functionality can lead to confusion and maintainability issues.
2014-03-10 20:10:35 +00:00
{
UI: Add support for showing output error messages
2017-05-15 10:03:00 +00:00
const char *errorDescription;
DStr errorMessage;
bool use_last_error = false;
UI: Add popup warnings for connection failure Also, check for null stream path/key in the RTMP output module.
2014-05-12 22:30:36 +00:00
switch (code) {
case OBS_OUTPUT_BAD_PATH:
UI: Add support for showing output error messages
2017-05-15 10:03:00 +00:00
errorDescription = Str("Output.ConnectFail.BadPath");
UI: Add popup warnings for connection failure Also, check for null stream path/key in the RTMP output module.
2014-05-12 22:30:36 +00:00
break;
case OBS_OUTPUT_CONNECT_FAILED:
UI: Add support for showing output error messages
2017-05-15 10:03:00 +00:00
use_last_error = true;
errorDescription = Str("Output.ConnectFail.ConnectFailed");
UI: Add popup warnings for connection failure Also, check for null stream path/key in the RTMP output module.
2014-05-12 22:30:36 +00:00
break;
case OBS_OUTPUT_INVALID_STREAM:
UI: Add support for showing output error messages
2017-05-15 10:03:00 +00:00
errorDescription = Str("Output.ConnectFail.InvalidStream");
UI: Add popup warnings for connection failure Also, check for null stream path/key in the RTMP output module.
2014-05-12 22:30:36 +00:00
break;
Fix 'potentially uninitialized variable' warnings
2014-06-25 09:03:00 +00:00
default:
UI: Add popup warnings for connection failure Also, check for null stream path/key in the RTMP output module.
2014-05-12 22:30:36 +00:00
case OBS_OUTPUT_ERROR:
UI: Add support for showing output error messages
2017-05-15 10:03:00 +00:00
use_last_error = true;
errorDescription = Str("Output.ConnectFail.Error");
UI: Add popup warnings for connection failure Also, check for null stream path/key in the RTMP output module.
2014-05-12 22:30:36 +00:00
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 */
UI: Add support for showing output error messages
2017-05-15 10:03:00 +00:00
use_last_error = true;
errorDescription = Str("Output.ConnectFail.Disconnected");
UI: Add popup warnings for connection failure Also, check for null stream path/key in the RTMP output module.
2014-05-12 22:30:36 +00:00
}
UI: Add support for showing output error messages
2017-05-15 10:03:00 +00:00
if (use_last_error && !last_error.isEmpty())
dstr_printf(errorMessage, "%s\n\n%s", errorDescription,
QT_TO_UTF8(last_error));
else
dstr_copy(errorMessage, errorDescription);
Implement status bar The status bar now displays: - Auto-reconnect information (reconnecting and reconnect success) - Dropped frames (as well as percentage of total video frames) - Duration of session - CPU usage of the program - Kbp/s The OBSBasic class is getting a bit big, so I separated out the status bar code to its own class derived from QStatusBar.
2014-07-06 23:19:27 +00:00
ui->statusbar->StreamStopped();
UI: Add FLV file output (sharing encoders) Implement the 'file path' in output settings, and implement the 'start recording' button, though for the time being I'm just going to make it use a directory rather than allow custom file names. This file output will actually share the video and audio encoder with the stream. I don't really know what to do about MP4 -- I don't really like the idea of saving directly in the program, if you do and the program crashes, that MP4 file is lost. I'm contemplating making some sort of mp4 output process stub. So no MP4 file output for the time being. If you need MP4, just remux it with FFmpeg: ffmpeg -i flv_file.flv -acodec copy -vcodec copy mp4_file.mp4
2014-05-21 06:27:27 +00:00
UI: Add popup warnings for connection failure Also, check for null stream path/key in the RTMP output module.
2014-05-12 22:30:36 +00:00
ui->streamButton->setText(QTStr("Basic.Main.StartStreaming"));
UI: Add name/version to window title Also, make the 'start stream' button say 'connecting...' when it's initially trying to connect.
2014-05-15 21:04:18 +00:00
ui->streamButton->setEnabled(true);
UI: Fix sys. tray crashes when sys. tray not available When the system tray is not available, the system tray variables would still be used despite not being initialized. Fixes mantis bug 640 on linux systems in particular that may not always have system tray available.
2016-10-19 12:29:34 +00:00
if (sysTrayStream) {
sysTrayStream->setText(ui->streamButton->text());
sysTrayStream->setEnabled(true);
}
UI: Add popup warnings for connection failure Also, check for null stream path/key in the RTMP output module.
2014-05-12 22:30:36 +00:00
UI: Add ability to forcibly stop streams/recordings If the user hits the "stop stream" button it'll transition in to "stopping stream..." and will continue to output until the stream reaches the timing in which "stop" was pressed. However, if there is significant congestion, stopping the stream can take far longer than the user may like. So there needs to be an option to forcibly stop the stream in that case; pushing the "stop" button a second time should allow the user to tell the stream/recording to stop right away instead of waiting for the precise stop timing.
2016-09-09 14:37:54 +00:00
streamingStopping = false;
UI: Add front-end API library Allows manipulating and modifying the front-end via plugins.
2016-08-28 21:24:14 +00:00
if (api)
api->on_event(OBS_FRONTEND_EVENT_STREAMING_STOPPED);
UI: Refactor dup. code from stream/recording start/stop The code to enable/disable the profile menu along with incrementing/decrementing the sleep inhibitor was duplicated more times than necessary.
2016-08-21 19:05:25 +00:00
OnDeactivate();
UI: Fix stream/recording startup/stop logging I actually made the mistake of making these messages only display if all outputs were no longer active.
2015-07-06 06:48:29 +00:00
blog(LOG_INFO, STREAMING_STOP);
UI: Log when output starts/stops
2015-06-30 14:58:29 +00:00
UI: Add system tray capability This adds a system tray when enabled. There is also a option to minimize to the system tray when the app is started. Closes jp9000/obs-studio#595
2016-08-13 14:36:17 +00:00
if (code != OBS_OUTPUT_SUCCESS && isVisible()) {
UI: Make sure all message box buttons are translated Instead of QMessageBox::question and QMessageBox::information, use the OBSMessageBox class, which translates all buttons.
2017-05-13 21:06:32 +00:00
OBSMessageBox::information(this,
UI: Add popup warnings for connection failure Also, check for null stream path/key in the RTMP output module.
2014-05-12 22:30:36 +00:00
QTStr("Output.ConnectFail.Title"),
QT_UTF8(errorMessage));
UI: Add system tray capability This adds a system tray when enabled. There is also a option to minimize to the system tray when the app is started. Closes jp9000/obs-studio#595
2016-08-13 14:36:17 +00:00
} else if (code != OBS_OUTPUT_SUCCESS && !isVisible()) {
UI: Add support for showing output error messages
2017-05-15 10:03:00 +00:00
SysTrayNotify(QT_UTF8(errorDescription), QSystemTrayIcon::Warning);
UI: Add system tray capability This adds a system tray when enabled. There is also a option to minimize to the system tray when the app is started. Closes jp9000/obs-studio#595
2016-08-13 14:36:17 +00:00
}
UI: Implement stream delay When stream delay is active, the "Start/Stop Streaming" button is changed in to a menu button, which allows the user to select either the option to stop the stream (which causes it to count down), or forcibly stop the stream (which immediately stops the stream and cuts off all delayed data). If the user decides they want to start the stream again while in the process of counting down, they can safely do so without having to wait for it to stop, and it will schedule it to start up again with the same delay after the stop. On the status bar, it will now show whether delay is active, and its duration. If the stream is in the process of stopping/starting, it will count down to the stop/start. If the option to preserve stream cutoff point on unexpected disconnections/reconnections is enabled, it will update the current delay duration accordingly.
2015-09-06 23:19:53 +00:00
if (!startStreamMenu.isNull()) {
ui->streamButton->setMenu(nullptr);
startStreamMenu->deleteLater();
startStreamMenu = nullptr;
}
Temporary fix to allow file output
2014-04-14 09:22:09 +00:00
}
UI: Add OBSBasic::StartRecording/StopRecording
2014-10-25 23:57:29 +00:00
void OBSBasic::StartRecording()
{
UI: Add option to automatically record while streaming Allows the ability for users to make it so recording automatically starts when they start streaming. Also adds the option to allow the recording to continue when stream is stopped. Closes jp9000/obs-studio#554
2016-06-16 17:59:36 +00:00
if (outputHandler->RecordingActive())
return;
UI: Change output blocking bool to integer ref counter
2017-05-15 21:15:25 +00:00
if (disableOutputsRef)
UI: Add function to enable/disable outputs
2017-04-28 10:58:53 +00:00
return;
UI: Add OBSBasic::StartRecording/StopRecording
2014-10-25 23:57:29 +00:00
UI: Add front-end API library Allows manipulating and modifying the front-end via plugins.
2016-08-28 21:24:14 +00:00
if (api)
api->on_event(OBS_FRONTEND_EVENT_RECORDING_STARTING);
UI: Add option to automatically record while streaming Allows the ability for users to make it so recording automatically starts when they start streaming. Also adds the option to allow the recording to continue when stream is stopped. Closes jp9000/obs-studio#554
2016-06-16 17:59:36 +00:00
SaveProject();
outputHandler->StartRecording();
UI: Add OBSBasic::StartRecording/StopRecording
2014-10-25 23:57:29 +00:00
}
UI: Show "stopping" text on buttons when waiting for stop The new cutoff timing fix means that streaming/recording has to remain active for bit until the stream/recording has reached the expecting stop timestamp. This means that the buttons would continue to say "Stop streaming/recording" while waiting for the output to stop itself at the appropriate timing. So instead of letting it do that and confusing the user, the buttons will now say "stopping" when the button is pressed to indicate to the user that the stream/recording is in the process of stopping.
2016-06-22 08:47:08 +00:00
void OBSBasic::RecordStopping()
{
UI: Separate replay buffer from recording Replay buffer and recording should be separate in case the user wants to start recording from a specific point rather being forced to reconfigure for regular recording. Creates a new button on the main window below the recording button for turning on/off the replay buffer.
2016-12-09 22:40:04 +00:00
ui->recordButton->setText(QTStr("Basic.Main.StoppingRecording"));
UI: Fix sys. tray crashes when sys. tray not available When the system tray is not available, the system tray variables would still be used despite not being initialized. Fixes mantis bug 640 on linux systems in particular that may not always have system tray available.
2016-10-19 12:29:34 +00:00
if (sysTrayRecord)
sysTrayRecord->setText(ui->recordButton->text());
UI: Add front-end API library Allows manipulating and modifying the front-end via plugins.
2016-08-28 21:24:14 +00:00
UI: Add ability to forcibly stop streams/recordings If the user hits the "stop stream" button it'll transition in to "stopping stream..." and will continue to output until the stream reaches the timing in which "stop" was pressed. However, if there is significant congestion, stopping the stream can take far longer than the user may like. So there needs to be an option to forcibly stop the stream in that case; pushing the "stop" button a second time should allow the user to tell the stream/recording to stop right away instead of waiting for the precise stop timing.
2016-09-09 14:37:54 +00:00
recordingStopping = true;
UI: Add front-end API library Allows manipulating and modifying the front-end via plugins.
2016-08-28 21:24:14 +00:00
if (api)
api->on_event(OBS_FRONTEND_EVENT_RECORDING_STOPPING);
UI: Show "stopping" text on buttons when waiting for stop The new cutoff timing fix means that streaming/recording has to remain active for bit until the stream/recording has reached the expecting stop timestamp. This means that the buttons would continue to say "Stop streaming/recording" while waiting for the output to stop itself at the appropriate timing. So instead of letting it do that and confusing the user, the buttons will now say "stopping" when the button is pressed to indicate to the user that the stream/recording is in the process of stopping.
2016-06-22 08:47:08 +00:00
}
UI: Add OBSBasic::StartRecording/StopRecording
2014-10-25 23:57:29 +00:00
void OBSBasic::StopRecording()
{
SaveProject();
if (outputHandler->RecordingActive())
UI: Add ability to forcibly stop streams/recordings If the user hits the "stop stream" button it'll transition in to "stopping stream..." and will continue to output until the stream reaches the timing in which "stop" was pressed. However, if there is significant congestion, stopping the stream can take far longer than the user may like. So there needs to be an option to forcibly stop the stream in that case; pushing the "stop" button a second time should allow the user to tell the stream/recording to stop right away instead of waiting for the precise stop timing.
2016-09-09 14:37:54 +00:00
outputHandler->StopRecording(recordingStopping);
UI: Log when output starts/stops
2015-06-30 14:58:29 +00:00
UI: Refactor dup. code from stream/recording start/stop The code to enable/disable the profile menu along with incrementing/decrementing the sleep inhibitor was duplicated more times than necessary.
2016-08-21 19:05:25 +00:00
OnDeactivate();
UI: Add OBSBasic::StartRecording/StopRecording
2014-10-25 23:57:29 +00:00
}
Update statusbar when recording
2014-08-25 01:10:57 +00:00
void OBSBasic::RecordingStart()
{
UI: Refactor output handling To accommodate multiple types of outputs, there has to be some level of abstraction. The BasicOutputHandler structure will give us a way that we can switch between different output configurations.
2015-02-06 11:17:33 +00:00
ui->statusbar->RecordingStarted(outputHandler->fileOutput);
UI: Separate replay buffer from recording Replay buffer and recording should be separate in case the user wants to start recording from a specific point rather being forced to reconfigure for regular recording. Creates a new button on the main window below the recording button for turning on/off the replay buffer.
2016-12-09 22:40:04 +00:00
ui->recordButton->setText(QTStr("Basic.Main.StopRecording"));
UI: Fix sys. tray crashes when sys. tray not available When the system tray is not available, the system tray variables would still be used despite not being initialized. Fixes mantis bug 640 on linux systems in particular that may not always have system tray available.
2016-10-19 12:29:34 +00:00
if (sysTrayRecord)
sysTrayRecord->setText(ui->recordButton->text());
UI: Only inhibit when active or if projector open Having sleep or screensavers inhibited at all times was causing some annoyances for people. Sleep/screensavers are now only inhibited when the program is active or when a projector is open.
2015-11-16 17:08:55 +00:00
UI: Add ability to forcibly stop streams/recordings If the user hits the "stop stream" button it'll transition in to "stopping stream..." and will continue to output until the stream reaches the timing in which "stop" was pressed. However, if there is significant congestion, stopping the stream can take far longer than the user may like. So there needs to be an option to forcibly stop the stream in that case; pushing the "stop" button a second time should allow the user to tell the stream/recording to stop right away instead of waiting for the precise stop timing.
2016-09-09 14:37:54 +00:00
recordingStopping = false;
UI: Add front-end API library Allows manipulating and modifying the front-end via plugins.
2016-08-28 21:24:14 +00:00
if (api)
api->on_event(OBS_FRONTEND_EVENT_RECORDING_STARTED);
UI: Refactor dup. code from stream/recording start/stop The code to enable/disable the profile menu along with incrementing/decrementing the sleep inhibitor was duplicated more times than necessary.
2016-08-21 19:05:25 +00:00
OnActivate();
UI: Only inhibit when active or if projector open Having sleep or screensavers inhibited at all times was causing some annoyances for people. Sleep/screensavers are now only inhibited when the program is active or when a projector is open.
2015-11-16 17:08:55 +00:00
UI: Fix stream/recording startup/stop logging I actually made the mistake of making these messages only display if all outputs were no longer active.
2015-07-06 06:48:29 +00:00
blog(LOG_INFO, RECORDING_START);
Update statusbar when recording
2014-08-25 01:10:57 +00:00
}
UI: Warn user if recording format unsupported If the recording format is unsupported or doesn't support multiple tracks, warn the user to check their settings.
2015-06-10 04:00:22 +00:00
void OBSBasic::RecordingStop(int code)
Add preliminary streaming code for testing - Add some temporary streaming code using FFmpeg. FFmpeg itself is not very ideal for streaming; lack of direct control of the sockets and no framedrop handling means that FFmpeg is definitely not something you want to use without wrapper code. I'd prefer writing my own network framework in this particular case just because you give away so much control of the network interface. Wasted an entire day trying to go through FFmpeg issues. There's just no way FFmpeg should be used for real streaming (at least without being patched or submitting some sort of patch, but I'm sort of feeling "meh" on that idea) I had to end up writing multiple threads just to handle both connecting and writing, because av_interleaved_write_frame blocks every call, stalling the main encoder thread, and thus also stalling draw signals. - Add some temporary user interface for streaming settings. This is just temporary for the time being. It's in the outputs section of the basic-mode settings - Make it so that dynamic arrays do not free all their data when the size just happens to be reduced to 0. This prevents constant reallocation when an array keeps going from 1 item to 0 items. Also, it was bad to become dependent upon that functionality. You must now always explicitly call "free" on it to ensure the data is free, and that's how it should be. Implicit functionality can lead to confusion and maintainability issues.
2014-03-10 20:10:35 +00:00
{
Update statusbar when recording
2014-08-25 01:10:57 +00:00
ui->statusbar->RecordingStopped();
UI: Separate replay buffer from recording Replay buffer and recording should be separate in case the user wants to start recording from a specific point rather being forced to reconfigure for regular recording. Creates a new button on the main window below the recording button for turning on/off the replay buffer.
2016-12-09 22:40:04 +00:00
ui->recordButton->setText(QTStr("Basic.Main.StartRecording"));
UI: Fix sys. tray crashes when sys. tray not available When the system tray is not available, the system tray variables would still be used despite not being initialized. Fixes mantis bug 640 on linux systems in particular that may not always have system tray available.
2016-10-19 12:29:34 +00:00
if (sysTrayRecord)
sysTrayRecord->setText(ui->recordButton->text());
UI: Separate replay buffer from recording Replay buffer and recording should be separate in case the user wants to start recording from a specific point rather being forced to reconfigure for regular recording. Creates a new button on the main window below the recording button for turning on/off the replay buffer.
2016-12-09 22:40:04 +00:00
UI: Fix stream/recording startup/stop logging I actually made the mistake of making these messages only display if all outputs were no longer active.
2015-07-06 06:48:29 +00:00
blog(LOG_INFO, RECORDING_STOP);
UI: Warn user if recording format unsupported If the recording format is unsupported or doesn't support multiple tracks, warn the user to check their settings.
2015-06-10 04:00:22 +00:00
UI: Add system tray capability This adds a system tray when enabled. There is also a option to minimize to the system tray when the app is started. Closes jp9000/obs-studio#595
2016-08-13 14:36:17 +00:00
if (code == OBS_OUTPUT_UNSUPPORTED && isVisible()) {
UI: Make sure all message box buttons are translated Instead of QMessageBox::question and QMessageBox::information, use the OBSMessageBox class, which translates all buttons.
2017-05-13 21:06:32 +00:00
OBSMessageBox::information(this,
UI: Warn user if recording format unsupported If the recording format is unsupported or doesn't support multiple tracks, warn the user to check their settings.
2015-06-10 04:00:22 +00:00
QTStr("Output.RecordFail.Title"),
QTStr("Output.RecordFail.Unsupported"));
UI: Log when output starts/stops
2015-06-30 14:58:29 +00:00
UI: Add system tray capability This adds a system tray when enabled. There is also a option to minimize to the system tray when the app is started. Closes jp9000/obs-studio#595
2016-08-13 14:36:17 +00:00
} else if (code == OBS_OUTPUT_NO_SPACE && isVisible()) {
UI: Make sure all message box buttons are translated Instead of QMessageBox::question and QMessageBox::information, use the OBSMessageBox class, which translates all buttons.
2017-05-13 21:06:32 +00:00
OBSMessageBox::information(this,
UI: Add more potential recording errors
2015-09-19 05:20:55 +00:00
QTStr("Output.RecordNoSpace.Title"),
QTStr("Output.RecordNoSpace.Msg"));
UI: Add system tray capability This adds a system tray when enabled. There is also a option to minimize to the system tray when the app is started. Closes jp9000/obs-studio#595
2016-08-13 14:36:17 +00:00
} else if (code != OBS_OUTPUT_SUCCESS && isVisible()) {
UI: Make sure all message box buttons are translated Instead of QMessageBox::question and QMessageBox::information, use the OBSMessageBox class, which translates all buttons.
2017-05-13 21:06:32 +00:00
OBSMessageBox::information(this,
UI: Add more potential recording errors
2015-09-19 05:20:55 +00:00
QTStr("Output.RecordError.Title"),
QTStr("Output.RecordError.Msg"));
UI: Add system tray capability This adds a system tray when enabled. There is also a option to minimize to the system tray when the app is started. Closes jp9000/obs-studio#595
2016-08-13 14:36:17 +00: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);
UI: Add more potential recording errors
2015-09-19 05:20:55 +00:00
}
UI: Add front-end API library Allows manipulating and modifying the front-end via plugins.
2016-08-28 21:24:14 +00:00
if (api)
api->on_event(OBS_FRONTEND_EVENT_RECORDING_STOPPED);
UI: Refactor dup. code from stream/recording start/stop The code to enable/disable the profile menu along with incrementing/decrementing the sleep inhibitor was duplicated more times than necessary.
2016-08-21 19:05:25 +00:00
OnDeactivate();
UI: Add FLV file output (sharing encoders) Implement the 'file path' in output settings, and implement the 'start recording' button, though for the time being I'm just going to make it use a directory rather than allow custom file names. This file output will actually share the video and audio encoder with the stream. I don't really know what to do about MP4 -- I don't really like the idea of saving directly in the program, if you do and the program crashes, that MP4 file is lost. I'm contemplating making some sort of mp4 output process stub. So no MP4 file output for the time being. If you need MP4, just remux it with FFmpeg: ffmpeg -i flv_file.flv -acodec copy -vcodec copy mp4_file.mp4
2014-05-21 06:27:27 +00: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 08:49:07 +00:00
UI: Separate replay buffer from recording Replay buffer and recording should be separate in case the user wants to start recording from a specific point rather being forced to reconfigure for regular recording. Creates a new button on the main window below the recording button for turning on/off the replay buffer.
2016-12-09 22:40:04 +00: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;
UI: Change output blocking bool to integer ref counter
2017-05-15 21:15:25 +00:00
if (disableOutputsRef)
UI: Add function to enable/disable outputs
2017-04-28 10:58:53 +00:00
return;
UI: Separate replay buffer from recording Replay buffer and recording should be separate in case the user wants to start recording from a specific point rather being forced to reconfigure for regular recording. Creates a new button on the main window below the recording button for turning on/off the replay buffer.
2016-12-09 22:40:04 +00:00
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) {
UI: Make sure all message box buttons are translated Instead of QMessageBox::question and QMessageBox::information, use the OBSMessageBox class, which translates all buttons.
2017-05-13 21:06:32 +00:00
OBSMessageBox::information(this,
UI: Separate replay buffer from recording Replay buffer and recording should be separate in case the user wants to start recording from a specific point rather being forced to reconfigure for regular recording. Creates a new button on the main window below the recording button for turning on/off the replay buffer.
2016-12-09 22:40:04 +00:00
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()) {
UI: Make sure all message box buttons are translated Instead of QMessageBox::question and QMessageBox::information, use the OBSMessageBox class, which translates all buttons.
2017-05-13 21:06:32 +00:00
OBSMessageBox::information(this,
UI: Separate replay buffer from recording Replay buffer and recording should be separate in case the user wants to start recording from a specific point rather being forced to reconfigure for regular recording. Creates a new button on the main window below the recording button for turning on/off the replay buffer.
2016-12-09 22:40:04 +00:00
QTStr("Output.RecordFail.Title"),
QTStr("Output.RecordFail.Unsupported"));
} else if (code == OBS_OUTPUT_NO_SPACE && isVisible()) {
UI: Make sure all message box buttons are translated Instead of QMessageBox::question and QMessageBox::information, use the OBSMessageBox class, which translates all buttons.
2017-05-13 21:06:32 +00:00
OBSMessageBox::information(this,
UI: Separate replay buffer from recording Replay buffer and recording should be separate in case the user wants to start recording from a specific point rather being forced to reconfigure for regular recording. Creates a new button on the main window below the recording button for turning on/off the replay buffer.
2016-12-09 22:40:04 +00:00
QTStr("Output.RecordNoSpace.Title"),
QTStr("Output.RecordNoSpace.Msg"));
} else if (code != OBS_OUTPUT_SUCCESS && isVisible()) {
UI: Make sure all message box buttons are translated Instead of QMessageBox::question and QMessageBox::information, use the OBSMessageBox class, which translates all buttons.
2017-05-13 21:06:32 +00:00
OBSMessageBox::information(this,
UI: Separate replay buffer from recording Replay buffer and recording should be separate in case the user wants to start recording from a specific point rather being forced to reconfigure for regular recording. Creates a new button on the main window below the recording button for turning on/off the replay buffer.
2016-12-09 22:40:04 +00:00
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();
}
UI: Add FLV file output (sharing encoders) Implement the 'file path' in output settings, and implement the 'start recording' button, though for the time being I'm just going to make it use a directory rather than allow custom file names. This file output will actually share the video and audio encoder with the stream. I don't really know what to do about MP4 -- I don't really like the idea of saving directly in the program, if you do and the program crashes, that MP4 file is lost. I'm contemplating making some sort of mp4 output process stub. So no MP4 file output for the time being. If you need MP4, just remux it with FFmpeg: ffmpeg -i flv_file.flv -acodec copy -vcodec copy mp4_file.mp4
2014-05-21 06:27:27 +00:00
void OBSBasic::on_streamButton_clicked()
{
UI: Refactor output handling To accommodate multiple types of outputs, there has to be some level of abstraction. The BasicOutputHandler structure will give us a way that we can switch between different output configurations.
2015-02-06 11:17:33 +00:00
if (outputHandler->StreamingActive()) {
UI: Add options to enable/disable stream confirm dialogs Some streamers would accidentally hit start/stop streaming, which on certain services would send out mass emails to all their followers. This just adds options to general settings to optionally enable dialogs that confirm whether to actually start/stop streaming when the button is clicked.
2016-01-22 16:09:04 +00:00
bool confirm = config_get_bool(GetGlobalConfig(), "BasicWindow",
"WarnBeforeStoppingStream");
UI: Add system tray capability This adds a system tray when enabled. There is also a option to minimize to the system tray when the app is started. Closes jp9000/obs-studio#595
2016-08-13 14:36:17 +00:00
if (confirm && isVisible()) {
UI: Add options to enable/disable stream confirm dialogs Some streamers would accidentally hit start/stop streaming, which on certain services would send out mass emails to all their followers. This just adds options to general settings to optionally enable dialogs that confirm whether to actually start/stop streaming when the button is clicked.
2016-01-22 16:09:04 +00:00
QMessageBox::StandardButton button =
UI: Make sure all message box buttons are translated Instead of QMessageBox::question and QMessageBox::information, use the OBSMessageBox class, which translates all buttons.
2017-05-13 21:06:32 +00:00
OBSMessageBox::question(this,
UI: Add options to enable/disable stream confirm dialogs Some streamers would accidentally hit start/stop streaming, which on certain services would send out mass emails to all their followers. This just adds options to general settings to optionally enable dialogs that confirm whether to actually start/stop streaming when the button is clicked.
2016-01-22 16:09:04 +00:00
QTStr("ConfirmStop.Title"),
QTStr("ConfirmStop.Text"));
if (button == QMessageBox::No)
return;
}
UI: Add OBSBasic::StartStreaming/StopStreaming
2014-10-26 00:03:13 +00:00
StopStreaming();
UI: Add FLV file output (sharing encoders) Implement the 'file path' in output settings, and implement the 'start recording' button, though for the time being I'm just going to make it use a directory rather than allow custom file names. This file output will actually share the video and audio encoder with the stream. I don't really know what to do about MP4 -- I don't really like the idea of saving directly in the program, if you do and the program crashes, that MP4 file is lost. I'm contemplating making some sort of mp4 output process stub. So no MP4 file output for the time being. If you need MP4, just remux it with FFmpeg: ffmpeg -i flv_file.flv -acodec copy -vcodec copy mp4_file.mp4
2014-05-21 06:27:27 +00:00
} else {
UI: Add options to enable/disable stream confirm dialogs Some streamers would accidentally hit start/stop streaming, which on certain services would send out mass emails to all their followers. This just adds options to general settings to optionally enable dialogs that confirm whether to actually start/stop streaming when the button is clicked.
2016-01-22 16:09:04 +00:00
bool confirm = config_get_bool(GetGlobalConfig(), "BasicWindow",
"WarnBeforeStartingStream");
UI: Add system tray capability This adds a system tray when enabled. There is also a option to minimize to the system tray when the app is started. Closes jp9000/obs-studio#595
2016-08-13 14:36:17 +00:00
if (confirm && isVisible()) {
UI: Add options to enable/disable stream confirm dialogs Some streamers would accidentally hit start/stop streaming, which on certain services would send out mass emails to all their followers. This just adds options to general settings to optionally enable dialogs that confirm whether to actually start/stop streaming when the button is clicked.
2016-01-22 16:09:04 +00:00
QMessageBox::StandardButton button =
UI: Make sure all message box buttons are translated Instead of QMessageBox::question and QMessageBox::information, use the OBSMessageBox class, which translates all buttons.
2017-05-13 21:06:32 +00:00
OBSMessageBox::question(this,
UI: Add options to enable/disable stream confirm dialogs Some streamers would accidentally hit start/stop streaming, which on certain services would send out mass emails to all their followers. This just adds options to general settings to optionally enable dialogs that confirm whether to actually start/stop streaming when the button is clicked.
2016-01-22 16:09:04 +00:00
QTStr("ConfirmStart.Title"),
QTStr("ConfirmStart.Text"));
if (button == QMessageBox::No)
return;
}
UI: Add OBSBasic::StartStreaming/StopStreaming
2014-10-26 00:03:13 +00:00
StartStreaming();
UI: Add FLV file output (sharing encoders) Implement the 'file path' in output settings, and implement the 'start recording' button, though for the time being I'm just going to make it use a directory rather than allow custom file names. This file output will actually share the video and audio encoder with the stream. I don't really know what to do about MP4 -- I don't really like the idea of saving directly in the program, if you do and the program crashes, that MP4 file is lost. I'm contemplating making some sort of mp4 output process stub. So no MP4 file output for the time being. If you need MP4, just remux it with FFmpeg: ffmpeg -i flv_file.flv -acodec copy -vcodec copy mp4_file.mp4
2014-05-21 06:27:27 +00:00
}
}
void OBSBasic::on_recordButton_clicked()
{
UI: Add OBSBasic::StartRecording/StopRecording
2014-10-25 23:57:29 +00:00
if (outputHandler->RecordingActive())
StopRecording();
else
StartRecording();
Do test recording to a specified file It will now output to a a filename that you specify when you click the record button. This is just for testing.
2014-02-10 17:22:35 +00: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 18:53:55 +00:00
void OBSBasic::on_settingsButton_clicked()
added more button callbacks
2013-12-10 18:22:33 +00:00
{
UI: Disable hiding if settings open Fixes a bug where you could minimize to tray if the settings window was open.
2016-09-22 04:20:06 +00:00
on_action_Settings_triggered();
added more button callbacks
2013-12-10 18:22:33 +00:00
}
Move basic mode configuration to a separate file Having everything in global.ini meant that if you wanted different settings for studio mode, that it would also overwrite it for basic mode. This way, the settings for each mode are separate, and you can use different settings for each mode.
2014-03-07 04:08:12 +00:00
UI: Add menu to visit website to basic main window
2015-06-25 08:02:47 +00:00
void OBSBasic::on_actionWebsite_triggered()
{
QUrl url = QUrl("https://obsproject.com", QUrl::TolerantMode);
QDesktopServices::openUrl(url);
}
UI: Add menu options to open settings folders Adds "Show Settings Folder" and "Show Profile Folder" items to the file menu.
2015-07-03 03:41:19 +00: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));
}
UI: Fix preview right-click menu getting wrong source When right-clicking items in the preview window and getting context menus for them, it would often make the wrong scene item be associated with the context menu because of the fact that it was using QListWidget::currentItem instead of querying the actual selected list. You must query the actual selection list via QListWidget::selectedItems because QListWidget::currentItem does not work properly for multi-selection list widgets.
2016-01-23 19:02:22 +00:00
QListWidgetItem *OBSBasic::GetTopSelectedSourceItem()
{
QList<QListWidgetItem*> selectedItems = ui->sources->selectedItems();
QListWidgetItem *topItem = nullptr;
if (selectedItems.size() != 0)
topItem = selectedItems[0];
return topItem;
}
UI: Add context menu to preview Includes the ability to disable the preview and general source context menu options (add/remove/filters/properties/etc)
2015-04-03 04:35:46 +00:00
void OBSBasic::on_preview_customContextMenuRequested(const QPoint &pos)
{
UI: Fix preview right-click menu getting wrong source When right-clicking items in the preview window and getting context menus for them, it would often make the wrong scene item be associated with the context menu because of the fact that it was using QListWidget::currentItem instead of querying the actual selected list. You must query the actual selection list via QListWidget::selectedItems because QListWidget::currentItem does not work properly for multi-selection list widgets.
2016-01-23 19:02:22 +00:00
CreateSourcePopupMenu(GetTopSelectedSourceItem(), true);
UI: Add context menu to preview Includes the ability to disable the preview and general source context menu options (add/remove/filters/properties/etc)
2015-04-03 04:35:46 +00:00
UNUSED_PARAMETER(pos);
}
void OBSBasic::on_previewDisabledLabel_customContextMenuRequested(
const QPoint &pos)
{
QMenu popup(this);
UI: Add fullscreen projector options Add the ability to use a fullscreen projector for scenes, sources, and the preview display.
2015-04-04 08:40:15 +00:00
QPointer<QMenu> previewProjector;
UI: Add context menu to preview Includes the ability to disable the preview and general source context menu options (add/remove/filters/properties/etc)
2015-04-03 04:35:46 +00:00
QAction *action = popup.addAction(
QTStr("Basic.Main.PreviewConextMenu.Enable"),
this, SLOT(TogglePreview()));
action->setCheckable(true);
UI: Change "main preview" to use OBSQTDisplay (Non-compiling commit: windowless-context branch) Gets rid of all functions/data related to setting up the main preview to be associated with obs_reset_video and instead uses OBSQTDisplay for the main window display (thus associating it with an obs_display object).
2015-08-02 07:02:58 +00:00
action->setChecked(obs_display_enabled(ui->preview->GetDisplay()));
UI: Add context menu to preview Includes the ability to disable the preview and general source context menu options (add/remove/filters/properties/etc)
2015-04-03 04:35:46 +00:00
UI: Add fullscreen projector options Add the ability to use a fullscreen projector for scenes, sources, and the preview display.
2015-04-04 08:40:15 +00:00
previewProjector = new QMenu(QTStr("PreviewProjector"));
AddProjectorMenuMonitors(previewProjector, this,
SLOT(OpenPreviewProjector()));
UI: Add ability to output to window Closes jp9000/obs-studio#841
2017-03-02 04:08:49 +00:00
QAction *previewWindow = popup.addAction(
QTStr("PreviewWindow"),
this, SLOT(OpenPreviewWindow()));
UI: Add fullscreen projector options Add the ability to use a fullscreen projector for scenes, sources, and the preview display.
2015-04-04 08:40:15 +00:00
popup.addMenu(previewProjector);
UI: Add ability to output to window Closes jp9000/obs-studio#841
2017-03-02 04:08:49 +00:00
popup.addAction(previewWindow);
UI: Add context menu to preview Includes the ability to disable the preview and general source context menu options (add/remove/filters/properties/etc)
2015-04-03 04:35:46 +00:00
popup.exec(QCursor::pos());
UNUSED_PARAMETER(pos);
}
UI: Add "Always On Top" option to file menu
2016-01-22 15:33:29 +00: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();
}
Move basic mode configuration to a separate file Having everything in global.ini meant that if you wanted different settings for studio mode, that it would also overwrite it for basic mode. This way, the settings for each mode are separate, and you can use different settings for each mode.
2014-03-07 04:08:12 +00: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;
UI: Add 24 NTSC as a common FPS value
2017-02-06 22:55:14 +00:00
} else if (strcmp(val, "24 NTSC") == 0) {
num = 24000;
den = 1001;
Move basic mode configuration to a separate file Having everything in global.ini meant that if you wanted different settings for studio mode, that it would also overwrite it for basic mode. This way, the settings for each mode are separate, and you can use different settings for each mode.
2014-03-07 04:08:12 +00:00
} 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);
}
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
config_t *OBSBasic::Config() const
Move basic mode configuration to a separate file Having everything in global.ini meant that if you wanted different settings for studio mode, that it would also overwrite it for basic mode. This way, the settings for each mode are separate, and you can use different settings for each mode.
2014-03-07 04:08:12 +00: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 07:54:48 +00:00
void OBSBasic::on_actionEditTransform_triggered()
{
Minor refactor for creation of sub-windows This refactors the sub-window code a bit so that instead of deleting the window pointers, it calls QWidget::close() on them to safely trigger a normal close on them instead (which will also delete them). Moves setting the DeleteOnClose flag from inside of the Dialog classes into the OBSBasic class, to make that behaviour more obvious.
2014-07-22 20:16:57 +00: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 07:54:48 +00:00
transformWindow = new OBSBasicTransform(this);
transformWindow->show();
Minor refactor for creation of sub-windows This refactors the sub-window code a bit so that instead of deleting the window pointers, it calls QWidget::close() on them to safely trigger a normal close on them instead (which will also delete them). Moves setting the DeleteOnClose flag from inside of the Dialog classes into the OBSBasic class, to make that behaviour more obvious.
2014-07-22 20:16:57 +00: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 07:54:48 +00:00
}
UI: Add ability to copy-paste scene item transforms This commit adds the ability to copy a scene item's transform and crop settings and paste those settings onto another scene item in any scene or scene collection. It also changes the menu shortcut key for the Transform action "Center to screen" from "C" to "n" because "C" is the standard shortcut key for "Copy" in most other applications. Closes jp9000/obs-studio#719
2016-12-07 07:43:23 +00: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 07:54:48 +00:00
void OBSBasic::on_actionResetTransform_triggered()
{
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00: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 07:54:48 +00:00
{
if (!obs_sceneitem_selected(item))
return true;
UI: Reset crop with transform
2016-03-31 17:15:20 +00:00
obs_sceneitem_defer_update_begin(item);
(API Change) Rename obs_sceneitem_info structure Change obs_sceneitem_info structure to obs_transform_info - this structure will not just be used with scene items in the future.
2014-08-02 06:33:45 +00: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 07:54:48 +00: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);
UI: Reset crop with transform
2016-03-31 17:15:20 +00: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 07:54:48 +00:00
UNUSED_PARAMETER(scene);
UNUSED_PARAMETER(param);
return true;
};
obs_scene_enum_items(GetCurrentScene(), func, nullptr);
}
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00: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 07:54:48 +00:00
{
matrix4 boxTransform;
obs_sceneitem_get_box_transform(item, &boxTransform);
vec3_set(&tl, M_INFINITE, M_INFINITE, 0.0f);
Make 'center to screen' just center the source Instead of using bounds to force the source to be centered (and unrotated), just center the source positionally on the screen. Will also preserve rotation.
2014-06-23 06:49:57 +00: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 07:54:48 +00:00
Make 'center to screen' just center the source Instead of using bounds to force the source to be centered (and unrotated), just center the source positionally on the screen. Will also preserve rotation.
2014-06-23 06:49:57 +00: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 07:54:48 +00:00
{
vec3 pos;
vec3_set(&pos, x, y, 0.0f);
vec3_transform(&pos, &pos, &boxTransform);
Make 'center to screen' just center the source Instead of using bounds to force the source to be centered (and unrotated), just center the source positionally on the screen. Will also preserve rotation.
2014-06-23 06:49:57 +00: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 07:54:48 +00:00
};
Make 'center to screen' just center the source Instead of using bounds to force the source to be centered (and unrotated), just center the source positionally on the screen. Will also preserve rotation.
2014-06-23 06:49:57 +00:00
GetMinPos(0.0f, 0.0f);
GetMinPos(1.0f, 0.0f);
GetMinPos(0.0f, 1.0f);
GetMinPos(1.0f, 1.0f);
}
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
static vec3 GetItemTL(obs_sceneitem_t *item)
Make 'center to screen' just center the source Instead of using bounds to force the source to be centered (and unrotated), just center the source positionally on the screen. Will also preserve rotation.
2014-06-23 06:49:57 +00: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 07:54:48 +00:00
return tl;
}
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00: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 07:54:48 +00:00
{
vec3 newTL;
vec2 pos;
(API Change) Un-squish obs_sceneitem_* Renamed: To: ----------------------------------------------------------- obs_sceneitem_getscene obs_sceneitem_get_scene obs_sceneitem_getsource obs_sceneitem_get_source obs_sceneitem_setpos obs_sceneitem_set_pos obs_sceneitem_setrot obs_sceneitem_set_rot obs_sceneitem_setscale obs_sceneitem_set_scale obs_sceneitem_setalignment obs_sceneitem_set_alignment obs_sceneitem_setorder obs_sceneitem_set_order obs_sceneitem_getpos obs_sceneitem_get_pos obs_sceneitem_getrot obs_sceneitem_get_rot obs_sceneitem_getscale obs_sceneitem_get_scale obs_sceneitem_getalignment obs_sceneitem_get_alignment
2014-08-03 21:39:19 +00: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 07:54:48 +00:00
newTL = GetItemTL(item);
pos.x += tl.x - newTL.x;
pos.y += tl.y - newTL.y;
(API Change) Un-squish obs_sceneitem_* Renamed: To: ----------------------------------------------------------- obs_sceneitem_getscene obs_sceneitem_get_scene obs_sceneitem_getsource obs_sceneitem_get_source obs_sceneitem_setpos obs_sceneitem_set_pos obs_sceneitem_setrot obs_sceneitem_set_rot obs_sceneitem_setscale obs_sceneitem_set_scale obs_sceneitem_setalignment obs_sceneitem_set_alignment obs_sceneitem_setorder obs_sceneitem_set_order obs_sceneitem_getpos obs_sceneitem_get_pos obs_sceneitem_getrot obs_sceneitem_get_rot obs_sceneitem_getscale obs_sceneitem_get_scale obs_sceneitem_getalignment obs_sceneitem_get_alignment
2014-08-03 21:39:19 +00: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 07:54:48 +00:00
}
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00: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 07:54:48 +00:00
void *param)
{
if (!obs_sceneitem_selected(item))
return true;
float rot = *reinterpret_cast<float*>(param);
vec3 tl = GetItemTL(item);
(API Change) Un-squish obs_sceneitem_* Renamed: To: ----------------------------------------------------------- obs_sceneitem_getscene obs_sceneitem_get_scene obs_sceneitem_getsource obs_sceneitem_get_source obs_sceneitem_setpos obs_sceneitem_set_pos obs_sceneitem_setrot obs_sceneitem_set_rot obs_sceneitem_setscale obs_sceneitem_set_scale obs_sceneitem_setalignment obs_sceneitem_set_alignment obs_sceneitem_setorder obs_sceneitem_set_order obs_sceneitem_getpos obs_sceneitem_get_pos obs_sceneitem_getrot obs_sceneitem_get_rot obs_sceneitem_getscale obs_sceneitem_get_scale obs_sceneitem_getalignment obs_sceneitem_get_alignment
2014-08-03 21:39:19 +00: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 07:54:48 +00:00
if (rot >= 360.0f) rot -= 360.0f;
else if (rot <= -360.0f) rot += 360.0f;
(API Change) Un-squish obs_sceneitem_* Renamed: To: ----------------------------------------------------------- obs_sceneitem_getscene obs_sceneitem_get_scene obs_sceneitem_getsource obs_sceneitem_get_source obs_sceneitem_setpos obs_sceneitem_set_pos obs_sceneitem_setrot obs_sceneitem_set_rot obs_sceneitem_setscale obs_sceneitem_set_scale obs_sceneitem_setalignment obs_sceneitem_set_alignment obs_sceneitem_setorder obs_sceneitem_set_order obs_sceneitem_getpos obs_sceneitem_get_pos obs_sceneitem_getrot obs_sceneitem_get_rot obs_sceneitem_getscale obs_sceneitem_get_scale obs_sceneitem_getalignment obs_sceneitem_get_alignment
2014-08-03 21:39:19 +00: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 07:54:48 +00: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);
}
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00: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 07:54:48 +00:00
void *param)
{
vec2 &mul = *reinterpret_cast<vec2*>(param);
if (!obs_sceneitem_selected(item))
return true;
vec3 tl = GetItemTL(item);
vec2 scale;
(API Change) Un-squish obs_sceneitem_* Renamed: To: ----------------------------------------------------------- obs_sceneitem_getscene obs_sceneitem_get_scene obs_sceneitem_getsource obs_sceneitem_get_source obs_sceneitem_setpos obs_sceneitem_set_pos obs_sceneitem_setrot obs_sceneitem_set_rot obs_sceneitem_setscale obs_sceneitem_set_scale obs_sceneitem_setalignment obs_sceneitem_set_alignment obs_sceneitem_setorder obs_sceneitem_set_order obs_sceneitem_getpos obs_sceneitem_get_pos obs_sceneitem_getrot obs_sceneitem_get_rot obs_sceneitem_getscale obs_sceneitem_get_scale obs_sceneitem_getalignment obs_sceneitem_get_alignment
2014-08-03 21:39:19 +00: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 07:54:48 +00:00
vec2_mul(&scale, &scale, &mul);
(API Change) Un-squish obs_sceneitem_* Renamed: To: ----------------------------------------------------------- obs_sceneitem_getscene obs_sceneitem_get_scene obs_sceneitem_getsource obs_sceneitem_get_source obs_sceneitem_setpos obs_sceneitem_set_pos obs_sceneitem_setrot obs_sceneitem_set_rot obs_sceneitem_setscale obs_sceneitem_set_scale obs_sceneitem_setalignment obs_sceneitem_set_alignment obs_sceneitem_setorder obs_sceneitem_set_order obs_sceneitem_getpos obs_sceneitem_get_pos obs_sceneitem_getrot obs_sceneitem_get_rot obs_sceneitem_getscale obs_sceneitem_get_scale obs_sceneitem_getalignment obs_sceneitem_get_alignment
2014-08-03 21:39:19 +00: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 07:54:48 +00:00
SetItemTL(item, tl);
Fix a number of warnings Structures with anonymous unions would a warning when you do a brace assignment on them. Also fixed some unused parameters and removed some unused variables.
2014-06-17 00:55:48 +00: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 07:54:48 +00:00
return true;
}
void OBSBasic::on_actionFlipHorizontal_triggered()
{
Fix a number of warnings Structures with anonymous unions would a warning when you do a brace assignment on them. Also fixed some unused parameters and removed some unused variables.
2014-06-17 00:55:48 +00: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 07:54:48 +00:00
obs_scene_enum_items(GetCurrentScene(), MultiplySelectedItemScale,
&scale);
}
void OBSBasic::on_actionFlipVertical_triggered()
{
Fix a number of warnings Structures with anonymous unions would a warning when you do a brace assignment on them. Also fixed some unused parameters and removed some unused variables.
2014-06-17 00:55:48 +00: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 07:54:48 +00:00
obs_scene_enum_items(GetCurrentScene(), MultiplySelectedItemScale,
&scale);
}
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00: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 07:54:48 +00: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);
(API Change) Rename obs_sceneitem_info structure Change obs_sceneitem_info structure to obs_transform_info - this structure will not just be used with scene items in the future.
2014-08-02 06:33:45 +00: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 07:54:48 +00: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()
{
(API Change) Remove pointers from all typedefs Typedef pointers are unsafe. If you do: typedef struct bla *bla_t; then you cannot use it as a constant, such as: const bla_t, because that constant will be to the pointer itself rather than to the underlying data. I admit this was a fundamental mistake that must be corrected. All typedefs that were pointer types will now have their pointers removed from the type itself, and the pointers will be used when they are actually used as variables/parameters/returns instead. This does not break ABI though, which is pretty nice.
2014-09-26 00:44:05 +00:00
auto func = [] (obs_scene_t *scene, obs_sceneitem_t *item, void *param)
Make 'center to screen' just center the source Instead of using bounds to force the source to be centered (and unrotated), just center the source positionally on the screen. Will also preserve rotation.
2014-06-23 06:49:57 +00: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);
Mark unused lambda parameter
2014-06-25 08:40:39 +00:00
UNUSED_PARAMETER(param);
Make 'center to screen' just center the source Instead of using bounds to force the source to be centered (and unrotated), just center the source positionally on the screen. Will also preserve rotation.
2014-06-23 06:49:57 +00: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 07:54:48 +00:00
}
UI: Add context menu to preview Includes the ability to disable the preview and general source context menu options (add/remove/filters/properties/etc)
2015-04-03 04:35:46 +00: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 19:19:29 +00:00
void OBSBasic::EnablePreviewDisplay(bool enable)
{
obs_display_set_enabled(ui->preview->GetDisplay(), enable);
ui->preview->setVisible(enable);
ui->previewDisabledLabel->setVisible(!enable);
}
UI: Add context menu to preview Includes the ability to disable the preview and general source context menu options (add/remove/filters/properties/etc)
2015-04-03 04:35:46 +00: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 19:19:29 +00:00
previewEnabled = !previewEnabled;
EnablePreviewDisplay(previewEnabled);
UI: Add context menu to preview Includes the ability to disable the preview and general source context menu options (add/remove/filters/properties/etc)
2015-04-03 04:35:46 +00:00
}
UI: Add up/down/left/right position shortcuts Allows nudging of selected items in the direction pressed when the preview window is focused.
2015-04-03 06:09:13 +00:00
void OBSBasic::Nudge(int dist, MoveDir dir)
{
UI: Don't nudge source if preview is locked
2016-09-02 15:13:45 +00:00
if (ui->preview->Locked())
return;
UI: Add up/down/left/right position shortcuts Allows nudging of selected items in the direction pressed when the preview window is focused.
2015-04-03 06:09:13 +00:00
struct MoveInfo {
float dist;
MoveDir dir;
} info = {(float)dist, dir};
auto func = [] (obs_scene_t*, obs_sceneitem_t *item, void *param)
{
UI, libobs: Add ability to lock individual scene items Adds a lock checkbox to allow the user to lock a specific scene item. Closes jp9000/obs-studio#949
2017-06-18 00:10:42 +00:00
if (obs_sceneitem_locked(item))
return true;
UI: Add up/down/left/right position shortcuts Allows nudging of selected items in the direction pressed when the preview window is focused.
2015-04-03 06:09:13 +00:00
MoveInfo *info = reinterpret_cast<MoveInfo*>(param);
UI: Fix vec2 warning Fix warning encountered on clang-504.0.40 on OSX 10.9: obs/window-basic-main.cpp:2884:22: warning: suggest braces around initialization of subobject [-Wmissing-braces] struct vec2 dir = {0.0f, 0.0f};
2015-04-10 17:07:56 +00:00
struct vec2 dir;
UI: Add up/down/left/right position shortcuts Allows nudging of selected items in the direction pressed when the preview window is focused.
2015-04-03 06:09:13 +00:00
struct vec2 pos;
UI: Fix vec2 warning Fix warning encountered on clang-504.0.40 on OSX 10.9: obs/window-basic-main.cpp:2884:22: warning: suggest braces around initialization of subobject [-Wmissing-braces] struct vec2 dir = {0.0f, 0.0f};
2015-04-10 17:07:56 +00:00
vec2_set(&dir, 0.0f, 0.0f);
UI: Add up/down/left/right position shortcuts Allows nudging of selected items in the direction pressed when the preview window is focused.
2015-04-03 06:09:13 +00: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);}
UI: Add fullscreen projector options Add the ability to use a fullscreen projector for scenes, sources, and the preview display.
2015-04-04 08:40:15 +00:00
UI: Add ability to output to window Closes jp9000/obs-studio#841
2017-03-02 04:08:49 +00:00
void OBSBasic::OpenProjector(obs_source_t *source, int monitor, bool window,
QString title)
UI: Add fullscreen projector options Add the ability to use a fullscreen projector for scenes, sources, and the preview display.
2015-04-04 08:40:15 +00:00
{
/* seriously? 10 monitors? */
UI: Add option to save projectors This adds an option to the general settings to save the opened projectors on exit. (Note: Fixed conflicts -Jim) Closes jp9000/obs-studio#743
2016-12-29 15:21:53 +00:00
if (monitor > 9 || monitor > QGuiApplication::screens().size() - 1)
UI: Add fullscreen projector options Add the ability to use a fullscreen projector for scenes, sources, and the preview display.
2015-04-04 08:40:15 +00:00
return;
UI: Add option to save projectors This adds an option to the general settings to save the opened projectors on exit. (Note: Fixed conflicts -Jim) Closes jp9000/obs-studio#743
2016-12-29 15:21:53 +00:00
bool isPreview = false;
if (source == nullptr)
isPreview = true;
UI: Add ability to output to window Closes jp9000/obs-studio#841
2017-03-02 04:08:49 +00:00
if (!window) {
delete projectors[monitor];
projectors[monitor].clear();
RemoveSavedProjectors(monitor);
}
UI: Add fullscreen projector options Add the ability to use a fullscreen projector for scenes, sources, and the preview display.
2015-04-04 08:40:15 +00:00
UI: Add ability to output to window Closes jp9000/obs-studio#841
2017-03-02 04:08:49 +00:00
OBSProjector *projector = new OBSProjector(nullptr, source, !!window);
UI: Add option to save projectors This adds an option to the general settings to save the opened projectors on exit. (Note: Fixed conflicts -Jim) Closes jp9000/obs-studio#743
2016-12-29 15:21:53 +00:00
const char *name = obs_source_get_name(source);
UI: Add ability to output to window Closes jp9000/obs-studio#841
2017-03-02 04:08:49 +00:00
if (!window) {
if (isPreview) {
previewProjectorArray.at((size_t)monitor) = 1;
} else {
projectorArray.at((size_t)monitor) = name;
}
UI: Add option to save projectors This adds an option to the general settings to save the opened projectors on exit. (Note: Fixed conflicts -Jim) Closes jp9000/obs-studio#743
2016-12-29 15:21:53 +00:00
}
UI: Add ability to output to window Closes jp9000/obs-studio#841
2017-03-02 04:08:49 +00:00
if (!window) {
projector->Init(monitor, false, nullptr);
projectors[monitor] = projector;
} else {
projector->Init(monitor, true, title);
for (auto &projPtr : windowProjectors) {
if (!projPtr) {
projPtr = projector;
projector = nullptr;
}
}
if (projector)
windowProjectors.push_back(projector);
}
UI: Add fullscreen projector options Add the ability to use a fullscreen projector for scenes, sources, and the preview display.
2015-04-04 08:40:15 +00:00
}
void OBSBasic::OpenPreviewProjector()
{
int monitor = sender()->property("monitor").toInt();
UI: Add ability to output to window Closes jp9000/obs-studio#841
2017-03-02 04:08:49 +00:00
OpenProjector(nullptr, monitor, false);
UI: Add fullscreen projector options Add the ability to use a fullscreen projector for scenes, sources, and the preview display.
2015-04-04 08:40:15 +00:00
}
void OBSBasic::OpenSourceProjector()
{
int monitor = sender()->property("monitor").toInt();
OBSSceneItem item = GetCurrentSceneItem();
if (!item)
return;
UI: Add ability to output to window Closes jp9000/obs-studio#841
2017-03-02 04:08:49 +00:00
OpenProjector(obs_sceneitem_get_source(item), monitor, false);
UI: Add fullscreen projector options Add the ability to use a fullscreen projector for scenes, sources, and the preview display.
2015-04-04 08:40:15 +00:00
}
void OBSBasic::OpenSceneProjector()
{
int monitor = sender()->property("monitor").toInt();
OBSScene scene = GetCurrentScene();
if (!scene)
return;
UI: Add ability to output to window Closes jp9000/obs-studio#841
2017-03-02 04:08:49 +00:00
OpenProjector(obs_scene_get_source(scene), monitor, false);
}
void OBSBasic::OpenPreviewWindow()
{
int monitor = sender()->property("monitor").toInt();
QString title = QTStr("PreviewWindow");
OpenProjector(nullptr, monitor, true, title);
}
void OBSBasic::OpenSourceWindow()
{
int monitor = sender()->property("monitor").toInt();
OBSSceneItem item = GetCurrentSceneItem();
OBSSource source = obs_sceneitem_get_source(item);
QString text = QString::fromUtf8(obs_source_get_name(source));
QString title = QTStr("SourceWindow") + " - " + text;
if (!item)
return;
OpenProjector(obs_sceneitem_get_source(item), monitor, true, title);
}
void OBSBasic::OpenSceneWindow()
{
int monitor = sender()->property("monitor").toInt();
OBSScene scene = GetCurrentScene();
OBSSource source = obs_scene_get_source(scene);
QString text = QString::fromUtf8(obs_source_get_name(source));
QString title = QTStr("SceneWindow") + " - " + text;
if (!scene)
return;
OpenProjector(obs_scene_get_source(scene), monitor, true, title);
UI: Add fullscreen projector options Add the ability to use a fullscreen projector for scenes, sources, and the preview display.
2015-04-04 08:40:15 +00:00
}
UI: Add UpdateTitleBar function to basic UI
2015-07-04 00:55:55 +00:00
UI: Add option to save projectors This adds an option to the general settings to save the opened projectors on exit. (Note: Fixed conflicts -Jim) Closes jp9000/obs-studio#743
2016-12-29 15:21:53 +00: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;
}
UI: Add ability to output to window Closes jp9000/obs-studio#841
2017-03-02 04:08:49 +00:00
OpenProjector(source, (int)i, false);
UI: Add option to save projectors This adds an option to the general settings to save the opened projectors on exit. (Note: Fixed conflicts -Jim) Closes jp9000/obs-studio#743
2016-12-29 15:21:53 +00:00
obs_source_release(source);
}
}
for (size_t i = 0; i < previewProjectorArray.size(); i++) {
if (previewProjectorArray.at(i) == 1) {
UI: Add ability to output to window Closes jp9000/obs-studio#841
2017-03-02 04:08:49 +00:00
OpenProjector(nullptr, (int)i, false);
UI: Add option to save projectors This adds an option to the general settings to save the opened projectors on exit. (Note: Fixed conflicts -Jim) Closes jp9000/obs-studio#743
2016-12-29 15:21:53 +00:00
}
}
}
}
void OBSBasic::RemoveSavedProjectors(int monitor)
{
previewProjectorArray.at((size_t)monitor) = 0;
projectorArray.at((size_t)monitor) = "";
}
UI: Add fullscreen UI option to view menu (Edit by Jim: Removed "Fullscreen Preview" because that's already sort of served by the normal fullscreen projector option via the preview context menu) Closes jp9000/obs-studio#846
2017-03-04 14:21:43 +00:00
void OBSBasic::on_actionFullscreenInterface_triggered()
{
if (!fullscreenInterface)
showFullScreen();
else
showNormal();
fullscreenInterface = !fullscreenInterface;
}
UI: Add UpdateTitleBar function to basic UI
2015-07-04 00:55:55 +00:00
void OBSBasic::UpdateTitleBar()
{
stringstream name;
UI: Add Profiles Adds setting profiles to the basic user interface. For each profile, a subdirectory for the profile will be created in [config_dir]/obs-studio/basic/profiles which will contain the settings data for each profile.
2015-06-24 02:38:01 +00:00
const char *profile = config_get_string(App()->GlobalConfig(),
"Basic", "Profile");
UI: Add scene collections Adds scene collections to the menu bar, which allows you to duplicate, rename, remove, or add clean new scene collections. Scene files are now stored in ./obs-studio/basic/scenes directory with filesystem-safe names.
2015-06-24 02:29:07 +00: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 19:19:29 +00:00
name << "OBS ";
if (previewProgramMode)
name << "Studio ";
name << App()->GetVersionString();
UI: Add Portable Mode indicator to title bar and log Closes jp9000/obs-studio#654
2016-10-10 00:53:45 +00:00
if (App()->IsPortableMode())
name << " - Portable Mode";
UI: Add Profiles Adds setting profiles to the basic user interface. For each profile, a subdirectory for the profile will be created in [config_dir]/obs-studio/basic/profiles which will contain the settings data for each profile.
2015-06-24 02:38:01 +00:00
name << " - " << Str("TitleBar.Profile") << ": " << profile;
UI: Add scene collections Adds scene collections to the menu bar, which allows you to duplicate, rename, remove, or add clean new scene collections. Scene files are now stored in ./obs-studio/basic/scenes directory with filesystem-safe names.
2015-06-24 02:29:07 +00:00
name << " - " << Str("TitleBar.Scenes") << ": " << sceneCollection;
UI: Add UpdateTitleBar function to basic UI
2015-07-04 00:55:55 +00:00
setWindowTitle(QT_UTF8(name.str().c_str()));
}
UI: Add Profiles Adds setting profiles to the basic user interface. For each profile, a subdirectory for the profile will be created in [config_dir]/obs-studio/basic/profiles which will contain the settings data for each profile.
2015-06-24 02:38:01 +00: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);
}
UI: Add "View" menu to control visibility of UI widgets Adds a little improvement to quality-of-life, a typical "View" menu with the ability to show/hide the following (for now): - Listbox toolbars - Status bar - Transitions pane (some people don't really need/use/care about it)
2016-06-30 21:52:56 +00:00
UI: Add modular UI Changes the UI to an adjustable user interface, allowing the user to fully customize how the scenes list, sources list, the mixer, transitions, and the buttons are oriented on the main window window.
2017-07-27 09:40:41 +00:00
void OBSBasic::on_resetUI_triggered()
UI: Add "View" menu to control visibility of UI widgets Adds a little improvement to quality-of-life, a typical "View" menu with the ability to show/hide the following (for now): - Listbox toolbars - Status bar - Transitions pane (some people don't really need/use/care about it)
2016-06-30 21:52:56 +00:00
{
UI: Add modular UI Changes the UI to an adjustable user interface, allowing the user to fully customize how the scenes list, sources list, the mixer, transitions, and the buttons are oriented on the main window window.
2017-07-27 09:40:41 +00:00
restoreState(startingDockLayout);
UI: Add "View" menu to control visibility of UI widgets Adds a little improvement to quality-of-life, a typical "View" menu with the ability to show/hide the following (for now): - Listbox toolbars - Status bar - Transitions pane (some people don't really need/use/care about it)
2016-06-30 21:52:56 +00:00
UI: Fix build issue with older linux Qt5 packages QMainWindow::resizeDocks isn't supported on certain long-term support distros (ubuntu trusty in particular), so instead just restore the starting state and don't try to recalculate the ideal positioning.
2017-07-28 05:50:25 +00:00
#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
UI: Add modular UI Changes the UI to an adjustable user interface, allowing the user to fully customize how the scenes list, sources list, the mixer, transitions, and the buttons are oriented on the main window window.
2017-07-27 09:40:41 +00:00
int cx = width();
int cy = height();
int cx22_5 = cx * 225 / 1000;
int cx5 = cx * 5 / 100;
cy = cy * 225 / 1000;
int mixerSize = cx - (cx22_5 * 2 + cx5 * 2);
QList<QDockWidget*> docks {
ui->scenesDock,
ui->sourcesDock,
ui->mixerDock,
ui->transitionsDock,
ui->controlsDock
};
QList<int> sizes {
cx22_5,
cx22_5,
mixerSize,
cx5,
cx5
};
ui->scenesDock->setVisible(true);
ui->sourcesDock->setVisible(true);
ui->mixerDock->setVisible(true);
ui->transitionsDock->setVisible(true);
ui->controlsDock->setVisible(true);
resizeDocks(docks, {cy, cy, cy, cy, cy}, Qt::Vertical);
resizeDocks(docks, sizes, Qt::Horizontal);
UI: Fix build issue with older linux Qt5 packages QMainWindow::resizeDocks isn't supported on certain long-term support distros (ubuntu trusty in particular), so instead just restore the starting state and don't try to recalculate the ideal positioning.
2017-07-28 05:50:25 +00:00
#endif
UI: Add modular UI Changes the UI to an adjustable user interface, allowing the user to fully customize how the scenes list, sources list, the mixer, transitions, and the buttons are oriented on the main window window.
2017-07-27 09:40:41 +00:00
}
void OBSBasic::on_lockUI_toggled(bool lock)
{
QDockWidget::DockWidgetFeatures features = lock
? QDockWidget::NoDockWidgetFeatures
: QDockWidget::AllDockWidgetFeatures;
ui->scenesDock->setFeatures(features);
ui->sourcesDock->setFeatures(features);
ui->mixerDock->setFeatures(features);
ui->transitionsDock->setFeatures(features);
ui->controlsDock->setFeatures(features);
UI: Add "View" menu to control visibility of UI widgets Adds a little improvement to quality-of-life, a typical "View" menu with the ability to show/hide the following (for now): - Listbox toolbars - Status bar - Transitions pane (some people don't really need/use/care about it)
2016-06-30 21:52:56 +00:00
}
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);
}
UI: Add ability to lock preview Adds the ability to lock the preview so sources can't be edited. This feature is typically used in the case where the user wants to prevent accidentally clicking and dragging on sources.
2016-07-26 08:32:43 +00:00
void OBSBasic::on_actionLockPreview_triggered()
{
ui->preview->ToggleLocked();
ui->actionLockPreview->setChecked(ui->preview->Locked());
}
UI: Add system tray capability This adds a system tray when enabled. There is also a option to minimize to the system tray when the app is started. Closes jp9000/obs-studio#595
2016-08-13 14:36:17 +00:00
UI: Add preview scaling options Adds preview scaling to the right-click context menu for the preview pane. This allows the ability to, for example, zoom the preview and edit the preview 1:1 (canvas/base resolution). This was a missing parity feature. Additionally, also allows scaling to the "output/scaled" resolution the program is set to. When the preview is in scale mode and is the focused widget, you can hold space and drag with left click to change the zoomed position. (Notes added by Jim) Closes jp9000/obs-studio#687
2016-11-05 16:48:46 +00: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);
UI: Allow zoom with the scroll wheel Adds the ability to zoom into the preview when fixed scaling mode is enabled. (Edit by Jim: Also now saves zoom and scroll position) Closes jp9000/obs-studio#917
2017-05-13 17:13:55 +00:00
action->setVisible(!(ovi.output_width == ovi.base_width &&
ovi.output_height == ovi.base_height));
UI: Add preview scaling options Adds preview scaling to the right-click context menu for the preview pane. This allows the ability to, for example, zoom the preview and edit the preview 1:1 (canvas/base resolution). This was a missing parity feature. Additionally, also allows scaling to the "output/scaled" resolution the program is set to. When the preview is in scale mode and is the focused widget, you can hold space and drag with left click to change the zoomed position. (Notes added by Jim) Closes jp9000/obs-studio#687
2016-11-05 16:48:46 +00:00
UpdatePreviewScalingMenu();
}
void OBSBasic::on_actionScaleWindow_triggered()
{
UI: Allow zoom with the scroll wheel Adds the ability to zoom into the preview when fixed scaling mode is enabled. (Edit by Jim: Also now saves zoom and scroll position) Closes jp9000/obs-studio#917
2017-05-13 17:13:55 +00:00
ui->preview->SetFixedScaling(false);
UI: Add preview scaling options Adds preview scaling to the right-click context menu for the preview pane. This allows the ability to, for example, zoom the preview and edit the preview 1:1 (canvas/base resolution). This was a missing parity feature. Additionally, also allows scaling to the "output/scaled" resolution the program is set to. When the preview is in scale mode and is the focused widget, you can hold space and drag with left click to change the zoomed position. (Notes added by Jim) Closes jp9000/obs-studio#687
2016-11-05 16:48:46 +00:00
ui->preview->ResetScrollingOffset();
emit ui->preview->DisplayResized();
}
void OBSBasic::on_actionScaleCanvas_triggered()
{
UI: Allow zoom with the scroll wheel Adds the ability to zoom into the preview when fixed scaling mode is enabled. (Edit by Jim: Also now saves zoom and scroll position) Closes jp9000/obs-studio#917
2017-05-13 17:13:55 +00:00
ui->preview->SetFixedScaling(true);
ui->preview->SetScalingLevel(0);
UI: Add preview scaling options Adds preview scaling to the right-click context menu for the preview pane. This allows the ability to, for example, zoom the preview and edit the preview 1:1 (canvas/base resolution). This was a missing parity feature. Additionally, also allows scaling to the "output/scaled" resolution the program is set to. When the preview is in scale mode and is the focused widget, you can hold space and drag with left click to change the zoomed position. (Notes added by Jim) Closes jp9000/obs-studio#687
2016-11-05 16:48:46 +00:00
emit ui->preview->DisplayResized();
}
void OBSBasic::on_actionScaleOutput_triggered()
{
UI: Allow zoom with the scroll wheel Adds the ability to zoom into the preview when fixed scaling mode is enabled. (Edit by Jim: Also now saves zoom and scroll position) Closes jp9000/obs-studio#917
2017-05-13 17:13:55 +00:00
obs_video_info ovi;
obs_get_video_info(&ovi);
ui->preview->SetFixedScaling(true);
float scalingAmount = float(ovi.output_width) / float(ovi.base_width);
// log base ZOOM_SENSITIVITY of x = log(x) / log(ZOOM_SENSITIVITY)
int32_t approxScalingLevel = int32_t(
round(log(scalingAmount) / log(ZOOM_SENSITIVITY)));
ui->preview->SetScalingLevel(approxScalingLevel);
ui->preview->SetScalingAmount(scalingAmount);
UI: Add preview scaling options Adds preview scaling to the right-click context menu for the preview pane. This allows the ability to, for example, zoom the preview and edit the preview 1:1 (canvas/base resolution). This was a missing parity feature. Additionally, also allows scaling to the "output/scaled" resolution the program is set to. When the preview is in scale mode and is the focused widget, you can hold space and drag with left click to change the zoomed position. (Notes added by Jim) Closes jp9000/obs-studio#687
2016-11-05 16:48:46 +00:00
emit ui->preview->DisplayResized();
}
UI: Add system tray capability This adds a system tray when enabled. There is also a option to minimize to the system tray when the app is started. Closes jp9000/obs-studio#595
2016-08-13 14:36:17 +00:00
void OBSBasic::SetShowing(bool showing)
{
if (!showing && isVisible()) {
config_set_string(App()->GlobalConfig(),
"BasicWindow", "geometry",
saveGeometry().toBase64().constData());
UI: Hide/show dialogs when minimizing to tray Hides dialogs when minimizing to tray, and shows again when restoring from tray. Closes jp9000/obs-studio#737
2017-01-25 08:39:18 +00:00
/* hide all visible child dialogs */
visDlgPositions.clear();
if (!visDialogs.isEmpty()) {
for (QDialog *dlg : visDialogs) {
visDlgPositions.append(dlg->pos());
dlg->hide();
}
}
UI: Fix poor handling of system tray pointers The original pull request that added the system tray feature was riddled with bad pointer usage. Bare pointers that are never properly freed, never contained within a QPointer or unique_ptr. These have now been changed to use QPointer variables, and to always check when the variables are valid before using. The order of destruction for QMenu that uses the actions has now been prioritized first before the actions.
2016-10-19 13:44:02 +00:00
if (showHide)
showHide->setText(QTStr("Basic.SystemTray.Show"));
UI: Add system tray capability This adds a system tray when enabled. There is also a option to minimize to the system tray when the app is started. Closes jp9000/obs-studio#595
2016-08-13 14:36:17 +00:00
QTimer::singleShot(250, this, SLOT(hide()));
if (previewEnabled)
EnablePreviewDisplay(false);
setVisible(false);
} else if (showing && !isVisible()) {
UI: Fix poor handling of system tray pointers The original pull request that added the system tray feature was riddled with bad pointer usage. Bare pointers that are never properly freed, never contained within a QPointer or unique_ptr. These have now been changed to use QPointer variables, and to always check when the variables are valid before using. The order of destruction for QMenu that uses the actions has now been prioritized first before the actions.
2016-10-19 13:44:02 +00:00
if (showHide)
showHide->setText(QTStr("Basic.SystemTray.Hide"));
UI: Add system tray capability This adds a system tray when enabled. There is also a option to minimize to the system tray when the app is started. Closes jp9000/obs-studio#595
2016-08-13 14:36:17 +00:00
QTimer::singleShot(250, this, SLOT(show()));
if (previewEnabled)
EnablePreviewDisplay(true);
setVisible(true);
UI: Add option to always minimize to tray Closes jp9000/obs-studio#737
2017-01-25 07:01:24 +00:00
UI: Hide/show dialogs when minimizing to tray Hides dialogs when minimizing to tray, and shows again when restoring from tray. Closes jp9000/obs-studio#737
2017-01-25 08:39:18 +00: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();
}
}
UI: Add option to always minimize to tray Closes jp9000/obs-studio#737
2017-01-25 07:01:24 +00: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);
}
UI: Add system tray capability This adds a system tray when enabled. There is also a option to minimize to the system tray when the app is started. Closes jp9000/obs-studio#595
2016-08-13 14:36:17 +00:00
}
}
UI: Hide/show dialogs when minimizing to tray Hides dialogs when minimizing to tray, and shows again when restoring from tray. Closes jp9000/obs-studio#737
2017-01-25 08:39:18 +00:00
void OBSBasic::ToggleShowHide()
{
bool showing = isVisible();
if (showing) {
/* check for modal dialogs */
EnumDialogs();
if (!modalDialogs.isEmpty() || !visMsgBoxes.isEmpty())
return;
}
SetShowing(!showing);
}
UI: Fix improper brace placement for function
2016-10-19 13:49:12 +00:00
void OBSBasic::SystemTrayInit()
{
UI: Add system tray capability This adds a system tray when enabled. There is also a option to minimize to the system tray when the app is started. Closes jp9000/obs-studio#595
2016-08-13 14:36:17 +00: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);
UI: Separate replay buffer from recording Replay buffer and recording should be separate in case the user wants to start recording from a specific point rather being forced to reconfigure for regular recording. Creates a new button on the main window below the recording button for turning on/off the replay buffer.
2016-12-09 22:40:04 +00:00
sysTrayReplayBuffer = new QAction(QTStr("Basic.Main.StartReplayBuffer"),
trayIcon);
UI: Add system tray capability This adds a system tray when enabled. There is also a option to minimize to the system tray when the app is started. Closes jp9000/obs-studio#595
2016-08-13 14:36:17 +00:00
exit = new QAction(QTStr("Exit"),
trayIcon);
UI: Separate replay buffer from recording Replay buffer and recording should be separate in case the user wants to start recording from a specific point rather being forced to reconfigure for regular recording. Creates a new button on the main window below the recording button for turning on/off the replay buffer.
2016-12-09 22:40:04 +00:00
if (outputHandler && !outputHandler->replayBuffer)
sysTrayReplayBuffer->setEnabled(false);
UI: Add replay buffer options to simple output mode
2016-12-07 13:21:44 +00:00
UI: Add system tray capability This adds a system tray when enabled. There is also a option to minimize to the system tray when the app is started. Closes jp9000/obs-studio#595
2016-08-13 14:36:17 +00: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()));
UI: Fix replay buffer compile issues on older compilers
2016-12-12 05:04:58 +00:00
connect(sysTrayReplayBuffer.data(), &QAction::triggered,
UI: Separate replay buffer from recording Replay buffer and recording should be separate in case the user wants to start recording from a specific point rather being forced to reconfigure for regular recording. Creates a new button on the main window below the recording button for turning on/off the replay buffer.
2016-12-09 22:40:04 +00:00
this, &OBSBasic::ReplayBufferClicked);
UI: Add system tray capability This adds a system tray when enabled. There is also a option to minimize to the system tray when the app is started. Closes jp9000/obs-studio#595
2016-08-13 14:36:17 +00:00
connect(exit, SIGNAL(triggered()),
this, SLOT(close()));
UI: Add fullscreen projector to systray menu (Edit by Jim: Changed it to just add the fullscreen projector sub-menu like when right-clicking the preview, that way it doesn't have to add new locale text for translators, and allows the users to specify which monitor to use) Closes jp9000/obs-studio#845
2017-03-04 13:25:55 +00:00
QMenu *previewProjector = new QMenu(QTStr("PreviewProjector"));
AddProjectorMenuMonitors(previewProjector, this,
SLOT(OpenPreviewProjector()));
UI: Add system tray capability This adds a system tray when enabled. There is also a option to minimize to the system tray when the app is started. Closes jp9000/obs-studio#595
2016-08-13 14:36:17 +00:00
trayMenu = new QMenu;
trayMenu->addAction(showHide);
UI: Add fullscreen projector to systray menu (Edit by Jim: Changed it to just add the fullscreen projector sub-menu like when right-clicking the preview, that way it doesn't have to add new locale text for translators, and allows the users to specify which monitor to use) Closes jp9000/obs-studio#845
2017-03-04 13:25:55 +00:00
trayMenu->addMenu(previewProjector);
UI: Add system tray capability This adds a system tray when enabled. There is also a option to minimize to the system tray when the app is started. Closes jp9000/obs-studio#595
2016-08-13 14:36:17 +00:00
trayMenu->addAction(sysTrayStream);
trayMenu->addAction(sysTrayRecord);
UI: Separate replay buffer from recording Replay buffer and recording should be separate in case the user wants to start recording from a specific point rather being forced to reconfigure for regular recording. Creates a new button on the main window below the recording button for turning on/off the replay buffer.
2016-12-09 22:40:04 +00:00
trayMenu->addAction(sysTrayReplayBuffer);
UI: Add system tray capability This adds a system tray when enabled. There is also a option to minimize to the system tray when the app is started. Closes jp9000/obs-studio#595
2016-08-13 14:36:17 +00: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();
UI: Add more command line options
2017-01-11 19:19:17 +00:00
} else if ((sysTrayWhenStarted && sysTrayEnabled)
|| opt_minimize_tray) {
UI: Add system tray capability This adds a system tray when enabled. There is also a option to minimize to the system tray when the app is started. Closes jp9000/obs-studio#595
2016-08-13 14:36:17 +00:00
trayIcon->show();
if (firstStarted) {
QTimer::singleShot(50, this, SLOT(hide()));
EnablePreviewDisplay(false);
setVisible(false);
UI: Add more command line options
2017-01-11 19:19:17 +00:00
opt_minimize_tray = false;
UI: Add system tray capability This adds a system tray when enabled. There is also a option to minimize to the system tray when the app is started. Closes jp9000/obs-studio#595
2016-08-13 14:36:17 +00: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"));
}
UI: Add option to always minimize to tray Closes jp9000/obs-studio#737
2017-01-25 07:01:24 +00:00
bool OBSBasic::sysTrayMinimizeToTray()
{
return config_get_bool(GetGlobalConfig(),
"BasicWindow", "SysTrayMinimizeToTray");
}
UI: Add copying/pasting of sources/filters Closes jp9000/obs-studio#860
2017-03-25 11:19:29 +00:00
void OBSBasic::on_actionCopySource_triggered()
{
on_actionCopyTransform_triggered();
OBSSceneItem item = GetCurrentSceneItem();
if (!item)
return;
OBSSource source = obs_sceneitem_get_source(item);
copyString = obs_source_get_name(source);
copyVisible = obs_sceneitem_visible(item);
ui->actionPasteRef->setEnabled(true);
ui->actionPasteDup->setEnabled(true);
}
void OBSBasic::on_actionPasteRef_triggered()
{
OBSBasicSourceSelect::SourcePaste(copyString, copyVisible, false);
on_actionPasteTransform_triggered();
}
void OBSBasic::on_actionPasteDup_triggered()
{
OBSBasicSourceSelect::SourcePaste(copyString, copyVisible, true);
on_actionPasteTransform_triggered();
}
void OBSBasic::on_actionCopyFilters_triggered()
{
OBSSceneItem item = GetCurrentSceneItem();
if (!item)
return;
OBSSource source = obs_sceneitem_get_source(item);
copyFiltersString = obs_source_get_name(source);
ui->actionPasteFilters->setEnabled(true);
}
void OBSBasic::on_actionPasteFilters_triggered()
{
OBSSource source = obs_get_source_by_name(copyFiltersString);
OBSSceneItem sceneItem = GetCurrentSceneItem();
OBSSource dstSource = obs_sceneitem_get_source(sceneItem);
if (source == dstSource)
return;
obs_source_copy_filters(dstSource, source);
}
UI: Add auto-configuration wizard The auto-configuration wizard is designed to allow first-time or novice/uneducated users or to set up video and encoding settings in a very quick and easy way. It'll automatically perform a bandwidth test, and/or test the user's video settings to determine the most ideal settings for streaming and recording (assuming a 1-pc setup).
2017-05-06 19:13:56 +00:00
void OBSBasic::on_autoConfigure_triggered()
{
AutoConfig test(this);
test.setModal(true);
test.show();
test.exec();
}
UI: Add stats dialog Shows performance stats, and streaming/recording stats, and helps warn the user when they have less-than-optimal values with coloring on the values (e.g. yellow when getting low on disk space, red when getting really low)
2017-05-11 02:37:45 +00:00
void OBSBasic::on_stats_triggered()
{
UI: Bring stats to front if it already exists If the menu item is triggered again, just bring it to the front instead of trying to recreate it again.
2017-05-14 03:45:48 +00:00
if (!stats.isNull()) {
stats->show();
stats->raise();
return;
}
UI: Add stats dialog Shows performance stats, and streaming/recording stats, and helps warn the user when they have less-than-optimal values with coloring on the values (e.g. yellow when getting low on disk space, red when getting really low)
2017-05-11 02:37:45 +00:00
OBSBasicStats *statsDlg;
statsDlg = new OBSBasicStats(nullptr);
statsDlg->show();
stats = statsDlg;
}
Reference in a new issue Copy permalink