diff --git a/ChangeLog b/ChangeLog index 6d31f332..e77e91bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,11 +4,16 @@ 3.5.4git +- introduce genre-based server lists (Ticket #139) + - support intermediate Reaper RPP file while recording, coded by pljones (Ticket #170) - duplicate Central Server type dropdown to Connection Setup (#157) +TODO Central Server Address: "Default" results in empty server browser, "Default (North America)" works fine #156 + -> made max list smaller from 200 to 150 -> check if that is sufficient to prevent UDP packet fragmentation + TODO Keep lrelease? Does it work as expected? TODO fix Linux deploy script -> gives errors right now diff --git a/src/clientsettingsdlg.cpp b/src/clientsettingsdlg.cpp index e59cb3a7..856d9d7d 100755 --- a/src/clientsettingsdlg.cpp +++ b/src/clientsettingsdlg.cpp @@ -346,9 +346,11 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent, // central server address type combo box cbxCentServAddrType->clear(); - cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_MANUAL ) ); + cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_CUSTOM ) ); cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_DEFAULT ) ); cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENERAL_NORTHAMERICA ) ); + cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENRE_ROCK ) ); + cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENRE_JAZZ ) ); cbxCentServAddrType->setCurrentIndex ( static_cast ( pClient->GetCentralServerAddressType() ) ); UpdateCentralServerDependency(); @@ -585,7 +587,7 @@ void CClientSettingsDlg::UpdateSoundChannelSelectionFrame() void CClientSettingsDlg::UpdateCentralServerDependency() { - const bool bCurUseDefCentServAddr = ( pClient->GetCentralServerAddressType() != AT_MANUAL ); + const bool bCurUseDefCentServAddr = ( pClient->GetCentralServerAddressType() != AT_CUSTOM ); // update server type combo box (because the value may have ben changed // by a control in another dialog, e.g., the connect dialog), diff --git a/src/connectdlg.cpp b/src/connectdlg.cpp index 06fc74e2..6acb98b1 100755 --- a/src/connectdlg.cpp +++ b/src/connectdlg.cpp @@ -78,9 +78,11 @@ CConnectDlg::CConnectDlg ( CClient* pNCliP, // central server address type combo box cbxCentServAddrType->clear(); - cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_MANUAL ) ); + cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_CUSTOM ) ); cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_DEFAULT ) ); cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENERAL_NORTHAMERICA ) ); + cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENRE_ROCK ) ); + cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENRE_JAZZ ) ); // filter edtFilter->setWhatsThis ( "" + tr ( "Filter" ) + ": " + tr ( "The server " diff --git a/src/global.h b/src/global.h index aa7b9a76..38690db1 100755 --- a/src/global.h +++ b/src/global.h @@ -105,6 +105,8 @@ LED bar: lbr #define DEFAULT_SERVER_ADDRESS "jamulus.fischvolk.de" #define DEFAULT_PORT_NUMBER 22124 #define CENTSERV_GENERAL_NORTHAMERICA "jamulus.fischvolk.de:22224" +#define CENTSERV_GENRE_ROCK "jamulus.drealm.info:22124" +#define CENTSERV_GENRE_JAZZ "jamulus.drealm.info:22224" // getting started and software manual URL #define CLIENT_GETTING_STARTED_URL "https://github.com/corrados/jamulus/wiki/Getting-Started" @@ -160,10 +162,10 @@ LED bar: lbr #define MAX_NUM_IN_OUT_CHANNELS 64 // maximum number of elemts in the server address combo box -#define MAX_NUM_SERVER_ADDR_ITEMS 6 +#define MAX_NUM_SERVER_ADDR_ITEMS 12 // maximum number of fader settings to be stored (together with the fader tags) -#define MAX_NUM_STORED_FADER_SETTINGS 200 +#define MAX_NUM_STORED_FADER_SETTINGS 250 // range for signal level meter #define LOW_BOUND_SIG_METER ( -50.0 ) // dB @@ -179,21 +181,20 @@ LED bar: lbr // Maximum number of servers registered in the server list. If you want to // change this parameter, you most probably have to adjust MAX_SIZE_BYTES_NETW_BUF. -#define MAX_NUM_SERVERS_IN_SERVER_LIST 200 +#define MAX_NUM_SERVERS_IN_SERVER_LIST 150 // reduced to 150 because we now have genre-based server lists // defines the time interval at which the ping time is updated in the GUI #define PING_UPDATE_TIME_MS 500 // ms -// defines the time interval at which the ping time is updated for the server -// list -#define PING_UPDATE_TIME_SERVER_LIST_MS 2000 // ms +// defines the time interval at which the ping time is updated for the server list +#define PING_UPDATE_TIME_SERVER_LIST_MS 2500 // ms // defines the interval between Channel Level updates from the server #define CHANNEL_LEVEL_UPDATE_INTERVAL 200 // number of frames at 64 samples frame size // time-out until a registered server is deleted from the server list if no // new registering was made in minutes -#define SERVLIST_TIME_OUT_MINUTES 60 // minutes +#define SERVLIST_TIME_OUT_MINUTES 33 // minutes (should include 3 UDP registration messages) // poll time for server list (to check if entries are time-out) #define SERVLIST_POLL_TIME_MINUTES 1 // minute @@ -205,7 +206,7 @@ LED bar: lbr #define SERVLIST_REGIST_INTERV_MINUTES 15 // minutes // defines the minimum time a server must run to be a permanent server -#define SERVLIST_TIME_PERMSERV_MINUTES 1440 // minutes, 1440 = 60 min * 24 h +#define SERVLIST_TIME_PERMSERV_MINUTES 4320 // minutes, 4320 = 60 min * 24 h * 3 d // registration response timeout #define REGISTER_SERVER_TIME_OUT_MS 500 // ms diff --git a/src/res/translation/translation_de_DE.qm b/src/res/translation/translation_de_DE.qm index c6f385ed..f7654dd1 100644 Binary files a/src/res/translation/translation_de_DE.qm and b/src/res/translation/translation_de_DE.qm differ diff --git a/src/res/translation/translation_de_DE.ts b/src/res/translation/translation_de_DE.ts index f1b66add..c1327efc 100644 --- a/src/res/translation/translation_de_DE.ts +++ b/src/res/translation/translation_de_DE.ts @@ -177,6 +177,11 @@ 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: + + CChannelFader @@ -1140,58 +1145,76 @@ Hoch - Manual - Manuell + Manuell - + + Custom + + + + + All Genres + + + + + Genre Rock + + + + + Genre Jazz + + + + Default Standard - Default (North America) - Standard (Nordamerika) + Standard (Nordamerika) - + preferred bevorzugt - - + + Size: Größe: - + Buffer Delay Puffergröße - + Buffer Delay: Puffergröße: - + Predefined Address - + The selected audio device could not be used because of the following error: Das ausgewählte Audiogerät kann aus folgendem Grund nicht verwendet werden: - + The previous driver will be selected. Der vorherige Treiber wird wieder ausgewählt. - + Ok @@ -1357,82 +1380,82 @@ CConnectDlg - + Server List Severliste - + The server list shows a list of available servers which are registered at the central server. Select a server from the list and press the connect button to connect to this server. Alternatively, double click a server from the list to connect to it. If a server is occupied, a list of the connected musicians is available by expanding the list item. Permanent servers are shown in bold font. Die Serverliste zeigt eine Liste von verfügbaren Server, die sich am Zentralserver registriert haben. Markiere einen Server von der Liste und drücke den Knopf Verbinden um eine Verbindung zu dem Server aufzubauen. Alternativ kann man auch den Server in der Liste direkt doppelklicken. Wenn ein Server belegt ist, dann wird eine Liste der verbundenen Musikern angezeigt. Server, die länger online sind (permanente Server) werden in Fettschrift dargestellt. - + Note that it may take some time to retrieve the server list from the central server. If no valid central server address is specified in the settings, no server list will be available. Es kann einen Moment dauern, bis die Serverliste vom Zentralserver empfangen wird. Falls keine gültige Zentralserveradresse in den Einstellungen angegeben ist, kann keine Liste angezeigt werden. - + Server list view Serverliste Anzeige - + Server Address Serveradresse - + The IP address or URL of the server running the Die IP-Adresse oder URL des Servers, auf der die - + server software must be set here. An optional port number can be added after the IP address or URL using a colon as a separator, e.g, example.org: Serversoftware läuft wird hier angegeben. Optional kann eine Portnummer angefügt werden. Diese wird hinter der IP-Adresse durch ein Doppelpunkt getrennt angegeben. Beispiel: example.org: - + . A list of the most recent used server IP addresses or URLs is available for selection. Eine Liste der letzten IP-Adressen oder URLs wird gespeichert und kann nachträglich wieder ausgewählt werden. - + Server address edit box Serveradresse Eingabefeld - + Holds the current server IP address or URL. It also stores old URLs in the combo box list. Enthält die aktuelle Server-IP-Adresse oder URL. Es speichert auch alte URLs in der Auswahlliste. - + Filter Filter - + The server list is filtered by the given text. Note that the filter is case insensitive. Die Serverliste kann mit dem eingegebenen Text gefiltert werden, d.h. es werden nur Einträge angezeigt, die dem Filtertext entsprechen. Die Groß- und Kleinschreibung des Filtertexts wird dabei nicht beachtet. - + Filter edit box Filtereingabefeld - + Show All Musicians Zeige alle Musiker - + If you check this check box, the musicians of all servers are shown. If you uncheck the check box, all list view items are collapsed. Ist diese Einstellung angehakt, dann werden alle Musiker auf allen Servern angezeigt. Wird der Haken entfernt, dann werden alle Listeneinträge eingeklappt und die verbundenen Musikernamen werden verborgen. - + Show all musicians check box Zeige alle Musiker Schalter @@ -1446,46 +1469,51 @@ + List + + + + Filter Filter - + Show All Musicians Zeige alle Musiker - + Server Name Servername - + Ping Time Ping-Zeit - + Musicians Musiker - + Location Standort - + Server Name/Address Servername/Adresse - + C&ancel A&bbrechen - + &Connect &Verbinden @@ -1657,7 +1685,7 @@ - + None Kein @@ -1723,172 +1751,172 @@ Was man hier sieht wird auch am Fader im Mixer angezeigt, wenn du mit einem - + Drum Set Schlagzeug - + Djembe Djembe - + Electric Guitar E-Gitarre - + Acoustic Guitar Akustikgitarre - + Bass Guitar E-Bass - + Keyboard Keyboard - + Synthesizer Synthesizer - + Grand Piano Flügel - + Accordion Akkordeon - + Vocal Gesang - + Microphone Mikrofon - + Harmonica Mundharmonika - + Trumpet Trompete - + Trombone Posaune - + French Horn Waldhorn - + Tuba Tuba - + Saxophone Saxophon - + Clarinet Klarinette - + Flute Flöte - + Violin Violine - + Cello Cello - + Double Bass Kontrabass - + Recorder Recorder - + Streamer - + Listener Zuhörer - + Guitar+Vocal Gitarre+Gesang - + Keyboard+Vocal Keyboard+Gesang - + Bodhran - + Bassoon Fagott - + Oboe Oboe - + Harp Harfe - + Viola Viola - + Congas Congas - + Bongo Bongos @@ -2027,7 +2055,7 @@ - + E&xit &Beenden @@ -2054,7 +2082,7 @@ Server - + Predefined Address @@ -2071,52 +2099,52 @@ Standard (Nordamerika) - + Server - + &Window &Fenster - + Unregistered Nicht registriert - + Bad address Ungültige Adresse - + Registration requested Registrierung angefordert - + Registration failed Registrierung fehlgeschlagen - + Check server version Überprüfe Version des Servers - + Registered Registriert - + Central Server full Zentralserver voll - + Unknown value Unbekannter Wert @@ -2371,7 +2399,7 @@ global - + For more information use the What's This help (help menu, right mouse button or Shift+F1) Für weitere Informationen verwende die Kontexthilfe (Hilfe-Menü, rechte Maustaste oder Tastenkombination Shift+F1) diff --git a/src/res/translation/translation_es_ES.qm b/src/res/translation/translation_es_ES.qm index 04a888af..29b8f1da 100644 Binary files a/src/res/translation/translation_es_ES.qm and b/src/res/translation/translation_es_ES.qm differ diff --git a/src/res/translation/translation_es_ES.ts b/src/res/translation/translation_es_ES.ts index 38068bf3..ca6ddcf9 100644 --- a/src/res/translation/translation_es_ES.ts +++ b/src/res/translation/translation_es_ES.ts @@ -181,6 +181,11 @@ 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: + + CChannelFader @@ -1144,58 +1149,76 @@ Alta - Manual - Manual + Manual - + + Custom + + + + + All Genres + + + + + Genre Rock + + + + + Genre Jazz + + + + Default Por defecto - Default (North America) - Por defecto (Norteamérica) + Por defecto (Norteamérica) - + preferred aconsejado - - + + Size: Tamaño: - + Buffer Delay Retardo Buffer - + Buffer Delay: Retardo Buffer: - + Predefined Address - + The selected audio device could not be used because of the following error: El dispositivo de audio seleccionado no puede utilizarse a causa del siguiente error: - + The previous driver will be selected. Se utilizará el driver anterior. - + Ok Ok @@ -1361,32 +1384,32 @@ CConnectDlg - + Server List Lista Servidores - + The server list shows a list of available servers which are registered at the central server. Select a server from the list and press the connect button to connect to this server. Alternatively, double click a server from the list to connect to it. If a server is occupied, a list of the connected musicians is available by expanding the list item. Permanent servers are shown in bold font. La lista de servidores muestra una lista de servidores disponibles que se encuentran registrados en el servidor central. Escoge un servidor de la lista y pulsa el botón de conectar para conectarte a este servidor. También es posible realizar la conexión haciendo doble clic en un servidor de la lista. Si un servidor está ocupado, se puede desplegar una lista de los músicos conectados al pulsar el icono al lado del nombre. Los servidores permanentes se muestran en negrita. - + Note that it may take some time to retrieve the server list from the central server. If no valid central server address is specified in the settings, no server list will be available. Ten en cuenta que puede llevar un tiempo recuperar la lista de servidores del servidor central. Si no se especifica una dirección válida en la configuración, no habrá ninguna lista de servidores disponible. - + Server list view Vista lista de servidores - + Server Address Dirección Servidor - + The IP address or URL of the server running the La dirección IP o URL del servidor ejecutando el software del servidor @@ -1395,52 +1418,52 @@ debe introducirse aquí. Se puede añadir un número de puerto opcional detrás de la dirección IP o URL utilizando dos puntos como separador, por ej. ejemplo.org: - + server software must be set here. An optional port number can be added after the IP address or URL using a colon as a separator, e.g, example.org: debe introducirse aquí. Se puede añadir un número de puerto opcional detrás de la dirección IP o URL utilizando dos puntos como separador, por ej. ejemplo.org: - + . A list of the most recent used server IP addresses or URLs is available for selection. . Hay disponible una lista de las direcciones IP o URLs utilizadas más recientemente para su selección. - + Server address edit box Selección dirección servidor - + Holds the current server IP address or URL. It also stores old URLs in the combo box list. Contiene la dirección IP o URL actual del servidor. También guarda viejas URL en la lista. - + Filter Filtro - + The server list is filtered by the given text. Note that the filter is case insensitive. La lista de servidores se filtra con el texto introducido. El filtro no es sensible a mayúsculas/minúsculas. - + Filter edit box Campo filtro - + Show All Musicians Mostrar Todos los Músicos - + If you check this check box, the musicians of all servers are shown. If you uncheck the check box, all list view items are collapsed. Si activas esta opción, se mostrarán los músicos de todos los servidores. Si lo desactivas, se colapsan todas las listas. - + Show all musicians check box Selección Mostrar todos los músicos @@ -1454,46 +1477,51 @@ + List + + + + Filter Filtro - + Show All Musicians Mostrar Todos los Músicos - + Server Name Nombre Servidor - + Ping Time Tiempo Ping - + Musicians Músicos - + Location Ubicación - + Server Name/Address Nombre/Dirección Servidor - + C&ancel C&ancelar - + &Connect &Conectar @@ -1665,7 +1693,7 @@ - + None Ninguno @@ -1731,172 +1759,172 @@ Lo que introduzcas aquí aparecerá en tu fader del mezclador cuando te conectes a un servidor - + Drum Set Batería - + Djembe Djembé - + Electric Guitar Guitarra Eléctrica - + Acoustic Guitar Guitarra Acústica - + Bass Guitar Bajo Eléctrico - + Keyboard Teclado - + Synthesizer Sintetizador - + Grand Piano Piano de Cola - + Accordion Acordeón - + Vocal Voz - + Microphone Micrófono - + Harmonica Armónica - + Trumpet Trompeta - + Trombone Trombón - + French Horn Trompa - + Tuba Tuba - + Saxophone Saxofón - + Clarinet Clarinete - + Flute Flauta - + Violin Violín - + Cello Violonchelo - + Double Bass Contrabajo - + Recorder Grabadora - + Streamer Streamer - + Listener Oyente - + Guitar+Vocal Guitarra+Voz - + Keyboard+Vocal Teclado+Voz - + Bodhran Bodhran - + Bassoon Fagot - + Oboe Oboe - + Harp Arpa - + Viola Viola - + Congas Congas - + Bongo Bongo @@ -2035,7 +2063,7 @@ - + E&xit S&alir @@ -2062,7 +2090,7 @@ - + Predefined Address @@ -2079,52 +2107,52 @@ Por defecto (Norteamérica) - + Server : Servidor - + &Window &Ventana - + Unregistered Sin registrar - + Bad address Dirección no válida - + Registration requested Registro solicitado - + Registration failed Error de registro - + Check server version Comprueba la versión del servidor - + Registered Registrado - + Central Server full Servidor Central lleno - + Unknown value Valor desconocido @@ -2379,7 +2407,7 @@ global - + For more information use the What's This help (help menu, right mouse button or Shift+F1) Para más información utiliza ¿Qué es Esto? (menú de ayuda, botón derecho del ratón o Shift+F1) diff --git a/src/res/translation/translation_fr_FR.qm b/src/res/translation/translation_fr_FR.qm index dbb9c0db..37aab986 100644 Binary files a/src/res/translation/translation_fr_FR.qm and b/src/res/translation/translation_fr_FR.qm differ diff --git a/src/res/translation/translation_fr_FR.ts b/src/res/translation/translation_fr_FR.ts index deae3f8d..2b615c79 100644 --- a/src/res/translation/translation_fr_FR.ts +++ b/src/res/translation/translation_fr_FR.ts @@ -189,6 +189,11 @@ 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: + + CChannelFader @@ -1152,58 +1157,76 @@ Haute - Manual - Manuel + Manuel - + + Custom + + + + + All Genres + + + + + Genre Rock + + + + + Genre Jazz + + + + Default Défaut - Default (North America) - Défault (Amérique du Nord) + Défault (Amérique du Nord) - + preferred préféré - - + + Size: Taille : - + Buffer Delay Délai de temporisation - + Buffer Delay: Délai de temporisation : - + Predefined Address Adresse prédéfinie - + The selected audio device could not be used because of the following error: Le périphérique audio sélectionné n'a pas pu être utilisé en raison de l'erreur suivante : - + The previous driver will be selected. Le pilote précédent sera sélectionné. - + Ok Ok @@ -1369,82 +1392,82 @@ CConnectDlg - + Server List Liste de serveurs - + The server list shows a list of available servers which are registered at the central server. Select a server from the list and press the connect button to connect to this server. Alternatively, double click a server from the list to connect to it. If a server is occupied, a list of the connected musicians is available by expanding the list item. Permanent servers are shown in bold font. La liste de serveurs affiche une liste des serveurs disponibles qui sont inscrits sur le serveur central. Sélectionnez un serveur dans la liste et appuyez sur le bouton de connexion pour vous connecter à ce serveur. Vous pouvez également double-cliquer sur un serveur de la liste pour vous y connecter. Si un serveur est occupé, une liste des musiciens connectés est disponible en développant l'élément de la liste. Les serveurs permanents sont indiqués en caractères gras. - + Note that it may take some time to retrieve the server list from the central server. If no valid central server address is specified in the settings, no server list will be available. Notez que ça peut prendre un certain temps pour récupérer la liste des serveurs depuis le serveur central. Si aucune adresse de serveur central valide n'est spécifiée dans les paramètres, aucune liste de serveurs ne sera disponible. - + Server list view Vue de la liste de serveurs - + Server Address Adresse du serveur - + The IP address or URL of the server running the L'adresse IP ou l'URL du serveur qui exécute le logiciel serveur - + server software must be set here. An optional port number can be added after the IP address or URL using a colon as a separator, e.g, example.org: doit être paramétré ici. Un numéro optionnel de port peut être ajouté après l'adresse IP ou l'URL en utilisant deux points en tant que séparateur, par exemple, exemple.org : - + . A list of the most recent used server IP addresses or URLs is available for selection. . Une liste des adresses IP ou URL de serveur les plus récentes est disponible pour la sélection. - + Server address edit box Dialogue d'édition d'addresse de serveur - + Holds the current server IP address or URL. It also stores old URLs in the combo box list. - + Filter Filtre - + The server list is filtered by the given text. Note that the filter is case insensitive. La liste des serveurs est filtrée par le texte donné. Notez que le filtre n'est pas sensible à la casse. - + Filter edit box Dialogue d'édition de filtre - + Show All Musicians Afficher tous les musiciens - + If you check this check box, the musicians of all servers are shown. If you uncheck the check box, all list view items are collapsed. Si vous cochez cette case, les musiciens de tous les serveurs sont affichés. Si vous décochez la case, tous les éléments de la vue en liste sont regroupés. - + Show all musicians check box Case-à-cocher pour afficher tous les musiciens @@ -1458,46 +1481,51 @@ + List + + + + Filter Filtre - + Show All Musicians Afficher tous les musiciens - + Server Name Nom du serveur - + Ping Time Temps de réponse - + Musicians Musiciens - + Location Localisation - + Server Name/Address Nom du serveur / adresse - + C&ancel &Annuler - + &Connect Se &connecter @@ -1669,7 +1697,7 @@ - + None Aucune @@ -1735,172 +1763,172 @@ Ce que vous réglez ici apparaîtra au niveau de votre fader sur la table de mixage lorsque vous serez connecté à un serveur - + Drum Set Batterie - + Djembe Djembé - + Electric Guitar Guitare électrique - + Acoustic Guitar Guitare accoustique - + Bass Guitar Guitare basse - + Keyboard Clavier - + Synthesizer Synthétiseur - + Grand Piano Piano à queue - + Accordion Accordéon - + Vocal Voix - + Microphone Microphone - + Harmonica Harmonica - + Trumpet Trompette - + Trombone Trombone - + French Horn Cor d'harmonie - + Tuba Tuba - + Saxophone Saxophone - + Clarinet Clarinette - + Flute Flute - + Violin Violon - + Cello Violoncelle - + Double Bass Contrebasse - + Recorder Enregistreur - + Streamer Diffuseur - + Listener Auditeur - + Guitar+Vocal Guitare+voix - + Keyboard+Vocal Clavier+voix - + Bodhran Bodhran - + Bassoon Basson - + Oboe Hautbois - + Harp Harpe - + Viola Alto - + Congas Congas - + Bongo Bongo @@ -2039,7 +2067,7 @@ - + E&xit &Quitter @@ -2066,7 +2094,7 @@ serveur - + Predefined Address Adresse prédéfinie @@ -2083,52 +2111,52 @@ Défaut (Amérique du nord) - + Server serveur - + &Window &Fenêtre - + Unregistered Non inscrit - + Bad address Mauvaise adresse - + Registration requested Inscription demandée - + Registration failed Échec de l'inscription - + Check server version Vérifier la version du serveur - + Registered Inscrit - + Central Server full Serveur central rempli - + Unknown value Valeur inconnue @@ -2319,7 +2347,7 @@ The - + Le logiciel @@ -2383,7 +2411,7 @@ global - + For more information use the What's This help (help menu, right mouse button or Shift+F1) Pour plus d'informations, utilisez l'aide Qu'est-ce que c'est (menu d'aide, bouton droit de la souris ou Maj+F1) diff --git a/src/res/translation/translation_nl_NL.qm b/src/res/translation/translation_nl_NL.qm index 76089100..017e4065 100644 Binary files a/src/res/translation/translation_nl_NL.qm and b/src/res/translation/translation_nl_NL.qm differ diff --git a/src/res/translation/translation_nl_NL.ts b/src/res/translation/translation_nl_NL.ts index b2dd4bf5..1f2be105 100644 --- a/src/res/translation/translation_nl_NL.ts +++ b/src/res/translation/translation_nl_NL.ts @@ -177,6 +177,11 @@ 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: + + CChannelFader @@ -1140,58 +1145,76 @@ Hoog - Manual - Handmatig + Handmatig - + + Custom + + + + + All Genres + + + + + Genre Rock + + + + + Genre Jazz + + + + Default Standaard - Default (North America) - Standaard (Noord-Amerika) + Standaard (Noord-Amerika) - + preferred gewenst - - + + Size: Size: - + Buffer Delay Buffervertraging - + Buffer Delay: Buffervertraging: - + Predefined Address - + The selected audio device could not be used because of the following error: Het geselecteerde audioapparaat kon niet worden gebruikt vanwege de volgende fout: - + The previous driver will be selected. Het vorige stuurprogramma wordt geselecteerd. - + Ok Ok @@ -1357,82 +1380,82 @@ CConnectDlg - + Server List Serverlijst - + The server list shows a list of available servers which are registered at the central server. Select a server from the list and press the connect button to connect to this server. Alternatively, double click a server from the list to connect to it. If a server is occupied, a list of the connected musicians is available by expanding the list item. Permanent servers are shown in bold font. De serverlijst toont een lijst van beschikbare servers die op de centrale server zijn geregistreerd. Selecteer een server uit de lijst en druk op de verbindingsknop om verbinding te maken met deze server. U kunt ook dubbelklikken op een server uit de lijst om verbinding te maken met deze server. Als een server bezet is, is een lijst van de verbonden muzikanten beschikbaar door het lijstitem uit te breiden. Permanente servers worden vetgedrukt weergegeven. - + Note that it may take some time to retrieve the server list from the central server. If no valid central server address is specified in the settings, no server list will be available. Merk op dat het enige tijd kan duren om de serverlijst op te halen van de centrale server. Als er geen geldig centraal serveradres is opgegeven in de instellingen, zal er geen serverlijst beschikbaar zijn. - + Server list view Serverlijstweergave - + Server Address Serveradres - + The IP address or URL of the server running the Het IP-adres of de URL van de server waarop de - + server software must be set here. An optional port number can be added after the IP address or URL using a colon as a separator, e.g, example.org: serversoftware moet worden ingesteld. Een optioneel poortnummer kan worden toegevoegd na het IP-adres of de URL met een dubbele punt als scheidingsteken, bijvoorbeeld example.org: - + . A list of the most recent used server IP addresses or URLs is available for selection. . Een lijst met de meest recent gebruikte server-IP-adressen of URL's is beschikbaar voor selectie. - + Server address edit box Serveradres bewerkingsvak - + Holds the current server IP address or URL. It also stores old URLs in the combo box list. Bevat het huidige server-IP-adres of de URL. Het slaat ook oude URL's op in de comboboxlijst. - + Filter Filter - + The server list is filtered by the given text. Note that the filter is case insensitive. De serverlijst wordt gefilterd met de gegeven tekst. Merk op dat het filter ongevoelig is voor hoofdletters. - + Filter edit box Filter bewerkingsvak - + Show All Musicians Toon alle muzikanten - + If you check this check box, the musicians of all servers are shown. If you uncheck the check box, all list view items are collapsed. Als u dit selectievakje aanvinkt, worden de muzikanten van alle servers getoond. Als u het selectievakje uitvinkt, worden alle items van de lijstweergave samengevouwen. - + Show all musicians check box Toon alle muzikanten checkbox @@ -1446,46 +1469,51 @@ + List + + + + Filter Filter - + Show All Musicians Toon alle muzikanten - + Server Name Servernaam - + Ping Time Ping-tijd - + Musicians Muzikanten - + Location Locatie - + Server Name/Address Servernaam/Adres - + C&ancel Annuleren - + &Connect Verbinden @@ -1663,7 +1691,7 @@ - + None Geen @@ -1723,172 +1751,172 @@ Combo-box voor vaardigheidsniveau - + Drum Set Drumstel - + Djembe Djembe - + Electric Guitar Elektrische Gitaar - + Acoustic Guitar Akoestische Gitaar - + Bass Guitar Basgitaar - + Keyboard Toetsenbord - + Synthesizer Synthesizer - + Grand Piano Piano - + Accordion Accordeon - + Vocal Vocaal - + Microphone Microfoon - + Harmonica Harmonica - + Trumpet Trompet - + Trombone Trombone - + French Horn Hoorn - + Tuba Tuba - + Saxophone Saxofoon - + Clarinet Klarinet - + Flute Fluit - + Violin Viool - + Cello Cello - + Double Bass Contrabas - + Recorder Opnemer - + Streamer Streamer - + Listener Luisteraar - + Guitar+Vocal Gitaar+Vocaal - + Keyboard+Vocal Toetsenbord+Vocaal - + Bodhran Bodhran - + Bassoon Fagot - + Oboe Hobo - + Harp Harp - + Viola Viola - + Congas Congas - + Bongo Bongo @@ -2027,7 +2055,7 @@ - + E&xit &Sluiten @@ -2054,7 +2082,7 @@ server - + Predefined Address @@ -2071,52 +2099,52 @@ Standaard (Noord-Amerika) - + Server Server - + &Window &Window - + Unregistered Niet geregistreerd - + Bad address Slecht adres - + Registration requested Aanmelding gevraagd - + Registration failed Registratie is mislukt - + Check server version Controleer de versie van de server - + Registered Geregistreerd - + Central Server full Centrale server vol - + Unknown value Onbekende waarde @@ -2371,7 +2399,7 @@ global - + For more information use the What's This help (help menu, right mouse button or Shift+F1) Voor meer informatie gebruik de Wat Is Dit hulp (helpmenu, rechtermuisklik of Shift+F1) diff --git a/src/res/translation/translation_pt_PT.qm b/src/res/translation/translation_pt_PT.qm index 5c2ebc81..b78316a6 100644 Binary files a/src/res/translation/translation_pt_PT.qm and b/src/res/translation/translation_pt_PT.qm differ diff --git a/src/res/translation/translation_pt_PT.ts b/src/res/translation/translation_pt_PT.ts index e58b3548..7e0ad142 100644 --- a/src/res/translation/translation_pt_PT.ts +++ b/src/res/translation/translation_pt_PT.ts @@ -189,6 +189,11 @@ 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: + + CChannelFader @@ -1152,58 +1157,76 @@ Alta - Manual - Manual + Manual - + + Custom + + + + + All Genres + + + + + Genre Rock + + + + + Genre Jazz + + + + Default Servidor Padrão - Default (North America) - Servidor Padrão (America do Norte) + Servidor Padrão (America do Norte) - + preferred preferido - - + + Size: Tamanho: - + Buffer Delay Atraso do buffer - + Buffer Delay: Atraso do buffer: - + Predefined Address - + The selected audio device could not be used because of the following error: O dispositivo de áudio selecionado não pôde ser usado devido ao seguinte erro: - + The previous driver will be selected. O driver anterior será selecionado. - + Ok Ok @@ -1369,82 +1392,82 @@ CConnectDlg - + Server List Lista de servidores - + The server list shows a list of available servers which are registered at the central server. Select a server from the list and press the connect button to connect to this server. Alternatively, double click a server from the list to connect to it. If a server is occupied, a list of the connected musicians is available by expanding the list item. Permanent servers are shown in bold font. A lista de servidores mostra a os servidores disponíveis registados no servidor central. Selecione um servidor da lista e pressione o botão Ligar para se ligar a este servidor. Como alternativa, clique duas vezes num servidor da lista para se ligar ao mesmo. Se um servidor estiver ocupado, uma lista dos músicos ligados estará disponível expandindo o item da lista. Os servidores permanentes são mostrados em negrito. - + Note that it may take some time to retrieve the server list from the central server. If no valid central server address is specified in the settings, no server list will be available. Observe que pode demorar algum tempo para obter a lista de servidores do servidor central. Se nenhum endereço de servidor central válido for especificado nas definições, nenhuma lista de servidores estará disponível. - + Server list view Vista da lista de servidores - + Server Address Endereço do servidor - + The IP address or URL of the server running the O endereço IP ou URL do servidor executando o servidor - + server software must be set here. An optional port number can be added after the IP address or URL using a colon as a separator, e.g, example.org: deve ser definido aqui. Um número de porta opcional pode ser adicionado após o endereço IP ou URL usando o caractere dois pontos como separador, por exemplo, example.org: - + . A list of the most recent used server IP addresses or URLs is available for selection. . Uma lista dos endereços IP ou URLs dos servidores usados recentemente está disponível para seleção. - + Server address edit box Caixa de edição do endereço do servidor - + Holds the current server IP address or URL. It also stores old URLs in the combo box list. Contém o endereço IP ou URL do servidor atual. Também armazena URLs antigos na lista do seletor. - + Filter Filtro - + The server list is filtered by the given text. Note that the filter is case insensitive. A lista de servidores é filtrada pelo texto fornecido. Note que o filtro não diferencia maiúsculas de minúsculas. - + Filter edit box Caixa de edição do filtro - + Show All Musicians Mostrar Todos os Músicos - + If you check this check box, the musicians of all servers are shown. If you uncheck the check box, all list view items are collapsed. Se marcar esta caixa de seleção, os músicos de todos os servidores serão mostrados. Se desmarcar a caixa de seleção, todos os itens em exibição na lista serão recolhidos. - + Show all musicians check box Caixa de seleção para mostrar músicos @@ -1458,46 +1481,51 @@ + List + + + + Filter Filtro - + Show All Musicians Mostrar Todos os Músicos - + Server Name Nome do Servidor - + Ping Time Latência - + Musicians Músicos - + Location Localização - + Server Name/Address Nome/Endereço do Servidor - + C&ancel &Cancelar - + &Connect &Ligar @@ -1669,7 +1697,7 @@ - + None Nenhum @@ -1735,172 +1763,172 @@ O que definir aqui aparecerá por baixo do seu fader na secção de mistura quando estiver ligado a um servidor - + Drum Set Bateria - + Djembe Djembe - + Electric Guitar Guitarra Elétrica - + Acoustic Guitar Guitarra Acústica - + Bass Guitar Baixo - + Keyboard Teclado - + Synthesizer Sintetizador - + Grand Piano Piano de Cauda - + Accordion Acordeão - + Vocal Voz - + Microphone Microfone - + Harmonica Harmónica - + Trumpet Trompete - + Trombone Trombone - + French Horn Trompa Francesa - + Tuba Tuba - + Saxophone Saxofone - + Clarinet Clarinete - + Flute Flauta - + Violin Violino - + Cello Violoncelo - + Double Bass Contrabaixo - + Recorder Gravador - + Streamer Streamer - + Listener Ouvinte - + Guitar+Vocal Guitarra+Voz - + Keyboard+Vocal Teclado+Voz - + Bodhran Bodhrán - + Bassoon Fagote - + Oboe Oboé - + Harp Harpa - + Viola Viola de Arco - + Congas Congas - + Bongo Bongo @@ -2039,7 +2067,7 @@ - + E&xit &Sair @@ -2066,7 +2094,7 @@ - + Predefined Address @@ -2083,52 +2111,52 @@ Servidor Padrão (America do Norte) - + Server - Servidor - + &Window &Janela - + Unregistered Não Registado - + Bad address Endereço incorrecto - + Registration requested Registo solicitado - + Registration failed Falha no registo - + Check server version Verifique versão do servidor - + Registered Registado - + Central Server full Servidor Central Cheio - + Unknown value Valor desconhecido @@ -2383,7 +2411,7 @@ global - + For more information use the What's This help (help menu, right mouse button or Shift+F1) Para mais informações, use O que é isto (menu Ajuda, botão direito do rato ou Shift + F1) diff --git a/src/serverdlg.cpp b/src/serverdlg.cpp index d2129481..3598aa23 100755 --- a/src/serverdlg.cpp +++ b/src/serverdlg.cpp @@ -188,9 +188,11 @@ lvwClients->setMinimumHeight ( 140 ); // central server address type combo box cbxCentServAddrType->clear(); - cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_MANUAL ) ); + cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_CUSTOM ) ); cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_DEFAULT ) ); cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENERAL_NORTHAMERICA ) ); + cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENRE_ROCK ) ); + cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENRE_JAZZ ) ); cbxCentServAddrType->setCurrentIndex ( static_cast ( pServer->GetCentralServerAddressType() ) ); // update server name line edit @@ -506,7 +508,7 @@ void CServerDlg::UpdateGUIDependencies() // get the states which define the GUI dependencies from the server const bool bCurSerListEnabled = pServer->GetServerListEnabled(); - const bool bCurUseDefCentServAddr = ( pServer->GetCentralServerAddressType() != AT_MANUAL ); + const bool bCurUseDefCentServAddr = ( pServer->GetCentralServerAddressType() != AT_CUSTOM ); const ESvrRegStatus eSvrRegStatus = pServer->GetSvrRegStatus(); diff --git a/src/serverlist.cpp b/src/serverlist.cpp index dc79c603..8e0a0f17 100755 --- a/src/serverlist.cpp +++ b/src/serverlist.cpp @@ -33,7 +33,7 @@ CServerListManager::CServerListManager ( const quint16 iNPortNum, CProtocol* pNConLProt ) : tsConsoleStream ( *( ( new ConsoleWriterFactory() )->get() ) ), iNumPredefinedServers ( 0 ), - eCentralServerAddressType ( AT_MANUAL ), // must be AT_MANUAL for the "no GUI" case + eCentralServerAddressType ( AT_CUSTOM ), // must be AT_CUSTOM for the "no GUI" case bCentServPingServerInList ( bNCentServPingServerInList ), pConnLessProtocol ( pNConLProt ), eSvrRegStatus ( SRS_UNREGISTERED ), @@ -206,7 +206,7 @@ void CServerListManager::SetCentralServerAddress ( const QString sNCentServAddr ( ( !strCentralServerAddress.toLower().compare ( "localhost" ) || !strCentralServerAddress.compare ( "127.0.0.1" ) ) && - ( eCentralServerAddressType == AT_MANUAL ) + ( eCentralServerAddressType == AT_CUSTOM ) ); bEnabled = true; diff --git a/src/settings.cpp b/src/settings.cpp index 23d65e3a..d26c4fcc 100755 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -288,7 +288,7 @@ void CSettings::Load() // central server address type if ( GetNumericIniSet ( IniXMLDocument, "client", "centservaddrtype", - 0, 2 /* AT_GENERAL_NORTHAMERICA */, iValue ) ) + 0, 4 /* AT_GENRE_JAZZ */, iValue ) ) { pClient->SetCentralServerAddressType ( static_cast ( iValue ) ); } @@ -304,7 +304,7 @@ if ( GetFlagIniSet ( IniXMLDocument, "client", "defcentservaddr", bValue ) ) // only the case that manual was set in old ini must be considered if ( !bValue ) { - pClient->SetCentralServerAddressType ( AT_MANUAL ); + pClient->SetCentralServerAddressType ( AT_CUSTOM ); } } @@ -359,7 +359,7 @@ if ( GetFlagIniSet ( IniXMLDocument, "client", "defcentservaddr", bValue ) ) // central server address type (note that it is important // to set this setting prior to the "central server address") if ( GetNumericIniSet ( IniXMLDocument, "server", "centservaddrtype", - 0, 2 /* AT_GENERAL_NORTHAMERICA */, iValue ) ) + 0, 4 /* AT_GENRE_JAZZ */, iValue ) ) { pServer->SetCentralServerAddressType ( static_cast ( iValue ) ); } @@ -375,7 +375,7 @@ if ( GetFlagIniSet ( IniXMLDocument, "server", "defcentservaddr", bValue ) ) // only the case that manual was set in old ini must be considered if ( !bValue ) { - pServer->SetCentralServerAddressType ( AT_MANUAL ); + pServer->SetCentralServerAddressType ( AT_CUSTOM ); } } diff --git a/src/util.cpp b/src/util.cpp index 825919a6..abccb739 100755 --- a/src/util.cpp +++ b/src/util.cpp @@ -950,8 +950,10 @@ QString NetworkUtil::GetCentralServerAddress ( const ECSAddType eCentralServerAd { switch ( eCentralServerAddressType ) { - case AT_MANUAL: return strCentralServerAddress; + case AT_CUSTOM: return strCentralServerAddress; case AT_GENERAL_NORTHAMERICA: return CENTSERV_GENERAL_NORTHAMERICA; + case AT_GENRE_ROCK: return CENTSERV_GENRE_ROCK; + case AT_GENRE_JAZZ: return CENTSERV_GENRE_JAZZ; default: return DEFAULT_SERVER_ADDRESS; // AT_DEFAULT } } diff --git a/src/util.h b/src/util.h index 09840f7e..8d5d8c6f 100755 --- a/src/util.h +++ b/src/util.h @@ -566,20 +566,28 @@ enum ELicenceType enum ECSAddType { // used for settings -> enum values must be fixed! - AT_MANUAL = 0, + AT_CUSTOM = 0, AT_DEFAULT = 1, - AT_GENERAL_NORTHAMERICA = 2 + AT_GENERAL_NORTHAMERICA = 2, + AT_GENRE_ROCK = 3, + AT_GENRE_JAZZ = 4 }; inline QString csCentServAddrTypeToString ( ECSAddType eAddrType ) { switch ( eAddrType ) { - case AT_MANUAL: - return QCoreApplication::translate ( "CClientSettingsDlg", "Manual" ); + case AT_CUSTOM: + return QCoreApplication::translate ( "CClientSettingsDlg", "Custom" ); case AT_GENERAL_NORTHAMERICA: - return QCoreApplication::translate ( "CClientSettingsDlg", "Default (North America)" ); + return QCoreApplication::translate ( "CClientSettingsDlg", "All Genres" ); + + case AT_GENRE_ROCK: + return QCoreApplication::translate ( "CClientSettingsDlg", "Genre Rock" ); + + case AT_GENRE_JAZZ: + return QCoreApplication::translate ( "CClientSettingsDlg", "Genre Jazz" ); default: // AT_DEFAULT return QCoreApplication::translate ( "CClientSettingsDlg", "Default" );