mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-13 19:49:51 +01:00
Added more streaming software to streamer mode binaries list (#3740)
Streamer mode now automatically detects if XSplit, PRISM Live Studio, Twitch Studio, or vMix are running Co-authored-by: Kasia <zneix@zneix.eu> Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
This commit is contained in:
parent
efcfb19187
commit
57f92f5eaa
|
@ -15,6 +15,7 @@
|
|||
- Minor: Fixed tag parsing for consecutive escaped characters. (#3711)
|
||||
- Minor: Prevent user from entering incorrect characters in Live Notifications channels list. (#3715, #3730)
|
||||
- Minor: Fixed automod caught message notice appearing twice for mods. (#3717)
|
||||
- Minor: Streamer mode now automatically detects if XSplit, PRISM Live Studio, Twitch Studio, or vMix are running. (#3740)
|
||||
- Minor: Add scrollbar to `Select filters` dialog. (#3737)
|
||||
- Minor: Added `/requests` command. Usage: `/requests [channel]`. Opens the channel points requests queue for the provided channel or the current channel if no input is provided. (#3746)
|
||||
- Minor: Added ability to execute commands on chat messages using the message context menu. (#3738)
|
||||
|
|
|
@ -208,7 +208,7 @@ public:
|
|||
|
||||
/// Streamer Mode
|
||||
EnumSetting<StreamerModeSetting> enableStreamerMode = {
|
||||
"/streamerMode/enabled", StreamerModeSetting::DetectObs};
|
||||
"/streamerMode/enabled", StreamerModeSetting::DetectStreamingSoftware};
|
||||
BoolSetting streamerModeHideUsercardAvatars = {
|
||||
"/streamerMode/hideUsercardAvatars", true};
|
||||
BoolSetting streamerModeHideLinkThumbnails = {
|
||||
|
|
|
@ -30,9 +30,11 @@ bool shouldShowWarning = true;
|
|||
const QStringList &broadcastingBinaries()
|
||||
{
|
||||
#ifdef USEWINSDK
|
||||
static QStringList bins = {"obs.exe", "obs64.exe"};
|
||||
static QStringList bins = {
|
||||
"obs.exe", "obs64.exe", "PRISMLiveStudio.exe",
|
||||
"XSplit.Core.exe", "TwitchStudio.exe", "vMix64.exe"};
|
||||
#else
|
||||
static QStringList bins = {"obs"};
|
||||
static QStringList bins = {"obs", "Twitch Studio", "Streamlabs Desktop"};
|
||||
#endif
|
||||
return bins;
|
||||
}
|
||||
|
@ -45,7 +47,7 @@ bool isInStreamerMode()
|
|||
return true;
|
||||
case StreamerModeSetting::Disabled:
|
||||
return false;
|
||||
case StreamerModeSetting::DetectObs:
|
||||
case StreamerModeSetting::DetectStreamingSoftware:
|
||||
|
||||
#if defined(Q_OS_LINUX) || defined(Q_OS_MACOS)
|
||||
|
||||
|
|
|
@ -4,7 +4,11 @@
|
|||
|
||||
namespace chatterino {
|
||||
|
||||
enum StreamerModeSetting { Disabled = 0, Enabled = 1, DetectObs = 2 };
|
||||
enum StreamerModeSetting {
|
||||
Disabled = 0,
|
||||
Enabled = 1,
|
||||
DetectStreamingSoftware = 2,
|
||||
};
|
||||
|
||||
const QStringList &broadcastingBinaries();
|
||||
bool isInStreamerMode();
|
||||
|
|
|
@ -620,7 +620,7 @@ void Window::addShortcuts()
|
|||
else if (mode == 3)
|
||||
{
|
||||
getSettings()->enableStreamerMode.setValue(
|
||||
StreamerModeSetting::DetectObs);
|
||||
StreamerModeSetting::DetectStreamingSoftware);
|
||||
}
|
||||
return "";
|
||||
}},
|
||||
|
|
|
@ -336,14 +336,14 @@ void GeneralPage::initLayout(GeneralPageView &layout)
|
|||
|
||||
layout.addTitle("Streamer Mode");
|
||||
layout.addDescription(
|
||||
"Chatterino can automatically change behavior if it detects that \"OBS "
|
||||
"Studio\" is running.\nSelect which things you want to change while "
|
||||
"streaming");
|
||||
"Chatterino can automatically change behavior if it detects that any "
|
||||
"streaming software is running.\nSelect which things you want to "
|
||||
"change while streaming");
|
||||
|
||||
ComboBox *dankDropdown =
|
||||
layout.addDropdown<std::underlying_type<StreamerModeSetting>::type>(
|
||||
"Enable Streamer Mode",
|
||||
{"Disabled", "Enabled", "Automatic (Detect OBS)"},
|
||||
{"Disabled", "Enabled", "Automatic (Detect streaming software)"},
|
||||
s.enableStreamerMode,
|
||||
[](int value) {
|
||||
return value;
|
||||
|
@ -352,7 +352,7 @@ void GeneralPage::initLayout(GeneralPageView &layout)
|
|||
return static_cast<StreamerModeSetting>(args.index);
|
||||
},
|
||||
false);
|
||||
dankDropdown->setMinimumWidth(dankDropdown->minimumSizeHint().width() + 10);
|
||||
dankDropdown->setMinimumWidth(dankDropdown->minimumSizeHint().width() + 30);
|
||||
|
||||
layout.addCheckbox("Hide usercard avatars",
|
||||
s.streamerModeHideUsercardAvatars);
|
||||
|
|
Loading…
Reference in a new issue