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

Fix statusdock #33

Merged
merged 3 commits into from
Nov 25, 2024
Merged

Fix statusdock #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c097be4
- Fix typo
hanatyan128 Nov 25, 2024
018e07b
- Fix bug on status dock that didn't show filter on linux platform (WIP)
hanatyan128 Nov 25, 2024
46400d6
- Fix bug on status dock that didn't show filter on linux platform
hanatyan128 Nov 25, 2024
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
2 changes: 1 addition & 1 deletion buildspec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
},
"name": "osi-branch-output",
"displayName": "Branch Output Plugin",
"version": "0.9.11",
"version": "0.9.12",
"author": "OPENSPHERE Inc.",
"website": "https://opensphere.co.jp/",
"email": "info@opensphere.co.jp",
Expand Down
2 changes: 1 addition & 1 deletion src/plugin-main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ void startOutput(BranchOutputFilter *filter, obs_data_t *settings)
obs_encoder_set_scaled_size(filter->videoEncoder, 0, 0);
obs_encoder_set_video(filter->videoEncoder, filter->videoOutput);

//--- Setup audo encoder ---//
//--- Setup audio encoder ---//
auto audio_encoder_id = obs_data_get_string(settings, "audio_encoder");
auto audio_bitrate = obs_data_get_int(settings, "audio_bitrate");
auto audio_encoder_settings = obs_encoder_defaults(audio_encoder_id);
Expand Down
3 changes: 3 additions & 0 deletions src/plugin-main.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ struct BranchOutputFilter {
uint64_t connectAttemptingAt;
};

// The type must be registered for Linux platform
Q_DECLARE_METATYPE(BranchOutputFilter *);

struct AudioBufferChunkHeader {
size_t data_idx[MAX_AUDIO_CHANNELS]; // Zero means unused channel
uint32_t frames;
Expand Down