Merge branch 'master' into fix/silent_remote_streams

Author: stonedDiscord

.github/workflows/build.yml

@@ -139,13 +139,13 @@ jobs:
         run: |
           curl http://www.un4seen.com/files/bass24-linux.zip -o bass.zip
           unzip -d bass -o bass.zip
-          cp ./bass/bass.h ./lib
+          cp ./bass/c/bass.h ./lib
           cp ./bass/libs/x86_64/libbass.so ./lib/
           cp ./bass/libs/x86_64/libbass.so ./bin/
 
           curl http://www.un4seen.com/files/bassopus24-linux.zip -o bassopus.zip
           unzip -d bass -o bassopus.zip
-          cp ./bass/bassopus.h ./lib
+          cp ./bass/c/bassopus.h ./lib
           cp ./bass/libs/x86_64/libbassopus.so ./lib/
           cp ./bass/libs/x86_64/libbassopus.so ./bin/
 

configure.sh

@@ -235,12 +235,12 @@ get_bass() {
             x64/bass.dll:./bin
     elif [[ "$PLATFORM" == "linux" ]]; then
         get_zip https://www.un4seen.com/files/bass24-linux.zip \
-            bass.h:./lib \
+            c/bass.h:./lib \
             libs/x86_64/libbass.so:./lib \
             libs/x86_64/libbass.so:./bin
     elif [[ "$PLATFORM" == "macos" ]]; then
         get_zip https://www.un4seen.com/files/bass24-osx.zip \
-            bass.h:./lib \
+            c/bass.h:./lib \
             libbass.dylib:./lib
     fi
 }
@@ -261,12 +261,12 @@ get_bassopus() {
             x64/bassopus.dll:./bin
     elif [[ "$PLATFORM" == "linux" ]]; then
         get_zip https://www.un4seen.com/files/bassopus24-linux.zip \
-            bassopus.h:./lib \
+            c/bassopus.h:./lib \
             libs/x86_64/libbassopus.so:./lib \
             libs/x86_64/libbassopus.so:./bin
     elif [[ "$PLATFORM" == "macos" ]]; then
         get_zip https://www.un4seen.com/files/bassopus24-osx.zip \
-            bassopus.h:./lib \
+            c/bassopus.h:./lib \
             libbassopus.dylib:./lib
     fi
 }

data/ui/options_dialog.ui

@@ -102,7 +102,7 @@
             </widget>
            </item>
            <item row="4" column="1">
-            <widget class="QSpinBox" name="theme_scaling_factor_sb">
+            <widget class="QDoubleSpinBox" name="theme_scaling_factor_sb">
              <property name="minimum">
               <number>1</number>
              </property>

src/lobby.cpp

@@ -471,7 +471,7 @@ void Lobby::list_servers()
     QTreeWidgetItem *treeItem = new QTreeWidgetItem(ui_serverlist_tree);
     treeItem->setData(0, Qt::DisplayRole, i);
 
-    if (i_server.legacy)
+    if (i_server.protocol == "tcp")
     {
       treeItem->setText(1, "(Legacy) " + i_server.name);
       treeItem->setBackground(0, Qt::darkRed);
@@ -504,7 +504,7 @@ void Lobby::list_favorites()
     QTreeWidgetItem *treeItem = new QTreeWidgetItem(ui_favorites_tree);
     treeItem->setData(0, Qt::DisplayRole, i);
 
-    if (i_server.legacy)
+    if (i_server.protocol == "tcp")
     {
       treeItem->setText(1, "(Legacy) " + i_server.name);
       treeItem->setBackground(0, Qt::darkRed);

src/network/serverinfo.h

@@ -9,7 +9,7 @@ class ServerInfo
   QString description;
   QString address;
   quint16 port = 0;
-  bool legacy = false;
+  QString protocol = "ws";
 
   QString toString() const;
 };

src/network/websocketconnection.cpp

@@ -32,7 +32,7 @@ void WebSocketConnection::connectToServer(const ServerInfo &server)
   disconnectFromServer();
 
   QUrl url;
-  url.setScheme("ws");
+  url.setScheme(server.protocol);
   url.setHost(server.address);
   url.setPort(server.port);
 

src/networkmanager.cpp

@@ -60,14 +60,20 @@ void NetworkManager::ms_request_finished(QNetworkReply *reply)
     server.address = entry["ip"].toString();
     server.name = entry["name"].toString();
     server.description = entry["description"].toString(tr("No description provided."));
-    if (entry.contains("ws_port"))
+    if (entry.contains("wss_port"))
+    {
+      server.port = entry["wss_port"].toInt();
+      server.protocol = "wss";
+    }
+    else if (entry.contains("ws_port"))
     {
       server.port = entry["ws_port"].toInt();
+      server.protocol = "ws";
     }
     else
     {
       server.port = entry["port"].toInt();
-      server.legacy = true;
+      server.protocol = "tcp";
     }
 
     if (server.port != 0)

src/options.cpp

@@ -92,17 +92,17 @@ void Options::setTheme(QString value)
   config.setValue("theme", value);
 }
 
-int Options::themeScalingFactor() const
+double Options::themeScalingFactor() const
 {
-  int value = config.value("theme_scaling_factor", "1").toInt();
-  if (value <= 0)
+  double value = config.value("theme_scaling_factor", "1").toDouble();
+  if (value < 0.1)
   {
-    value = 1;
+    value = 0.1;
   }
   return value;
 }
 
-void Options::setThemeScalingFactor(int value)
+void Options::setThemeScalingFactor(double value)
 {
   config.setValue("theme_scaling_factor", value);
 }
@@ -680,11 +680,11 @@ QVector<ServerInfo> Options::favorites()
     f_server.description = favorite.value("desc", "No description").toString();
     if (favorite.contains("protocol"))
     {
-      f_server.legacy = favorite.value("protocol").toString() == "tcp";
+      f_server.protocol = favorite.value("protocol").toString();
     }
     else
     {
-      f_server.legacy = favorite.value("legacy", false).toBool();
+      f_server.protocol = "tcp";
     }
 
     serverlist.append(std::move(f_server));
@@ -705,7 +705,7 @@ void Options::setFavorites(QVector<ServerInfo> value)
     favorite.setValue("address", fav_server.address);
     favorite.setValue("port", fav_server.port);
     favorite.setValue("desc", fav_server.description);
-    favorite.setValue("legacy", fav_server.legacy);
+    favorite.setValue("protocol", fav_server.protocol);
     favorite.endGroup();
   }
   favorite.sync();
@@ -726,7 +726,7 @@ void Options::addFavorite(ServerInfo server)
   favorite.setValue("address", server.address);
   favorite.setValue("port", server.port);
   favorite.setValue("desc", server.description);
-  favorite.setValue("legacy", server.legacy);
+  favorite.setValue("protocol", server.protocol);
   favorite.endGroup();
   favorite.sync();
 }
@@ -738,7 +738,7 @@ void Options::updateFavorite(ServerInfo server, int index)
   favorite.setValue("address", server.address);
   favorite.setValue("port", server.port);
   favorite.setValue("desc", server.description);
-  favorite.setValue("legacy", server.legacy);
+  favorite.setValue("protocol", server.protocol);
   favorite.endGroup();
   favorite.sync();
 }

src/options.h

@@ -30,8 +30,8 @@ class Options
   QString theme() const;
   void setTheme(QString value);
 
-  int themeScalingFactor() const;
-  void setThemeScalingFactor(int value);
+  double themeScalingFactor() const;
+  void setThemeScalingFactor(double value);
 
   // Returns the blip rate from config.ini (once per X symbols)
   int blipRate() const;

src/widgets/aooptionsdialog.cpp

@@ -10,6 +10,7 @@
 #include <bass.h>
 
 #include <QCollator>
+#include <QDoubleSpinBox>
 #include <QGroupBox>
 #include <QResource>
 #include <QUiLoader>
@@ -97,6 +98,18 @@ int AOOptionsDialog::widgetData(QSpinBox *widget) const
   return widget->value();
 }
 
+template <>
+void AOOptionsDialog::setWidgetData(QDoubleSpinBox *widget, const double &value)
+{
+  widget->setValue(value);
+}
+
+template <>
+double AOOptionsDialog::widgetData(QDoubleSpinBox *widget) const
+{
+  return widget->value();
+}
+
 template <>
 void AOOptionsDialog::setWidgetData(QComboBox *widget, const QString &value)
 {
@@ -344,7 +357,7 @@ void AOOptionsDialog::setupUI()
     QDesktopServices::openUrl(QUrl::fromLocalFile(p_path));
   });
 
-  FROM_UI(QSpinBox, theme_scaling_factor_sb);
+  FROM_UI(QDoubleSpinBox, theme_scaling_factor_sb);
   FROM_UI(QCheckBox, animated_theme_cb);
   FROM_UI(QSpinBox, stay_time_spinbox);
   FROM_UI(QCheckBox, instant_objection_cb);
@@ -374,7 +387,7 @@ void AOOptionsDialog::setupUI()
   FROM_UI(QCheckBox, restoreposition_cb);
   FROM_UI(QLineEdit, playerlist_format_edit);
 
-  registerOption<QSpinBox, int>("theme_scaling_factor_sb", &Options::themeScalingFactor, &Options::setThemeScalingFactor);
+  registerOption<QDoubleSpinBox, double>("theme_scaling_factor_sb", &Options::themeScalingFactor, &Options::setThemeScalingFactor);
   registerOption<QCheckBox, bool>("animated_theme_cb", &Options::animatedThemeEnabled, &Options::setAnimatedThemeEnabled);
   registerOption<QSpinBox, int>("stay_time_spinbox", &Options::textStayTime, &Options::setTextStayTime);
   registerOption<QCheckBox, bool>("instant_objection_cb", &Options::objectionSkipQueueEnabled, &Options::setObjectionSkipQueueEnabled);