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

Feature: Improved Channel Selection #9

Merged
merged 2 commits into from
Jul 26, 2024
Merged

Feature: Improved Channel Selection #9

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b4725a
Removed dead Strings
parzival-space Jul 26, 2024
8b3a5ef
Implemented Channels List
parzival-space Jul 26, 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
64 changes: 51 additions & 13 deletions FaderSyncPlugin/OBS/GoXlrChannelSyncFilter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@

// check if channel is muted
var isMuted = false;
var faderStatus = (JsonObject)utility.Status?["mixers"]?[deviceSerial ?? ""]?["fader_status"];

Check warning on line 113 in FaderSyncPlugin/OBS/GoXlrChannelSyncFilter.cs

View workflow job for this annotation

GitHub Actions / Build for Linux 

Converting null literal or possible null value to non-nullable type.

Check warning on line 113 in FaderSyncPlugin/OBS/GoXlrChannelSyncFilter.cs

View workflow job for this annotation

GitHub Actions / Build for Windows 

Converting null literal or possible null value to non-nullable type.

Check warning on line 113 in FaderSyncPlugin/OBS/GoXlrChannelSyncFilter.cs

View workflow job for this annotation

GitHub Actions / Build for Linux 

Converting null literal or possible null value to non-nullable type.

Check warning on line 113 in FaderSyncPlugin/OBS/GoXlrChannelSyncFilter.cs

View workflow job for this annotation

GitHub Actions / Build for Windows 

Converting null literal or possible null value to non-nullable type.
if (faderStatus != null)
foreach (var faderEntry in faderStatus)
{
Expand Down Expand Up @@ -142,20 +142,58 @@
var properties = ObsProperties.obs_properties_create();

fixed (byte*
tWarnTitle = "Attention"u8.ToArray(),
tWarnMessage = "The GoXLR Utility is currently not running."u8.ToArray(),

// add channels
sChannelNameId = "CHANNEL_NAME"u8.ToArray(),
sChannelNameDescription = "Channel Name"u8.ToArray(),

// device serial input
sDeviceSerialId = "DEVICE_SERIAL"u8.ToArray(),
sDeviceSerialDescription = "Device Serial"u8.ToArray())
// device serial input
sDeviceSerialId = "DEVICE_SERIAL"u8.ToArray(),
sDeviceSerialDescription = "Device Serial"u8.ToArray(),

// add channels
sChannelNameId = "CHANNEL_NAME"u8.ToArray(),
sChannelNameDescription = "Channel Name"u8.ToArray(),

// channel names
sChannelMic = "Microphone"u8.ToArray(),
sChannelMicId = "Mic"u8.ToArray(),
sChannelChat = "Chat"u8.ToArray(),
sChannelChatId = "Chat"u8.ToArray(),
sChannelMusic = "Music"u8.ToArray(),
sChannelMusicId = "Music"u8.ToArray(),
sChannelGame = "Game"u8.ToArray(),
sChannelGameId = "Game"u8.ToArray(),
sChannelConsole = "Console"u8.ToArray(),
sChannelConsoleId = "Console"u8.ToArray(),
sChannelLineIn = "Line In"u8.ToArray(),
sChannelLineInId = "LineIn"u8.ToArray(),
sChannelSystem = "System"u8.ToArray(),
sChannelSystemId = "System"u8.ToArray(),
sChannelSample = "Samples / VOD"u8.ToArray(),
sChannelSampleId = "Sample"u8.ToArray(),
sChannelHeadphones = "Headphones"u8.ToArray(),
sChannelHeadphonesId = "Headphones"u8.ToArray(),
sChannelMicMonitor = "Mic Monitor"u8.ToArray(),
sChannelMicMonitorId = "MicMonitor"u8.ToArray(),
sChannelLineOut = "Line Out"u8.ToArray(),
sChannelLineOutId = "LineOut"u8.ToArray()
)
{
// channel name text field
ObsProperties.obs_properties_add_text(properties, (sbyte*)sChannelNameId, (sbyte*)sChannelNameDescription,
obs_text_type.OBS_TEXT_DEFAULT);
// channel selection list
var channelList = ObsProperties.obs_properties_add_list(properties, (sbyte*)sChannelNameId,
(sbyte*)sChannelNameDescription, obs_combo_type.OBS_COMBO_TYPE_LIST,
obs_combo_format.OBS_COMBO_FORMAT_STRING);
ObsProperties.obs_property_list_add_string(channelList, (sbyte*)sChannelMic, (sbyte*)sChannelMicId);
ObsProperties.obs_property_list_add_string(channelList, (sbyte*)sChannelChat, (sbyte*)sChannelChatId);
ObsProperties.obs_property_list_add_string(channelList, (sbyte*)sChannelMusic, (sbyte*)sChannelMusicId);
ObsProperties.obs_property_list_add_string(channelList, (sbyte*)sChannelGame, (sbyte*)sChannelGameId);
ObsProperties.obs_property_list_add_string(channelList, (sbyte*)sChannelConsole, (sbyte*)sChannelConsoleId);
ObsProperties.obs_property_list_add_string(channelList, (sbyte*)sChannelLineIn, (sbyte*)sChannelLineInId);
ObsProperties.obs_property_list_add_string(channelList, (sbyte*)sChannelSystem, (sbyte*)sChannelSystemId);
ObsProperties.obs_property_list_add_string(channelList, (sbyte*)sChannelSample, (sbyte*)sChannelSampleId);
ObsProperties.obs_property_list_add_string(channelList, (sbyte*)sChannelHeadphones, (sbyte*)sChannelHeadphonesId);
ObsProperties.obs_property_list_add_string(channelList, (sbyte*)sChannelMicMonitor, (sbyte*)sChannelMicMonitorId);
ObsProperties.obs_property_list_add_string(channelList, (sbyte*)sChannelLineOut, (sbyte*)sChannelLineOutId);

// // channel name text field
// ObsProperties.obs_properties_add_text(properties, (sbyte*)sChannelNameId, (sbyte*)sChannelNameDescription,
// obs_text_type.OBS_TEXT_DEFAULT);

// device serial text field
ObsProperties.obs_properties_add_text(properties, (sbyte*)sDeviceSerialId, (sbyte*)sDeviceSerialDescription,
Expand Down Expand Up @@ -186,7 +224,7 @@
{
public obs_source* Source;
public obs_data* Settings;
public bool* IsEnabled;

Check warning on line 227 in FaderSyncPlugin/OBS/GoXlrChannelSyncFilter.cs

View workflow job for this annotation

GitHub Actions / Build for Linux 

Field 'GoXlrChannelSyncFilter.FilterContext.IsEnabled' is never assigned to, and will always have its default value

Check warning on line 227 in FaderSyncPlugin/OBS/GoXlrChannelSyncFilter.cs

View workflow job for this annotation

GitHub Actions / Build for Windows 

Field 'GoXlrChannelSyncFilter.FilterContext.IsEnabled' is never assigned to, and will always have its default value

Check warning on line 227 in FaderSyncPlugin/OBS/GoXlrChannelSyncFilter.cs

View workflow job for this annotation

GitHub Actions / Build for Linux 

Field 'GoXlrChannelSyncFilter.FilterContext.IsEnabled' is never assigned to, and will always have its default value

Check warning on line 227 in FaderSyncPlugin/OBS/GoXlrChannelSyncFilter.cs

View workflow job for this annotation

GitHub Actions / Build for Windows 

Field 'GoXlrChannelSyncFilter.FilterContext.IsEnabled' is never assigned to, and will always have its default value

public sbyte* DeviceSerial;
public sbyte* ChannelName;
Expand Down
Loading