Skip to content

frontend: Copy show/hide transitions when pasting source as duplicate #12308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
howellrl wants to merge 1 commit into
base: master
Choose a base branch
from
+47 −0
Open

frontend: Copy show/hide transitions when pasting source as duplicate #12308

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions frontend/dialogs/OBSBasicSourceSelect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@ struct AddSourceData {
obs_sceneitem_t *scene_item = nullptr;
};

struct FindSceneItemData {
/* Input data */
obs_source_t *source = nullptr;

/* Return data */
obs_sceneitem_t *sceneItem = nullptr;
};

bool OBSBasicSourceSelect::EnumSources(void *data, obs_source_t *source)
{
if (obs_source_is_hidden(source))
Expand Down Expand Up @@ -131,6 +139,33 @@ static void AddSource(void *_data, obs_scene_t *scene)
data->scene_item = sceneitem;
}

static bool FindSceneItem(obs_scene_t *, obs_sceneitem_t *sceneItem, void *_data)
{
FindSceneItemData *data = (FindSceneItemData *)(_data);
if (obs_sceneitem_get_source(sceneItem) == data->source) {
data->sceneItem = sceneItem;
return false;
}
return true;
}

static void DuplicateTransition(obs_sceneitem_t *originSceneItem, obs_sceneitem_t *destinationSceneItem, bool visible)
{
if (!originSceneItem || !destinationSceneItem)
return;

obs_source_t *tr = obs_sceneitem_get_transition(originSceneItem, visible);
int trDur = obs_sceneitem_get_transition_duration(originSceneItem, visible);

if (!tr)
return;

OBSSourceAutoRelease dupTr = obs_source_duplicate(tr, obs_source_get_name(tr), visible);

obs_sceneitem_set_transition(destinationSceneItem, visible, dupTr);
obs_sceneitem_set_transition_duration(destinationSceneItem, visible, trDur);
}

char *get_new_source_name(const char *name, const char *format)
{
struct dstr new_name = {0};
Expand All @@ -157,6 +192,13 @@ static void AddExisting(OBSSource source, bool visible, bool duplicate, obs_tran
if (!scene)
return;

FindSceneItemData findSceneItemData;
findSceneItemData.source = source;

obs_scene_enum_items(scene, FindSceneItem, &findSceneItemData);

obs_sceneitem_t *originSceneItem = findSceneItemData.sceneItem;

if (duplicate) {
OBSSource from = source;
char *new_name = get_new_source_name(obs_source_get_name(source), "%s %d");
Expand All @@ -179,6 +221,11 @@ static void AddExisting(OBSSource source, bool visible, bool duplicate, obs_tran
obs_enter_graphics();
obs_scene_atomic_update(scene, AddSource, &data);
obs_leave_graphics();

if (duplicate) {
DuplicateTransition(originSceneItem, data.scene_item, true);
DuplicateTransition(originSceneItem, data.scene_item, false);
}
}

static void AddExisting(const char *name, bool visible, bool duplicate, obs_transform_info *transform,
Expand Down