Skip to content

Commit 653a8c3

Browse files
committed
fix: Callback Types
1 parent a597912 commit 653a8c3

File tree

2 files changed

+26
-18
lines changed

2 files changed

+26
-18
lines changed

src/main/java/net/twasi/obsremotejava/OBSCommunicator.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -722,63 +722,63 @@ public void setStudioModeEnabled(boolean enabled, Callback<SetStudioModeEnabledR
722722
callbacks.put(SetStudioModeEnabledResponse.class, callback);
723723
}
724724

725-
public void playPauseMedia(String sourceName, Boolean playPause, Callback callback) {
725+
public void playPauseMedia(String sourceName, Boolean playPause, Callback<PlayPauseMediaResponse> callback) {
726726
PlayPauseMediaRequest request = new PlayPauseMediaRequest(this, sourceName, playPause);
727727

728728
session.getRemote().sendStringByFuture(this.gson.toJson(request));
729729
callbacks.put(PlayPauseMediaResponse.class, callback);
730730
}
731731

732-
public void restartMedia(String sourceName, Callback callback) {
732+
public void restartMedia(String sourceName, Callback<RestartMediaResponse> callback) {
733733
RestartMediaRequest request = new RestartMediaRequest(this, sourceName);
734734

735735
session.getRemote().sendStringByFuture(this.gson.toJson(request));
736736
callbacks.put(RestartMediaResponse.class, callback);
737737
}
738738

739-
public void stopMedia(String sourceName, Callback callback) {
739+
public void stopMedia(String sourceName, Callback<StopMediaResponse> callback) {
740740
StopMediaRequest request = new StopMediaRequest(this, sourceName);
741741

742742
session.getRemote().sendStringByFuture(this.gson.toJson(request));
743743
callbacks.put(StopMediaResponse.class, callback);
744744
}
745745

746-
public void nextMedia(String sourceName, Callback callback) {
746+
public void nextMedia(String sourceName, Callback<NextMediaResponse> callback) {
747747
NextMediaRequest request = new NextMediaRequest(this, sourceName);
748748

749749
session.getRemote().sendStringByFuture(this.gson.toJson(request));
750750
callbacks.put(NextMediaResponse.class, callback);
751751
}
752752

753-
public void previousMedia(String sourceName, Callback callback) {
753+
public void previousMedia(String sourceName, Callback<PreviousMediaResponse> callback) {
754754
PreviousMediaRequest request = new PreviousMediaRequest(this, sourceName);
755755

756756
session.getRemote().sendStringByFuture(this.gson.toJson(request));
757757
callbacks.put(PreviousMediaResponse.class, callback);
758758
}
759759

760-
public void refreshBrowserSource(String sourceName, Callback callback) {
760+
public void refreshBrowserSource(String sourceName, Callback<RefreshBrowserSourceResponse> callback) {
761761
RefreshBrowserSourceRequest request = new RefreshBrowserSourceRequest(this, sourceName);
762762

763763
session.getRemote().sendStringByFuture(this.gson.toJson(request));
764764
callbacks.put(RefreshBrowserSourceResponse.class, callback);
765765
}
766766

767-
public void getAudioMonitorType(String sourceName, Callback callback) {
767+
public void getAudioMonitorType(String sourceName, Callback<GetAudioMonitorTypeResponse> callback) {
768768
GetAudioMonitorTypeRequest request = new GetAudioMonitorTypeRequest(this, sourceName);
769769

770770
session.getRemote().sendStringByFuture(this.gson.toJson(request));
771771
callbacks.put(GetAudioMonitorTypeResponse.class, callback);
772772
}
773773

774-
public void setAudioMonitorType(String sourceName, GetAudioMonitorTypeResponse.MonitorType monitorType, Callback callback) {
774+
public void setAudioMonitorType(String sourceName, GetAudioMonitorTypeResponse.MonitorType monitorType, Callback<SetAudioMonitorTypeResponse> callback) {
775775
SetAudioMonitorTypeRequest request = new SetAudioMonitorTypeRequest(this, sourceName, monitorType);
776776

777777
session.getRemote().sendStringByFuture(this.gson.toJson(request));
778778
callbacks.put(SetAudioMonitorTypeResponse.class, callback);
779779
}
780780

781-
public void getSpecialSources(Callback callback) {
781+
public void getSpecialSources(Callback<GetSpecialSourcesResponse> callback) {
782782
GetSpecialSourcesRequest request = new GetSpecialSourcesRequest(this);
783783

784784
session.getRemote().sendStringByFuture(this.gson.toJson(request));

src/main/java/net/twasi/obsremotejava/OBSRemoteController.java

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,21 @@
1212
import net.twasi.obsremotejava.requests.GetSourceFilterInfo.GetSourceFilterInfoResponse;
1313
import net.twasi.obsremotejava.requests.GetSourceFilters.GetSourceFiltersResponse;
1414
import net.twasi.obsremotejava.requests.GetSourceSettings.GetSourceSettingsResponse;
15+
import net.twasi.obsremotejava.requests.GetSpecialSources.GetSpecialSourcesResponse;
1516
import net.twasi.obsremotejava.requests.GetStreamingStatus.GetStreamingStatusResponse;
1617
import net.twasi.obsremotejava.requests.GetStudioModeEnabled.GetStudioModeEnabledResponse;
1718
import net.twasi.obsremotejava.requests.GetTransitionDuration.GetTransitionDurationResponse;
1819
import net.twasi.obsremotejava.requests.GetTransitionList.GetTransitionListResponse;
1920
import net.twasi.obsremotejava.requests.GetVersion.GetVersionResponse;
2021
import net.twasi.obsremotejava.requests.GetVolume.GetVolumeResponse;
2122
import net.twasi.obsremotejava.requests.ListProfiles.ListProfilesResponse;
23+
import net.twasi.obsremotejava.requests.NextMedia.NextMediaResponse;
24+
import net.twasi.obsremotejava.requests.PlayPauseMedia.PlayPauseMediaResponse;
25+
import net.twasi.obsremotejava.requests.PreviousMedia.PreviousMediaResponse;
26+
import net.twasi.obsremotejava.requests.RefreshBrowserSource.RefreshBrowserSourceResponse;
27+
import net.twasi.obsremotejava.requests.RestartMedia.RestartMediaResponse;
2228
import net.twasi.obsremotejava.requests.SaveReplayBuffer.SaveReplayBufferResponse;
29+
import net.twasi.obsremotejava.requests.SetAudioMonitorType.SetAudioMonitorTypeResponse;
2330
import net.twasi.obsremotejava.requests.SetCurrentProfile.SetCurrentProfileResponse;
2431
import net.twasi.obsremotejava.requests.SetCurrentScene.SetCurrentSceneResponse;
2532
import net.twasi.obsremotejava.requests.SetCurrentTransition.SetCurrentTransitionResponse;
@@ -34,6 +41,7 @@
3441
import net.twasi.obsremotejava.requests.StartRecording.StartRecordingResponse;
3542
import net.twasi.obsremotejava.requests.StartReplayBuffer.StartReplayBufferResponse;
3643
import net.twasi.obsremotejava.requests.StartStreaming.StartStreamingResponse;
44+
import net.twasi.obsremotejava.requests.StopMedia.StopMediaResponse;
3745
import net.twasi.obsremotejava.requests.StopRecording.StopRecordingResponse;
3846
import net.twasi.obsremotejava.requests.StopReplayBuffer.StopReplayBufferResponse;
3947
import net.twasi.obsremotejava.requests.StopStreaming.StopStreamingResponse;
@@ -386,39 +394,39 @@ public void saveReplayBuffer(Callback<SaveReplayBufferResponse> callback) {
386394
communicator.saveReplayBuffer(callback);
387395
}
388396

389-
public void playPauseMedia(String sourceName, Boolean playPause, Callback callback) {
397+
public void playPauseMedia(String sourceName, Boolean playPause, Callback<PlayPauseMediaResponse> callback) {
390398
communicator.playPauseMedia(sourceName, playPause, callback);
391399
}
392400

393-
public void restartMedia(String sourceName, Callback callback) {
401+
public void restartMedia(String sourceName, Callback<RestartMediaResponse> callback) {
394402
communicator.restartMedia(sourceName, callback);
395403
}
396404

397-
public void stopMedia(String sourceName, Callback callback) {
405+
public void stopMedia(String sourceName, Callback<StopMediaResponse> callback) {
398406
communicator.stopMedia(sourceName, callback);
399407
}
400408

401-
public void nextMedia(String sourceName, Callback callback) {
409+
public void nextMedia(String sourceName, Callback<NextMediaResponse> callback) {
402410
communicator.nextMedia(sourceName, callback);
403411
}
404412

405-
public void previousMedia(String sourceName, Callback callback) {
413+
public void previousMedia(String sourceName, Callback<PreviousMediaResponse> callback) {
406414
communicator.previousMedia(sourceName, callback);
407415
}
408416

409-
public void refreshBrowserSource(String sourceName, Callback callback) {
417+
public void refreshBrowserSource(String sourceName, Callback<RefreshBrowserSourceResponse> callback) {
410418
communicator.refreshBrowserSource(sourceName, callback);
411419
}
412420

413-
public void getAudioMonitorType(String sourceName, Callback callback) {
421+
public void getAudioMonitorType(String sourceName, Callback<GetAudioMonitorTypeResponse> callback) {
414422
communicator.getAudioMonitorType(sourceName, callback);
415423
}
416424

417-
public void setAudioMonitorType(String sourceName, GetAudioMonitorTypeResponse.MonitorType monitorType, Callback callback) {
425+
public void setAudioMonitorType(String sourceName, GetAudioMonitorTypeResponse.MonitorType monitorType, Callback<SetAudioMonitorTypeResponse> callback) {
418426
communicator.setAudioMonitorType(sourceName, monitorType, callback);
419427
}
420428

421-
public void getSpecialSources(Callback callback) {
429+
public void getSpecialSources(Callback<GetSpecialSourcesResponse> callback) {
422430
communicator.getSpecialSources(callback);
423431
}
424432

0 commit comments

Comments
 (0)