Mirrors/obs-aitum-multistream
1
0
Fork 0
mirror of https://github.com/Aitum/obs-aitum-multistream.git synced 2024-11-23 02:42:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add facebook domains
Some checks failed
Push to master / Check Formatting 🔍 (push) Has been cancelled
Details
Push to master / Build Project 🧱 (push) Has been cancelled
Details
Push to master / Create Release 🛫 (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Exeldro 2024-11-01 16:02:59 +01:00
parent e156f504e8
commit 99a34cee3b
No known key found for this signature in database
GPG Key ID: 97269A83FC715751
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -34,7 +34,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE Qt::Core Qt::Widgets)
target_compile_options(
${PROJECT_NAME} PRIVATE $<$<C_COMPILER_ID:Clang,AppleClang>:-Wno-quoted-include-in-framework-header
-Wno-comma>)
#set_target_properties(${PROJECT_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
set_target_properties(${PROJECT_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
set_target_properties(
${PROJECT_NAME}
PROPERTIES AUTOMOC ON

3
config-utils.cpp
View File

@ -93,7 +93,8 @@ QIcon ConfigUtils::getPlatformIconFromEndpoint(QString endpoint)
return QIcon(":/aitum/media/twitter.png");
} else if (endpoint.contains(QString::fromUtf8("livepush.trovo.live"))) { // trovo
return QIcon(":/aitum/media/trovo.png");
} else if (endpoint.contains(QString::fromUtf8(".facebook.com"))) { // facebook
} else if (endpoint.contains(QString::fromUtf8(".facebook.com")) ||
endpoint.contains(QString::fromUtf8(".fbcdn.net"))) { // facebook
return QIcon(":/aitum/media/facebook.png");
} else { // unknown
return QIcon(":/aitum/media/unknown.png");

2
data/locale/en-US.ini
View File

@ -99,7 +99,7 @@ FacebookOutput="Facebook Output"
FacebookServiceInfo="Please complete the following fields to add a new Facebook output."
FacebookServiceInfoEdit="Please complete the following fields to edit this Facebook output."
FacebookServer="Facebook Server"
FacebookServerInfo="The stream server URL is preset for Facebook, you do not need to change it."
FacebookServerInfo="The stream server URL is preset for Facebook, you do not need to change it. Or you can copy one from <a href='https://www.facebook.com/live/ingests/'>Facebook Live Ingests page</a>"
FacebookStreamKey="Facebook Stream Key"
FacebookStreamKeyInfo="Please enter your stream key, you can find this on your <a href='https://www.facebook.com/live/producer?ref=OBS'>Facebook Producer page</a>."

8
output-dialog.cpp
View File

@ -370,7 +370,8 @@ OutputDialog::OutputDialog(QDialog *parent, QString name, QString server, QStrin
layout->addWidget(WizardInfoTwitter(true));
} else if (outputServer.contains(QString::fromUtf8("livepush.trovo.live"))) { // trovo
layout->addWidget(WizardInfoTrovo(true));
} else if (outputServer.contains(QString::fromUtf8(".facebook.com"))) { // facebook
} else if (outputServer.contains(QString::fromUtf8(".fbcdn.net")) ||
outputServer.contains(QString::fromUtf8(".facebook.com"))) { // facebook
layout->addWidget(WizardInfoFacebook(true));
} else { // unknown
layout->addWidget(WizardInfoUnknown(true));
@ -1034,8 +1035,9 @@ QWidget *OutputDialog::WizardInfoFacebook(bool edit)
formLayout->addRow(generateFormLabel("OutputName"), outputNameField);
// Server field
auto serverSelection = generateOutputServerField(confirmButton, true, edit);
serverSelection->setText("rtmps://rtmp-api.facebook.com:443/rtmp/");
auto serverSelection = generateOutputServerField(confirmButton, false, edit);
if (!edit)
serverSelection->setText("rtmps://rtmp-api.facebook.com:443/rtmp/");
formLayout->addRow(generateFormLabel("FacebookServer"), serverSelection);