Merge remote-tracking branch 'upst/master' into autobuild/stable2

Author: ann0see

ChangeLog

@@ -4,7 +4,11 @@
 
 ### 3.6.2dev <- NOTE: the release version number will be 3.7.0 ###
 
-- introduced new server lists: Any Genre 2, Choral/Barbershop (#875)
+- introduced new server lists: Any Genre 3, Choral/Barbershop (#875),
+  also renamed Default to Any Genre 1, Any Genre to Any Genre 2,
+  and Classical/Folk/Choral to Classical/Folk.
+
+- central server addresses are now in jamulus.io instead of fischvolk.de (#919)
 
 - show --clientname as first word in title to avoid clipping in Windows task bar (#789)
 
@@ -13,12 +17,10 @@
 - support http links in the chat dialog, coded by hoffie (#879)
 
 - support Github actions for CodeQL, Publish Release, Autobuild Flatpak,
-  coded by pljones, ann0see, ranfdev
+  coded by pljones, nefarius2001, ann0see, ranfdev.
 
 - more detailed version number of unreleased version, coded by nefarius2001 (#475)
 
-- remove ConsoleWriterFactory (#926)
-
 - add new --serverpublicip option to support central servers behind NAT,
   coded by hoffie (#954)
 
@@ -28,7 +30,17 @@
 
 - Highlight the fact that the server is recording in the Mixerboard title (#968), coded by dcorson-ticino.com
 
-TODO fix crash if settings are changed in ASIO4All during a connection (contained in #796)
+- Implement new --ctrlmidich syntax allowing to specify fader, pan, mute,
+  solo buttons (#945).  Implementation for mute&solo buttons for now is
+  only for toggle controllers and does not support headless operation yet.
+  
+- Move ASIO Setup button on Windows below driver selection (#977), coded by mulyaj and ann0see
+
+- Gray out input levels and show a message if you're not connected to a server (#847)
+
+- bug fix: remove ConsoleWriterFactory - to resolve suspected memory leak (#926)
+
+- bug fix: fix crash if settings are changed in ASIO4ALL during a connection (contained in #796). Reverts #727 for Windows
 
 
 

Jamulus.pro

@@ -400,7 +400,6 @@ HEADERS += src/buffer.h \
     src/channel.h \
     src/client.h \
     src/global.h \
-    src/multicolorled.h \
     src/protocol.h \
     src/recorder/jamcontroller.h \
     src/server.h \
@@ -423,7 +422,8 @@ HEADERS_GUI = src/audiomixerboard.h \
     src/clientdlg.h \
     src/serverdlg.h \
     src/levelmeter.h \
-    src/analyzerconsole.h
+    src/analyzerconsole.h \
+    src/multicolorled.h
 
 HEADERS_OPUS = libs/opus/celt/arch.h \
     libs/opus/celt/bands.h \

android/sound.h

@@ -35,6 +35,8 @@
 /* Classes ********************************************************************/
 class CSound : public CSoundBase, public oboe::AudioStreamCallback
 {
+    Q_OBJECT
+
 public:
     static const uint8_t RING_FACTOR;
     CSound ( void           (*fpNewProcessCallback) ( CVector<short>& psData, void* arg ),

ios/sound.h

@@ -33,6 +33,8 @@
 /* Classes ********************************************************************/
 class CSound : public CSoundBase
 {
+    Q_OBJECT
+
 public:
     CSound ( void           (*fpNewProcessCallback) ( CVector<short>& psData, void* arg ),
              void*          arg,

linux/sound.h

@@ -59,6 +59,8 @@
 #if WITH_SOUND
 class CSound : public CSoundBase
 {
+    Q_OBJECT
+
 public:
     CSound ( void           (*fpNewProcessCallback) ( CVector<short>& psData, void* arg ),
              void*          arg,

mac/sound.h

@@ -36,6 +36,8 @@
 /* Classes ********************************************************************/
 class CSound : public CSoundBase
 {
+    Q_OBJECT
+
 public:
     CSound ( void           (*fpNewProcessCallback) ( CVector<short>& psData, void* arg ),
              void*          arg,

src/audiomixerboard.cpp

@@ -458,7 +458,7 @@ void CChannelFader::SetRemoteFaderIsMute ( const bool bIsMute )
     if ( bIsMute )
     {
         // show orange utf8 SPEAKER WITH CANCELLATION STROKE (U+1F507)
-        pInfoLabel->setText ( "<font color=""orange"">&#128263;</font>" );
+        pInfoLabel->setText ( "<font color=\"orange\">&#128263;</font>" );
     }
     else
     {
@@ -1246,6 +1246,47 @@ void CAudioMixerBoard::SetFaderLevel ( const int iChannelIdx,
     }
 }
 
+void CAudioMixerBoard::SetPanValue ( const int iChannelIdx,
+                                     const int iValue )
+{
+    // only apply new pan value if channel index is valid and the panner is visible
+    if ( ( iChannelIdx >= 0 ) && ( iChannelIdx < MAX_NUM_CHANNELS )
+           && bDisplayPans )
+    {
+        if ( vecpChanFader[iChannelIdx]->IsVisible() )
+        {
+            vecpChanFader[iChannelIdx]->SetPanValue ( iValue );
+        }
+    }
+}
+
+void CAudioMixerBoard::SetFaderIsSolo ( const int iChannelIdx,
+                                        const bool bIsSolo )
+{
+    // only apply solo if channel index is valid and the fader is visible
+    if ( ( iChannelIdx >= 0 ) && ( iChannelIdx < MAX_NUM_CHANNELS ) )
+
+    {
+        if ( vecpChanFader[iChannelIdx]->IsVisible() )
+        {
+            vecpChanFader[iChannelIdx]->SetFaderIsSolo ( bIsSolo );
+        }
+    }
+}
+
+void CAudioMixerBoard::SetFaderIsMute ( const int iChannelIdx,
+                                        const bool bIsMute )
+{
+    // only apply mute if channel index is valid and the fader is visible
+    if ( ( iChannelIdx >= 0 ) && ( iChannelIdx < MAX_NUM_CHANNELS ) )
+    {
+        if ( vecpChanFader[iChannelIdx]->IsVisible() )
+        {
+            vecpChanFader[iChannelIdx]->SetFaderIsMute ( bIsMute );
+        }
+    }
+}
+
 void CAudioMixerBoard::SetAllFaderLevelsToNewClientLevel()
 {
     QMutexLocker locker ( &Mutex );

src/audiomixerboard.h

@@ -208,7 +208,16 @@ class CAudioMixerBoard :
     void            SetMyChannelID ( const int iChannelIdx ) { iMyChannelID = iChannelIdx; }
 
     void            SetFaderLevel ( const int iChannelIdx,
-                                const int iValue );
+                                    const int iValue );
+
+    void            SetPanValue ( const int iChannelIdx,
+                                  const int iValue );
+
+    void            SetFaderIsSolo ( const int iChannelIdx,
+                                     const bool bIsSolo );
+
+    void            SetFaderIsMute ( const int iChannelIdx,
+                                     const bool bIsMute );
 
     void            SetNumMixerPanelRows ( const int iNNumMixerPanelRows );
     int             GetNumMixerPanelRows() { return iNumMixerPanelRows; }

src/client.cpp

@@ -184,6 +184,15 @@ CClient::CClient ( const quint16  iPortNumber,
     QObject::connect ( &Sound, &CSound::ControllerInFaderLevel,
         this, &CClient::OnControllerInFaderLevel );
 
+    QObject::connect ( &Sound, &CSound::ControllerInPanValue,
+        this, &CClient::OnControllerInPanValue );
+
+    QObject::connect ( &Sound, &CSound::ControllerInFaderIsSolo,
+        this, &CClient::OnControllerInFaderIsSolo );
+
+    QObject::connect ( &Sound, &CSound::ControllerInFaderIsMute,
+        this, &CClient::OnControllerInFaderIsMute );
+
     QObject::connect ( &Socket, &CHighPrioSocket::InvalidPacketReceived,
         this, &CClient::OnInvalidPacketReceived );
 
@@ -707,6 +716,43 @@ void CClient::OnControllerInFaderLevel ( int iChannelIdx,
     emit ControllerInFaderLevel ( iChannelIdx, iValue );
 }
 
+void CClient::OnControllerInPanValue ( int iChannelIdx,
+                                       int iValue )
+{
+    // in case of a headless client the panners cannot be moved so we need
+    // to send the controller information directly to the server
+#ifdef HEADLESS
+    // channel index is valid
+    SetRemoteChanPan ( iChannelIdx, static_cast<float>( iValue ) / AUD_MIX_PAN_MAX);
+#endif
+
+    emit ControllerInPanValue ( iChannelIdx, iValue );
+}
+
+void CClient::OnControllerInFaderIsSolo ( int iChannelIdx,
+                                          bool bIsSolo )
+{
+    // in case of a headless client the buttons are not displayed so we need
+    // to send the controller information directly to the server
+#ifdef HEADLESS
+    // FIXME: no idea what to do here.
+#endif
+
+    emit ControllerInFaderIsSolo ( iChannelIdx, bIsSolo );
+}
+
+void CClient::OnControllerInFaderIsMute ( int iChannelIdx,
+                                          bool bIsMute )
+{
+    // in case of a headless client the buttons are not displayed so we need
+    // to send the controller information directly to the server
+#ifdef HEADLESS
+    // FIXME: no idea what to do here.
+#endif
+
+    emit ControllerInFaderIsMute ( iChannelIdx, bIsMute );
+}
+
 void CClient::OnClientIDReceived ( int iChanID )
 {
     // for headless mode we support to mute our own signal in the personal mix

src/client.h

@@ -391,6 +391,9 @@ protected slots:
 
     void OnSndCrdReinitRequest ( int iSndCrdResetType );
     void OnControllerInFaderLevel ( int iChannelIdx, int iValue );
+    void OnControllerInPanValue ( int iChannelIdx, int iValue );
+    void OnControllerInFaderIsSolo ( int iChannelIdx, bool bIsSolo );
+    void OnControllerInFaderIsMute ( int iChannelIdx, bool bIsMute );
     void OnClientIDReceived ( int iChanID );
 
 signals:
@@ -426,4 +429,7 @@ protected slots:
     void Disconnected();
     void SoundDeviceChanged ( QString strError );
     void ControllerInFaderLevel ( int iChannelIdx, int iValue );
+    void ControllerInPanValue ( int iChannelIdx, int iValue );
+    void ControllerInFaderIsSolo ( int iChannelIdx, bool bIsSolo );
+    void ControllerInFaderIsMute ( int iChannelIdx, bool bIsMute );
 };