mirror/lmms
1
0 Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-10-23 07:08:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable-1.2'

Browse Source 
# Conflicts:
#	cmake/linux/package_linux.sh.in
#	data/locale/cs.ts
This commit is contained in:
Hyunjin Song committed 2018-08-24 09:50:36 +09:00
2 parents 8d00e90322 b5dc70c20a
commit 12d251cc3e
18 files changed
+62 -56
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

cmake/linux/package_linux.sh.in
+5 -1
View File
@@ -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"
data/locale/cs.ts
+3 -3
View File
@@ -1035,7 +1035,7 @@ Chcete-li vylepšit stávající překlad, Vaše pomoc bude vítána! Stačí je
</message>
<message>
<source>FDBK</source>
<translation>ZPVAZ</translation>
<translation>FDBK</translation>
</message>
<message>
<source>RATE</source>
@@ -2270,7 +2270,7 @@ Ověřte si prosím, zda máte povolen zápis do souboru a do složky, ve které
</message>
<message>
<source>FDBK</source>
<translation>ZP. VAZ</translation>
<translation>FDBK</translation>
</message>
<message>
<source>NOISE</source>
@@ -10319,4 +10319,4 @@ LED v pravém dolním rohu editoru vlny určuje, jestli bude struna v aktuální
<translation>Zesílení výstupu</translation>
</message>
</context>
</TS>
</TS>
data/locale/de.ts
+2 -2
View File
@@ -1030,7 +1030,7 @@ Wenn Sie daran interessiert sind LMMS in eine andere Sprache zu übersetzen oder
</message>
<message>
<source>DELAY</source>
<translation>VERZÖGERUNG</translation>
<translation>DELAY</translation>
</message>
<message>
<source>FDBK</source>
@@ -2251,7 +2251,7 @@ Please make sure you have write permission to the file and the directory contain
</message>
<message>
<source>DELAY</source>
<translation>VERZÖGERUNG</translation>
<translation>DELAY</translation>
</message>
<message>
<source>RATE</source>
data/locale/es.ts
+4 -4
View File
@@ -704,11 +704,11 @@ Si te interesa traducir LMMS a otros idiomas o mejorar las traducciones existent
<name>BitcrushControlDialog</name>
<message>
<source>IN</source>
<translation>ENTRADA</translation>
<translation>IN</translation>
</message>
<message>
<source>OUT</source>
<translation>SALIDA</translation>
<translation>OUT</translation>
</message>
<message>
<source>GAIN</source>
@@ -728,7 +728,7 @@ Si te interesa traducir LMMS a otros idiomas o mejorar las traducciones existent
</message>
<message>
<source>CLIP</source>
<translation>RECORTE</translation>
<translation>CLIP</translation>
</message>
<message>
<source>Output Clip:</source>
@@ -1031,7 +1031,7 @@ Si te interesa traducir LMMS a otros idiomas o mejorar las traducciones existent
</message>
<message>
<source>DELAY</source>
<translation>RETRASO</translation>
<translation>DELAY</translation>
</message>
<message>
<source>FDBK</source>
data/locale/fa.ts
+2 -2
View File
@@ -1218,7 +1218,7 @@ If you&apos;re interested in translating LMMS in another language or want to imp
</message>
<message>
<source>DECAY</source>
<translation type="unfinished">محو-DECAY</translation>
<translation type="unfinished">DECAY</translation>
</message>
<message>
<source>Time:</source>
@@ -1360,7 +1360,7 @@ Right clicking will bring up a context menu where you can change the order in wh
</message>
<message>
<source>HOLD</source>
<translation type="unfinished">نگهداری-HOLD</translation>
<translation type="unfinished">HOLD</translation>
</message>
<message>
<source>Hold:</source>
data/locale/fr.ts
+3 -3
View File
@@ -703,11 +703,11 @@ Si vous êtes intéressé par la traduction de LMMS dans une nouvelle langue ou
<name>BitcrushControlDialog</name>
<message>
<source>IN</source>
<translation>ENTRÉE</translation>
<translation>IN</translation>
</message>
<message>
<source>OUT</source>
<translation>SORTIE</translation>
<translation>OUT</translation>
</message>
<message>
<source>GAIN</source>
@@ -2252,7 +2252,7 @@ Veuillez vous assurez que vous avez les droits d&apos;écriture sur le fichier e
</message>
<message>
<source>DELAY</source>
<translation>DE RETARD</translation>
<translation>DELAY</translation>
</message>
<message>
<source>RATE</source>
data/locale/gl.ts
+2 -2
View File
@@ -1468,7 +1468,7 @@ Ao premer co botón dereito aparece un menú de contexto no que se pode cambiar
<name>EnvelopeAndLfoView</name>
<message>
<source>DEL</source>
<translation>TMP REV</translation>
<translation>DEL</translation>
</message>
<message>
<source>Predelay:</source>
@@ -1540,7 +1540,7 @@ Ao premer co botón dereito aparece un menú de contexto no que se pode cambiar
</message>
<message>
<source>AMT</source>
<translation>CANTIDADE</translation>
<translation>AMT</translation>
</message>
<message>
<source>Modulation amount:</source>
data/locale/it.ts
+4 -4
View File
@@ -1030,7 +1030,7 @@ Se sei interessato a tradurre LMMS o vuoi migliorare una traduzione esistente, s
</message>
<message>
<source>DELAY</source>
<translation>RITARDO</translation>
<translation>DELAY</translation>
</message>
<message>
<source>FDBK</source>
@@ -1038,7 +1038,7 @@ Se sei interessato a tradurre LMMS o vuoi migliorare una traduzione esistente, s
</message>
<message>
<source>RATE</source>
<translation>FREQUENZA</translation>
<translation>RATE</translation>
</message>
<message>
<source>AMNT</source>
@@ -2252,11 +2252,11 @@ Si prega di controllare i permessi di scrittura sul file e la cartella che lo co
</message>
<message>
<source>DELAY</source>
<translation>RITARDO</translation>
<translation>DELAY</translation>
</message>
<message>
<source>RATE</source>
<translation>FREQUENZA</translation>
<translation>RATE</translation>
</message>
<message>
<source>AMNT</source>
data/locale/ja.ts
+2 -2
View File
@@ -3377,7 +3377,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri
</message>
<message>
<source>PAN</source>
<translation>パニング</translation>
<translation>PAN</translation>
</message>
<message>
<source>MIDI</source>
@@ -6142,7 +6142,7 @@ Reason: &quot;%2&quot;</source>
</message>
<message>
<source>PAN</source>
<translation>パニング</translation>
<translation>PAN</translation>
</message>
</context>
<context>
data/locale/pt.ts
+6 -6
View File
@@ -80,7 +80,7 @@ Esteban Viveros</translation>
</message>
<message>
<source>LEFT</source>
<translation>ESQUERDA</translation>
<translation>LEFT</translation>
</message>
<message>
<source>Left gain:</source>
@@ -88,7 +88,7 @@ Esteban Viveros</translation>
</message>
<message>
<source>RIGHT</source>
<translation>DIREITA</translation>
<translation>RIGHT</translation>
</message>
<message>
<source>Right gain:</source>
@@ -705,11 +705,11 @@ Esteban Viveros</translation>
<name>BitcrushControlDialog</name>
<message>
<source>IN</source>
<translation>DENTRO</translation>
<translation>IN</translation>
</message>
<message>
<source>OUT</source>
<translation>FORA</translation>
<translation>OUT</translation>
</message>
<message>
<source>GAIN</source>
@@ -3099,7 +3099,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri
</message>
<message>
<source>VELOCITY</source>
<translation>INTENSIDADE</translation>
<translation>VELOCITY</translation>
</message>
<message>
<source>ENABLE MIDI OUTPUT</source>
@@ -7936,7 +7936,7 @@ Por favor certifique-se que você tem permissões de leitura para o arquivo e pa
</message>
<message>
<source>RELEASE</source>
<translation>LANÇAMENTO</translation>
<translation>RELEASE</translation>
</message>
<message>
<source>Peak release time:</source>
data/locale/ru.ts
+2 -2
View File
@@ -707,11 +707,11 @@ Oe Ai &lt;oeai/at/symbiants/dot/com&gt;</translation>
<name>BitcrushControlDialog</name>
<message>
<source>IN</source>
<translation>ВХОД</translation>
<translation>IN</translation>
</message>
<message>
<source>OUT</source>
<translation>ВЫХОД</translation>
<translation>OUT</translation>
</message>
<message>
<source>GAIN</source>
data/locale/sv.ts
+12 -12
View File
@@ -1063,7 +1063,7 @@ If you&apos;re interested in translating LMMS in another language or want to imp
</message>
<message>
<source>FREQ</source>
<translation>FREKV.</translation>
<translation>FREQ</translation>
</message>
<message>
<source>Cutoff frequency</source>
@@ -1443,7 +1443,7 @@ Right clicking will bring up a context menu where you can change the order in wh
</message>
<message>
<source>Freq x 100</source>
<translation>Frekv. x 100</translation>
<translation>Freq x 100</translation>
</message>
<message>
<source>Modulate Env-Amount</source>
@@ -1454,7 +1454,7 @@ Right clicking will bring up a context menu where you can change the order in wh
<name>EnvelopeAndLfoView</name>
<message>
<source>DEL</source>
<translation>RADERA</translation>
<translation>DEL</translation>
</message>
<message>
<source>Predelay:</source>
@@ -1526,7 +1526,7 @@ Right clicking will bring up a context menu where you can change the order in wh
</message>
<message>
<source>AMT</source>
<translation>MÄNGD</translation>
<translation>AMT</translation>
</message>
<message>
<source>Modulation amount:</source>
@@ -1590,7 +1590,7 @@ Right clicking will bring up a context menu where you can change the order in wh
</message>
<message>
<source>FREQ x 100</source>
<translation>FREKV. x 100</translation>
<translation>FREQ x 100</translation>
</message>
<message>
<source>Click here if the frequency of this LFO should be multiplied by 100.</source>
@@ -1883,7 +1883,7 @@ Right clicking will bring up a context menu where you can change the order in wh
</message>
<message>
<source>Freq: </source>
<translation>Frekv.:</translation>
<translation>Freq:</translation>
</message>
</context>
<context>
@@ -3197,7 +3197,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri
</message>
<message>
<source>FREQ</source>
<translation>FREKV.</translation>
<translation>FREQ</translation>
</message>
<message>
<source>cutoff frequency:</source>
@@ -3275,7 +3275,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri
</message>
<message>
<source>PAN</source>
<translation>PANORERA</translation>
<translation>PAN</translation>
</message>
<message>
<source>MIDI</source>
@@ -3322,7 +3322,7 @@ You can remove and move FX channels in the context menu, which is accessed by ri
</message>
<message>
<source>PAN</source>
<translation>PANORERA</translation>
<translation>PAN</translation>
</message>
<message>
<source>Pitch</source>
@@ -5982,14 +5982,14 @@ Orsak: &quot;%2&quot;</translation>
</message>
<message>
<source>PAN</source>
<translation>PANORERA</translation>
<translation>PAN</translation>
</message>
</context>
<context>
<name>SetupDialog</name>
<message>
<source>Setup LMMS</source>
<translation>Ställ in LMMS</translation>
<translation>Inställningar</translation>
</message>
<message>
<source>General settings</source>
@@ -6077,7 +6077,7 @@ Orsak: &quot;%2&quot;</translation>
</message>
<message>
<source>STK rawwave directory</source>
<translation>Katalog för STK rå-vågform</translation>
<translation>Katalog för STK vågformer</translation>
</message>
<message>
<source>Default Soundfont File</source>
data/locale/uk.ts
+1 -1
View File
@@ -1341,7 +1341,7 @@ If you&apos;re interested in translating LMMS in another language or want to imp
</message>
<message>
<source>DECAY</source>
<translation>ЗГАСАННЯ</translation>
<translation>DECAY</translation>
</message>
<message>
<source>Time:</source>
include/ImportFilter.h
+1
View File
@@ -80,6 +80,7 @@ protected:
inline QByteArray readAllData()
{
m_file.seek(0);
return m_file.readAll();
}
plugins/LadspaEffect/LadspaEffect.cpp
-3
View File
@@ -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();
}
plugins/zynaddsubfx/ZynAddSubFx.cpp
-2
View File
@@ -641,8 +641,6 @@ void ZynAddSubFxView::toggleUI()
connect( model->m_remotePlugin, SIGNAL( clickedCloseButton() ),
m_toggleUIButton, SLOT( toggle() ) );
}
ControllerConnection::finalizeConnections();
}
}
src/core/ControllerConnection.cpp
+12 -6
View File
@@ -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 );
}
}
}
src/gui/SetupDialog.cpp
+1 -1
View File
@@ -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(