beta 1.6.2.010901

fix rollOff signal
thorwe · Jan 8, 2015 · 799585b · 799585b
1 parent f414f2b
commit 799585b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/src/plugin.cpp b/src/plugin.cpp
@@ -131,7 +131,7 @@ TSServersInfo* centralStation = TSServersInfo::instance();
 const char* ts3plugin_name() { return "CrossTalk"; }
 
 /* Plugin version */
-const char* ts3plugin_version() { return "1.6.2.010801"; }
+const char* ts3plugin_version() { return "1.6.2.010901"; }
 
 /* Plugin API version. Must be the same as the clients API major version, else the plugin fails to load. */
 int ts3plugin_apiVersion() { return PLUGIN_API_VERSION; }

diff --git a/src/positional_audio/groupbox_positional_audio.cpp b/src/positional_audio/groupbox_positional_audio.cpp
@@ -16,8 +16,8 @@ GroupBoxPositionalAudio::GroupBoxPositionalAudio(QWidget *parent) :
     connect(ui->groupBoxVolume,SIGNAL(toggled(bool)),this,SIGNAL(attenuationSet(bool)));
     connect(ui->spinBox_MinDistance,SIGNAL(valueChanged(int)),this,SIGNAL(distanceMinChanged(int)));
     connect(ui->spinBox_MaxDistance,SIGNAL(valueChanged(int)),this,SIGNAL(distanceMaxChanged(int)));
-    connect(ui->doubleSpinBox_RollOff,SIGNAL(valueChanged(double)),this,SIGNAL(rollOffChanged(float))); //let's see if that works
-    connect(ui->doubleSpinBox_RollOffMax,SIGNAL(valueChanged(double)),this,SIGNAL(rollOffMaxChanged(float)));
+    connect(ui->doubleSpinBox_RollOff,SIGNAL(valueChanged(double)),this,SLOT(on_DoubleSpinBoxRollOff_valueChanged(double)));
+    connect(ui->doubleSpinBox_RollOffMax,SIGNAL(valueChanged(double)),this,SLOT(on_DoubleSpinBoxRollOffMax_valueChanged(double)));
 
     connect(ui->groupBoxServerSettings,SIGNAL(enabledSet(QString,bool)),this,SIGNAL(ServerEnabledSet(QString,bool)));
     connect(ui->groupBoxServerSettings,SIGNAL(sendIntervalChange(QString,float)),this,SIGNAL(ServerSendIntervalChange(QString,float)));
@@ -84,3 +84,13 @@ void GroupBoxPositionalAudio::UpdateUIRollOffMax(float val)
     ui->doubleSpinBox_RollOffMax->setValue(val);
     this->blockSignals(false);
 }
+
+void GroupBoxPositionalAudio::on_DoubleSpinBoxRollOff_valueChanged(double val)
+{
+    emit rollOffChanged(static_cast<float>(val));
+}
+
+void GroupBoxPositionalAudio::on_DoubleSpinBoxRollOffMax_valueChanged(double val)
+{
+    emit rollOffMaxChanged(static_cast<float>(val));
+}
diff --git a/src/positional_audio/groupbox_positional_audio.h b/src/positional_audio/groupbox_positional_audio.h
@@ -25,6 +25,9 @@ public slots:
     void UpdateUIRollOff(float val);
     void UpdateUIRollOffMax(float val);
 
+    void on_DoubleSpinBoxRollOff_valueChanged(double val);
+    void on_DoubleSpinBoxRollOffMax_valueChanged(double val);
+
 signals:
     void enabledSet(bool);
     void cameraSet(bool);

diff --git a/src/positional_audio/mod_positionalaudio.cpp b/src/positional_audio/mod_positionalaudio.cpp
@@ -18,7 +18,6 @@
 
 #include "../talkers.h"
 #include "../ts_helpers_qt.h"
-#include "../ts_logging_qt.h"
 
 #include "ts_serversinfo.h"
 
@@ -166,7 +165,6 @@ void PositionalAudio::setRollOff(float val)
         return;
     m_rollOff = val;
     //m_rollOff_Lin = db2lin_alt2(m_rollOff);
-
     emit rollOffChanged(m_rollOff);
 }
 
@@ -176,7 +174,6 @@ void PositionalAudio::setRollOffMax(float val)
         return;
     m_rollOffMax = val;
     m_rollOffMax_Lin = db2lin_alt2(m_rollOffMax);
-
     emit rollOffMaxChanged(m_rollOffMax);
 }