Added header files to CMakeLists and rebranded
This commit is contained in:
parent
829729aef2
commit
18e6598a95
|
@ -46,6 +46,14 @@ set(discord-screenaudio_SRC
|
||||||
src/userscript.cpp
|
src/userscript.cpp
|
||||||
src/centralwidget.cpp
|
src/centralwidget.cpp
|
||||||
src/localserver.cpp
|
src/localserver.cpp
|
||||||
|
src/centralwidget.h
|
||||||
|
src/discordpage.h
|
||||||
|
src/localserver.h
|
||||||
|
src/log.h
|
||||||
|
src/mainwindow.h
|
||||||
|
src/streamdialog.h
|
||||||
|
src/userscript.h
|
||||||
|
src/virtmic.h
|
||||||
resources.qrc
|
resources.qrc
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@ function setGetDisplayMedia(video = true, overrideArgs = undefined) {
|
||||||
var id;
|
var id;
|
||||||
try {
|
try {
|
||||||
let myDiscordAudioSink = await getAudioDevice(
|
let myDiscordAudioSink = await getAudioDevice(
|
||||||
"discord-screenaudio-virtmic"
|
"discord-awesomeaudio-virtmic"
|
||||||
);
|
);
|
||||||
id = myDiscordAudioSink.deviceId;
|
id = myDiscordAudioSink.deviceId;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
@ -240,7 +240,7 @@ function main() {
|
||||||
} else {
|
} else {
|
||||||
aboutEl = document.createElement("div");
|
aboutEl = document.createElement("div");
|
||||||
}
|
}
|
||||||
aboutEl.innerText = `discord-screenaudio ${userscript.version}`;
|
aboutEl.innerText = `discord-awesomeaudio ${userscript.version}`;
|
||||||
aboutEl.style.fontSize = "12px";
|
aboutEl.style.fontSize = "12px";
|
||||||
aboutEl.style.color = "var(--text-muted)";
|
aboutEl.style.color = "var(--text-muted)";
|
||||||
aboutEl.style.textTransform = "none";
|
aboutEl.style.textTransform = "none";
|
||||||
|
@ -319,7 +319,7 @@ function main() {
|
||||||
const title = document.createElement("h2");
|
const title = document.createElement("h2");
|
||||||
title.className =
|
title.className =
|
||||||
"h1-3iMExa title-lXcL8p defaultColor-3Olr-9 defaultMarginh1-1UYutH";
|
"h1-3iMExa title-lXcL8p defaultColor-3Olr-9 defaultMarginh1-1UYutH";
|
||||||
title.innerText = "discord-screenaudio";
|
title.innerText = "discord-awesomeaudio";
|
||||||
section.appendChild(title);
|
section.appendChild(title);
|
||||||
|
|
||||||
section.appendChild(
|
section.appendChild(
|
||||||
|
@ -342,7 +342,7 @@ function main() {
|
||||||
|
|
||||||
section.appendChild(
|
section.appendChild(
|
||||||
createSwitch(
|
createSwitch(
|
||||||
"Move discord-screenaudio to the system tray instead of closing",
|
"Move discord-awesomeaudio to the system tray instead of closing",
|
||||||
await userscript.getBoolPref("trayIcon", false),
|
await userscript.getBoolPref("trayIcon", false),
|
||||||
(enabled) => {
|
(enabled) => {
|
||||||
userscript.setTrayIcon(enabled);
|
userscript.setTrayIcon(enabled);
|
||||||
|
@ -352,7 +352,7 @@ function main() {
|
||||||
|
|
||||||
section.appendChild(
|
section.appendChild(
|
||||||
createSwitch(
|
createSwitch(
|
||||||
"Start discord-screenaudio hidden to tray",
|
"Start discord-awesomeaudio hidden to tray",
|
||||||
await userscript.getPref("startHidden", false),
|
await userscript.getPref("startHidden", false),
|
||||||
(hidden) => {
|
(hidden) => {
|
||||||
userscript.setPref("startHidden", hidden);
|
userscript.setPref("startHidden", hidden);
|
||||||
|
|
|
@ -16,11 +16,11 @@
|
||||||
int main(int argc, char *argv[]) {
|
int main(int argc, char *argv[]) {
|
||||||
QApplication app(argc, argv);
|
QApplication app(argc, argv);
|
||||||
|
|
||||||
QApplication::setApplicationName("discord-screenaudio");
|
QApplication::setApplicationName("discord-awesomeaudio");
|
||||||
QApplication::setWindowIcon(
|
QApplication::setWindowIcon(
|
||||||
QIcon(":assets/de.shorsh.discord-screenaudio.png"));
|
QIcon(":assets/de.shorsh.discord-screenaudio.png"));
|
||||||
QApplication::setApplicationVersion(DISCORD_SCEENAUDIO_VERSION_FULL);
|
QApplication::setApplicationVersion(DISCORD_SCEENAUDIO_VERSION_FULL);
|
||||||
QApplication::setDesktopFileName("de.shorsh.discord-screenaudio");
|
QApplication::setDesktopFileName("lol.deadzone.discord-awesomeaudio");
|
||||||
|
|
||||||
qSetMessagePattern("[%{category}] %{message}");
|
qSetMessagePattern("[%{category}] %{message}");
|
||||||
|
|
||||||
|
@ -57,10 +57,10 @@ int main(int argc, char *argv[]) {
|
||||||
MainWindow w(parser.isSet(notifySendOption));
|
MainWindow w(parser.isSet(notifySendOption));
|
||||||
|
|
||||||
// Check if discord is already running
|
// Check if discord is already running
|
||||||
QString program_name = "discord-screenaudio";
|
QString program_name = "discord-awesomeaudio";
|
||||||
if (isProgramRunning(program_name)) {
|
if (isProgramRunning(program_name)) {
|
||||||
// if running show error message
|
// if running show error message
|
||||||
showErrorMessage("discord-screenaudio is already running");
|
showErrorMessage("discord-awesomeaudio is already running");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -64,7 +64,7 @@ void MainWindow::setupTrayIcon() {
|
||||||
return;
|
return;
|
||||||
|
|
||||||
auto aboutAction = new QAction(
|
auto aboutAction = new QAction(
|
||||||
"discord-screenaudio v" + QString(DISCORD_SCEENAUDIO_VERSION_FULL), this);
|
"discord-awesomeaudio v" + QString(DISCORD_SCEENAUDIO_VERSION_FULL), this);
|
||||||
aboutAction->setIcon(QIcon(":assets/de.shorsh.discord-screenaudio.png"));
|
aboutAction->setIcon(QIcon(":assets/de.shorsh.discord-screenaudio.png"));
|
||||||
aboutAction->setEnabled(false);
|
aboutAction->setEnabled(false);
|
||||||
|
|
||||||
|
@ -99,7 +99,7 @@ void MainWindow::cleanTrayIcon() {
|
||||||
|
|
||||||
void MainWindow::setupSettings() {
|
void MainWindow::setupSettings() {
|
||||||
m_settings =
|
m_settings =
|
||||||
new QSettings("discord-screenaudio", "discord-screenaudio", this);
|
new QSettings("discord-awesomeaudio", "discord-awesomeaudio", this);
|
||||||
m_settings->beginGroup("settings");
|
m_settings->beginGroup("settings");
|
||||||
m_settings->endGroup();
|
m_settings->endGroup();
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
namespace Virtmic {
|
namespace Virtmic {
|
||||||
|
|
||||||
const QStringList EXCLUDE_TARGETS{"Chromium input", "discord-screenaudio"};
|
const QStringList EXCLUDE_TARGETS{"Chromium input", "discord-awesomeaudio"};
|
||||||
|
|
||||||
const std::string nullstr = "";
|
const std::string nullstr = "";
|
||||||
const std::string &getTarget(const pipewire::spa::dict &props) {
|
const std::string &getTarget(const pipewire::spa::dict &props) {
|
||||||
|
@ -108,7 +108,7 @@ void start(QString _target) {
|
||||||
std::string target = _target.toUtf8().toStdString();
|
std::string target = _target.toUtf8().toStdString();
|
||||||
|
|
||||||
auto virtual_mic = core.create("adapter",
|
auto virtual_mic = core.create("adapter",
|
||||||
{{"node.name", "discord-screenaudio-virtmic"},
|
{{"node.name", "discord-awesomeaudio-virtmic"},
|
||||||
{"media.class", "Audio/Source/Virtual"},
|
{"media.class", "Audio/Source/Virtual"},
|
||||||
{"factory.name", "support.null-audio-sink"},
|
{"factory.name", "support.null-audio-sink"},
|
||||||
{"audio.channels", "2"},
|
{"audio.channels", "2"},
|
||||||
|
|
Loading…
Reference in New Issue