jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
obs-studio/UI/window-basic-source-select.cpp

283 lines
7.2 KiB
C++
Raw Normal View History

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-10 18:47:48 -07:00
/******************************************************************************
Copyright (C) 2014 by Hugh Bailey <obs.jim@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
******************************************************************************/
UI: Check for valid source name and duplicates When creating a source, it was possible to create duplicates. That has now been fixed. I think that perhaps libobs shouldn't even allow for duplicates in its core code, just to be safe. Will have to consider doing that in the future.
2014-05-12 15:32:55 -07:00
#include <QMessageBox>
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-10 18:47:48 -07:00
#include "window-basic-main.hpp"
#include "window-basic-source-select.hpp"
#include "qt-wrappers.hpp"
Auto suggest scene and source names. NameDialog can have placeholder text. Localize scene number. Pre-select scene and source text.
2014-05-09 15:09:17 -07:00
#include "obs-app.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-10 18:47:48 -07:00
UI: Add checkbox for visibility of new scene items Note: This functionality should probably be considered as a temporary solution. Ideally, sources should not be visible on creation until the user presses "OK" in the initial properties dialog. Also, the problem of initial visibility can additionally be solved by implementing the preview/program functionality. Once preview/program is implemented the need for this patch will be negated, and the option should probably be removed. Closes jp9000/obs-studio#483
2015-09-19 03:49:37 -07:00
struct AddSourceData {
obs_source_t *source;
bool visible;
};
(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-25 17:44:05 -07:00
bool OBSBasicSourceSelect::EnumSources(void *data, obs_source_t *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-10 18:47:48 -07:00
{
OBSBasicSourceSelect *window = static_cast<OBSBasicSourceSelect*>(data);
(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 08:41:15 -07:00
const char *name = obs_source_get_name(source);
(API Change) Split obs_source_gettype Changed: - obs_source_gettype To: - enum obs_source_type obs_source_get_type(obs_source_t source); - const char *obs_source_get_id(obs_source_t source); This function was inconsistent for a number of reasons. First, it returns both the ID and the type of source (input/transition/filter), which is inconsistent with the name of "get type". Secondly, the 'squishy' naming convention which has just turned out to be bad practice and causes inconsistencies. So it's now replaced with two functions that just return the type and the ID.
2014-08-02 12:42:47 -07:00
const char *id = obs_source_get_id(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-10 18:47:48 -07:00
Don't use "type" of source, use "id" of source The naming here is a poor choice, a source type determines if a source is either a regular input, a filter, or a transition. The ID is the actual unique identifier of a source.
2014-08-02 12:38:55 -07:00
if (strcmp(id, window->id) == 0)
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-10 18:47:48 -07:00
window->ui->sourceList->addItem(QT_UTF8(name));
return 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-25 17:44:05 -07:00
void OBSBasicSourceSelect::OBSSourceAdded(void *data, calldata_t *calldata)
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-10 18:47:48 -07:00
{
OBSBasicSourceSelect *window = static_cast<OBSBasicSourceSelect*>(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-25 17:44:05 -07:00
obs_source_t *source = (obs_source_t*)calldata_ptr(calldata, "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-10 18:47:48 -07:00
QMetaObject::invokeMethod(window, "SourceAdded",
Q_ARG(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-25 17:44:05 -07:00
void OBSBasicSourceSelect::OBSSourceRemoved(void *data, calldata_t *calldata)
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-10 18:47:48 -07:00
{
OBSBasicSourceSelect *window = static_cast<OBSBasicSourceSelect*>(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-25 17:44:05 -07:00
obs_source_t *source = (obs_source_t*)calldata_ptr(calldata, "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-10 18:47:48 -07:00
QMetaObject::invokeMethod(window, "SourceRemoved",
Q_ARG(OBSSource, source));
}
void OBSBasicSourceSelect::SourceAdded(OBSSource 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 08:41:15 -07:00
const char *name = obs_source_get_name(source);
(API Change) Split obs_source_gettype Changed: - obs_source_gettype To: - enum obs_source_type obs_source_get_type(obs_source_t source); - const char *obs_source_get_id(obs_source_t source); This function was inconsistent for a number of reasons. First, it returns both the ID and the type of source (input/transition/filter), which is inconsistent with the name of "get type". Secondly, the 'squishy' naming convention which has just turned out to be bad practice and causes inconsistencies. So it's now replaced with two functions that just return the type and the ID.
2014-08-02 12:42:47 -07:00
const char *sourceId = obs_source_get_id(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-10 18:47:48 -07:00
Don't use "type" of source, use "id" of source The naming here is a poor choice, a source type determines if a source is either a regular input, a filter, or a transition. The ID is the actual unique identifier of a source.
2014-08-02 12:38:55 -07:00
if (strcmp(sourceId, id) != 0)
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-10 18:47:48 -07:00
return;
ui->sourceList->addItem(name);
}
void OBSBasicSourceSelect::SourceRemoved(OBSSource 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 08:41:15 -07:00
const char *name = obs_source_get_name(source);
(API Change) Split obs_source_gettype Changed: - obs_source_gettype To: - enum obs_source_type obs_source_get_type(obs_source_t source); - const char *obs_source_get_id(obs_source_t source); This function was inconsistent for a number of reasons. First, it returns both the ID and the type of source (input/transition/filter), which is inconsistent with the name of "get type". Secondly, the 'squishy' naming convention which has just turned out to be bad practice and causes inconsistencies. So it's now replaced with two functions that just return the type and the ID.
2014-08-02 12:42:47 -07:00
const char *sourceId = obs_source_get_id(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-10 18:47:48 -07:00
Don't use "type" of source, use "id" of source The naming here is a poor choice, a source type determines if a source is either a regular input, a filter, or a transition. The ID is the actual unique identifier of a source.
2014-08-02 12:38:55 -07:00
if (strcmp(sourceId, id) != 0)
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-10 18:47:48 -07:00
return;
QList<QListWidgetItem*> items =
ui->sourceList->findItems(name, Qt::MatchFixedString);
if (!items.count())
return;
delete items[0];
}
UI: Add checkbox for visibility of new scene items Note: This functionality should probably be considered as a temporary solution. Ideally, sources should not be visible on creation until the user presses "OK" in the initial properties dialog. Also, the problem of initial visibility can additionally be solved by implementing the preview/program functionality. Once preview/program is implemented the need for this patch will be negated, and the option should probably be removed. Closes jp9000/obs-studio#483
2015-09-19 03:49:37 -07:00
static void AddSource(void *_data, obs_scene_t *scene)
{
AddSourceData *data = (AddSourceData *)_data;
obs_sceneitem_t *sceneitem;
sceneitem = obs_scene_add(scene, data->source);
obs_sceneitem_set_visible(sceneitem, data->visible);
}
UI: Add copying/pasting of sources/filters Closes jp9000/obs-studio#860
2017-03-25 04:19:29 -07:00
static char *get_new_source_name(const char *name)
{
struct dstr new_name = {0};
int inc = 0;
dstr_copy(&new_name, name);
for (;;) {
obs_source_t *existing_source = obs_get_source_by_name(
new_name.array);
if (!existing_source)
break;
obs_source_release(existing_source);
dstr_printf(&new_name, "%s %d", name, ++inc + 1);
}
return new_name.array;
}
static void AddExisting(const char *name, bool visible, bool duplicate)
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-10 18:47:48 -07:00
{
UI: Implement transitions and preview/program mode Implements transitions, and introduces "Studio Mode" which allows live editing of the same or different scenes while preserving what's currently being displayed. Studio Mode offers a number of new features: - The ability to edit different scenes or the same scene without modifying what's currently being displayed (of course) - The ability to set up "quick transitions" with a desired transition and duration that can be assigned hotkeys - The option to create full copies of all sources in the program scene to allow editing of source properties of the same scene live without modifying the output, or (by default) just use references. (Note however that certain sources cannot be duplicated, such as capture sources, media sources, and device sources) - Swap Mode (enabled by default) which swaps the program scene with the preview scene when a transition completes Currently, only non-configurable transitions (transitions without properties) are listed, and the only transitions available as of this writing are fade and cut. In future versions more transitions will be added, such as swipe, stingers, and many other various sort of transitions, and the UI will support being able to add/configure/remove those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
OBSBasic *main = reinterpret_cast<OBSBasic*>(App()->GetMainWindow());
OBSScene scene = main->GetCurrentScene();
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-10 18:47:48 -07:00
if (!scene)
return;
UI: Implement transitions and preview/program mode Implements transitions, and introduces "Studio Mode" which allows live editing of the same or different scenes while preserving what's currently being displayed. Studio Mode offers a number of new features: - The ability to edit different scenes or the same scene without modifying what's currently being displayed (of course) - The ability to set up "quick transitions" with a desired transition and duration that can be assigned hotkeys - The option to create full copies of all sources in the program scene to allow editing of source properties of the same scene live without modifying the output, or (by default) just use references. (Note however that certain sources cannot be duplicated, such as capture sources, media sources, and device sources) - Swap Mode (enabled by default) which swaps the program scene with the preview scene when a transition completes Currently, only non-configurable transitions (transitions without properties) are listed, and the only transitions available as of this writing are fade and cut. In future versions more transitions will be added, such as swipe, stingers, and many other various sort of transitions, and the UI will support being able to add/configure/remove those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
obs_source_t *source = obs_get_source_by_name(name);
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-10 18:47:48 -07:00
if (source) {
UI: Add copying/pasting of sources/filters Closes jp9000/obs-studio#860
2017-03-25 04:19:29 -07:00
if (duplicate) {
obs_source_t *from = source;
char *new_name = get_new_source_name(name);
source = obs_source_duplicate(from, new_name, false);
bfree(new_name);
obs_source_release(from);
if (!source)
return;
}
UI: Add checkbox for visibility of new scene items Note: This functionality should probably be considered as a temporary solution. Ideally, sources should not be visible on creation until the user presses "OK" in the initial properties dialog. Also, the problem of initial visibility can additionally be solved by implementing the preview/program functionality. Once preview/program is implemented the need for this patch will be negated, and the option should probably be removed. Closes jp9000/obs-studio#483
2015-09-19 03:49:37 -07:00
AddSourceData data;
data.source = source;
data.visible = visible;
obs_scene_atomic_update(scene, AddSource, &data);
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-10 18:47:48 -07:00
obs_source_release(source);
}
}
UI: Add checkbox for visibility of new scene items Note: This functionality should probably be considered as a temporary solution. Ideally, sources should not be visible on creation until the user presses "OK" in the initial properties dialog. Also, the problem of initial visibility can additionally be solved by implementing the preview/program functionality. Once preview/program is implemented the need for this patch will be negated, and the option should probably be removed. Closes jp9000/obs-studio#483
2015-09-19 03:49:37 -07:00
bool AddNew(QWidget *parent, const char *id, const char *name,
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 07:07:05 -07:00
const bool visible, OBSSource &newSource)
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-10 18:47:48 -07:00
{
UI: Implement transitions and preview/program mode Implements transitions, and introduces "Studio Mode" which allows live editing of the same or different scenes while preserving what's currently being displayed. Studio Mode offers a number of new features: - The ability to edit different scenes or the same scene without modifying what's currently being displayed (of course) - The ability to set up "quick transitions" with a desired transition and duration that can be assigned hotkeys - The option to create full copies of all sources in the program scene to allow editing of source properties of the same scene live without modifying the output, or (by default) just use references. (Note however that certain sources cannot be duplicated, such as capture sources, media sources, and device sources) - Swap Mode (enabled by default) which swaps the program scene with the preview scene when a transition completes Currently, only non-configurable transitions (transitions without properties) are listed, and the only transitions available as of this writing are fade and cut. In future versions more transitions will be added, such as swipe, stingers, and many other various sort of transitions, and the UI will support being able to add/configure/remove those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
OBSBasic *main = reinterpret_cast<OBSBasic*>(App()->GetMainWindow());
OBSScene scene = main->GetCurrentScene();
UI: Check for valid source name and duplicates When creating a source, it was possible to create duplicates. That has now been fixed. I think that perhaps libobs shouldn't even allow for duplicates in its core code, just to be safe. Will have to consider doing that in the future.
2014-05-12 15:32:55 -07:00
bool success = false;
UI: Implement transitions and preview/program mode Implements transitions, and introduces "Studio Mode" which allows live editing of the same or different scenes while preserving what's currently being displayed. Studio Mode offers a number of new features: - The ability to edit different scenes or the same scene without modifying what's currently being displayed (of course) - The ability to set up "quick transitions" with a desired transition and duration that can be assigned hotkeys - The option to create full copies of all sources in the program scene to allow editing of source properties of the same scene live without modifying the output, or (by default) just use references. (Note however that certain sources cannot be duplicated, such as capture sources, media sources, and device sources) - Swap Mode (enabled by default) which swaps the program scene with the preview scene when a transition completes Currently, only non-configurable transitions (transitions without properties) are listed, and the only transitions available as of this writing are fade and cut. In future versions more transitions will be added, such as swipe, stingers, and many other various sort of transitions, and the UI will support being able to add/configure/remove those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
if (!scene)
UI: Check for valid source name and duplicates When creating a source, it was possible to create duplicates. That has now been fixed. I think that perhaps libobs shouldn't even allow for duplicates in its core code, just to be safe. Will have to consider doing that in the future.
2014-05-12 15:32:55 -07:00
return false;
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-10 18:47:48 -07:00
UI: Implement transitions and preview/program mode Implements transitions, and introduces "Studio Mode" which allows live editing of the same or different scenes while preserving what's currently being displayed. Studio Mode offers a number of new features: - The ability to edit different scenes or the same scene without modifying what's currently being displayed (of course) - The ability to set up "quick transitions" with a desired transition and duration that can be assigned hotkeys - The option to create full copies of all sources in the program scene to allow editing of source properties of the same scene live without modifying the output, or (by default) just use references. (Note however that certain sources cannot be duplicated, such as capture sources, media sources, and device sources) - Swap Mode (enabled by default) which swaps the program scene with the preview scene when a transition completes Currently, only non-configurable transitions (transitions without properties) are listed, and the only transitions available as of this writing are fade and cut. In future versions more transitions will be added, such as swipe, stingers, and many other various sort of transitions, and the UI will support being able to add/configure/remove those sort of configurable transitions.
2016-01-23 11:19:29 -08:00
obs_source_t *source = obs_get_source_by_name(name);
UI: Check for valid source name and duplicates When creating a source, it was possible to create duplicates. That has now been fixed. I think that perhaps libobs shouldn't even allow for duplicates in its core code, just to be safe. Will have to consider doing that in the future.
2014-05-12 15:32:55 -07: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 14:06:32 -07:00
OBSMessageBox::information(parent,
UI: Check for valid source name and duplicates When creating a source, it was possible to create duplicates. That has now been fixed. I think that perhaps libobs shouldn't even allow for duplicates in its core code, just to be safe. Will have to consider doing that in the future.
2014-05-12 15:32:55 -07:00
QTStr("NameExists.Title"),
QTStr("NameExists.Text"));
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-10 18:47:48 -07:00
UI: Check for valid source name and duplicates When creating a source, it was possible to create duplicates. That has now been fixed. I think that perhaps libobs shouldn't even allow for duplicates in its core code, just to be safe. Will have to consider doing that in the future.
2014-05-12 15:32:55 -07:00
} else {
(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 15:25:45 -08:00
source = obs_source_create(id, name, NULL, nullptr);
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-10 18:47:48 -07:00
UI: Check for valid source name and duplicates When creating a source, it was possible to create duplicates. That has now been fixed. I think that perhaps libobs shouldn't even allow for duplicates in its core code, just to be safe. Will have to consider doing that in the future.
2014-05-12 15:32:55 -07:00
if (source) {
UI: Add checkbox for visibility of new scene items Note: This functionality should probably be considered as a temporary solution. Ideally, sources should not be visible on creation until the user presses "OK" in the initial properties dialog. Also, the problem of initial visibility can additionally be solved by implementing the preview/program functionality. Once preview/program is implemented the need for this patch will be negated, and the option should probably be removed. Closes jp9000/obs-studio#483
2015-09-19 03:49:37 -07:00
AddSourceData data;
data.source = source;
data.visible = visible;
obs_scene_atomic_update(scene, AddSource, &data);
UI: Check for valid source name and duplicates When creating a source, it was possible to create duplicates. That has now been fixed. I think that perhaps libobs shouldn't even allow for duplicates in its core code, just to be safe. Will have to consider doing that in the future.
2014-05-12 15:32:55 -07:00
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 07:07:05 -07:00
newSource = source;
UI: Check for valid source name and duplicates When creating a source, it was possible to create duplicates. That has now been fixed. I think that perhaps libobs shouldn't even allow for duplicates in its core code, just to be safe. Will have to consider doing that in the future.
2014-05-12 15:32:55 -07:00
success = true;
}
}
obs_source_release(source);
return success;
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-10 18:47:48 -07:00
}
void OBSBasicSourceSelect::on_buttonBox_accepted()
{
bool useExisting = ui->selectExisting->isChecked();
UI: Add checkbox for visibility of new scene items Note: This functionality should probably be considered as a temporary solution. Ideally, sources should not be visible on creation until the user presses "OK" in the initial properties dialog. Also, the problem of initial visibility can additionally be solved by implementing the preview/program functionality. Once preview/program is implemented the need for this patch will be negated, and the option should probably be removed. Closes jp9000/obs-studio#483
2015-09-19 03:49:37 -07:00
bool visible = ui->sourceVisible->isChecked();
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-10 18:47:48 -07:00
if (useExisting) {
QListWidgetItem *item = ui->sourceList->currentItem();
if (!item)
return;
UI: Add copying/pasting of sources/filters Closes jp9000/obs-studio#860
2017-03-25 04:19:29 -07:00
AddExisting(QT_TO_UTF8(item->text()), visible, false);
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-10 18:47:48 -07:00
} else {
UI: Check for valid source name and duplicates When creating a source, it was possible to create duplicates. That has now been fixed. I think that perhaps libobs shouldn't even allow for duplicates in its core code, just to be safe. Will have to consider doing that in the future.
2014-05-12 15:32:55 -07:00
if (ui->sourceName->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 14:06:32 -07:00
OBSMessageBox::information(this,
Alert user when using existing source name.
2014-08-12 12:09:19 -07:00
QTStr("NoNameEntered.Title"),
QTStr("NoNameEntered.Text"));
UI: Check for valid source name and duplicates When creating a source, it was possible to create duplicates. That has now been fixed. I think that perhaps libobs shouldn't even allow for duplicates in its core code, just to be safe. Will have to consider doing that in the future.
2014-05-12 15:32:55 -07:00
return;
}
UI: Add checkbox for visibility of new scene items Note: This functionality should probably be considered as a temporary solution. Ideally, sources should not be visible on creation until the user presses "OK" in the initial properties dialog. Also, the problem of initial visibility can additionally be solved by implementing the preview/program functionality. Once preview/program is implemented the need for this patch will be negated, and the option should probably be removed. Closes jp9000/obs-studio#483
2015-09-19 03:49:37 -07:00
if (!AddNew(this, id, QT_TO_UTF8(ui->sourceName->text()),
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 07:07:05 -07:00
visible, newSource))
UI: Check for valid source name and duplicates When creating a source, it was possible to create duplicates. That has now been fixed. I think that perhaps libobs shouldn't even allow for duplicates in its core code, just to be safe. Will have to consider doing that in the future.
2014-05-12 15:32:55 -07:00
return;
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-10 18:47:48 -07:00
}
done(DialogCode::Accepted);
}
void OBSBasicSourceSelect::on_buttonBox_rejected()
{
done(DialogCode::Rejected);
}
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 15:23:06 -07:00
static inline const char *GetSourceDisplayName(const char *id)
{
if (strcmp(id, "scene") == 0)
return Str("Basic.Scene");
return obs_source_get_display_name(id);
}
Q_DECLARE_METATYPE(OBSScene);
template <typename T>
static inline T GetOBSRef(QListWidgetItem *item)
{
return item->data(static_cast<int>(QtDataRole::OBSRef)).value<T>();
}
Don't use "type" of source, use "id" of source The naming here is a poor choice, a source type determines if a source is either a regular input, a filter, or a transition. The ID is the actual unique identifier of a source.
2014-08-02 12:38:55 -07:00
OBSBasicSourceSelect::OBSBasicSourceSelect(OBSBasic *parent, const char *id_)
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-10 18:47:48 -07:00
: QDialog (parent),
ui (new Ui::OBSBasicSourceSelect),
Don't use "type" of source, use "id" of source The naming here is a poor choice, a source type determines if a source is either a regular input, a filter, or a transition. The ID is the actual unique identifier of a source.
2014-08-02 12:38:55 -07:00
id (id_)
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-10 18:47:48 -07:00
{
ui->setupUi(this);
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 09:18:00 -07:00
ui->sourceList->setAttribute(Qt::WA_MacShowFocusRect, false);
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 15:23:06 -07:00
QString placeHolderText{QT_UTF8(GetSourceDisplayName(id))};
Auto suggest scene and source names. NameDialog can have placeholder text. Localize scene number. Pre-select scene and source text.
2014-05-09 15:09:17 -07:00
Make generated source name unique
2014-05-12 16:12:22 -07:00
QString text{placeHolderText};
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 08:23:31 -08:00
int i = 2;
(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-25 17:44:05 -07:00
obs_source_t *source = nullptr;
Release sources after name check
2014-05-14 13:20:08 -07:00
while ((source = obs_get_source_by_name(QT_TO_UTF8(text)))) {
obs_source_release(source);
Make generated source name unique
2014-05-12 16:12:22 -07:00
text = QString("%1 %2").arg(placeHolderText).arg(i++);
Release sources after name check
2014-05-14 13:20:08 -07:00
}
Make generated source name unique
2014-05-12 16:12:22 -07:00
ui->sourceName->setText(text);
Auto suggest scene and source names. NameDialog can have placeholder text. Localize scene number. Pre-select scene and source text.
2014-05-09 15:09:17 -07:00
ui->sourceName->setFocus(); //Fixes deselect of text.
ui->sourceName->selectAll();
UI: Add basic hotkey integration
2014-11-01 13:48:58 -07:00
installEventFilter(CreateShortcutFilter());
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 15:23:06 -07:00
if (strcmp(id_, "scene") == 0) {
OBSBasic *main = reinterpret_cast<OBSBasic*>(
App()->GetMainWindow());
OBSSource curSceneSource = main->GetCurrentSceneSource();
ui->selectExisting->setChecked(true);
ui->createNew->setChecked(false);
ui->createNew->setEnabled(false);
ui->sourceName->setEnabled(false);
int count = main->ui->scenes->count();
for (int i = 0; i < count; i++) {
QListWidgetItem *item = main->ui->scenes->item(i);
OBSScene scene = GetOBSRef<OBSScene>(item);
OBSSource sceneSource = obs_scene_get_source(scene);
if (curSceneSource == sceneSource)
continue;
const char *name = obs_source_get_name(sceneSource);
ui->sourceList->addItem(QT_UTF8(name));
}
} else {
obs_enum_sources(EnumSources, this);
}
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-10 18:47:48 -07:00
}
UI: Add copying/pasting of sources/filters Closes jp9000/obs-studio#860
2017-03-25 04:19:29 -07:00
void OBSBasicSourceSelect::SourcePaste(const char *name, bool visible, bool dup)
{
AddExisting(name, visible, dup);
}