diff --git a/cmake/linux/package_linux.sh.in b/cmake/linux/package_linux.sh.in
index 069938656..386ba5c1d 100644
--- a/cmake/linux/package_linux.sh.in
+++ b/cmake/linux/package_linux.sh.in
@@ -57,6 +57,7 @@ PATH="$(pwd -P)/squashfs-root/usr/bin:$(dirname "@QT_QMAKE_EXECUTABLE@")":$PATH
export PATH
# Fetch portable linuxdeployqt if not in PATH
+APPIMAGETOOL="squashfs-root/usr/bin/appimagetool"=
echo -e "\nDownloading linuxdeployqt to ${LINUXDEPLOYQT}..."
if env -i which linuxdeployqt > /dev/null 2>&1; then
skipped "System already provides this utility"
@@ -75,7 +76,6 @@ else
# to support systems without fuse
"$LINUXDEPLOYQT" --appimage-extract > /dev/null 2>&1
LINUXDEPLOYQT="squashfs-root/AppRun"
- APPIMAGETOOL="squashfs-root/usr/bin/appimagetool"
success "Extracted $APPIMAGETOOL"
fi
@@ -193,6 +193,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"
diff --git a/data/locale/cs.ts b/data/locale/cs.ts
index f880c4767..a82f6596c 100644
--- a/data/locale/cs.ts
+++ b/data/locale/cs.ts
@@ -1035,7 +1035,7 @@ Chcete-li vylepšit stávající překlad, Vaše pomoc bude vítána! Stačí je
FDBK
- ZPVAZ
+ FDBKRATE
@@ -2270,7 +2270,7 @@ Ověřte si prosím, zda máte povolen zápis do souboru a do složky, ve které
FDBK
- ZP. VAZ
+ FDBKNOISE
@@ -10319,4 +10319,4 @@ LED v pravém dolním rohu editoru vlny určuje, jestli bude struna v aktuální
Zesílení výstupu
-
\ No newline at end of file
+
diff --git a/data/locale/de.ts b/data/locale/de.ts
index 63dc63ba5..a02cecd7c 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
+ DELAYFDBK
@@ -2251,7 +2251,7 @@ Please make sure you have write permission to the file and the directory contain
DELAY
- VERZÖGERUNG
+ DELAYRATE
diff --git a/data/locale/es.ts b/data/locale/es.ts
index c4d5178f1..f6cfaf832 100644
--- a/data/locale/es.ts
+++ b/data/locale/es.ts
@@ -704,11 +704,11 @@ Si te interesa traducir LMMS a otros idiomas o mejorar las traducciones existent
BitcrushControlDialogIN
- ENTRADA
+ INOUT
- SALIDA
+ OUTGAIN
@@ -728,7 +728,7 @@ Si te interesa traducir LMMS a otros idiomas o mejorar las traducciones existent
CLIP
- RECORTE
+ CLIPOutput Clip:
@@ -1031,7 +1031,7 @@ Si te interesa traducir LMMS a otros idiomas o mejorar las traducciones existent
DELAY
- RETRASO
+ DELAYFDBK
diff --git a/data/locale/fa.ts b/data/locale/fa.ts
index 9f6ec278b..fe9d2ca6b 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
+ DECAYTime:
@@ -1360,7 +1360,7 @@ Right clicking will bring up a context menu where you can change the order in wh
HOLD
- نگهداری-HOLD
+ HOLDHold:
diff --git a/data/locale/fr.ts b/data/locale/fr.ts
index ddfbb1ea3..f8209d5d1 100644
--- a/data/locale/fr.ts
+++ b/data/locale/fr.ts
@@ -703,11 +703,11 @@ Si vous êtes intéressé par la traduction de LMMS dans une nouvelle langue ou
BitcrushControlDialogIN
- ENTRÉE
+ INOUT
- SORTIE
+ OUTGAIN
@@ -2252,7 +2252,7 @@ Veuillez vous assurez que vous avez les droits d'écriture sur le fichier e
DELAY
- DE RETARD
+ DELAYRATE
diff --git a/data/locale/gl.ts b/data/locale/gl.ts
index a7843d081..657ed1291 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
EnvelopeAndLfoViewDEL
- TMP REV
+ DELPredelay:
@@ -1540,7 +1540,7 @@ Ao premer co botón dereito aparece un menú de contexto no que se pode cambiar
AMT
- CANTIDADE
+ AMTModulation amount:
diff --git a/data/locale/it.ts b/data/locale/it.ts
index 6931b8421..f93cb0170 100644
--- a/data/locale/it.ts
+++ b/data/locale/it.ts
@@ -1030,7 +1030,7 @@ Se sei interessato a tradurre LMMS o vuoi migliorare una traduzione esistente, s
DELAY
- RITARDO
+ DELAYFDBK
@@ -1038,7 +1038,7 @@ Se sei interessato a tradurre LMMS o vuoi migliorare una traduzione esistente, s
RATE
- FREQUENZA
+ RATEAMNT
@@ -2252,11 +2252,11 @@ Si prega di controllare i permessi di scrittura sul file e la cartella che lo co
DELAY
- RITARDO
+ DELAYRATE
- FREQUENZA
+ RATEAMNT
diff --git a/data/locale/ja.ts b/data/locale/ja.ts
index 4355aef58..b7c1a780c 100644
--- a/data/locale/ja.ts
+++ b/data/locale/ja.ts
@@ -3377,7 +3377,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri
PAN
- パニング
+ PANMIDI
@@ -6142,7 +6142,7 @@ Reason: "%2"
PAN
- パニング
+ PAN
diff --git a/data/locale/pt.ts b/data/locale/pt.ts
index d9c3a7cb2..f1a2386f3 100644
--- a/data/locale/pt.ts
+++ b/data/locale/pt.ts
@@ -80,7 +80,7 @@ Esteban Viveros
LEFT
- ESQUERDA
+ LEFTLeft gain:
@@ -88,7 +88,7 @@ Esteban Viveros
RIGHT
- DIREITA
+ RIGHTRight gain:
@@ -705,11 +705,11 @@ Esteban Viveros
BitcrushControlDialogIN
- DENTRO
+ INOUT
- FORA
+ OUTGAIN
@@ -3099,7 +3099,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri
VELOCITY
- INTENSIDADE
+ VELOCITYENABLE MIDI OUTPUT
@@ -7936,7 +7936,7 @@ Por favor certifique-se que você tem permissões de leitura para o arquivo e pa
RELEASE
- LANÇAMENTO
+ RELEASEPeak release time:
diff --git a/data/locale/ru.ts b/data/locale/ru.ts
index 1bc94ca92..1dbba50f1 100644
--- a/data/locale/ru.ts
+++ b/data/locale/ru.ts
@@ -707,11 +707,11 @@ Oe Ai <oeai/at/symbiants/dot/com>
BitcrushControlDialogIN
- ВХОД
+ INOUT
- ВЫХОД
+ OUTGAIN
diff --git a/data/locale/sv.ts b/data/locale/sv.ts
index 6f0120deb..144cee15a 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.
+ FREQCutoff 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 100Modulate Env-Amount
@@ -1454,7 +1454,7 @@ Right clicking will bring up a context menu where you can change the order in wh
EnvelopeAndLfoViewDEL
- RADERA
+ DELPredelay:
@@ -1526,7 +1526,7 @@ Right clicking will bring up a context menu where you can change the order in wh
AMT
- MÄNGD
+ AMTModulation 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 100Click 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.
+ FREQcutoff frequency:
@@ -3275,7 +3275,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri
PAN
- PANORERA
+ PANMIDI
@@ -3322,7 +3322,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri
PAN
- PANORERA
+ PANPitch
@@ -5982,14 +5982,14 @@ Orsak: "%2"
PAN
- PANORERA
+ PANSetupDialogSetup LMMS
- Ställ in LMMS
+ InställningarGeneral settings
@@ -6077,7 +6077,7 @@ Orsak: "%2"
STK rawwave directory
- Katalog för STK rå-vågform
+ Katalog för STK vågformerDefault Soundfont File
diff --git a/data/locale/uk.ts b/data/locale/uk.ts
index 43931a173..b6c803ef0 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
- ЗГАСАННЯ
+ DECAYTime:
diff --git a/include/ImportFilter.h b/include/ImportFilter.h
index 1fc141a32..166c1bfda 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();
}
diff --git a/plugins/LadspaEffect/LadspaEffect.cpp b/plugins/LadspaEffect/LadspaEffect.cpp
index f9959a205..d7e66bf47 100644
--- a/plugins/LadspaEffect/LadspaEffect.cpp
+++ b/plugins/LadspaEffect/LadspaEffect.cpp
@@ -123,9 +123,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 6131bcac1..4eb827bb8 100644
--- a/plugins/zynaddsubfx/ZynAddSubFx.cpp
+++ b/plugins/zynaddsubfx/ZynAddSubFx.cpp
@@ -641,8 +641,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 );
+ }
}
}
diff --git a/src/gui/SetupDialog.cpp b/src/gui/SetupDialog.cpp
index 84c76128d..11a6d8386 100644
--- a/src/gui/SetupDialog.cpp
+++ b/src/gui/SetupDialog.cpp
@@ -187,7 +187,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(