diff --git a/Jamulus.pro b/Jamulus.pro index f2b6a6be..c86cb438 100755 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -148,119 +148,118 @@ win32 { ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android OTHER_FILES += android/AndroidManifest.xml -# if compiling for android you need to use Oboe library which is included as a git submodule -# make sure you git pull with submodules to pull the latest Oboe library -OBOE_SOURCES = libs/oboe/src/aaudio/AAudioLoader.cpp \ - libs/oboe/src/aaudio/AudioStreamAAudio.cpp \ - libs/oboe/src/common/AudioSourceCaller.cpp \ - libs/oboe/src/common/AudioStream.cpp \ - libs/oboe/src/common/AudioStreamBuilder.cpp \ - libs/oboe/src/common/DataConversionFlowGraph.cpp \ - libs/oboe/src/common/FilterAudioStream.cpp \ - libs/oboe/src/common/FixedBlockAdapter.cpp \ - libs/oboe/src/common/FixedBlockReader.cpp \ - libs/oboe/src/common/FixedBlockWriter.cpp \ - libs/oboe/src/common/LatencyTuner.cpp \ - libs/oboe/src/common/QuirksManager.cpp \ - libs/oboe/src/common/SourceFloatCaller.cpp \ - libs/oboe/src/common/SourceI16Caller.cpp \ - libs/oboe/src/common/StabilizedCallback.cpp \ - libs/oboe/src/common/Trace.cpp \ - libs/oboe/src/common/Utilities.cpp \ - libs/oboe/src/common/Version.cpp \ - libs/oboe/src/fifo/FifoBuffer.cpp \ - libs/oboe/src/fifo/FifoController.cpp \ - libs/oboe/src/fifo/FifoControllerBase.cpp \ - libs/oboe/src/fifo/FifoControllerIndirect.cpp \ - libs/oboe/src/flowgraph/ClipToRange.cpp \ - libs/oboe/src/flowgraph/FlowGraphNode.cpp \ - libs/oboe/src/flowgraph/ManyToMultiConverter.cpp \ - libs/oboe/src/flowgraph/MonoToMultiConverter.cpp \ - libs/oboe/src/flowgraph/RampLinear.cpp \ - libs/oboe/src/flowgraph/SampleRateConverter.cpp \ - libs/oboe/src/flowgraph/SinkFloat.cpp \ - libs/oboe/src/flowgraph/SinkI16.cpp \ - libs/oboe/src/flowgraph/SinkI24.cpp \ - libs/oboe/src/flowgraph/SourceFloat.cpp \ - libs/oboe/src/flowgraph/SourceI16.cpp \ - libs/oboe/src/flowgraph/SourceI24.cpp \ - libs/oboe/src/flowgraph/resampler/IntegerRatio.cpp \ - libs/oboe/src/flowgraph/resampler/LinearResampler.cpp \ - libs/oboe/src/flowgraph/resampler/MultiChannelResampler.cpp \ - libs/oboe/src/flowgraph/resampler/PolyphaseResampler.cpp \ - libs/oboe/src/flowgraph/resampler/PolyphaseResamplerMono.cpp \ - libs/oboe/src/flowgraph/resampler/PolyphaseResamplerStereo.cpp \ - libs/oboe/src/flowgraph/resampler/SincResampler.cpp \ - libs/oboe/src/flowgraph/resampler/SincResamplerStereo.cpp \ - libs/oboe/src/opensles/AudioInputStreamOpenSLES.cpp \ - libs/oboe/src/opensles/AudioOutputStreamOpenSLES.cpp \ - libs/oboe/src/opensles/AudioStreamBuffered.cpp \ - libs/oboe/src/opensles/AudioStreamOpenSLES.cpp \ - libs/oboe/src/opensles/EngineOpenSLES.cpp \ - libs/oboe/src/opensles/OpenSLESUtilities.cpp \ - libs/oboe/src/opensles/OutputMixerOpenSLES.cpp + # if compiling for android you need to use Oboe library which is included as a git submodule + # make sure you git pull with submodules to pull the latest Oboe library + OBOE_SOURCES = libs/oboe/src/aaudio/AAudioLoader.cpp \ + libs/oboe/src/aaudio/AudioStreamAAudio.cpp \ + libs/oboe/src/common/AudioSourceCaller.cpp \ + libs/oboe/src/common/AudioStream.cpp \ + libs/oboe/src/common/AudioStreamBuilder.cpp \ + libs/oboe/src/common/DataConversionFlowGraph.cpp \ + libs/oboe/src/common/FilterAudioStream.cpp \ + libs/oboe/src/common/FixedBlockAdapter.cpp \ + libs/oboe/src/common/FixedBlockReader.cpp \ + libs/oboe/src/common/FixedBlockWriter.cpp \ + libs/oboe/src/common/LatencyTuner.cpp \ + libs/oboe/src/common/QuirksManager.cpp \ + libs/oboe/src/common/SourceFloatCaller.cpp \ + libs/oboe/src/common/SourceI16Caller.cpp \ + libs/oboe/src/common/StabilizedCallback.cpp \ + libs/oboe/src/common/Trace.cpp \ + libs/oboe/src/common/Utilities.cpp \ + libs/oboe/src/common/Version.cpp \ + libs/oboe/src/fifo/FifoBuffer.cpp \ + libs/oboe/src/fifo/FifoController.cpp \ + libs/oboe/src/fifo/FifoControllerBase.cpp \ + libs/oboe/src/fifo/FifoControllerIndirect.cpp \ + libs/oboe/src/flowgraph/ClipToRange.cpp \ + libs/oboe/src/flowgraph/FlowGraphNode.cpp \ + libs/oboe/src/flowgraph/ManyToMultiConverter.cpp \ + libs/oboe/src/flowgraph/MonoToMultiConverter.cpp \ + libs/oboe/src/flowgraph/RampLinear.cpp \ + libs/oboe/src/flowgraph/SampleRateConverter.cpp \ + libs/oboe/src/flowgraph/SinkFloat.cpp \ + libs/oboe/src/flowgraph/SinkI16.cpp \ + libs/oboe/src/flowgraph/SinkI24.cpp \ + libs/oboe/src/flowgraph/SourceFloat.cpp \ + libs/oboe/src/flowgraph/SourceI16.cpp \ + libs/oboe/src/flowgraph/SourceI24.cpp \ + libs/oboe/src/flowgraph/resampler/IntegerRatio.cpp \ + libs/oboe/src/flowgraph/resampler/LinearResampler.cpp \ + libs/oboe/src/flowgraph/resampler/MultiChannelResampler.cpp \ + libs/oboe/src/flowgraph/resampler/PolyphaseResampler.cpp \ + libs/oboe/src/flowgraph/resampler/PolyphaseResamplerMono.cpp \ + libs/oboe/src/flowgraph/resampler/PolyphaseResamplerStereo.cpp \ + libs/oboe/src/flowgraph/resampler/SincResampler.cpp \ + libs/oboe/src/flowgraph/resampler/SincResamplerStereo.cpp \ + libs/oboe/src/opensles/AudioInputStreamOpenSLES.cpp \ + libs/oboe/src/opensles/AudioOutputStreamOpenSLES.cpp \ + libs/oboe/src/opensles/AudioStreamBuffered.cpp \ + libs/oboe/src/opensles/AudioStreamOpenSLES.cpp \ + libs/oboe/src/opensles/EngineOpenSLES.cpp \ + libs/oboe/src/opensles/OpenSLESUtilities.cpp \ + libs/oboe/src/opensles/OutputMixerOpenSLES.cpp -OBOE_HEADERS = libs/oboe/src/aaudio/AAudioLoader.h \ - libs/oboe/src/aaudio/AudioStreamAAudio.h \ - libs/oboe/src/common/AudioClock.h \ - libs/oboe/src/common/AudioSourceCaller.h \ - libs/oboe/src/common/DataConversionFlowGraph.h \ - libs/oboe/src/common/FilterAudioStream.h \ - libs/oboe/src/common/FixedBlockAdapter.h \ - libs/oboe/src/common/FixedBlockReader.h \ - libs/oboe/src/common/FixedBlockWriter.h \ - libs/oboe/src/common/MonotonicCounter.h \ - libs/oboe/src/common/OboeDebug.h \ - libs/oboe/src/common/QuirksManager.h \ - libs/oboe/src/common/SourceFloatCaller.h \ - libs/oboe/src/common/SourceI16Caller.h \ - libs/oboe/src/common/Trace.h \ - libs/oboe/src/fifo/FifoBuffer.h \ - libs/oboe/src/fifo/FifoController.h \ - libs/oboe/src/fifo/FifoControllerBase.h \ - libs/oboe/src/fifo/FifoControllerIndirect.h \ - libs/oboe/src/flowgraph/ClipToRange.h \ - libs/oboe/src/flowgraph/FlowGraphNode.h \ - libs/oboe/src/flowgraph/ManyToMultiConverter.h \ - libs/oboe/src/flowgraph/MonoToMultiConverter.h \ - libs/oboe/src/flowgraph/RampLinear.h \ - libs/oboe/src/flowgraph/SampleRateConverter.h \ - libs/oboe/src/flowgraph/SinkFloat.h \ - libs/oboe/src/flowgraph/SinkI16.h \ - libs/oboe/src/flowgraph/SinkI24.h \ - libs/oboe/src/flowgraph/SourceFloat.h \ - libs/oboe/src/flowgraph/SourceI16.h \ - libs/oboe/src/flowgraph/SourceI24.h \ - libs/oboe/src/flowgraph/resampler/HyperbolicCosineWindow.h \ - libs/oboe/src/flowgraph/resampler/IntegerRatio.h \ - libs/oboe/src/flowgraph/resampler/LinearResampler.h \ - libs/oboe/src/flowgraph/resampler/MultiChannelResampler.h \ - libs/oboe/src/flowgraph/resampler/PolyphaseResampler.h \ - libs/oboe/src/flowgraph/resampler/PolyphaseResamplerMono.h \ - libs/oboe/src/flowgraph/resampler/PolyphaseResamplerStereo.h \ - libs/oboe/src/flowgraph/resampler/SincResampler.h \ - libs/oboe/src/flowgraph/resampler/SincResamplerStereo.h \ - libs/oboe/src/opensles/AudioInputStreamOpenSLES.h \ - libs/oboe/src/opensles/AudioOutputStreamOpenSLES.h \ - libs/oboe/src/opensles/AudioStreamBuffered.h \ - libs/oboe/src/opensles/AudioStreamOpenSLES.h \ - libs/oboe/src/opensles/EngineOpenSLES.h \ - libs/oboe/src/opensles/OpenSLESUtilities.h \ - libs/oboe/src/opensles/OutputMixerOpenSLES.h + OBOE_HEADERS = libs/oboe/src/aaudio/AAudioLoader.h \ + libs/oboe/src/aaudio/AudioStreamAAudio.h \ + libs/oboe/src/common/AudioClock.h \ + libs/oboe/src/common/AudioSourceCaller.h \ + libs/oboe/src/common/DataConversionFlowGraph.h \ + libs/oboe/src/common/FilterAudioStream.h \ + libs/oboe/src/common/FixedBlockAdapter.h \ + libs/oboe/src/common/FixedBlockReader.h \ + libs/oboe/src/common/FixedBlockWriter.h \ + libs/oboe/src/common/MonotonicCounter.h \ + libs/oboe/src/common/OboeDebug.h \ + libs/oboe/src/common/QuirksManager.h \ + libs/oboe/src/common/SourceFloatCaller.h \ + libs/oboe/src/common/SourceI16Caller.h \ + libs/oboe/src/common/Trace.h \ + libs/oboe/src/fifo/FifoBuffer.h \ + libs/oboe/src/fifo/FifoController.h \ + libs/oboe/src/fifo/FifoControllerBase.h \ + libs/oboe/src/fifo/FifoControllerIndirect.h \ + libs/oboe/src/flowgraph/ClipToRange.h \ + libs/oboe/src/flowgraph/FlowGraphNode.h \ + libs/oboe/src/flowgraph/ManyToMultiConverter.h \ + libs/oboe/src/flowgraph/MonoToMultiConverter.h \ + libs/oboe/src/flowgraph/RampLinear.h \ + libs/oboe/src/flowgraph/SampleRateConverter.h \ + libs/oboe/src/flowgraph/SinkFloat.h \ + libs/oboe/src/flowgraph/SinkI16.h \ + libs/oboe/src/flowgraph/SinkI24.h \ + libs/oboe/src/flowgraph/SourceFloat.h \ + libs/oboe/src/flowgraph/SourceI16.h \ + libs/oboe/src/flowgraph/SourceI24.h \ + libs/oboe/src/flowgraph/resampler/HyperbolicCosineWindow.h \ + libs/oboe/src/flowgraph/resampler/IntegerRatio.h \ + libs/oboe/src/flowgraph/resampler/LinearResampler.h \ + libs/oboe/src/flowgraph/resampler/MultiChannelResampler.h \ + libs/oboe/src/flowgraph/resampler/PolyphaseResampler.h \ + libs/oboe/src/flowgraph/resampler/PolyphaseResamplerMono.h \ + libs/oboe/src/flowgraph/resampler/PolyphaseResamplerStereo.h \ + libs/oboe/src/flowgraph/resampler/SincResampler.h \ + libs/oboe/src/flowgraph/resampler/SincResamplerStereo.h \ + libs/oboe/src/opensles/AudioInputStreamOpenSLES.h \ + libs/oboe/src/opensles/AudioOutputStreamOpenSLES.h \ + libs/oboe/src/opensles/AudioStreamBuffered.h \ + libs/oboe/src/opensles/AudioStreamOpenSLES.h \ + libs/oboe/src/opensles/EngineOpenSLES.h \ + libs/oboe/src/opensles/OpenSLESUtilities.h \ + libs/oboe/src/opensles/OutputMixerOpenSLES.h -INCLUDEPATH_OBOE = libs/oboe/include/ \ - libs/oboe/src/ + INCLUDEPATH_OBOE = libs/oboe/include/ \ + libs/oboe/src/ -DISTFILES_OBOE += libs/oboe/AUTHORS \ - libs/oboe/CONTRIBUTING \ - libs/oboe/LICENSE \ - libs/oboe/README - - INCLUDEPATH += $$INCLUDEPATH_OBOE - HEADERS += $$OBOE_HEADERS - SOURCES += $$OBOE_SOURCES - DISTFILES += $$DISTFILES_OBOE + DISTFILES_OBOE += libs/oboe/AUTHORS \ + libs/oboe/CONTRIBUTING \ + libs/oboe/LICENSE \ + libs/oboe/README + INCLUDEPATH += $$INCLUDEPATH_OBOE + HEADERS += $$OBOE_HEADERS + SOURCES += $$OBOE_SOURCES + DISTFILES += $$DISTFILES_OBOE } else:unix { # we want to compile with C++11 CONFIG += c++11 @@ -290,18 +289,6 @@ DISTFILES_OBOE += libs/oboe/AUTHORS \ DEFINES += WITH_SOUND } - # Linux is our source distribution, include sources from other OSs - DISTFILES += mac/sound.h \ - mac/sound.cpp \ - mac/mainicon.icns \ - windows/sound.h \ - windows/sound.cpp \ - windows/mainicon.rc \ - windows/mainicon.ico \ - android/AndroidManifest.xml \ - android/sound.h \ - android/sound.cpp - isEmpty(PREFIX) { PREFIX = /usr/local } diff --git a/src/connectdlg.cpp b/src/connectdlg.cpp index fc448dc3..8a1ce398 100755 --- a/src/connectdlg.cpp +++ b/src/connectdlg.cpp @@ -80,7 +80,8 @@ CConnectDlg::CConnectDlg ( CClient* pNCliP, cbxCentServAddrType->clear(); cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_DEFAULT ) ); cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_ALL_GENRES ) ); - cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENRE_ROCK_JAZZ ) ); + cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENRE_ROCK ) ); + cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENRE_JAZZ ) ); cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENRE_CLASSICAL_FOLK ) ); cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_CUSTOM ) ); diff --git a/src/global.h b/src/global.h index 727bb3eb..6183cd2b 100755 --- a/src/global.h +++ b/src/global.h @@ -105,8 +105,9 @@ LED bar: lbr #define DEFAULT_SERVER_ADDRESS "jamulus.fischvolk.de" #define DEFAULT_PORT_NUMBER 22124 #define CENTSERV_ALL_GENRES "jamulusallgenres.fischvolk.de:22224" -#define CENTSERV_GENRE_ROCK_JAZZ "jamulusrock.fischvolk.de:22124" -#define CENTSERV_GENRE_CLASSICAL_FOLK "jamulusclassical.fischvolk.de:22224" +#define CENTSERV_GENRE_ROCK "jamulusrock.fischvolk.de:22424" +#define CENTSERV_GENRE_JAZZ "jamulusjazz.fischvolk.de:22324" +#define CENTSERV_GENRE_CLASSICAL_FOLK "jamulusclassical.fischvolk.de:22524" // getting started and software manual URL #define CLIENT_GETTING_STARTED_URL "https://github.com/corrados/jamulus/wiki/Getting-Started" diff --git a/src/res/translation/translation_de_DE.qm b/src/res/translation/translation_de_DE.qm index 8358df29..d0a47aa7 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 1e3c4b22..0c16f374 100644 --- a/src/res/translation/translation_de_DE.ts +++ b/src/res/translation/translation_de_DE.ts @@ -1202,27 +1202,36 @@ Manuell - + Custom Benutzerdefiniert - + All Genres Alle Genres - - Genre Rock/Jazz - Genre Rock/Jazz + + Genre Rock + Genre Rock - + + Genre Jazz + Genre Jazz + + + Genre Rock/Jazz + Genre Rock/Jazz + + + Genre Classical/Folk/Choir Genre Klassik/Volksmusik/Chor - + Default Standard @@ -1486,47 +1495,47 @@ Enthält die aktuelle Server-IP-Adresse oder URL. Es speichert auch alte URLs in der Auswahlliste. - + Server List Selection Serverlistenauswahl - + Selects the server list to be shown. Wählt die Serverliste aus, die angezeigt werden soll. - + Server list selection combo box Severlistenauswahl Selektion - + 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 @@ -1756,7 +1765,7 @@ - + None Kein @@ -1822,192 +1831,192 @@ 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 - + Vocal Bass Gesang Bass - + Vocal Tenor Gesang Tenor - + Vocal Alto Gesang Alt - + Vocal Soprano Gesang Sopran @@ -2176,7 +2185,7 @@ - + E&xit &Beenden @@ -2203,7 +2212,7 @@ Server - + Predefined Address Vordefinierte Adresse @@ -2220,52 +2229,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 @@ -2524,7 +2533,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 11f3d4f3..4e6e147f 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 9ecbda8c..b8f85f54 100644 --- a/src/res/translation/translation_es_ES.ts +++ b/src/res/translation/translation_es_ES.ts @@ -1206,35 +1206,36 @@ Manual - + Custom Personalizado - + All Genres Todos los Géneros - Genre Rock/Jazz - Género Rock/Jazz + Género Rock/Jazz - + Genre Classical/Folk/Choir Género Clásica/Folk/Coro + Genre Rock - Género Rock + Género Rock + Genre Jazz - Género Jazz + Género Jazz - + Default Por defecto @@ -1502,47 +1503,47 @@ Contiene la dirección IP o URL actual del servidor. También guarda viejas URL en la lista. - + Server List Selection Selección Lista de Servidores - + Selects the server list to be shown. Selecciona la lista de servidores a mostrar. - + Server list selection combo box Selección lista de servidores - + 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 @@ -1772,7 +1773,7 @@ - + None Ninguno @@ -1838,192 +1839,192 @@ 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 - + Vocal Bass Voz bajo - + Vocal Tenor Voz Tenor - + Vocal Alto Voz Alto - + Vocal Soprano Voz Soprano @@ -2188,7 +2189,7 @@ - + E&xit S&alir @@ -2215,7 +2216,7 @@ - + Predefined Address Dirección Preestablecida @@ -2232,52 +2233,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 @@ -2536,7 +2537,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 a99f8bca..9ae9f100 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 09ed91aa..2134ae1d 100644 --- a/src/res/translation/translation_fr_FR.ts +++ b/src/res/translation/translation_fr_FR.ts @@ -1222,35 +1222,36 @@ Manuel - + Custom Personnalisé - + All Genres Tous les genres - Genre Rock/Jazz - Genre rock/jazz + Genre rock/jazz - + Genre Classical/Folk/Choir - Genre classique/folk/coeur + Genre classique/folk/choeur + Genre Rock - Genre Rock + Genre Rock + Genre Jazz - Genre Jazz + Genre Jazz - + Default Défaut @@ -1514,47 +1515,47 @@ Contient l'adresse IP ou l'URL du serveur actuel. Il stocke également les anciennes URL dans la liste déroulante. - + Server List Selection Sélection de la liste des serveurs - + Selects the server list to be shown. Sélectionne la liste de serveurs à afficher. - + Server list selection combo box Liste déroulante de sélection de la liste des serveurs - + 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 @@ -1784,7 +1785,7 @@ - + None Aucune @@ -1850,192 +1851,192 @@ 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 - + Vocal Bass Voix basse - + Vocal Tenor Voix ténor - + Vocal Alto Voix alto - + Vocal Soprano Voix soprano @@ -2200,7 +2201,7 @@ - + E&xit &Quitter @@ -2227,7 +2228,7 @@ serveur - + Predefined Address Adresse prédéfinie @@ -2244,52 +2245,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 @@ -2548,7 +2549,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_it_IT.ts b/src/res/translation/translation_it_IT.ts index ed1301ae..1efb75fd 100644 --- a/src/res/translation/translation_it_IT.ts +++ b/src/res/translation/translation_it_IT.ts @@ -1222,27 +1222,32 @@ - + Custom - + All Genres - - Genre Rock/Jazz + + Genre Rock - + + Genre Jazz + + + + Genre Classical/Folk/Choir - + Default @@ -1458,47 +1463,47 @@ - + Server List Selection - + Selects the server list to be shown. - + Server list selection combo box - + Filter - + The server list is filtered by the given text. Note that the filter is case insensitive. - + Filter edit box - + Show All Musicians - + 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. - + Show all musicians check box @@ -1734,7 +1739,7 @@ - + None @@ -1794,192 +1799,192 @@ - + Drum Set - + Djembe - + Electric Guitar - + Acoustic Guitar - + Bass Guitar - + Keyboard - + Synthesizer - + Grand Piano - + Accordion - + Vocal - + Microphone - + Harmonica - + Trumpet - + Trombone - + French Horn - + Tuba - + Saxophone - + Clarinet - + Flute - + Violin - + Cello - + Double Bass - + Recorder - + Streamer - + Listener - + Guitar+Vocal - + Keyboard+Vocal - + Bodhran - + Bassoon - + Oboe - + Harp - + Viola - + Congas - + Bongo - + Vocal Bass - + Vocal Tenor - + Vocal Alto - + Vocal Soprano @@ -2128,7 +2133,7 @@ - + E&xit @@ -2155,57 +2160,57 @@ - + Server - + &Window - + Predefined Address - + Unregistered - + Bad address - + Registration requested - + Registration failed - + Check server version - + Registered - + Central Server full - + Unknown value @@ -2460,7 +2465,7 @@ global - + For more information use the What's This help (help menu, right mouse button or Shift+F1) diff --git a/src/res/translation/translation_nl_NL.ts b/src/res/translation/translation_nl_NL.ts index a5996092..9b0f8376 100644 --- a/src/res/translation/translation_nl_NL.ts +++ b/src/res/translation/translation_nl_NL.ts @@ -1202,27 +1202,32 @@ Handmatig - + Custom - + All Genres - - Genre Rock/Jazz + + Genre Rock - + + Genre Jazz + + + + Genre Classical/Folk/Choir - + Default Standaard @@ -1482,47 +1487,47 @@ Bevat het huidige server-IP-adres of de URL. Het slaat ook oude URL's op in de comboboxlijst. - + Server List Selection - + Selects the server list to be shown. - + Server list selection combo box - + 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 @@ -1758,7 +1763,7 @@ - + None Geen @@ -1818,192 +1823,192 @@ 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 - + Vocal Bass - + Vocal Tenor - + Vocal Alto - + Vocal Soprano @@ -2168,7 +2173,7 @@ - + E&xit &Sluiten @@ -2195,7 +2200,7 @@ server - + Predefined Address @@ -2212,52 +2217,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 @@ -2516,7 +2521,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 68da3c9c..d6d10fdf 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 898692e5..49886140 100644 --- a/src/res/translation/translation_pt_PT.ts +++ b/src/res/translation/translation_pt_PT.ts @@ -192,7 +192,7 @@ Personal Mix at the Server: - + Mistura Pessoal no Servidor: @@ -230,37 +230,37 @@ 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: Speaker with cancellation stroke: Indicates that the other client has muted you. - + 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 Sets the panning position from Left to Right of the channel. Works only in stereo or preferably mono in/stereo out mode. - + 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 @@ -310,7 +310,7 @@ PAN - + PAN @@ -375,7 +375,7 @@ Pan - Pan + Pan @@ -568,7 +568,7 @@ &Connection Setup... - &Configuração da ligação ... + &Ligar a Servidor... @@ -699,7 +699,7 @@ Central Server - + Servidor Central @@ -777,7 +777,7 @@ Reverb - Reverberação + Reverb. @@ -1120,12 +1120,12 @@ Custom Central Server Address - + Endereço do Servidor Central Personalizado The custom central server address is the IP address or URL of the central server at which the server list of the connection dialog is managed. This address is only used if the custom server list is selected in the connection dialog. - + O endereço personalizado do servidor central é o endereço IP ou URL do servidor central no qual a lista de servidores da Configuração de Ligação é gerida. Este endereço é usado apenas se a lista de servidores personalizados estiver selecionada na Configuração de Ligação. Central Server Address @@ -1214,27 +1214,36 @@ Manual - + Custom - + Personalizado - + All Genres - + Servidor Geral + + + + Genre Rock + Servidor Rock + + + + Genre Jazz + Servidor Jazz - Genre Rock/Jazz - + Servidor Rock/Jazz - + Genre Classical/Folk/Choir - + Serv. Clássica/Folclore/Coro - + Default Servidor Padrão @@ -1412,7 +1421,7 @@ Custom Central Server Address: - + Endereço do Servidor Central Personalizado: Central Server Address: @@ -1494,47 +1503,47 @@ Contém o endereço IP ou URL do servidor atual. Também armazena URLs antigos na lista do seletor. - + Server List Selection - + Selecção da Lista de Servidores - + Selects the server list to be shown. - + Seleciona a lista de servidores a ser apresentada. - + Server list selection combo box - + Caixa de selecção de lista de servidores - + 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 @@ -1549,7 +1558,7 @@ List - + Lista @@ -1764,7 +1773,7 @@ - + None Nenhum @@ -1830,194 +1839,194 @@ 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 - - - Vocal Bass - - - Vocal Tenor - + Vocal Bass + Voz Baixo - Vocal Alto - + Vocal Tenor + Voz Tenor + Vocal Alto + Voz Alto + + + Vocal Soprano - + Voz Soprano @@ -2097,7 +2106,7 @@ If the Make My Server Public check box is checked, this will show whether registration with the central server is successful. If the registration failed, please choose another server list. - + Se a caixa de seleção Tornar Meu Servidor Público fôr seleccionada, isto apresentará se o registro no servidor central foi bem-sucedido. Se o registo falhar, escolha outra lista de servidores. Default central server type combo box @@ -2106,12 +2115,12 @@ Custom Central Server Address - + Endereço do Servidor Central Personalizado The custom central server address is the IP address or URL of the central server at which the server list of the connection dialog is managed. - + O endereço do servidor central personalizado é o endereço IP ou URL do servidor central no qual a lista de servidores da Configuração da Ligação é gerida. @@ -2121,17 +2130,17 @@ Server List Selection - + Selecção da Lista de Servidores Selects the server list (i.e. central server address) in which your server will be added. - + Seleciona a lista de servidores (ou seja, endereço do servidor central) à qual seu servidor será adicionado. Server list selection combo box - + Caixa de selecção de lista de servidores @@ -2180,7 +2189,7 @@ - + E&xit &Sair @@ -2207,9 +2216,9 @@ - + Predefined Address - + Endereço Predefinido Manual @@ -2224,52 +2233,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 @@ -2315,7 +2324,7 @@ Custom Central Server Address: - + Endereço do Servidor Central Personalizado: Central Server Address: @@ -2528,7 +2537,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 fa1fd644..7586bbf9 100755 --- a/src/serverdlg.cpp +++ b/src/serverdlg.cpp @@ -190,7 +190,8 @@ lvwClients->setMinimumHeight ( 140 ); cbxCentServAddrType->clear(); cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_DEFAULT ) ); cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_ALL_GENRES ) ); - cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENRE_ROCK_JAZZ ) ); + cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENRE_ROCK ) ); + cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENRE_JAZZ ) ); cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENRE_CLASSICAL_FOLK ) ); cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_CUSTOM ) ); cbxCentServAddrType->setCurrentIndex ( static_cast ( pServer->GetCentralServerAddressType() ) ); diff --git a/src/settings.cpp b/src/settings.cpp index 7c5156fd..e8d859f1 100755 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -299,7 +299,7 @@ void CSettings::Load() // central server address type if ( GetNumericIniSet ( IniXMLDocument, "client", "centservaddrtype", - 0, 4 /* AT_CUSTOM */, iValue ) ) + 0, static_cast ( AT_CUSTOM ), iValue ) ) { pClient->SetCentralServerAddressType ( static_cast ( iValue ) ); } @@ -370,7 +370,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, 4 /* AT_CUSTOM */, iValue ) ) + 0, static_cast ( AT_CUSTOM ), iValue ) ) { pServer->SetCentralServerAddressType ( static_cast ( iValue ) ); } diff --git a/src/settings.h b/src/settings.h index c204fa74..65ad07a5 100755 --- a/src/settings.h +++ b/src/settings.h @@ -32,6 +32,7 @@ #include "global.h" #include "client.h" #include "server.h" +#include "util.h" /* Classes ********************************************************************/ diff --git a/src/util.cpp b/src/util.cpp index 8befc68a..38bc2823 100755 --- a/src/util.cpp +++ b/src/util.cpp @@ -953,7 +953,8 @@ QString NetworkUtil::GetCentralServerAddress ( const ECSAddType eCentralServerAd { case AT_CUSTOM: return strCentralServerAddress; case AT_ALL_GENRES: return CENTSERV_ALL_GENRES; - case AT_GENRE_ROCK_JAZZ: return CENTSERV_GENRE_ROCK_JAZZ; + case AT_GENRE_ROCK: return CENTSERV_GENRE_ROCK; + case AT_GENRE_JAZZ: return CENTSERV_GENRE_JAZZ; case AT_GENRE_CLASSICAL_FOLK: return CENTSERV_GENRE_CLASSICAL_FOLK; default: return DEFAULT_SERVER_ADDRESS; // AT_DEFAULT } diff --git a/src/util.h b/src/util.h index cb4b1b6d..bdf7818f 100755 --- a/src/util.h +++ b/src/util.h @@ -568,9 +568,10 @@ enum ECSAddType // used for settings -> enum values should be fixed AT_DEFAULT = 0, AT_ALL_GENRES = 1, - AT_GENRE_ROCK_JAZZ = 2, - AT_GENRE_CLASSICAL_FOLK = 3, - AT_CUSTOM = 4 + AT_GENRE_ROCK = 2, + AT_GENRE_JAZZ = 3, + AT_GENRE_CLASSICAL_FOLK = 4, + AT_CUSTOM = 5 // Must be the last entry! }; inline QString csCentServAddrTypeToString ( ECSAddType eAddrType ) @@ -583,8 +584,11 @@ inline QString csCentServAddrTypeToString ( ECSAddType eAddrType ) case AT_ALL_GENRES: return QCoreApplication::translate ( "CClientSettingsDlg", "All Genres" ); - case AT_GENRE_ROCK_JAZZ: - return QCoreApplication::translate ( "CClientSettingsDlg", "Genre Rock/Jazz" ); + case AT_GENRE_ROCK: + return QCoreApplication::translate ( "CClientSettingsDlg", "Genre Rock" ); + + case AT_GENRE_JAZZ: + return QCoreApplication::translate ( "CClientSettingsDlg", "Genre Jazz" ); case AT_GENRE_CLASSICAL_FOLK: return QCoreApplication::translate ( "CClientSettingsDlg", "Genre Classical/Folk/Choir" );