hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'stable-1.1'

Browse Source
This commit is contained in:
Vesa
2014-11-18 09:22:25 +02:00
parent dfb89c8c92 0037b9ade9
commit e6938994cd
8 changed files with 49 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
data/locale/ja.ts
View File

@@ -5057,7 +5057,7 @@ Please make sure you have read-permission to the file and the directory containi
</message>
<message>
<source>Load waveform</source>
<translation type="unfinished"></translation>
<translation type="unfinished">波形の読み込み</translation>
</message>
<message>
<source>Click to load a waveform from a sample file</source>
@@ -5171,7 +5171,7 @@ Please make sure you have read-permission to the file and the directory containi
<name>ZynAddSubFxView</name>
<message>
<source>Show GUI</source>
<translation type="unfinished"></translation>
<translation>GUI を表示</translation>
</message>
<message>
<source>Click here to show or hide the graphical user interface (GUI) of ZynAddSubFX.</source>
@@ -5289,11 +5289,11 @@ Please make sure you have read-permission to the file and the directory containi
<name>bbEditor</name>
<message>
<source>Beat+Bassline Editor</source>
<translation type="unfinished">ビート＋ベースライン　エディタ</translation>
<translation>Beat+Bassline-Editor</translation>
</message>
<message>
<source>Play/pause current beat/bassline (Space)</source>
<translation type="unfinished">現在の beat/bassline を 再生/ポーズ (Space)</translation>
<translation type="unfinished">現在の beat/bassline を 再生/一時停止 (Space)</translation>
</message>
<message>
<source>Add beat/bassline</source>
@@ -5328,7 +5328,7 @@ Please make sure you have read-permission to the file and the directory containi
<name>bbTCOView</name>
<message>
<source>Open in Beat+Bassline-Editor</source>
<translation type="unfinished">ビート+ベースライン-エディタを開く</translation>
<translation>Beat+Bassline-Editor を開く</translation>
</message>
<message>
<source>Reset name</source>
@@ -5373,19 +5373,19 @@ Please make sure you have read-permission to the file and the directory containi
</message>
<message>
<source>Sine wave</source>
<translation type="unfinished"></translation>
<translation>サイン波</translation>
</message>
<message>
<source>Triangle wave</source>
<translation type="unfinished"></translation>
<translation>三角波</translation>
</message>
<message>
<source>Saw wave</source>
<translation type="unfinished"></translation>
<translation>のこぎり波</translation>
</message>
<message>
<source>Square wave</source>
<translation type="unfinished"></translation>
<translation>矩形波</translation>
</message>
<message>
<source>White noise wave</source>
@@ -5429,7 +5429,7 @@ Please make sure you have read-permission to the file and the directory containi
</message>
<message>
<source>Click here for a square-wave.</source>
<translation type="unfinished">クリックすると方形波</translation>
<translation type="unfinished">クリックすると矩形波</translation>
</message>
<message>
<source>Click here for white-noise.</source>
@@ -5448,7 +5448,7 @@ Please make sure you have read-permission to the file and the directory containi
</message>
<message>
<source>Input gain:</source>
<translation type="unfinished"></translation>
<translation>入力ゲイン:</translation>
</message>
<message>
<source>OUTPUT</source>
@@ -5456,7 +5456,7 @@ Please make sure you have read-permission to the file and the directory containi
</message>
<message>
<source>Output gain:</source>
<translation type="unfinished"></translation>
<translation>出力ゲイン:</translation>
</message>
<message>
<source>ATTACK</source>
@@ -5476,7 +5476,7 @@ Please make sure you have read-permission to the file and the directory containi
</message>
<message>
<source>Reset waveform</source>
<translation type="unfinished"></translation>
<translation>波形をリセット</translation>
</message>
<message>
<source>Click here to reset the wavegraph back to default</source>
@@ -5535,11 +5535,11 @@ Please make sure you have read-permission to the file and the directory containi
<name>dynProcControls</name>
<message>
<source>Input gain</source>
<translation type="unfinished"></translation>
<translation>入力ゲイン</translation>
</message>
<message>
<source>Output gain</source>
<translation type="unfinished"></translation>
<translation>出力ゲイン</translation>
</message>
<message>
<source>Attack time</source>
@@ -7956,20 +7956,20 @@ Latency: %2 ms</source>
<name>vestigeInstrument</name>
<message>
<source>Loading plugin</source>
<translation type="unfinished">プラグインをロードしています</translation>
<translation type="unfinished">プラグインを読み込んでいます</translation>
</message>
<message>
<source>Please wait while loading VST-plugin...</source>
<translation type="unfinished">VST-プラグインをロードする間お待ちください...</translation>
<translation type="unfinished">VST-プラグインを読み込む間お待ちください...</translation>
</message>
<message>
<source>Failed loading VST-plugin</source>
<translation type="unfinished">VST-プラグインのロードに失敗しました</translation>
<translation type="unfinished">VST-プラグインの読み込みに失敗しました</translation>
</message>
<message>
<source>The VST-plugin %1 could not be loaded for some reason.
If it runs with other VST-software under Linux, please contact an LMMS-developer!</source>
<translation type="unfinished">VST-plugin %1 がいくつかの理由でロードできませんでした。
<translation type="unfinished">VST-plugin %1 がいくつかの理由で読み込みできませんでした。
もしその VST が Linuxの他のVST-ソフトウェアで動作するならば LMMS の開発者に連絡してください!</translation>
</message>
</context>

8
include/Mixer.h
View File

@@ -25,6 +25,14 @@
#ifndef _MIXER_H
#define _MIXER_H
// denormals stripping
#ifdef __SSE__
#include <xmmintrin.h>
#endif
#ifdef __SSE3__
#include <pmmintrin.h>
#endif
#include "lmmsconfig.h"
#ifndef LMMS_USE_3RDPARTY_LIBSRC

8
include/lmms_math.h
View File

@@ -47,6 +47,12 @@ using namespace std;
#ifndef _isinff
#define _isinff(x) isinf(x)
#endif
#ifndef exp10
#define exp10(x) pow( 10, x )
#endif
#ifndef exp10f
#define exp10f(x) powf( 10, x )
#endif
#endif
#ifdef __INTEL_COMPILER
@@ -203,7 +209,7 @@ static inline float dbvToAmp( float dbv )
{
return isinff( dbv )
? 0.0f
: powf( 10.0f, dbv * 0.05f );
: exp10f( dbv * 0.05f );
}

4
plugins/dynamics_processor/dynamics_processor.cpp
View File

@@ -76,12 +76,12 @@ dynProcEffect::~dynProcEffect()
inline void dynProcEffect::calcAttack()
{
m_attCoeff = pow( 10, ( DNF_LOG / ( m_dpControls.m_attackModel.value() * 0.001 ) ) / engine::mixer()->processingSampleRate() );
m_attCoeff = exp10( ( DNF_LOG / ( m_dpControls.m_attackModel.value() * 0.001 ) ) / engine::mixer()->processingSampleRate() );
}
inline void dynProcEffect::calcRelease()
{
m_relCoeff = pow( 10, ( -DNF_LOG / ( m_dpControls.m_releaseModel.value() * 0.001 ) ) / engine::mixer()->processingSampleRate() );
m_relCoeff = exp10( ( -DNF_LOG / ( m_dpControls.m_releaseModel.value() * 0.001 ) ) / engine::mixer()->processingSampleRate() );
}

4
plugins/monstro/Monstro.cpp
View File

@@ -1440,14 +1440,14 @@ void MonstroInstrument::updateSamplerate()
void MonstroInstrument::updateSlope1()
{
const float slope = m_env1Slope.value();
m_slope1 = powf( 10.0f, slope * -1.0f );
m_slope1 = exp10f( slope * -1.0f );
}
void MonstroInstrument::updateSlope2()
{
const float slope = m_env2Slope.value();
m_slope2 = powf( 10.0f, slope * -1.0f );
m_slope2 = exp10f( slope * -1.0f );
}

2
src/core/AutomationPattern.cpp
View File

@@ -109,7 +109,7 @@ void AutomationPattern::addObject( AutomatableModel * _obj, bool _search_dup )
if( m_objects.isEmpty() && hasAutomation() == false )
{
// then initialize first value
putValue( MidiTime(0), _obj->value<float>(), false );
putValue( MidiTime(0), _obj->inverseScaledValue( _obj->value<float>() ), false );
}
m_objects += _obj;

9
src/core/Mixer.cpp
View File

@@ -914,6 +914,15 @@ Mixer::fifoWriter::fifoWriter( Mixer* mixer, fifo * _fifo ) :
m_fifo( _fifo ),
m_writing( true )
{
// set denormal protection for this thread
#ifdef __SSE3__
/* DAZ flag */
_MM_SET_DENORMALS_ZERO_MODE( _MM_DENORMALS_ZERO_ON );
#endif
#ifdef __SSE__
/* FTZ flag */
_MM_SET_FLUSH_ZERO_MODE( _MM_FLUSH_ZERO_ON );
#endif
}

2
src/gui/widgets/knob.cpp
View File

@@ -734,7 +734,7 @@ void knob::enterValue()
}
else
{
new_val = pow( 10.0, ( new_val / 20.0 ) ) * 100.0;
new_val = dbvToAmp( new_val ) * 100.0;
}
}
else