Skip to content

5.x.x/events #119

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

Merged
merged 4 commits into from
Sep 8, 2021
Merged

5.x.x/events #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bab5bab
fix: rename CurrentSceneChangedEvent >> CurrentProgramSceneChangedEvent
Pjiesco Sep 6, 2021
8700e3d
core: reformat code
Pjiesco Sep 6, 2021
08f9da6
fix: type
Pjiesco Sep 7, 2021
1714bc2
fix: Enum name
ChristopheCVB Sep 8, 2021
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
4 changes: 2 additions & 2 deletions client/src/main/java/io/obswebsocket/community/client/message/event/Event.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import io.obswebsocket.community.client.message.event.sceneitems.SceneItemLockStateChangedEvent;
import io.obswebsocket.community.client.message.event.sceneitems.SceneItemRemovedEvent;
import io.obswebsocket.community.client.message.event.scenes.CurrentPreviewSceneChangedEvent;
import io.obswebsocket.community.client.message.event.scenes.CurrentSceneChangedEvent;
import io.obswebsocket.community.client.message.event.scenes.CurrentProgramSceneChangedEvent;
import io.obswebsocket.community.client.message.event.scenes.SceneCreatedEvent;
import io.obswebsocket.community.client.message.event.scenes.SceneListChangedEvent;
import io.obswebsocket.community.client.message.event.scenes.SceneNameChangedEvent;
Expand Down Expand Up @@ -85,7 +85,7 @@ public enum Type {
SceneCreated(SceneCreatedEvent.class),
SceneRemoved(SceneRemovedEvent.class),
SceneNameChanged(SceneNameChangedEvent.class),
CurrentSceneChanged(CurrentSceneChangedEvent.class),
CurrentProgramSceneChanged(CurrentProgramSceneChangedEvent.class),
CurrentPreviewSceneChanged(CurrentPreviewSceneChangedEvent.class),
SceneListChanged(SceneListChangedEvent.class),

Expand Down
6 changes: 3 additions & 3 deletions ...vent/scenes/CurrentSceneChangedEvent.java → ...enes/CurrentProgramSceneChangedEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@

@Getter
@ToString(callSuper = true)
public class CurrentSceneChangedEvent extends SceneEvent {
public class CurrentProgramSceneChangedEvent extends SceneEvent {

private Data eventData;

protected CurrentSceneChangedEvent() {
super(Type.CurrentSceneChanged, Category.Scenes);
protected CurrentProgramSceneChangedEvent() {
super(Type.CurrentProgramSceneChanged, Category.Scenes);
}
}
2 changes: 2 additions & 0 deletions ...rc/main/java/io/obswebsocket/community/client/message/event/scenes/SceneCreatedEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
@Getter
@ToString(callSuper = true)
public class SceneCreatedEvent extends SceneEvent {

private Data eventData;

protected SceneCreatedEvent() {
Expand All @@ -15,6 +16,7 @@ protected SceneCreatedEvent() {
@Getter
@ToString(callSuper = true)
public static class Data extends SceneEvent.Data {

private Boolean isGroup;
}
}
1 change: 1 addition & 0 deletions ...rc/main/java/io/obswebsocket/community/client/message/event/scenes/SceneRemovedEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ protected SceneRemovedEvent() {
@Getter
@ToString(callSuper = true)
public static class Data extends SceneEvent.Data {

private Boolean isGroup;
}
}