beta 1.6.3.050101

thorwe · May 1, 2015 · 6631baf · 6631baf
1 parent 6660297
commit 6631baf
Show file tree

Hide file tree

Showing 15 changed files with 772 additions and 111 deletions.
diff --git a/CrossTalk.pro b/CrossTalk.pro
@@ -58,7 +58,9 @@ HEADERS += \
     src/plugin_qt.h \
     src/sse_server.h \
     src/groupbox_ducking.h \
-    src/pipeserver.h
+    src/pipeserver.h \
+    src/version.h \
+    src/version_qt.h
 
 SOURCES += \
     src/ts_settings_qt.cpp \
@@ -96,7 +98,8 @@ SOURCES += \
     src/plugin_qt.cpp \
     src/sse_server.cpp \
     src/groupbox_ducking.cpp \
-    src/pipeserver.cpp
+    src/pipeserver.cpp \
+    src/version_qt.cpp
 
 FORMS += \
     src/config.ui \

diff --git a/CrossTalk.pro.user.3.3-pre1 b/CrossTalk.pro.user.3.3-pre1
diff --git a/src/config.cpp b/src/config.cpp
@@ -68,7 +68,7 @@ Config::Config(QWidget *parent) :
     // Fill with settings
     QSettings cfg(TSHelpers::GetFullConfigPath(), QSettings::IniFormat);
 
-    checkBoxBeta->setChecked(cfg.value("beta",false).toBool());
+    checkBoxBeta->setChecked(cfg.value("beta",true).toBool());
     connect(checkBoxBeta,SIGNAL(toggled(bool)),SLOT(onBetaChannelToggled(bool)));
 
     // WebSocket Server

diff --git a/src/mod_ducker_global.cpp b/src/mod_ducker_global.cpp
@@ -9,8 +9,6 @@
 #include <QSettings>
 #include "ts_helpers_qt.h"
 
-//Ducker_Global* Ducker_Global::m_Instance = 0;
-
 Ducker_Global::Ducker_Global(QObject *parent) :
     m_isActive(false),
     m_value(0.0f),
@@ -29,10 +27,6 @@ float Ducker_Global::getValue() const
     return m_value;
 }
 
-//Ducker_Global::~Ducker_Global()
-//{
-//}
-
 void Ducker_Global::setActive(bool value)
 {
     if (value == m_isActive)
@@ -64,15 +58,6 @@ bool Ducker_Global::onInfoDataChanged(uint64 serverConnectionHandlerID, uint64 i
     return isDirty;
 }
 
-//void Ducker_Global::saveSettings()
-//{
-//    QSettings cfg(TSHelpers::GetFullConfigPath(), QSettings::IniFormat);
-//    cfg.beginGroup("ducker_global");
-//    cfg.setValue("enabled",isEnabled());
-//    cfg.setValue("value",getValue());
-//    cfg.endGroup();
-//}
-
 void Ducker_Global::onContextMenuEvent(uint64 serverConnectionHandlerID, PluginMenuType type, int menuItemID, uint64 selectedItemID)
 {
     Q_UNUSED(type);

diff --git a/src/mod_ducker_global.h b/src/mod_ducker_global.h
@@ -25,32 +25,11 @@ class Ducker_Global : public Module, public InfoDataInterface, public ContextMen
 
 public:
     explicit Ducker_Global(QObject *parent = 0);
-//    static Ducker_Global* instance() {
-//        static QMutex mutex;
-//        if(!m_Instance) {
-//            mutex.lock();
-
-//            if(!m_Instance)
-//                m_Instance = new Ducker_Global;
-
-//            mutex.unlock();
-//        }
-//        return m_Instance;
-//    }
-
-//    static void drop() {
-//        static QMutex mutex;
-//        mutex.lock();
-//        delete m_Instance;
-//        m_Instance = 0;
-//        mutex.unlock();
-//    }
+
     float getValue() const;
 
     void AddMusicBot(uint64 serverConnectionHandlerID, anyID clientID);
-//    void AddMusicBot(QString uid);
     void RemoveMusicBot(uint64 serverConnectionHandlerID, anyID clientID);
-//    void RemoveMusicBot(QString uid);
     void ToggleMusicBot(uint64 serverConnectionHandlerID, anyID clientID);
 
     // events forwarded from plugin.cpp
@@ -81,12 +60,6 @@ public slots:
     void onRunningStateChanged(bool value);
 
 private:
-//    explicit Ducker_Global();
-//    ~Ducker_Global();
-//    static Ducker_Global* m_Instance;
-//    Ducker_Global(const Ducker_Global &);
-//    Ducker_Global& operator=(const Ducker_Global &);
-
     bool m_isActive;
 
     float value() {return m_value;}

diff --git a/src/module.cpp b/src/module.cpp
@@ -37,6 +37,7 @@ void Module::setEnabled(bool value)
         onEnabledStateChanged(value);
         if (running_old != isRunning())
             onRunningStateChanged(isRunning());
+
         emit enabledSet(m_enabled);
     }
 }
@@ -50,6 +51,7 @@ void Module::setBlocked(bool value)
         onBlockedStateChanged(value);
         if (running_old != isRunning())
             onRunningStateChanged(isRunning());
+
         emit blockedSet(value);
     }
 }

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.3"; }
+const char* ts3plugin_version() { return "1.6.3.050101"; }
 
 /* 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; }
@@ -279,7 +279,7 @@ int ts3plugin_init() {
     }
 
     QSettings cfg(TSHelpers::GetFullConfigPath(), QSettings::IniFormat);
-    updater.CheckUpdate(cfg.value("beta",false).toBool());
+    updater.CheckUpdate(cfg.value("beta",true).toBool());
 
     TSLogging::Log("init done");
     return 0;  /* 0 = success, 1 = failure */

diff --git a/src/positional_audio/groupbox_positionalaudio_servers.ui b/src/positional_audio/groupbox_positionalaudio_servers.ui
@@ -76,16 +76,16 @@
      <string notr="true"> sec</string>
     </property>
     <property name="decimals">
-     <number>1</number>
+     <number>2</number>
     </property>
     <property name="minimum">
-     <double>0.100000000000000</double>
+     <double>0.020000000000000</double>
     </property>
     <property name="maximum">
      <double>2.000000000000000</double>
     </property>
     <property name="singleStep">
-     <double>0.100000000000000</double>
+     <double>0.020000000000000</double>
     </property>
     <property name="value">
      <double>1.000000000000000</double>
@@ -117,19 +117,19 @@
      <string notr="true"> sec</string>
     </property>
     <property name="decimals">
-     <number>1</number>
+     <number>2</number>
     </property>
     <property name="minimum">
-     <double>0.200000000000000</double>
+     <double>0.020000000000000</double>
     </property>
     <property name="maximum">
      <double>2.000000000000000</double>
     </property>
     <property name="singleStep">
-     <double>0.100000000000000</double>
+     <double>0.020000000000000</double>
     </property>
     <property name="value">
-     <double>1.000000000000000</double>
+     <double>2.000000000000000</double>
     </property>
    </widget>
    <widget class="QLabel" name="label_SendIntervalSilentInc">

diff --git a/src/positional_audio/guildwarstwo.cpp b/src/positional_audio/guildwarstwo.cpp
@@ -1,6 +1,5 @@
 #include "guildwarstwo.h"
 
-#include <QStringList>
 #include "ts_helpers_qt.h"
 #include "tsvr_obj.h"
 

diff --git a/src/ts_logging_qt.cpp b/src/ts_logging_qt.cpp
@@ -164,7 +164,5 @@ void TSLogging::Print(QString message, uint64 serverConnectionHandlerID, LogLeve
 
 void TSLogging::Log(QString message, uint64 serverConnectionHandlerID, LogLevel logLevel)
 {
-    if (serverConnectionHandlerID == NULL)
-        serverConnectionHandlerID = 0;
     ts3Functions.logMessage(message.toLocal8Bit().constData(), logLevel, ts3plugin_name(), serverConnectionHandlerID);
 }
diff --git a/src/ts_logging_qt.h b/src/ts_logging_qt.h
@@ -23,13 +23,11 @@ namespace TSLogging
     inline void Error(QString message, bool isSoundSilent)                                      {Error(message, 0, NULL, isSoundSilent);}
     inline void Error(QString message)                                                          {Error(message, 0, NULL, false);}
 
-    void Print(QString message, uint64 serverConnectionHandlerID, LogLevel logLevel);
+    void Print(QString message, uint64 serverConnectionHandlerID = 0, LogLevel logLevel = LogLevel_INFO);
     inline void Print(QString message, LogLevel logLevel)                                       {Print(message, 0, logLevel);}
-    inline void Print(QString message)                                                          {Print(message, 0, LogLevel_INFO);}
 
-    void Log(QString message, uint64 serverConnectionHandlerID, LogLevel logLevel);
+    void Log(QString message, uint64 serverConnectionHandlerID = 0, LogLevel logLevel = LogLevel_INFO);
     inline void Log(QString message, LogLevel logLevel)                                         {Log(message, 0, logLevel);}
-    inline void Log(QString message)                                                            {Log(message, 0, LogLevel_INFO);}
 }
 
 #endif // TS_LOGGING_QT_H