From 112d34226ad1ee3f8c53f0160aba4ff27c0fb6d6 Mon Sep 17 00:00:00 2001 From: Hyunin Song Date: Fri, 27 Jul 2018 15:48:58 +0900 Subject: [PATCH 1/5] Fix broken MIDI import Fix a regression in 3e538d510c135d6b6504298aa57135506397c708 (#4401) that readAllData doesn't read the file from the beginning --- include/ImportFilter.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/ImportFilter.h b/include/ImportFilter.h index 1b6fe2b59..53c769adf 100644 --- a/include/ImportFilter.h +++ b/include/ImportFilter.h @@ -80,6 +80,7 @@ protected: inline QByteArray readAllData() { + m_file.seek(0); return m_file.readAll(); } From b9634fa672db3def2036c251cefacfa98c775b20 Mon Sep 17 00:00:00 2001 From: Oskar Wallgren Date: Sat, 28 Jul 2018 20:07:21 +0200 Subject: [PATCH 2/5] Setup Dialog - Fix bottom of letters cut off (#4483) --- src/gui/SetupDialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/SetupDialog.cpp b/src/gui/SetupDialog.cpp index 5063761e2..5e8f53c5c 100644 --- a/src/gui/SetupDialog.cpp +++ b/src/gui/SetupDialog.cpp @@ -188,7 +188,7 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) : SLOT( setBufferSize( int ) ) ); m_bufSizeLbl = new QLabel( bufsize_tw ); - m_bufSizeLbl->setGeometry( 10, 40, 200, 24 ); + m_bufSizeLbl->setGeometry( 10, 40, 200, 32 ); setBufferSize( m_bufSizeSlider->value() ); QPushButton * bufsize_reset_btn = new QPushButton( From b268abba45130b04a67c222a9e3bb161ab0f9fc3 Mon Sep 17 00:00:00 2001 From: Oskar Wallgren Date: Tue, 31 Jul 2018 05:04:20 +0200 Subject: [PATCH 3/5] Fix some formatting issues in translations (#4482) * Swedish translation formatting and fixes * German translation formatting * Czech translation formatting * Spanish translation formatting * Farsi translation formatting * French translation formatting * Italian translation formatting * Portuguese translation formatting * Galician translation formatting * Russian translation formatting * Ukrainian translation formatting * Japanese translation formatting --- data/locale/cs.ts | 4 ++-- data/locale/de.ts | 4 ++-- data/locale/es.ts | 8 ++++---- data/locale/fa.ts | 4 ++-- data/locale/fr.ts | 6 +++--- data/locale/gl.ts | 4 ++-- data/locale/it.ts | 8 ++++---- data/locale/ja.ts | 4 ++-- data/locale/pt.ts | 12 ++++++------ data/locale/ru.ts | 4 ++-- data/locale/sv.ts | 24 ++++++++++++------------ data/locale/uk.ts | 2 +- 12 files changed, 42 insertions(+), 42 deletions(-) diff --git a/data/locale/cs.ts b/data/locale/cs.ts index ebaee2c00..cf55f760f 100644 --- a/data/locale/cs.ts +++ b/data/locale/cs.ts @@ -1034,7 +1034,7 @@ Máte-li zájem o překlad LMMS do jiného jazyka, nebo chcete-li vylepšit exis FDBK - ZP. VAZBA + FDBK RATE @@ -2172,7 +2172,7 @@ Please make sure you have write permission to the file and the directory contain FDBK - ZP. VAZBA + FDBK NOISE diff --git a/data/locale/de.ts b/data/locale/de.ts index ccc4e4438..10f37d009 100644 --- a/data/locale/de.ts +++ b/data/locale/de.ts @@ -1030,7 +1030,7 @@ Wenn Sie daran interessiert sind LMMS in eine andere Sprache zu übersetzen oder DELAY - VERZÖGERUNG + DELAY FDBK @@ -2164,7 +2164,7 @@ Please make sure you have write permission to the file and the directory contain DELAY - VERZÖGERUNG + DELAY RATE diff --git a/data/locale/es.ts b/data/locale/es.ts index d50953d8e..d363900b8 100644 --- a/data/locale/es.ts +++ b/data/locale/es.ts @@ -700,11 +700,11 @@ Si te interesa traducir LMMS a otros idiomas o mejorar las traducciones existent BitcrushControlDialog IN - ENTRADA + IN OUT - SALIDA + OUT GAIN @@ -728,7 +728,7 @@ Si te interesa traducir LMMS a otros idiomas o mejorar las traducciones existent CLIP - RECORTE + CLIP Output Clip: @@ -1031,7 +1031,7 @@ Si te interesa traducir LMMS a otros idiomas o mejorar las traducciones existent DELAY - RETRASO + DELAY FDBK diff --git a/data/locale/fa.ts b/data/locale/fa.ts index 7593cb57e..17f010cd1 100644 --- a/data/locale/fa.ts +++ b/data/locale/fa.ts @@ -1218,7 +1218,7 @@ If you're interested in translating LMMS in another language or want to imp DECAY - محو-DECAY + DECAY Time: @@ -1360,7 +1360,7 @@ Right clicking will bring up a context menu where you can change the order in wh HOLD - نگهداری-HOLD + HOLD Hold: diff --git a/data/locale/fr.ts b/data/locale/fr.ts index ae72c61dd..65df2cf97 100644 --- a/data/locale/fr.ts +++ b/data/locale/fr.ts @@ -699,11 +699,11 @@ Si vous êtes intéressé par la traduction de LMMS dans une nouvelle langue ou BitcrushControlDialog IN - ENTRÉE + IN OUT - SORTIE + OUT GAIN @@ -2173,7 +2173,7 @@ Veuillez vérifier que vous avez les droits d'accès en écriture à ce fic DELAY - DE RETARD + DELAY RATE diff --git a/data/locale/gl.ts b/data/locale/gl.ts index 0956b9173..b427a057f 100644 --- a/data/locale/gl.ts +++ b/data/locale/gl.ts @@ -1468,7 +1468,7 @@ Ao premer co botón dereito aparece un menú de contexto no que se pode cambiar EnvelopeAndLfoView DEL - TMP REV + DEL Predelay: @@ -1540,7 +1540,7 @@ Ao premer co botón dereito aparece un menú de contexto no que se pode cambiar AMT - CANTIDADE + AMT Modulation amount: diff --git a/data/locale/it.ts b/data/locale/it.ts index f019943ab..e092c9d98 100644 --- a/data/locale/it.ts +++ b/data/locale/it.ts @@ -1033,7 +1033,7 @@ Se sei interessato a tradurre LMMS o vuoi migliorare una traduzione esistente, s DELAY - RITARDO + DELAY FDBK @@ -1041,7 +1041,7 @@ Se sei interessato a tradurre LMMS o vuoi migliorare una traduzione esistente, s RATE - FREQUENZA + RATE AMNT @@ -2168,11 +2168,11 @@ Si prega di controllare i permessi di scrittura sul file e la cartella che lo co DELAY - RITARDO + DELAY RATE - FREQUENZA + RATE Rate: diff --git a/data/locale/ja.ts b/data/locale/ja.ts index 4b355e2c3..258baeb09 100644 --- a/data/locale/ja.ts +++ b/data/locale/ja.ts @@ -3277,7 +3277,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri PAN - パニング + PAN MIDI @@ -5984,7 +5984,7 @@ Reason: "%2" PAN - パニング + PAN diff --git a/data/locale/pt.ts b/data/locale/pt.ts index 58a5318e4..1980df7f7 100644 --- a/data/locale/pt.ts +++ b/data/locale/pt.ts @@ -80,7 +80,7 @@ Esteban Viveros LEFT - ESQUERDA + LEFT Left gain: @@ -88,7 +88,7 @@ Esteban Viveros RIGHT - DIREITA + RIGHT Right gain: @@ -701,11 +701,11 @@ Esteban Viveros BitcrushControlDialog IN - DENTRO + IN OUT - FORA + OUT GAIN @@ -3000,7 +3000,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri VELOCITY - INTENSIDADE + VELOCITY ENABLE MIDI OUTPUT @@ -7776,7 +7776,7 @@ Por favor certifique-se que você tem permissões de leitura para o arquivo e pa RELEASE - LANÇAMENTO + RELEASE Peak release time: diff --git a/data/locale/ru.ts b/data/locale/ru.ts index 4ef85094a..b26a4e82f 100644 --- a/data/locale/ru.ts +++ b/data/locale/ru.ts @@ -703,11 +703,11 @@ Oe Ai <oeai/at/symbiants/dot/com> BitcrushControlDialog IN - ВХОД + IN OUT - ВЫХОД + OUT GAIN diff --git a/data/locale/sv.ts b/data/locale/sv.ts index ec36538f0..29f99f555 100644 --- a/data/locale/sv.ts +++ b/data/locale/sv.ts @@ -1063,7 +1063,7 @@ If you're interested in translating LMMS in another language or want to imp FREQ - FREKV. + FREQ Cutoff frequency @@ -1443,7 +1443,7 @@ Right clicking will bring up a context menu where you can change the order in wh Freq x 100 - Frekv. x 100 + Freq x 100 Modulate Env-Amount @@ -1454,7 +1454,7 @@ Right clicking will bring up a context menu where you can change the order in wh EnvelopeAndLfoView DEL - RADERA + DEL Predelay: @@ -1526,7 +1526,7 @@ Right clicking will bring up a context menu where you can change the order in wh AMT - MÄNGD + AMT Modulation amount: @@ -1590,7 +1590,7 @@ Right clicking will bring up a context menu where you can change the order in wh FREQ x 100 - FREKV. x 100 + FREQ x 100 Click here if the frequency of this LFO should be multiplied by 100. @@ -1883,7 +1883,7 @@ Right clicking will bring up a context menu where you can change the order in wh Freq: - Frekv.: + Freq: @@ -3197,7 +3197,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri FREQ - FREKV. + FREQ cutoff frequency: @@ -3275,7 +3275,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri PAN - PANORERA + PAN MIDI @@ -3322,7 +3322,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri PAN - PANORERA + PAN Pitch @@ -5982,14 +5982,14 @@ Orsak: "%2" PAN - PANORERA + PAN SetupDialog Setup LMMS - Ställ in LMMS + Inställningar General settings @@ -6077,7 +6077,7 @@ Orsak: "%2" STK rawwave directory - Katalog för STK rå-vågform + Katalog för STK vågformer Default Soundfont File diff --git a/data/locale/uk.ts b/data/locale/uk.ts index 583dbf136..88d92b82b 100644 --- a/data/locale/uk.ts +++ b/data/locale/uk.ts @@ -1341,7 +1341,7 @@ If you're interested in translating LMMS in another language or want to imp DECAY - ЗГАСАННЯ + DECAY Time: From e07f9a3b648d8ce168f247217509677ecd38811d Mon Sep 17 00:00:00 2001 From: Hyunjin Song Date: Wed, 1 Aug 2018 14:35:16 +0900 Subject: [PATCH 4/5] Don't use dummy controllers for connections if not loading projects (#4493) Remove the need of ControllerConnection::finalizeConnections when not loading projects. Fix ZynAddSubFX knob disconnection when exporting. --- plugins/LadspaEffect/LadspaEffect.cpp | 3 --- plugins/zynaddsubfx/ZynAddSubFx.cpp | 2 -- src/core/ControllerConnection.cpp | 18 ++++++++++++------ 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/plugins/LadspaEffect/LadspaEffect.cpp b/plugins/LadspaEffect/LadspaEffect.cpp index 72b195314..a274bef6d 100644 --- a/plugins/LadspaEffect/LadspaEffect.cpp +++ b/plugins/LadspaEffect/LadspaEffect.cpp @@ -121,9 +121,6 @@ void LadspaEffect::changeSampleRate() // the IDs of re-created controls have been saved and now need to be // resolved again AutomationPattern::resolveAllIDs(); - - // make sure, connections are ok - ControllerConnection::finalizeConnections(); } diff --git a/plugins/zynaddsubfx/ZynAddSubFx.cpp b/plugins/zynaddsubfx/ZynAddSubFx.cpp index 8c1da751f..adc337542 100644 --- a/plugins/zynaddsubfx/ZynAddSubFx.cpp +++ b/plugins/zynaddsubfx/ZynAddSubFx.cpp @@ -645,8 +645,6 @@ void ZynAddSubFxView::toggleUI() connect( model->m_remotePlugin, SIGNAL( clickedCloseButton() ), m_toggleUIButton, SLOT( toggle() ) ); } - - ControllerConnection::finalizeConnections(); } } diff --git a/src/core/ControllerConnection.cpp b/src/core/ControllerConnection.cpp index 4f04cbc20..af398d389 100644 --- a/src/core/ControllerConnection.cpp +++ b/src/core/ControllerConnection.cpp @@ -204,16 +204,22 @@ void ControllerConnection::loadSettings( const QDomElement & _this ) } else { - if( _this.attribute( "id", "-1" ).toInt() >= 0 ) - { - m_controllerId = _this.attribute( "id" ).toInt(); - } - else + m_controllerId = _this.attribute( "id", "-1" ).toInt(); + if( m_controllerId < 0 ) { qWarning( "controller index invalid\n" ); m_controllerId = -1; } - m_controller = Controller::create( Controller::DummyController, NULL ); + + if (!Engine::getSong()->isLoadingProject() && m_controllerId != -1) + { + setController( Engine::getSong()-> + controllers().at( m_controllerId ) ); + } + else + { + m_controller = Controller::create( Controller::DummyController, NULL ); + } } } From b5dc70c20a3c4d8881bfd1bfc119b2a2581b706a Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Sun, 5 Aug 2018 23:53:49 -0400 Subject: [PATCH 5/5] Fix AppImage shim launcher Due to upstream change in linuxdeployqt --- cmake/linux/package_linux.sh.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake/linux/package_linux.sh.in b/cmake/linux/package_linux.sh.in index 61afe35a0..99c5aebc1 100644 --- a/cmake/linux/package_linux.sh.in +++ b/cmake/linux/package_linux.sh.in @@ -55,6 +55,7 @@ echo -e "\nWriting verbose output to \"${LOGFILE}\"" export PATH="$(pwd -P)/squashfs-root/usr/bin:$(dirname "@QT_QMAKE_EXECUTABLE@")":$PATH # Fetch portable linuxdeployqt if cache is older than $DAYSOLD +APPIMAGETOOL="squashfs-root/usr/bin/appimagetool" echo -e "\nDownloading linuxdeployqt to ${LINUXDEPLOYQT}..." mkdir -p "$HOME/bin" DAYSOLD=2 @@ -69,7 +70,6 @@ elif ! find "$LINUXDEPLOYQT" -mtime -$DAYSOLD 2>/dev/null|grep -q "." > /dev/nul touch "$LINUXDEPLOYQT" success "Downloaded $LINUXDEPLOYQT" "$LINUXDEPLOYQT" --appimage-extract > /dev/null 2>&1 - APPIMAGETOOL="squashfs-root/usr/bin/appimagetool" success "Extracted $APPIMAGETOOL" else skipped "$LINUXDEPLOYQT is less than $DAYSOLD days old" @@ -181,6 +181,10 @@ if [ -e "${APPDIR}/usr/lib/libjack.so.0" ]; then mv "${APPDIR}/usr/lib/libjack.so.0" "${APPDIR}usr/lib/lmms/optional/" fi +# Point the AppRun to the shim launcher +rm -f "${APPDIR}/AppRun" +ln -sr "${APPDIR}/usr/bin/lmms" "${APPDIR}/AppRun" + # Create AppImage echo -e "\nFinishing the AppImage..." echo -e "\n\n>>>>> appimagetool" >> "$LOGFILE"