Skip to content
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

Jump to bottom

row number parameter for AddScene #50

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

row number parameter for AddScene #50

wants to merge 12 commits into from

Conversation

dunronet
Copy link
Contributor

  • Added parameters to AddScene-related functions to support adding a Scene to a DSK at a specific index.
    • I had wanted this to be an optional parameter (defaulting to -1), however I found that websocket was not handling this correctly. I had to hardcode -1 into my script, so clearly the default behavior wasn't working.
  • Pressing the Add Scene button on the front end UI while a scene is selected in the DSK will put the scene prior to the selected scene. If none selected, then scene is added to the end of the list (as usual)
    • I had users complaining about dragging a scene from the end up to where they wanted it. This solves that, but it will break existing websocket requests because they have to specify the row number (-1) now.
    • An argument could be made that Add Scene should put scenes directly below (instead of before) the selected scene. This would align with Scene List behavior. However, it then becomes impossible to add a scene at the top of a list (unless that becomes the default, which would be counter-intuitive)

dunronet and others added 9 commits October 15, 2024 23:51
@dunronet
save/load tie state
c2b56bc
@dunronet
Preview in Studio mode
4279bfa 
Exposed scene list to public, added reference to parent Dock within DSKs, DSKs trigger Dock to rebuild a preview scene named Downstream Keyer Preview
@dunronet
An alternative approach to exeldro#29
f37bf19 
Allows addition of non-existent "spacer" scenes (essentially "Pause" buttons in the DSK scene list)
@dunronet
Merge pull request #1 from dunronet/preview-dsk
a48c45b 
Preview in Studio mode
@dunronet
Merge pull request #2 from dunronet/spacer-scenes
39fe5f0 
An alternative approach to exeldro#29
@dunronet
Merge pull request #3 from dunronet/tie-not-persistent
0e0345c 
save/load tie state
@dunronet
Merge pull request #4 from exeldro/master
c637480 
Support OBS 31
@dunronet
Merge pull request #5 from exeldro/master
54e912b 
Resync with Master
@dunronet
Add parameter to specify where in list a Scene is added. If less than…
23dd4f8 
… 0, then append (previous behavior).
exeldro
exeldro reviewed Nov 21, 2024
View reviewed changes
downstream-keyer.cpp Outdated
{
const auto item = new QListWidgetItem(scene_name);
scenesList->addItem(item);
if (insertBeforeRow < 0) {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also check if insertBeforeRow > scenesList->count() ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call. Thank you!

dunronet added a commit to dunronet/obs-downstream-keyer that referenced this pull request Nov 24, 2024
@dunronet
Squashed commit of the following:
1ebbeac 
commit 31fbb2d
Author: dunronet <github@dunro.net>
Date:   Sun Nov 24 00:06:20 2024 -0500

    Revert "Merge branch 'tests' into add-scene-at-selected-row"

    This reverts commit 5cc479d, reversing
    changes made to a301912.

commit 5cc479d
Merge: a301912 54e912b
Author: dunronet <40171533+dunronet@users.noreply.github.com>
Date:   Fri Nov 22 10:28:55 2024 -0500

    Merge branch 'tests' into add-scene-at-selected-row

commit a301912
Author: dunronet <github@dunro.net>
Date:   Thu Nov 21 18:59:49 2024 -0500

    Prevent inserting at row greater than count
    (re: exeldro#50 (comment) )

commit 23dd4f8
Author: dunronet <github@dunro.net>
Date:   Thu Nov 21 01:26:53 2024 -0500

    Add parameter to specify where in list a Scene is added. If less than 0, then append (previous behavior).

commit 54e912b
Merge: 0e0345c ab6ccac
Author: dunronet <40171533+dunronet@users.noreply.github.com>
Date:   Sat Oct 26 22:38:49 2024 -0400

    Merge pull request #5 from exeldro/master

    Resync with Master

commit 0e0345c
Merge: 39fe5f0 c2b56bc
Author: dunronet <40171533+dunronet@users.noreply.github.com>
Date:   Wed Oct 16 02:00:57 2024 -0400

    Merge pull request #3 from dunronet/tie-not-persistent

    save/load tie state

commit 39fe5f0
Merge: a48c45b f37bf19
Author: dunronet <40171533+dunronet@users.noreply.github.com>
Date:   Wed Oct 16 01:59:51 2024 -0400

    Merge pull request #2 from dunronet/spacer-scenes

    An alternative approach to exeldro#29

commit a48c45b
Merge: 02ea554 4279bfa
Author: dunronet <40171533+dunronet@users.noreply.github.com>
Date:   Wed Oct 16 01:58:39 2024 -0400

    Merge pull request #1 from dunronet/preview-dsk

    Preview in Studio mode

commit f37bf19
Author: dunronet <40171533+dunronet@users.noreply.github.com>
Date:   Wed Oct 16 01:47:53 2024 -0400

    An alternative approach to exeldro#29

    Allows addition of non-existent "spacer" scenes (essentially "Pause" buttons in the DSK scene list)

commit 4279bfa
Author: dunronet <40171533+dunronet@users.noreply.github.com>
Date:   Wed Oct 16 00:56:18 2024 -0400

    Preview in Studio mode

    Exposed scene list to public, added reference to parent Dock within DSKs, DSKs trigger Dock to rebuild a preview scene named Downstream Keyer Preview

commit c2b56bc
Author: dunronet <40171533+dunronet@users.noreply.github.com>
Date:   Tue Oct 15 23:51:43 2024 -0400

    save/load tie state
dunronet added a commit to dunronet/obs-downstream-keyer that referenced this pull request Nov 24, 2024
@dunronet
Squashed commit of the following:
dc627c2 
commit 0677924
Author: dunronet <github@dunro.net>
Date:   Sun Nov 24 00:08:45 2024 -0500

    Revert "Merge branch 'tests' into add-pause-point-at-selected-row"

    This reverts commit 21773fe, reversing
    changes made to a76a0e9.

commit 21773fe
Merge: a76a0e9 2f48f03
Author: dunronet <40171533+dunronet@users.noreply.github.com>
Date:   Fri Nov 22 23:04:39 2024 -0500

    Merge branch 'tests' into add-pause-point-at-selected-row

commit a76a0e9
Author: dunronet <github@dunro.net>
Date:   Fri Nov 22 22:41:55 2024 -0500

    Ability to plan "clear layers" by adding pseudo-scenes which are the same as pressing the pause button

commit 2f48f03
Merge: 54e912b 5cc479d
Author: dunronet <40171533+dunronet@users.noreply.github.com>
Date:   Fri Nov 22 10:29:25 2024 -0500

    Merge pull request #7 from dunronet/add-scene-at-selected-row

    Add scene at selected row

commit 5cc479d
Merge: a301912 54e912b
Author: dunronet <40171533+dunronet@users.noreply.github.com>
Date:   Fri Nov 22 10:28:55 2024 -0500

    Merge branch 'tests' into add-scene-at-selected-row

commit a301912
Author: dunronet <github@dunro.net>
Date:   Thu Nov 21 18:59:49 2024 -0500

    Prevent inserting at row greater than count
    (re: exeldro#50 (comment) )

commit 23dd4f8
Author: dunronet <github@dunro.net>
Date:   Thu Nov 21 01:26:53 2024 -0500

    Add parameter to specify where in list a Scene is added. If less than 0, then append (previous behavior).

commit 54e912b
Merge: 0e0345c ab6ccac
Author: dunronet <40171533+dunronet@users.noreply.github.com>
Date:   Sat Oct 26 22:38:49 2024 -0400

    Merge pull request #5 from exeldro/master

    Resync with Master

commit 0e0345c
Merge: 39fe5f0 c2b56bc
Author: dunronet <40171533+dunronet@users.noreply.github.com>
Date:   Wed Oct 16 02:00:57 2024 -0400

    Merge pull request #3 from dunronet/tie-not-persistent

    save/load tie state

commit 39fe5f0
Merge: a48c45b f37bf19
Author: dunronet <40171533+dunronet@users.noreply.github.com>
Date:   Wed Oct 16 01:59:51 2024 -0400

    Merge pull request #2 from dunronet/spacer-scenes

    An alternative approach to exeldro#29

commit a48c45b
Merge: 02ea554 4279bfa
Author: dunronet <40171533+dunronet@users.noreply.github.com>
Date:   Wed Oct 16 01:58:39 2024 -0400

    Merge pull request #1 from dunronet/preview-dsk

    Preview in Studio mode

commit f37bf19
Author: dunronet <40171533+dunronet@users.noreply.github.com>
Date:   Wed Oct 16 01:47:53 2024 -0400

    An alternative approach to exeldro#29

    Allows addition of non-existent "spacer" scenes (essentially "Pause" buttons in the DSK scene list)

commit 4279bfa
Author: dunronet <40171533+dunronet@users.noreply.github.com>
Date:   Wed Oct 16 00:56:18 2024 -0400

    Preview in Studio mode

    Exposed scene list to public, added reference to parent Dock within DSKs, DSKs trigger Dock to rebuild a preview scene named Downstream Keyer Preview

commit c2b56bc
Author: dunronet <40171533+dunronet@users.noreply.github.com>
Date:   Tue Oct 15 23:51:43 2024 -0400

    save/load tie state
dunronet added a commit to dunronet/obs-downstream-keyer that referenced this pull request Nov 25, 2024
@dunronet
Squashed commit of the following:
5ccd9be 
commit 6e7dd6b
Merge: efa79fd 0677924
Author: dunronet <github@dunro.net>
Date:   Mon Nov 25 00:20:04 2024 -0500

    Merge branch 'add-pause-point-at-selected-row' of https://github.com/dunronet/obs-downstream-keyer into add-pause-point-at-selected-row

commit efa79fd
Author: dunronet <github@dunro.net>
Date:   Fri Nov 22 22:41:55 2024 -0500

    added pause point to websocket, Ability to plan "clear layers" by adding pseudo-scenes which are the same as pressing the pause button

commit 0677924
Author: dunronet <github@dunro.net>
Date:   Sun Nov 24 00:08:45 2024 -0500

    Revert "Merge branch 'tests' into add-pause-point-at-selected-row"

    This reverts commit 21773fe, reversing
    changes made to a76a0e9.

commit 21773fe
Merge: a76a0e9 2f48f03
Author: dunronet <40171533+dunronet@users.noreply.github.com>
Date:   Fri Nov 22 23:04:39 2024 -0500

    Merge branch 'tests' into add-pause-point-at-selected-row

commit a76a0e9
Author: dunronet <github@dunro.net>
Date:   Fri Nov 22 22:41:55 2024 -0500

    Ability to plan "clear layers" by adding pseudo-scenes which are the same as pressing the pause button

commit 2f48f03
Merge: 54e912b 5cc479d
Author: dunronet <40171533+dunronet@users.noreply.github.com>
Date:   Fri Nov 22 10:29:25 2024 -0500

    Merge pull request #7 from dunronet/add-scene-at-selected-row

    Add scene at selected row

commit 5cc479d
Merge: a301912 54e912b
Author: dunronet <40171533+dunronet@users.noreply.github.com>
Date:   Fri Nov 22 10:28:55 2024 -0500

    Merge branch 'tests' into add-scene-at-selected-row

commit a301912
Author: dunronet <github@dunro.net>
Date:   Thu Nov 21 18:59:49 2024 -0500

    Prevent inserting at row greater than count
    (re: exeldro#50 (comment) )

commit 23dd4f8
Author: dunronet <github@dunro.net>
Date:   Thu Nov 21 01:26:53 2024 -0500

    Add parameter to specify where in list a Scene is added. If less than 0, then append (previous behavior).

commit 54e912b
Merge: 0e0345c ab6ccac
Author: dunronet <40171533+dunronet@users.noreply.github.com>
Date:   Sat Oct 26 22:38:49 2024 -0400

    Merge pull request #5 from exeldro/master

    Resync with Master

commit 0e0345c
Merge: 39fe5f0 c2b56bc
Author: dunronet <40171533+dunronet@users.noreply.github.com>
Date:   Wed Oct 16 02:00:57 2024 -0400

    Merge pull request #3 from dunronet/tie-not-persistent

    save/load tie state

commit 39fe5f0
Merge: a48c45b f37bf19
Author: dunronet <40171533+dunronet@users.noreply.github.com>
Date:   Wed Oct 16 01:59:51 2024 -0400

    Merge pull request #2 from dunronet/spacer-scenes

    An alternative approach to exeldro#29

commit a48c45b
Merge: 02ea554 4279bfa
Author: dunronet <40171533+dunronet@users.noreply.github.com>
Date:   Wed Oct 16 01:58:39 2024 -0400

    Merge pull request #1 from dunronet/preview-dsk

    Preview in Studio mode

commit f37bf19
Author: dunronet <40171533+dunronet@users.noreply.github.com>
Date:   Wed Oct 16 01:47:53 2024 -0400

    An alternative approach to exeldro#29

    Allows addition of non-existent "spacer" scenes (essentially "Pause" buttons in the DSK scene list)

commit 4279bfa
Author: dunronet <40171533+dunronet@users.noreply.github.com>
Date:   Wed Oct 16 00:56:18 2024 -0400

    Preview in Studio mode

    Exposed scene list to public, added reference to parent Dock within DSKs, DSKs trigger Dock to rebuild a preview scene named Downstream Keyer Preview

commit c2b56bc
Author: dunronet <40171533+dunronet@users.noreply.github.com>
Date:   Tue Oct 15 23:51:43 2024 -0400

    save/load tie state
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@exeldro exeldro exeldro left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@dunronet @exeldro