Skip to content

Commit

Permalink
Add facebook domains
Browse files Browse the repository at this point in the history
  • Loading branch information
exeldro committed Nov 1, 2024
1 parent e156f50 commit 99a34ce
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion config-utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion data/locale/en-US.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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>."

Expand Down
8 changes: 5 additions & 3 deletions output-dialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit 99a34ce

Please sign in to comment.