From 8d8b52ae068591c148eb3a751558915eb21eaae2 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Mon, 8 Jun 2020 17:34:45 +0200 Subject: [PATCH 1/3] support sorting faders by channel name (#178) --- ChangeLog | 9 ++ src/audiomixerboard.cpp | 97 ++++++++++++++---- src/audiomixerboard.h | 6 +- src/clientdlg.cpp | 8 ++ src/clientdlg.h | 2 + src/res/translation/translation_de_DE.qm | Bin 94502 -> 94692 bytes src/res/translation/translation_de_DE.ts | 120 ++++++++++++---------- src/res/translation/translation_es_ES.ts | 120 ++++++++++++---------- src/res/translation/translation_fr_FR.ts | 120 ++++++++++++---------- src/res/translation/translation_it_IT.ts | 120 ++++++++++++---------- src/res/translation/translation_nl_NL.ts | 120 ++++++++++++---------- src/res/translation/translation_pl_PL.ts | 124 ++++++++++++----------- src/res/translation/translation_pt_PT.ts | 120 ++++++++++++---------- 13 files changed, 557 insertions(+), 409 deletions(-) diff --git a/ChangeLog b/ChangeLog index bae06e92..630a4990 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ 3.5.6git +- support sorting faders by channel name (#178) + - enable/disable recording from command line, coded by pljones (#228) - add Audacity "list of files" writer to jam recorder, by pljones (#315) @@ -24,6 +26,13 @@ by OS level Nap, Sleep, and Thread Priority systems, coded by AronVietti (#23) +TODO fix Windows installer: fix check for app run, fix Qt dlls missing + + + + + + 3.5.5 (2020-05-26) diff --git a/src/audiomixerboard.cpp b/src/audiomixerboard.cpp index 215c2fe1..50e67f39 100644 --- a/src/audiomixerboard.cpp +++ b/src/audiomixerboard.cpp @@ -28,8 +28,7 @@ /******************************************************************************\ * CChanneFader * \******************************************************************************/ -CChannelFader::CChannelFader ( QWidget* pNW, - QHBoxLayout* pParentLayout ) +CChannelFader::CChannelFader ( QWidget* pNW ) { // create new GUI control objects and store pointers to them (note that // QWidget takes the ownership of the pMainGrid so that this only has @@ -120,9 +119,6 @@ CChannelFader::CChannelFader ( QWidget* pNW, pMainGrid->addWidget ( pMuteSoloBox, 0, Qt::AlignHCenter ); pMainGrid->addWidget ( pLabelInstBox ); - // add fader frame to audio mixer board layout - pParentLayout->addWidget( pFrame ); - // reset current fader Reset(); @@ -430,15 +426,21 @@ void CChannelFader::SetChannelLevel ( const uint16_t iLevel ) plbrChannelLevel->setValue ( iLevel ); } -void CChannelFader::SetText ( const CChannelInfo& ChanInfo ) +void CChannelFader::SetChannelInfos ( const CChannelInfo& cChanInfo ) { + // init properties for the tool tip + int iTTInstrument = CInstPictures::GetNotUsedInstrument(); + QLocale::Country eTTCountry = QLocale::AnyCountry; + + + // Label text -------------------------------------------------------------- // store original received name - strReceivedName = ChanInfo.strName; + strReceivedName = cChanInfo.strName; // break text at predefined position const int iBreakPos = MAX_LEN_FADER_TAG / 2; - QString strModText = ChanInfo.strName; + QString strModText = cChanInfo.strName; if ( strModText.length() > iBreakPos ) { @@ -446,13 +448,6 @@ void CChannelFader::SetText ( const CChannelInfo& ChanInfo ) } plblLabel->setText ( strModText ); -} - -void CChannelFader::SetChannelInfos ( const CChannelInfo& cChanInfo ) -{ - // init properties for the tool tip - int iTTInstrument = CInstPictures::GetNotUsedInstrument(); - QLocale::Country eTTCountry = QLocale::AnyCountry; // Instrument picture ------------------------------------------------------ @@ -630,8 +625,11 @@ CAudioMixerBoard::CAudioMixerBoard ( QWidget* parent, Qt::WindowFlags ) : for ( int i = 0; i < MAX_NUM_CHANNELS; i++ ) { - vecpChanFader[i] = new CChannelFader ( this, pMainLayout ); + vecpChanFader[i] = new CChannelFader ( this ); vecpChanFader[i]->Hide(); + + // add fader frame to audio mixer board layout + pMainLayout->addWidget ( vecpChanFader[i]->GetMainWidget() ); } // insert horizontal spacer @@ -759,10 +757,72 @@ void CAudioMixerBoard::HideAll() bNoFaderVisible = true; iMyChannelID = INVALID_INDEX; + // use original order of channel (by server ID) + ChangeFaderOrder ( false ); + // emit status of connected clients emit NumClientsChanged ( 0 ); // -> no clients connected } +void CAudioMixerBoard::ChangeFaderOrder ( const bool bDoSort ) +{ +//// TEST for using a dialog for drag'n'drop channels to sort individually +//QDialog* pDialog = new QDialog ( this ); // TODO put this in header as declaration +//QVBoxLayout* pLayout = new QVBoxLayout ( pDialog ); +//QListWidget* pList = new QListWidget ( pDialog ); +//pList->setDragDropMode ( QAbstractItemView::InternalMove ); +//pList->setSortingEnabled ( true ); +//pLayout->addWidget ( pList ); +//// TODO use current sort order, not the sorting by ID; up/down buttons; cancel button; title; etc. +//for ( int i = 0; i < MAX_NUM_CHANNELS; i++ ) +//{ +// QListWidgetItem* pNewItem = new QListWidgetItem ( vecpChanFader[i]->GetReceivedName() ); +// pNewItem->setData ( Qt::UserRole, i ); +// pList->addItem ( pNewItem ); +// pNewItem->setHidden ( !vecpChanFader[i]->IsVisible() ); +//} +//pDialog->exec(); +//QLayoutItem* child; +//while ( ( child = pMainLayout->takeAt ( 0 ) ) != nullptr ) +//{ +// pMainLayout->removeWidget ( child->widget() ); +//} +//for ( int i = 0; i < MAX_NUM_CHANNELS; i++ ) +//{ +// // add fader frame to audio mixer board layout +// pMainLayout->addWidget ( vecpChanFader[pList->item ( i )->data ( Qt::UserRole ).toInt()]->GetMainWidget() ); +//} +//// insert horizontal spacer +//pMainLayout->addItem ( new QSpacerItem ( 0, 0, QSizePolicy::Expanding ) ); +//delete pDialog; + +// TODO better solution to sort by names and get the indexes after sorting (here +// we utilize the "data" property to store the original ID value) + QListWidget ListWidget; + for ( int i = 0; i < MAX_NUM_CHANNELS; i++ ) + { + // fill list widget (used for sorting the channels) + QListWidgetItem* pNewItem = new QListWidgetItem ( vecpChanFader[i]->GetReceivedName() ); + pNewItem->setData ( Qt::UserRole, i ); + ListWidget.addItem ( pNewItem ); + + // remove channels from layout (note that we keep the spacer on the right side) + pMainLayout->removeWidget ( vecpChanFader[i]->GetMainWidget() ); + } + if ( bDoSort ) + { + ListWidget.sortItems(); + } + + // add channels to the layout in the new order (since we insert on the left, we + // have to use a backwards counting loop) + for ( int i = MAX_NUM_CHANNELS - 1; i >= 0; i-- ) + { + // add fader frame to the audio mixer board layout + pMainLayout->insertWidget ( 0, vecpChanFader[ListWidget.item ( i )->data ( Qt::UserRole ).toInt()]->GetMainWidget() ); + } +} + void CAudioMixerBoard::ApplyNewConClientList ( CVector& vecChanInfo ) { // we want to set the server name only if the very first faders appear @@ -841,10 +901,7 @@ void CAudioMixerBoard::ApplyNewConClientList ( CVector& vecChanInf } } - // set the text in the fader - vecpChanFader[i]->SetText ( vecChanInfo[j] ); - - // update other channel infos + // set the channel infos vecpChanFader[i]->SetChannelInfos ( vecChanInfo[j] ); bFaderIsUsed = true; diff --git a/src/audiomixerboard.h b/src/audiomixerboard.h index 2a18c704..df84a50b 100644 --- a/src/audiomixerboard.h +++ b/src/audiomixerboard.h @@ -35,6 +35,7 @@ #include #include #include +#include #include "global.h" #include "util.h" #include "multicolorledbar.h" @@ -46,9 +47,8 @@ class CChannelFader : public QObject Q_OBJECT public: - CChannelFader ( QWidget* pNW, QHBoxLayout* pParentLayout ); + CChannelFader ( QWidget* pNW ); - void SetText ( const CChannelInfo& ChanInfo ); QString GetReceivedName() { return strReceivedName; } void SetChannelInfos ( const CChannelInfo& cChanInfo ); void Show() { pFrame->show(); } @@ -60,6 +60,7 @@ public: void SetDisplayChannelLevel ( const bool eNDCL ); bool GetDisplayChannelLevel(); void SetDisplayPans ( const bool eNDP ); + QFrame* GetMainWidget() { return pFrame; } void UpdateSoloState ( const bool bNewOtherSoloState ); void SetFaderLevel ( const int iLevel ); @@ -143,6 +144,7 @@ public: CAudioMixerBoard ( QWidget* parent = nullptr, Qt::WindowFlags f = nullptr ); void HideAll(); + void ChangeFaderOrder ( const bool bDoSort ); void ApplyNewConClientList ( CVector& vecChanInfo ); void SetServerName ( const QString& strNewServerName ); void SetGUIDesign ( const EGUIDesign eNewDesign ); diff --git a/src/clientdlg.cpp b/src/clientdlg.cpp index 0aa4059f..6360b0f1 100755 --- a/src/clientdlg.cpp +++ b/src/clientdlg.cpp @@ -279,10 +279,18 @@ CClientDlg::CClientDlg ( CClient* pNCliP, SLOT ( close() ), QKeySequence ( Qt::CTRL + Qt::Key_Q ) ); + // Edit menu -------------------------------------------------------------- + pEditMenu = new QMenu ( tr ( "&Edit" ), this ); + + pEditMenu->addAction ( tr ( "&Sort Channels by Name..." ), this, + SLOT ( OnSortChannelsByName() ), QKeySequence ( Qt::CTRL + Qt::Key_N ) ); + + // Main menu bar ----------------------------------------------------------- pMenu = new QMenuBar ( this ); pMenu->addMenu ( pViewMenu ); + pMenu->addMenu ( pEditMenu ); pMenu->addMenu ( new CHelpMenu ( true, this ) ); // Now tell the layout about the menu diff --git a/src/clientdlg.h b/src/clientdlg.h index 0040db8a..c09999fc 100755 --- a/src/clientdlg.h +++ b/src/clientdlg.h @@ -107,6 +107,7 @@ protected: void UpdateDisplay(); QMenu* pViewMenu; + QMenu* pEditMenu; QMenuBar* pMenu; QMenu* pInstrPictPopupMenu; QMenu* pCountryFlagPopupMenu; @@ -151,6 +152,7 @@ public slots: void OnOpenGeneralSettings() { ShowGeneralSettings(); } void OnOpenChatDialog() { ShowChatWindow(); } void OnOpenAnalyzerConsole() { ShowAnalyzerConsole(); } + void OnSortChannelsByName() { MainMixerBoard->ChangeFaderOrder ( true ); } void OnSettingsStateChanged ( int value ); void OnChatStateChanged ( int value ); diff --git a/src/res/translation/translation_de_DE.qm b/src/res/translation/translation_de_DE.qm index bc39ef6ee90099329cf0491956b5e2e71bc19c4f..c659532e524edd756785f75d4976e70f8adec928 100644 GIT binary patch delta 4015 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 diff --git a/src/res/translation/translation_de_DE.ts b/src/res/translation/translation_de_DE.ts index 1628c25b..01b8e73a 100644 --- a/src/res/translation/translation_de_DE.ts +++ b/src/res/translation/translation_de_DE.ts @@ -190,17 +190,17 @@ CAudioMixerBoard - + Server - + T R Y I N G T O C O N N E C T V E R B I N D U N G S A U F B A U - + Personal Mix at the Server: Eigener Mix am Server: @@ -208,7 +208,7 @@ CChannelFader - + Channel Level Kanalpegel @@ -217,12 +217,12 @@ Zeigt den Audiopegel vor dem Lautstärkeregler des Kanals. Allen verbundenen Musikern am Server wird ein Audiopegel zugewiesen. - + Input level of the current audio channel at the server Eingangspegel des aktuellen Musikers am Server - + Mixer Fader Kanalregler @@ -231,17 +231,17 @@ Regelt die Lautstärke des Kanals. Für alle Musiker, die gerade am Server verbunden sind, wird ein Lautstärkeregler angezeigt. Damit kann man seinen eigenen lokalen Mix erstellen. - + Local mix level setting of the current audio channel at the server Lokale Mixerpegeleinstellung des aktuellen Kanals am Server - + Status Indicator Statusanzeige - + Shows a status indication about the client which is assigned to this channel. Supported indicators are: Zeigt den Status über den Musiker, der dem Kanal zugewiesen ist. Unterstützte Indikatoren sind: @@ -250,12 +250,12 @@ Durchgestrichener Lautsprecher: Zeigt an, dass der andere Musiker dich stummgeschaltet hat. - + Status indicator label Statusanzeige - + Panning Pan @@ -264,17 +264,17 @@ Legt die Pan-Position von Links nach Rechts fest. Der Pan funktioniert nur im Stereo oder Mono-In/Stereo-Out Modus. - + Local panning position of the current audio channel at the server Lokale Pan-Position von dem aktuellen Audiokanal am Server - + With the Mute checkbox, the audio channel can be muted. Mit dem Mute-Schalter kann man den Kanal stumm schalten. - + Mute button Mute Schalter @@ -283,12 +283,12 @@ Bei aktiviertem Solo Status hört man nur diesen Kanal. Alle anderen Kanäle sind stumm geschaltet. Es ist möglich mehrere Kanäle auf Solo zu stellen. Dann hört man nur die Kanäle, die auf Solo gestellt wurden. - + Solo button Solo Schalter - + Fader Tag Kanalbeschriftung @@ -297,124 +297,124 @@ Mit der Kanalbeschriftung wird der verbundene Teilnehmen identifiziert. Der Name, ein Bild des Instruments und eine Flagge des eigenen Landes kann im eigenen Profil ausgewählt werden. - + Displays the pre-fader audio level of this channel. All clients connected to the server will be assigned an audio level, the same value for every client. Zeigt den Audiopegel vor dem Lautstärkeregler des Kanals. Allen verbundenen Musikern am Server wird ein Audiopegel zugewiesen. - + Adjusts the audio level of this channel. All clients connected to the server will be assigned an audio fader, displayed at each client, to adjust the local mix. Regelt die Lautstärke des Kanals. Für alle Musiker, die gerade am Server verbunden sind, wird ein Lautstärkeregler angezeigt. Damit kann man seinen eigenen lokalen Mix erstellen. - + Speaker with cancellation stroke: Indicates that another client has muted you. Durchgestrichener Lautsprecher: Zeigt an, dass der andere Musiker dich stummgeschaltet hat. - + Sets the pan from Left to Right of the channel. Works only in stereo or preferably mono in/stereo out mode. Legt die Pan-Position von Links nach Rechts fest. Der Pan funktioniert nur im Stereo oder Mono-In/Stereo-Out Modus. - + With the Solo checkbox, the audio channel can be set to solo which means that all other channels except the soloed channel are muted. It is possible to set more than one channel to solo. Bei aktiviertem Solo Status hört man nur diesen Kanal. Alle anderen Kanäle sind stumm geschaltet. Es ist möglich mehrere Kanäle auf Solo zu stellen. Dann hört man nur die Kanäle, die auf Solo gestellt wurden. - + The fader tag identifies the connected client. The tag name, a picture of your instrument and the flag of your country can be set in the main window. Mit der Kanalbeschriftung wird der verbundene Teilnehmen identifiziert. Der Name, ein Bild des Instruments und eine Flagge des eigenen Landes kann im eigenen Profil ausgewählt werden. - + Mixer channel instrument picture Mixerkanal Instrumentenbild - + Mixer channel label (fader tag) Mixerkanalbeschriftung - + Mixer channel country flag Mixerkanal Landesflagge - + PAN - + MUTE - + SOLO - + Alias/Name - + Instrument - + Location Standort - - - + + + Skill Level Spielstärke - + Beginner Anfänger - + Intermediate Mittlere Spielstärke - + Expert Experte - + Musician Profile Profil des Musikers - - - + + + Mute - - + + Pan - - - + + + Solo @@ -704,7 +704,7 @@ - + C&onnect &Verbinden @@ -744,23 +744,33 @@ &Beenden - + + &Edit + B&earbeiten + + + + &Sort Channels by Name... + &Sortiere Kanäle nach Namen... + + + None Keine - + Center Mitte - + R - + L @@ -835,22 +845,22 @@ Die CPU des Computers ist voll ausgelastet. - + Central Server Zentralserver - + user Musiker - + users Musiker - + D&isconnect &Trennen diff --git a/src/res/translation/translation_es_ES.ts b/src/res/translation/translation_es_ES.ts index 46704058..5cd6729b 100644 --- a/src/res/translation/translation_es_ES.ts +++ b/src/res/translation/translation_es_ES.ts @@ -194,17 +194,17 @@ CAudioMixerBoard - + Server Servidor - + T R Y I N G T O C O N N E C T I N T E N T A N D O C O N E C T A R - + Personal Mix at the Server: Mezcla Personal en el Servidor: @@ -212,7 +212,7 @@ CChannelFader - + Channel Level Nivel Canal @@ -221,12 +221,12 @@ Muestra el nivel de audio pre-fader de este canal. Todos los clientes conectados al servidor tienen un nivel de audio asignado, el mismo para cada cliente. - + Input level of the current audio channel at the server Nivel de entrada del canal de audio actual en el servidor - + Mixer Fader Fader Mezclador @@ -235,17 +235,17 @@ Ajusta el nivel de audio de este canal. Todos los clientes conectados al servidor tienen asignado un fader en el cliente, ajustando la mezcla local. - + Local mix level setting of the current audio channel at the server Ajuste local de la mezcla del canal de audio actual en el servidor - + Status Indicator Indicador de Estado - + Shows a status indication about the client which is assigned to this channel. Supported indicators are: Muestra una indicación del estado del cliente asignado a este canal. Los indicadores soportados son: @@ -254,12 +254,12 @@ Altavoz tachado: Indica que el otro cliente te ha muteado. - + Status indicator label Etiqueta indicador estado - + Panning Paneo @@ -268,17 +268,17 @@ Fija el paneo de Izquierda a Derecha del canal. Solo funciona en estéreo o preferiblemente en modo Entrada mono/Salida estéreo. - + Local panning position of the current audio channel at the server Posición local del paneo del canal de audio actual en el servidor - + With the Mute checkbox, the audio channel can be muted. Activando Mute, se puede mutear el canal de audio. - + Mute button Botón Mute @@ -287,12 +287,12 @@ Activando Solo, todos los demás canales de audio excepto este se mutean. Es posible activar esta función para más de un canal. - + Solo button Botón Solo - + Fader Tag Etiqueta Fader @@ -301,124 +301,124 @@ La etiqueta del fader identifica al cliente conectado. El nombre de la etiqueta, la imagen de tu instrumento y la bandera de tu país se pueden establecer en la ventana principal. - + Displays the pre-fader audio level of this channel. All clients connected to the server will be assigned an audio level, the same value for every client. Muestra el nivel de audio pre-fader de este canal. Todos los clientes conectados al servidor tienen un nivel de audio asignado, el mismo valor para cada cliente. - + Adjusts the audio level of this channel. All clients connected to the server will be assigned an audio fader, displayed at each client, to adjust the local mix. Ajusta el nivel de audio de este canal. Todos los clientes conectados al servidor tendrán asignado un fader, mostrado en cada cliente, para ajustar la mezcla local. - + Speaker with cancellation stroke: Indicates that another client has muted you. Altavoz tachado: Indica que otro cliente te ha muteado. - + Sets the pan from Left to Right of the channel. Works only in stereo or preferably mono in/stereo out mode. Fija el paneo de Izquierda a Derecha del canal. Solo funciona en modo estéreo o preferiblemente en modo Entrada mono/Salida estéreo. - + With the Solo checkbox, the audio channel can be set to solo which means that all other channels except the soloed channel are muted. It is possible to set more than one channel to solo. Activando Solo, todos los demás canales de audio excepto este se mutean. Es posible activar esta función para más de un canal. - + The fader tag identifies the connected client. The tag name, a picture of your instrument and the flag of your country can be set in the main window. La etiqueta del fader identifica al cliente conectado. El nombre de la etiqueta, la imagen de tu instrumento y la bandera de tu país se pueden establecer en la ventana principal. - + Mixer channel instrument picture Imagen mezclador canal instrumento - + Mixer channel label (fader tag) Etiqueta mezclador canal (etiqueta fader) - + Mixer channel country flag Bandera país mezclador canal - + PAN PAN - + MUTE MUTE - + SOLO SOLO - + Alias/Name Alias/Nombre - + Instrument Instrumento - + Location Ubicación - - - + + + Skill Level Nivel Habilidad - + Beginner Principiante - + Intermediate Intermedio - + Expert Experto - + Musician Profile Perfil Músico - - - + + + Mute Mute - - + + Pan Paneo - - - + + + Solo Solo @@ -716,7 +716,7 @@ - + C&onnect C&onectar @@ -756,23 +756,33 @@ S&alir - + + &Edit + + + + + &Sort Channels by Name... + + + + None Ninguno - + Center Centro - + R R - + L L @@ -847,22 +857,22 @@ El procesador del cliente o del servidor está al 100%. - + Central Server Servidor Central - + user usuario - + users usuarios - + D&isconnect D&esconectar diff --git a/src/res/translation/translation_fr_FR.ts b/src/res/translation/translation_fr_FR.ts index c0e35cda..0cd86ee8 100644 --- a/src/res/translation/translation_fr_FR.ts +++ b/src/res/translation/translation_fr_FR.ts @@ -202,17 +202,17 @@ CAudioMixerBoard - + Server Serveur - + T R Y I N G T O C O N N E C T T E N T A T I V E D E C O N N E X I O N - + Personal Mix at the Server: Mixage personnel du serveur : @@ -220,7 +220,7 @@ CChannelFader - + Channel Level Niveau de canal @@ -229,12 +229,12 @@ Affiche le niveau audio pré-fader de ce canal. Tous les clients connectés au serveur se verront attribuer un niveau audio, la même valeur pour chaque client. - + Input level of the current audio channel at the server Niveau d'entrée du canal audio actuel sur le serveur - + Mixer Fader Charriot du mixeur @@ -243,17 +243,17 @@ Règle le niveau audio de ce canal. Tous les clients connectés au serveur se verront attribuer un chariot audio à chaque client, ce qui permettra d'ajuster le mixage local. - + Local mix level setting of the current audio channel at the server Réglage du niveau de mixage local du canal audio actuel sur le serveur - + Status Indicator Indicateur d'état - + Shows a status indication about the client which is assigned to this channel. Supported indicators are: Affiche une indication sur l'état du client qui est affecté à ce canal. Les indicateurs pris en charge sont : @@ -262,12 +262,12 @@ Haut-parleur avec barre d'annulation : indique que l'autre client vous a mis en sourdine. - + Status indicator label Étiquette d'indicateur d'état - + Panning Panoramique @@ -276,17 +276,17 @@ Règle la position panoramique du canal de gauche à droite. Fonctionne uniquement en mode stéréo ou de préférence en mode entrée mono/sortie stéréo. - + Local panning position of the current audio channel at the server Position panoramique locale du canal audio actuel sur le serveur - + With the Mute checkbox, the audio channel can be muted. En cochant la case Muet, le canal audio peut être mis en sourdine. - + Mute button Bouton de sourdine @@ -295,12 +295,12 @@ En cochant la case Solo, le canal audio peut être réglé sur solo, ce qui signifie que tous les autres canaux, à l'exception du canal actuel, sont mis en sourdine. Il est possible de mettre plus d'un canal en solo. - + Solo button Bouton de solo - + Fader Tag Étiquette de chariot @@ -309,124 +309,124 @@ L'étiquette de chariot identifie le client connecté. Le nom du tag, la photo de votre instrument et un drapeau de votre pays peuvent être définis dans la fenêtre principale. - + Displays the pre-fader audio level of this channel. All clients connected to the server will be assigned an audio level, the same value for every client. - + Adjusts the audio level of this channel. All clients connected to the server will be assigned an audio fader, displayed at each client, to adjust the local mix. - + Speaker with cancellation stroke: Indicates that another client has muted you. - + Sets the pan from Left to Right of the channel. Works only in stereo or preferably mono in/stereo out mode. - + With the Solo checkbox, the audio channel can be set to solo which means that all other channels except the soloed channel are muted. It is possible to set more than one channel to solo. - + The fader tag identifies the connected client. The tag name, a picture of your instrument and the flag of your country can be set in the main window. - + Mixer channel instrument picture Image d'instrument de canal de mixeur - + Mixer channel label (fader tag) Label de canal de mixeur (étiquette de chariot) - + Mixer channel country flag Drapeau de pays de canal de mixeur - + PAN PAN - + MUTE MUET - + SOLO SOLO - + Alias/Name Pseudo/nom - + Instrument Instrument - + Location Localisation - - - + + + Skill Level Niveau de compétence - + Beginner Débutant - + Intermediate Intermédiaire - + Expert Expert - + Musician Profile Profil de musicien - - - + + + Mute Muet - - + + Pan Pan - - - + + + Solo Solo @@ -712,7 +712,7 @@ - + C&onnect Se c&onnecter @@ -752,23 +752,33 @@ &Quitter - + + &Edit + + + + + &Sort Channels by Name... + + + + None Aucun - + Center Centre - + R D - + L G @@ -843,22 +853,22 @@ Le processeur du client ou du serveur est à 100%. - + Central Server Serveur central - + user utilisateur - + users utilisateurs - + D&isconnect Dé&connecter diff --git a/src/res/translation/translation_it_IT.ts b/src/res/translation/translation_it_IT.ts index afb40af2..251b34bd 100644 --- a/src/res/translation/translation_it_IT.ts +++ b/src/res/translation/translation_it_IT.ts @@ -190,17 +190,17 @@ CAudioMixerBoard - + Server Server - + T R Y I N G T O C O N N E C T I N A T T E S A D I C O N N E S S I O N E - + Personal Mix at the Server: Mixer personale sul Server: @@ -208,27 +208,27 @@ CChannelFader - - + + Pan Bilanciamento - - - + + + Mute Mute - - - + + + Solo Solo - + Channel Level Volume @@ -237,12 +237,12 @@ Visualizza il livello audio pre-fader di questo canale. A tutti i client connessi al server verrà assegnato un livello audio, lo stesso valore per ciascun client. - + Input level of the current audio channel at the server Livello di input del canale audio corrente sul server - + Mixer Fader Mixer Fader @@ -251,17 +251,17 @@ Regola il livello audio di questo canale. A tutti i client connessi al server verrà assegnato un fader audio su ciascun client, regolando il mix locale. - + Local mix level setting of the current audio channel at the server Impostazione del livello di volume locale del canale audio corrente sul server - + Status Indicator Indicatore di Stato - + Shows a status indication about the client which is assigned to this channel. Supported indicators are: Visualizza lo stato del client assegnato a questo canale. Gli Stati supportati sono: @@ -270,12 +270,12 @@ Altoparlante segnato: Indica che un altro client ha messo in mute il tuo canale. - + Status indicator label Etichetta dell'indicatore di stato - + Panning Bilanciamento @@ -284,17 +284,17 @@ Imposta il Bilanciamento da Sinistra a Destra del canale. Funzione abilitata in modalità stereo oppure in modalità mono in/stereo out. - + Local panning position of the current audio channel at the server Bilancimento locale del canale audio corrente sul server - + With the Mute checkbox, the audio channel can be muted. Quando il Mute è selezionato, il canale audio è mutato. - + Mute button Pulsante Mute @@ -303,12 +303,12 @@ Quando il Solo è attivo, il canale audio sarà in modalità solista escludendo gli altri canali che non saranno più udibili. E' possibile attivare il solo su più canali per sentirli contemporaneamente. - + Solo button Pulsante Solo - + Fader Tag Tag Fader @@ -317,104 +317,104 @@ Il tag fader identifica il client connesso. Il nome del tag, l'immagine del tuo strumento e una bandiera del tuo paese possono essere impostati nella finestra principale del profilo. - + Displays the pre-fader audio level of this channel. All clients connected to the server will be assigned an audio level, the same value for every client. - + Adjusts the audio level of this channel. All clients connected to the server will be assigned an audio fader, displayed at each client, to adjust the local mix. - + Speaker with cancellation stroke: Indicates that another client has muted you. - + Sets the pan from Left to Right of the channel. Works only in stereo or preferably mono in/stereo out mode. - + With the Solo checkbox, the audio channel can be set to solo which means that all other channels except the soloed channel are muted. It is possible to set more than one channel to solo. - + The fader tag identifies the connected client. The tag name, a picture of your instrument and the flag of your country can be set in the main window. - + Mixer channel instrument picture Immagine dello strumento - + Mixer channel label (fader tag) Etichetta del Canale (fader tag) - + Mixer channel country flag Bandiera del Paese - + PAN Bil. (L / R) - + MUTE MUTE - + SOLO SOLO - + Alias/Name Identificativo/Nome - + Instrument Strumento - + Location Località - - - + + + Skill Level Livello di Preparazione - + Beginner Principiante - + Intermediate Livello Intermedio - + Expert Esperto - + Musician Profile Profilo del Musicista @@ -549,7 +549,7 @@ - + L L @@ -772,7 +772,7 @@ - + C&onnect C&onnetti @@ -812,37 +812,47 @@ &Uscita - + + &Edit + + + + + &Sort Channels by Name... + + + + None Nullo - + Center Centro - + R R - + Central Server Server Centrale - + user utente - + users utenti - + D&isconnect D&isconnetti diff --git a/src/res/translation/translation_nl_NL.ts b/src/res/translation/translation_nl_NL.ts index a2be5e43..92373b3b 100644 --- a/src/res/translation/translation_nl_NL.ts +++ b/src/res/translation/translation_nl_NL.ts @@ -190,17 +190,17 @@ CAudioMixerBoard - + Server Server - + T R Y I N G T O C O N N E C T A A N H E T V E R B I N D E N - + Personal Mix at the Server: @@ -208,27 +208,27 @@ CChannelFader - - + + Pan Pan - - - + + + Mute Demp - - - + + + Solo Solo - + Channel Level Kanaalniveau @@ -237,12 +237,12 @@ Geeft het pre-fader-audioniveau van dit kanaal weer. Alle verbonden clients op de server krijgen een audioniveau toegewezen, dezelfde waarde voor elke client. - + Input level of the current audio channel at the server Invoerniveau van het huidige audiokanaal op de server - + Mixer Fader Mixer Fader @@ -251,42 +251,42 @@ Past het geluidsniveau van dit kanaal aan. Alle verbonden clients op de server krijgen een audiofader toegewezen bij elke client, waarbij de lokale mix wordt aangepast. - + Local mix level setting of the current audio channel at the server Lokale instelling van het mixniveau van het huidige audiokanaal op de server - + Status Indicator - + Shows a status indication about the client which is assigned to this channel. Supported indicators are: - + Status indicator label - + Panning - + Local panning position of the current audio channel at the server - + With the Mute checkbox, the audio channel can be muted. Met het selectievakje Demp kan het audiokanaal worden gedempt. - + Mute button Dempknop @@ -295,12 +295,12 @@ Met het selectievakje Solo kan het audiokanaal worden ingesteld op solo, zodat alle overige kanalen worden gedempt. Het is mogelijk om meer dan één kanaal op solo in te stellen. - + Solo button Soloknop - + Fader Tag Fader tag @@ -309,104 +309,104 @@ De fadertag identificeert de verbonden client. De tagnaam, de afbeelding van uw instrument en een vlag van uw land kunnen in het hoofdvenster worden ingesteld. - + Displays the pre-fader audio level of this channel. All clients connected to the server will be assigned an audio level, the same value for every client. - + Adjusts the audio level of this channel. All clients connected to the server will be assigned an audio fader, displayed at each client, to adjust the local mix. - + Speaker with cancellation stroke: Indicates that another client has muted you. - + Sets the pan from Left to Right of the channel. Works only in stereo or preferably mono in/stereo out mode. - + With the Solo checkbox, the audio channel can be set to solo which means that all other channels except the soloed channel are muted. It is possible to set more than one channel to solo. - + The fader tag identifies the connected client. The tag name, a picture of your instrument and the flag of your country can be set in the main window. - + Mixer channel instrument picture Afbeelding van het mengkanaalinstrument - + Mixer channel label (fader tag) Label van het mengkanaal (faderlabel) - + Mixer channel country flag Landvlag van het kanaal - + PAN - + MUTE DEMP - + SOLO SOLO - + Alias/Name Alias/Naam - + Instrument Instrument - + Location Locatie - - - + + + Skill Level Vaardigheidssniveau - + Beginner Beginner - + Intermediate Gemiddeld - + Expert Gevorderd - + Musician Profile Muzikantenprofiel @@ -541,7 +541,7 @@ - + L L @@ -764,7 +764,7 @@ - + C&onnect C&onnect @@ -804,37 +804,47 @@ E&xit - + + &Edit + + + + + &Sort Channels by Name... + + + + None Geen - + Center Centrum - + R R - + Central Server - + user gebruiker - + users gebruikers - + D&isconnect &Afmelden diff --git a/src/res/translation/translation_pl_PL.ts b/src/res/translation/translation_pl_PL.ts index 203d8fb8..9265aec4 100644 --- a/src/res/translation/translation_pl_PL.ts +++ b/src/res/translation/translation_pl_PL.ts @@ -158,17 +158,17 @@ CAudioMixerBoard - + Server - + T R Y I N G T O C O N N E C T - + Personal Mix at the Server: @@ -176,189 +176,189 @@ CChannelFader - - + + Pan + + + + + Mute + + - - Mute - - - - - - + Solo - + Channel Level - + Input level of the current audio channel at the server - + Mixer Fader - + Local mix level setting of the current audio channel at the server - + Status Indicator - + Shows a status indication about the client which is assigned to this channel. Supported indicators are: - + Status indicator label - + Panning - + Local panning position of the current audio channel at the server - + With the Mute checkbox, the audio channel can be muted. - + Mute button - + Solo button - + Fader Tag - + Displays the pre-fader audio level of this channel. All clients connected to the server will be assigned an audio level, the same value for every client. - + Adjusts the audio level of this channel. All clients connected to the server will be assigned an audio fader, displayed at each client, to adjust the local mix. - + Speaker with cancellation stroke: Indicates that another client has muted you. - + Sets the pan from Left to Right of the channel. Works only in stereo or preferably mono in/stereo out mode. - + With the Solo checkbox, the audio channel can be set to solo which means that all other channels except the soloed channel are muted. It is possible to set more than one channel to solo. - + The fader tag identifies the connected client. The tag name, a picture of your instrument and the flag of your country can be set in the main window. - + Mixer channel instrument picture - + Mixer channel label (fader tag) - + Mixer channel country flag - + PAN - + MUTE - + SOLO - + Alias/Name - + Instrument - + Location - - - + + + Skill Level - + Beginner - + Intermediate - + Expert - + Musician Profile @@ -453,7 +453,7 @@ - + L @@ -624,7 +624,7 @@ - + C&onnect @@ -664,37 +664,47 @@ - + + &Edit + + + + + &Sort Channels by Name... + + + + None - + Center - + R - + Central Server - + user - + users - + D&isconnect diff --git a/src/res/translation/translation_pt_PT.ts b/src/res/translation/translation_pt_PT.ts index 336a46e6..4d76b3c2 100644 --- a/src/res/translation/translation_pt_PT.ts +++ b/src/res/translation/translation_pt_PT.ts @@ -202,17 +202,17 @@ CAudioMixerBoard - + Server Servidor - + T R Y I N G T O C O N N E C T T E N T A N D O L I G A R - + Personal Mix at the Server: Mistura Pessoal no Servidor: @@ -220,7 +220,7 @@ CChannelFader - + Channel Level Nível do Canal @@ -229,12 +229,12 @@ Mostra o nível de áudio pré-fader deste canal. Todos os clientes ligados ao servidor terão atribuído um nível de áudio, o mesmo valor para cada cliente. - + Input level of the current audio channel at the server Nível de entrada deste canal de áudio do servidor - + Mixer Fader Fader da Mistura @@ -243,17 +243,17 @@ Ajusta o nível de áudio deste canal. Por cada cliente ligado ao servidor será atribuído um fader de áudio em todos os clientes, podendo cada um ajustar a sua mistura local. - + Local mix level setting of the current audio channel at the server Configuração do nível de mistura local deste canal de áudio do servidor - + Status Indicator Indicador de Estado - + Shows a status indication about the client which is assigned to this channel. Supported indicators are: Mostra uma indicação de estado sobre o cliente que está atribuído a este canal. Os indicadores suportados são: @@ -262,12 +262,12 @@ Alti-falante com sinal de proibição: Indica que o cliente silenciou o teu canal. - + Status indicator label Etiqueta do indicador de estado - + Panning Panorâmica @@ -276,17 +276,17 @@ Define a posição de panorâmica da esquerda para a direita do canal. Funciona apenas no modo estéreo ou, de preferência, no modo Entrada Mono/Saída Estéreo. - + Local panning position of the current audio channel at the server Posição de panorâmica local do canal de áudio actual no servidor - + With the Mute checkbox, the audio channel can be muted. Com a caixa de seleção Mute, o canal de áudio pode ser silenciado. - + Mute button Botão Mute @@ -295,12 +295,12 @@ Com a caixa de seleção Solo, o canal de áudio pode ser definido como solo, o que significa que todos os outros canais, exceto o canal atual, serão silenciados. É possível definir mais que um canal no modo solo. - + Solo button Botão Solo - + Fader Tag Identificador do Fader @@ -309,124 +309,124 @@ O Identificador do fader identifica o cliente ligado. O nome no identificador, a imagem do instrumento e a bandeira do país podem ser definidos no Meu Perfil. - + Displays the pre-fader audio level of this channel. All clients connected to the server will be assigned an audio level, the same value for every client. - + Adjusts the audio level of this channel. All clients connected to the server will be assigned an audio fader, displayed at each client, to adjust the local mix. - + Speaker with cancellation stroke: Indicates that another client has muted you. - + Sets the pan from Left to Right of the channel. Works only in stereo or preferably mono in/stereo out mode. - + With the Solo checkbox, the audio channel can be set to solo which means that all other channels except the soloed channel are muted. It is possible to set more than one channel to solo. - + The fader tag identifies the connected client. The tag name, a picture of your instrument and the flag of your country can be set in the main window. - + Mixer channel instrument picture Imagem do instrumento do canal da mistura - + Mixer channel label (fader tag) Identificação do canal da mistura (identificador do fader) - + Mixer channel country flag Bandeira do país do canal da mistura - + PAN PAN - + MUTE MUTE - + SOLO SOLO - + Alias/Name Nome/Alcunha - + Instrument Instrumento - + Location Localização - - - + + + Skill Level Nível de Habilidade - + Beginner Principiante - + Intermediate Intermediário - + Expert Avançado - + Musician Profile Perfil do músico - - - + + + Mute Mute - - + + Pan Pan - - - + + + Solo Solo @@ -708,7 +708,7 @@ - + C&onnect &Ligar @@ -748,23 +748,33 @@ &Sair - + + &Edit + + + + + &Sort Channels by Name... + + + + None Nenhum - + Center Centro - + R R - + L L @@ -839,22 +849,22 @@ O CPU do cliente ou servidor está a 100%. - + Central Server Servidor Central - + user utilizador - + users utilizadores - + D&isconnect Desl&igar From c4866aff2fcc2465c64b92b16360e11e2cd16fab Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Mon, 8 Jun 2020 17:40:59 +0200 Subject: [PATCH 2/3] code cleanup --- src/audiomixerboard.cpp | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/src/audiomixerboard.cpp b/src/audiomixerboard.cpp index 50e67f39..8a0d8031 100644 --- a/src/audiomixerboard.cpp +++ b/src/audiomixerboard.cpp @@ -766,36 +766,6 @@ void CAudioMixerBoard::HideAll() void CAudioMixerBoard::ChangeFaderOrder ( const bool bDoSort ) { -//// TEST for using a dialog for drag'n'drop channels to sort individually -//QDialog* pDialog = new QDialog ( this ); // TODO put this in header as declaration -//QVBoxLayout* pLayout = new QVBoxLayout ( pDialog ); -//QListWidget* pList = new QListWidget ( pDialog ); -//pList->setDragDropMode ( QAbstractItemView::InternalMove ); -//pList->setSortingEnabled ( true ); -//pLayout->addWidget ( pList ); -//// TODO use current sort order, not the sorting by ID; up/down buttons; cancel button; title; etc. -//for ( int i = 0; i < MAX_NUM_CHANNELS; i++ ) -//{ -// QListWidgetItem* pNewItem = new QListWidgetItem ( vecpChanFader[i]->GetReceivedName() ); -// pNewItem->setData ( Qt::UserRole, i ); -// pList->addItem ( pNewItem ); -// pNewItem->setHidden ( !vecpChanFader[i]->IsVisible() ); -//} -//pDialog->exec(); -//QLayoutItem* child; -//while ( ( child = pMainLayout->takeAt ( 0 ) ) != nullptr ) -//{ -// pMainLayout->removeWidget ( child->widget() ); -//} -//for ( int i = 0; i < MAX_NUM_CHANNELS; i++ ) -//{ -// // add fader frame to audio mixer board layout -// pMainLayout->addWidget ( vecpChanFader[pList->item ( i )->data ( Qt::UserRole ).toInt()]->GetMainWidget() ); -//} -//// insert horizontal spacer -//pMainLayout->addItem ( new QSpacerItem ( 0, 0, QSizePolicy::Expanding ) ); -//delete pDialog; - // TODO better solution to sort by names and get the indexes after sorting (here // we utilize the "data" property to store the original ID value) QListWidget ListWidget; From 8876e2c569fddac49362fed7eeac582da7955bcc Mon Sep 17 00:00:00 2001 From: Tormod Volden Date: Mon, 8 Jun 2020 17:50:00 +0200 Subject: [PATCH 3/3] Update Debian packaging With qmake now doing a more standard installation, there is less left to do in our debian/rules. Signed-off-by: Tormod Volden --- distributions/debian/changelog | 2 +- distributions/debian/copyright | 3 ++- distributions/debian/jamulus.install | 1 + distributions/debian/rules | 13 +------------ distributions/debian/source/format | 1 + 5 files changed, 6 insertions(+), 14 deletions(-) create mode 100644 distributions/debian/jamulus.install create mode 100644 distributions/debian/source/format diff --git a/distributions/debian/changelog b/distributions/debian/changelog index efa48b11..00cd2ce2 100644 --- a/distributions/debian/changelog +++ b/distributions/debian/changelog @@ -1,4 +1,4 @@ -jamulus (3.5.2) UNRELEASED; urgency=medium +jamulus (3.5.6~git-0) UNRELEASED; urgency=medium * Initial release. diff --git a/distributions/debian/copyright b/distributions/debian/copyright index a34612a0..9e011191 100644 --- a/distributions/debian/copyright +++ b/distributions/debian/copyright @@ -9,8 +9,9 @@ License: GPL-2 Files: debian/* Copyright: + 2020 Tormod Volden 2020 Olivier Humbert - 2019 "Marc Landolt jr" + 2019 Marc Landolt jr License: GPL-2 License: GPL-2 diff --git a/distributions/debian/jamulus.install b/distributions/debian/jamulus.install new file mode 100644 index 00000000..918bab6f --- /dev/null +++ b/distributions/debian/jamulus.install @@ -0,0 +1 @@ +distributions/jamulus-server.service lib/systemd/system diff --git a/distributions/debian/rules b/distributions/debian/rules index b98816c9..2cf5eb13 100755 --- a/distributions/debian/rules +++ b/distributions/debian/rules @@ -3,19 +3,8 @@ dh $@ override_dh_auto_configure: - qmake CONFIG+=noupcasename Jamulus.pro + qmake CONFIG+=noupcasename PREFIX=/usr Jamulus.pro override_dh_auto_build: cd src/res/translation && lrelease *.ts dh_auto_build - -override_dh_usrlocal: - echo $$(pwd) - mkdir -p $$(pwd)/debian/jamulus/usr/bin/ - install -D -m 0755 jamulus $$(pwd)/debian/jamulus/usr/bin/ - mkdir -p $$(pwd)/debian/jamulus/usr/share/applications/ - install -D -m 0755 $$(pwd)/distributions/jamulus.desktop $$(pwd)/debian/jamulus/usr/share/applications/ - mkdir -p $$(pwd)/debian/jamulus/usr/share/icons/hicolor/512x512/apps/ - cp $$(pwd)/distributions/jamulus.png $$(pwd)/debian/jamulus/usr/share/icons/hicolor/512x512/apps/ - mkdir -p $$(pwd)/debian/jamulus/lib/systemd/system - cp $$(pwd)/distributions/jamulus-server.service $$(pwd)/debian/jamulus/lib/systemd/system/ diff --git a/distributions/debian/source/format b/distributions/debian/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/distributions/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt)