mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-05-19 12:16:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'f7741f184f83e6b9e2f081d39efffb2c499962f6' into ed_refac

Browse Source
This commit is contained in:
Lukas W
2015-01-06 16:11:39 +01:00
parent eb79701acc f7741f184f
commit 834be948ee
7 changed files with 155 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/locale/de.qm
View File

Binary file not shown.

159
data/locale/de.ts
View File

@@ -654,6 +654,63 @@ Wenn Sie daran interessiert sind LMMS in eine andere Sprache zu übersetzen oder
<translation>Plugin entfe&amp;rnen</translation>
</message>
</context>
<context>
<name>DelayControls</name>
<message>
<source>Delay Samples</source>
<translation>Samples verzögern</translation>
</message>
<message>
<source>Feedback</source>
<translation>Rückkopplung</translation>
</message>
<message>
<source>Lfo Frequency</source>
<translation>LFO-Frequenz</translation>
</message>
<message>
<source>Lfo Amount</source>
<translation>LFO-Stärke</translation>
</message>
</context>
<context>
<name>DelayControlsDialog</name>
<message>
<source>Delay</source>
<translation>Verzögerung</translation>
</message>
<message>
<source>Delay Time</source>
<translation>Verzögerungszeit</translation>
</message>
<message>
<source>Regen</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Feedback Amount</source>
<translation>Rückkopplungsstärke</translation>
</message>
<message>
<source>Rate</source>
<translation>Rate</translation>
</message>
<message>
<source>Lfo</source>
<translation>LFO</translation>
</message>
<message>
<source>Lfo Amt</source>
<translation>LFO-Stärke</translation>
</message>
</context>
<context>
<name>DetuningHelper</name>
<message>
<source>Note detuning</source>
<translation>Noten-Verstimmung</translation>
</message>
</context>
<context>
<name>DualFilterControlDialog</name>
<message>
@@ -780,6 +837,13 @@ Wenn Sie daran interessiert sind LMMS in eine andere Sprache zu übersetzen oder
<translation>Vokalformant-Filter</translation>
</message>
</context>
<context>
<name>DummyEffect</name>
<message>
<source>NOT FOUND</source>
<translation>NICHT GEFUNDEN</translation>
</message>
</context>
<context>
<name>Effect</name>
<message>
@@ -3294,7 +3358,7 @@ Bitte besuchen Sie http://lmms.sf.net/wiki für Dokumentationen über LMMS.</tra
</message>
<message>
<source>Bandlimited Ramp wave</source>
<translation type="unfinished"></translation>
<translation>Bandbegrenzte Sägezahnwelle</translation>
</message>
<message>
<source>Bandlimited Square wave</source>
@@ -3330,7 +3394,7 @@ Bitte besuchen Sie http://lmms.sf.net/wiki für Dokumentationen über LMMS.</tra
</message>
<message>
<source>Digital Ramp wave</source>
<translation type="unfinished"></translation>
<translation>Digitale Sägezahnwelle</translation>
</message>
<message>
<source>Digital Square wave</source>
@@ -3350,7 +3414,7 @@ Bitte besuchen Sie http://lmms.sf.net/wiki für Dokumentationen über LMMS.</tra
</message>
<message>
<source>Ramp wave</source>
<translation type="unfinished"></translation>
<translation>Sägezahnwelle</translation>
</message>
<message>
<source>Square wave</source>
@@ -4085,6 +4149,21 @@ Grund: »%2«</translation>
<translation>LMMS Plugin %1 hat keinen Plugin-Deskriptor namens %2!</translation>
</message>
</context>
<context>
<name>PluginBrowser</name>
<message>
<source>Instrument plugins</source>
<translation>Instrument-Plugins</translation>
</message>
<message>
<source>Instrument browser</source>
<translation>Instrument-Browser</translation>
</message>
<message>
<source>Drag an instrument into either the Song-Editor, the Beat+Bassline Editor or into an existing instrument track.</source>
<translation>Ziehen Sie ein Instrument entweder in den Song-Editor, den Beat+Bassline-Editor oder in eine existierende Instrumentspur.</translation>
</message>
</context>
<context>
<name>ProjectRenderer</name>
<message>
@@ -6990,10 +7069,6 @@ Doppelklicken auf eines der Plugins zeigt Informaitonen über die Ports an.</tra
</context>
<context>
<name>pluginBrowser</name>
<message>
<source>Instrument plugins</source>
<translation>Instrument-Plugins</translation>
</message>
<message>
<source>VST-host for using VST(i)-plugins within LMMS</source>
<translation>VST-Host zum Benutzen von VST(i)-Plugins innerhalb von LMMS</translation>
@@ -7056,14 +7131,6 @@ This chip was used in the Commodore 64 computer.</source>
<translation>Emulation des MOS6581 und MOS8580 SID Chips.
Dieser Chip wurde in Commodore 64 Computern genutzt.</translation>
</message>
<message>
<source>Instrument browser</source>
<translation>Instrument-Browser</translation>
</message>
<message>
<source>Drag an instrument into either the Song-Editor, the Beat+Bassline Editor or into an existing instrument track.</source>
<translation>Ziehen Sie ein Instrument entweder in den Song-Editor, den Beat+Bassline-Editor oder in eine existierende Instrumentspur.</translation>
</message>
<message>
<source>Player for SoundFont files</source>
<translation>Wiedergabe von SoundFont-Dateien</translation>
@@ -7148,6 +7215,10 @@ Dieser Chip wurde in Commodore 64 Computern genutzt.</translation>
<source>Carla Patchbay Instrument</source>
<translation>Carla Patchbay Instrument</translation>
</message>
<message>
<source>A native delay plugin</source>
<translation>Ein natives Verzögerung-Plugin</translation>
</message>
</context>
<context>
<name>projectNotes</name>
@@ -7476,6 +7547,57 @@ Latenz: %2 ms</translation>
<translation>Wiedergabe-Courser im AudioFileProcessor anzeigen</translation>
</message>
</context>
<context>
<name>setupWidget</name>
<message>
<source>OSS (Open Sound System)</source>
<translation>OSS (Open Sound System)</translation>
</message>
<message>
<source>SDL (Simple DirectMedia Layer)</source>
<translation>SDL (Simple DirectMedia Layer)</translation>
</message>
<message>
<source>ALSA-Sequencer (Advanced Linux Sound Architecture)</source>
<translation>ALSA-Sequencer (Advanced Linux Sound Architecture)</translation>
</message>
<message>
<source>JACK (JACK Audio Connection Kit)</source>
<translation>JACK (JACK Audio Connection Kit)</translation>
</message>
<message>
<source>ALSA Raw-MIDI (Advanced Linux Sound Architecture)</source>
<translation>ALSA Raw-MIDI (Advanced Linux Sound Architecture)</translation>
</message>
<message>
<source>PulseAudio (bad latency!)</source>
<translation>PulseAudio (Schlechte Latenz!)</translation>
</message>
<message>
<source>Dummy (no sound output)</source>
<translation>Dummy (Keine Soundausgabe)</translation>
</message>
<message>
<source>Dummy (no MIDI support)</source>
<translation>Dummy (Keine MIDI-Unterstützung)</translation>
</message>
<message>
<source>WinMM MIDI</source>
<translation>WinMM MIDI</translation>
</message>
<message>
<source>OSS Raw-MIDI (Open Sound System)</source>
<translation>OSS Raw-MIDI (Open Sound System)</translation>
</message>
<message>
<source>ALSA (Advanced Linux Sound Architecture)</source>
<translation>ALSA (Advanced Linux Sound Architecture)</translation>
</message>
<message>
<source>PortAudio</source>
<translation>PortAudio</translation>
</message>
</context>
<context>
<name>sf2Instrument</name>
<message>
@@ -7902,6 +8024,13 @@ Latenz: %2 ms</translation>
<translation>Rechts-nach-rechts</translation>
</message>
</context>
<context>
<name>tabWidget</name>
<message>
<source>Settings for %1</source>
<translation>Einstellungen für %1</translation>
</message>
</context>
<context>
<name>timeLine</name>
<message>

3
data/scripts/create_apple_dmg.sh.in
View File

@@ -16,10 +16,11 @@ DMG_BACKGROUND_IMG="dmg_branding.png"
cp "@CMAKE_SOURCE_DIR@/data/${DMG_BACKGROUND_IMG}" .
# you should not need to change these
OS_VER=`sw_vers -productVersion|cut -d"." -f1-2`
APP_LOWERCASE=$(echo $APP_NAME|tr '[:upper:]' '[:lower:]')
APP_EXE="${APP_NAME}.app/Contents/MacOS/${APP_LOWERCASE}"
VOL_NAME="${APP_NAME} ${VERSION}" # volume name will be "SuperCoolApp 1.0.0"
VOL_NAME="${APP_LOWERCASE}-${VERSION}-mac${OS_VER}" # volume name will be "SuperCoolApp 1.0.0"
DMG_TMP="${VOL_NAME}-temp.dmg"
DMG_FINAL="${VOL_NAME}.dmg" # final DMG name will be "SuperCoolApp 1.0.0.dmg"
STAGING_DIR="./Install" # we copy all our stuff into this dir

4
plugins/LadspaEffect/swh/imp_1199.c
View File

@@ -74,7 +74,11 @@ static fftw_real *real_in, *real_out, *comp_in, *comp_out;
unsigned int fft_length[IMPULSES];
#ifdef __clang__
void impulse2freq(int id, float *imp, unsigned int length, fftw_real *out)
#else
inline void impulse2freq(int id, float *imp, unsigned int length, fftw_real *out)
#endif
{
fftw_real impulse_time[MAX_FFT_LENGTH];
#ifdef FFTW3

1
plugins/audio_file_processor/audio_file_processor.cpp
View File

@@ -742,6 +742,7 @@ AudioFileProcessorWaveView::AudioFileProcessorWaveView( QWidget * _parent, int _
m_to( m_sampleBuffer.frames() ),
m_last_from( 0 ),
m_last_to( 0 ),
m_last_amp( 0 ),
m_startKnob( 0 ),
m_endKnob( 0 ),
m_loopKnob( 0 ),

1
plugins/zynaddsubfx/LocalZynAddSubFx.cpp
View File

@@ -89,6 +89,7 @@ LocalZynAddSubFx::LocalZynAddSubFx() :
LocalZynAddSubFx::~LocalZynAddSubFx()
{
delete m_master;
delete m_ioEngine;
if( --s_instanceCount == 0 )
{

3
src/core/Controller.cpp
View File

@@ -205,8 +205,11 @@ Controller * Controller::create( ControllerTypes _ct, Model * _parent )
if( dummy )
c = dummy;
else
{
c = new Controller( DummyController, NULL,
QString() );
dummy = c;
}
break;
case Controller::LfoController: