Skip to content

Commit df207c7

Browse files
author
TinaTiel
committed
Added Group sources and an empty scene
1 parent 36620a8 commit df207c7

File tree

2 files changed

+192
-3
lines changed

2 files changed

+192
-3
lines changed

‎obs-resources/AnonymizedSceneCollection.json

Lines changed: 183 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,67 @@
6262
"current_program_scene": "scene1",
6363
"current_scene": "scene1",
6464
"current_transition": "Cut",
65-
"groups": [],
65+
"groups": [
66+
{
67+
"balance": 0.5,
68+
"deinterlace_field_order": 0,
69+
"deinterlace_mode": 0,
70+
"enabled": true,
71+
"flags": 0,
72+
"hotkeys": {},
73+
"id": "group",
74+
"mixers": 0,
75+
"monitoring_type": 0,
76+
"muted": false,
77+
"name": "group",
78+
"prev_ver": 436273153,
79+
"private_settings": {},
80+
"push-to-mute": false,
81+
"push-to-mute-delay": 0,
82+
"push-to-talk": false,
83+
"push-to-talk-delay": 0,
84+
"settings": {
85+
"custom_size": true,
86+
"cx": 1318,
87+
"cy": 264,
88+
"id_counter": 0,
89+
"items": [
90+
{
91+
"align": 5,
92+
"bounds": {
93+
"x": 0.0,
94+
"y": 0.0
95+
},
96+
"bounds_align": 0,
97+
"bounds_type": 0,
98+
"crop_bottom": 0,
99+
"crop_left": 0,
100+
"crop_right": 0,
101+
"crop_top": 0,
102+
"group_item_backup": false,
103+
"id": 15,
104+
"locked": false,
105+
"name": "grouptext",
106+
"pos": {
107+
"x": 0.0,
108+
"y": 0.0
109+
},
110+
"private_settings": {},
111+
"rot": 0.0,
112+
"scale": {
113+
"x": 1.0,
114+
"y": 1.0
115+
},
116+
"scale_filter": "disable",
117+
"visible": true
118+
}
119+
]
120+
},
121+
"sync": 0,
122+
"versioned_id": "group",
123+
"volume": 1.0
124+
}
125+
],
66126
"modules": {
67127
"auto-scene-switcher": {
68128
"active": false,
@@ -129,9 +189,66 @@
129189
},
130190
{
131191
"name": "scene2"
192+
},
193+
{
194+
"name": "emptyscene"
132195
}
133196
],
134197
"sources": [
198+
{
199+
"balance": 0.5,
200+
"deinterlace_field_order": 0,
201+
"deinterlace_mode": 0,
202+
"enabled": true,
203+
"flags": 0,
204+
"hotkeys": {
205+
"OBSBasic.SelectScene": []
206+
},
207+
"id": "scene",
208+
"mixers": 0,
209+
"monitoring_type": 0,
210+
"muted": false,
211+
"name": "emptyscene",
212+
"prev_ver": 436273153,
213+
"private_settings": {},
214+
"push-to-mute": false,
215+
"push-to-mute-delay": 0,
216+
"push-to-talk": false,
217+
"push-to-talk-delay": 0,
218+
"settings": {
219+
"custom_size": false,
220+
"id_counter": 0,
221+
"items": []
222+
},
223+
"sync": 0,
224+
"versioned_id": "scene",
225+
"volume": 1.0
226+
},
227+
{
228+
"balance": 0.5,
229+
"deinterlace_field_order": 0,
230+
"deinterlace_mode": 0,
231+
"enabled": true,
232+
"flags": 0,
233+
"hotkeys": {},
234+
"id": "text_gdiplus",
235+
"mixers": 0,
236+
"monitoring_type": 0,
237+
"muted": false,
238+
"name": "grouptext",
239+
"prev_ver": 436273153,
240+
"private_settings": {},
241+
"push-to-mute": false,
242+
"push-to-mute-delay": 0,
243+
"push-to-talk": false,
244+
"push-to-talk-delay": 0,
245+
"settings": {
246+
"text": "Inside Group"
247+
},
248+
"sync": 0,
249+
"versioned_id": "text_gdiplus_v2",
250+
"volume": 1.0
251+
},
135252
{
136253
"balance": 0.5,
137254
"deinterlace_field_order": 0,
@@ -346,10 +463,14 @@
346463
"flags": 0,
347464
"hotkeys": {
348465
"OBSBasic.SelectScene": [],
466+
"libobs.hide_scene_item.group": [],
467+
"libobs.hide_scene_item.grouptext": [],
349468
"libobs.hide_scene_item.media": [],
350469
"libobs.hide_scene_item.red_square": [],
351470
"libobs.hide_scene_item.scenename1": [],
352471
"libobs.hide_scene_item.vlc-media": [],
472+
"libobs.show_scene_item.group": [],
473+
"libobs.show_scene_item.grouptext": [],
353474
"libobs.show_scene_item.media": [],
354475
"libobs.show_scene_item.red_square": [],
355476
"libobs.show_scene_item.scenename1": [],
@@ -368,8 +489,68 @@
368489
"push-to-talk-delay": 0,
369490
"settings": {
370491
"custom_size": false,
371-
"id_counter": 13,
492+
"id_counter": 15,
372493
"items": [
494+
{
495+
"align": 5,
496+
"bounds": {
497+
"x": 0.0,
498+
"y": 0.0
499+
},
500+
"bounds_align": 0,
501+
"bounds_type": 0,
502+
"crop_bottom": 0,
503+
"crop_left": 0,
504+
"crop_right": 0,
505+
"crop_top": 0,
506+
"group_item_backup": true,
507+
"id": 15,
508+
"locked": false,
509+
"name": "grouptext",
510+
"pos": {
511+
"x": 547.0,
512+
"y": 742.0
513+
},
514+
"private_settings": {},
515+
"rot": 0.0,
516+
"scale": {
517+
"x": 1.0,
518+
"y": 1.0
519+
},
520+
"scale_filter": "disable",
521+
"visible": true
522+
},
523+
{
524+
"align": 5,
525+
"bounds": {
526+
"x": 0.0,
527+
"y": 0.0
528+
},
529+
"bounds_align": 0,
530+
"bounds_type": 0,
531+
"crop_bottom": 0,
532+
"crop_left": 0,
533+
"crop_right": 0,
534+
"crop_top": 0,
535+
"group_item_backup": false,
536+
"id": 14,
537+
"locked": false,
538+
"name": "group",
539+
"pos": {
540+
"x": 547.0,
541+
"y": 742.0
542+
},
543+
"private_settings": {
544+
"collapsed": true
545+
},
546+
"rot": 0.0,
547+
"scale": {
548+
"x": 1.0,
549+
"y": 1.0
550+
},
551+
"scale_filter": "disable",
552+
"visible": false
553+
},
373554
{
374555
"align": 5,
375556
"bounds": {

‎src/integrationTest/java/net/twasi/obsremotejava/test/ObsRemoteE2eIT.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import java.util.concurrent.LinkedBlockingQueue;
1111
import java.util.function.Consumer;
1212
import net.twasi.obsremotejava.OBSRemoteController;
13+
import net.twasi.obsremotejava.objects.Scene;
1314
import net.twasi.obsremotejava.requests.GetSceneList.GetSceneListResponse;
1415
import org.junit.jupiter.api.AfterAll;
1516
import org.junit.jupiter.api.AfterEach;
@@ -80,7 +81,14 @@ void getScenes() {
8081
waitMs(50);
8182

8283
GetSceneListResponse res = (GetSceneListResponse)resultQueue.remove();
83-
assertThat(res.getScenes().size()).isEqualTo(2);
84+
assertThat(res.getScenes().size()).isEqualTo(3);
85+
86+
Scene scene1 = res.getScenes().get(0);
87+
assertThat(scene1.getSources().size()).isEqualTo(5);
88+
assertThat(scene1.getSourcesIncludingGroupChildren().size()).isEqualTo(6);
89+
90+
Scene emptyScene = res.getScenes().get(2);
91+
assertThat(emptyScene.getSources().size()).isZero();
8492

8593
}
8694

0 commit comments

Comments
 (0)