From 46b86e70aefb8904a093aba4b53b9660f5adb95b Mon Sep 17 00:00:00 2001 From: LYF610400210 Date: Tue, 18 Nov 2014 15:39:43 +0800 Subject: [PATCH 1/2] [Translation] zh.ts --- data/locale/zh.ts | 72 +++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/data/locale/zh.ts b/data/locale/zh.ts index d2b19e6bf..a82900c88 100644 --- a/data/locale/zh.ts +++ b/data/locale/zh.ts @@ -130,7 +130,7 @@ Jeff Bai，邮箱：jeffbaichina@gmail.com Click here, if you want to open another audio-file. A dialog will appear where you can select your file. Settings like looping-mode, start and end-points, amplify-value, and so on are not reset. So, it may not sound like the original sample. - 如果想打开另一个音频文件，请点击这里。接着会出现文件选择对话框。诸如环回模式(looping-mode)，起始/结束点，放大值(amplify-value)之类的值不会被重置。因此听起来会和源采样有差异。 + 如果想打开另一个音频文件，请点击这里。接着会出现文件选择对话框。 诸如环回模式(looping-mode)、起始/结束点、放大值(amplify-value)之类的值不会被重置。因此音频听起来会和原采样有差异。 Reverse sample @@ -146,7 +146,7 @@ Jeff Bai，邮箱：jeffbaichina@gmail.com With this knob you can set the amplify ratio. When you set a value of 100% your sample isn't changed. Otherwise it will be amplified up or down (your actual sample-file isn't touched!) - 此旋钮用于调整放大比率。当设为100% 时采样不会变化。除此之外，不是放大就是减弱(原始的采样文件不会被改变) + 此旋钮用于调整振幅放大比率。当设为100%时采样不会变化。除此之外，振幅不是放大就是减弱 (原始的采样文件不会被改变) Startpoint: @@ -170,11 +170,11 @@ Jeff Bai，邮箱：jeffbaichina@gmail.com This button disables looping. The sample plays only once from start to end. - + 点击此按钮可以禁止循环播放。 Enable loop - + 开启循环 This button enables forwards-looping. The sample loops between the end point and the loop point. @@ -216,7 +216,7 @@ Jeff Bai，邮箱：jeffbaichina@gmail.com LMMS was kicked by JACK for some reason. Therefore the JACK backend of LMMS has been restarted. You will have to make manual connections again. - LMMS由于某些原因与JACK断开连接，这可能是因为LMMS的JACK后端重启导致的，你需要手动重新连接。 + LMMS由于某些原因与JACK断开连接。 这可能是因为LMMS的JACK后端重启导致的，你需要手动重新连接。 JACK server down @@ -224,7 +224,7 @@ Jeff Bai，邮箱：jeffbaichina@gmail.com The JACK server seems to have been shutdown and starting a new instance failed. Therefore LMMS is unable to proceed. You should save your project and restart JACK and LMMS. - JACK服务好像崩溃了而且未能正常启动，LMMS不能正常工作，你需要保存你的工作然后重启JACK和LMMS。 + JACK服务好像崩溃了，而且未能正常启动。 LMMS不能正常工作，你需要保存你的工作然后重启JACK和LMMS。 @@ -322,7 +322,7 @@ Jeff Bai，邮箱：jeffbaichina@gmail.com Remove all linked controls - 删除所有已连接的控制器 + 移除所有已连接的控制器 @@ -401,7 +401,7 @@ Jeff Bai，邮箱：jeffbaichina@gmail.com All selected values were copied to the clipboard. - + 所有选中的值已复制 Discrete progression @@ -681,15 +681,15 @@ Jeff Bai，邮箱：jeffbaichina@gmail.com DualFilterControls Filter 1 enabled - 过滤器1 已启用 + 过滤器 1 已启用 Filter 1 type - 过滤器 1 类型 + 过滤器 1 的类型 Cutoff 1 frequency - + 频谱刀 1 的频率 Q/Resonance 1 @@ -697,7 +697,7 @@ Jeff Bai，邮箱：jeffbaichina@gmail.com Gain 1 - + 增益 1 Mix @@ -709,11 +709,11 @@ Jeff Bai，邮箱：jeffbaichina@gmail.com Filter 2 type - 过滤器 1 类型 {2 ?} + 过滤器 2 的类型 Cutoff 2 frequency - + 频谱刀 2 的频率 Q/Resonance 2 @@ -721,7 +721,7 @@ Jeff Bai，邮箱：jeffbaichina@gmail.com Gain 2 - + 增益 2 LowPass @@ -788,7 +788,7 @@ Jeff Bai，邮箱：jeffbaichina@gmail.com Effect Effect enabled - 启用效果器 + 效果器已启用 Wet/Dry mix @@ -807,7 +807,7 @@ Jeff Bai，邮箱：jeffbaichina@gmail.com EffectChain Effects enabled - 启用效果器 + 效果器已启用 @@ -829,14 +829,14 @@ Jeff Bai，邮箱：jeffbaichina@gmail.com Plugin description - 插件描述 + 插件说明 EffectView Toggles the effect on or off. - 打开或关闭效果 + 打开/关闭效果 On/Off @@ -844,15 +844,15 @@ Jeff Bai，邮箱：jeffbaichina@gmail.com W/D - W/D + 干/湿 Wet Level: - + 湿度 The Wet/Dry knob sets the ratio between the input signal and the effect signal that forms the output. - + 旋转干湿度旋钮以调整原信号与有效果的信号的比例。 DECAY @@ -990,23 +990,23 @@ Right clicking will bring up a context menu where you can change the order in wh ATT - + ATT Attack: - 打进声 + 打进： Use this knob for setting attack-time of the current envelope. The bigger this value the longer the envelope needs to increase to attack-level. Choose a small value for instruments like pianos and a big value for strings. - + (ADSR Attack) HOLD - + HOLD Hold: - + 持续： Use this knob for setting hold-time of the current envelope. The bigger this value the longer the envelope holds attack-level before it begins to decrease to sustain-level. @@ -1014,7 +1014,7 @@ Right clicking will bring up a context menu where you can change the order in wh DEC - + DEC Decay: @@ -1022,31 +1022,31 @@ Right clicking will bring up a context menu where you can change the order in wh Use this knob for setting decay-time of the current envelope. The bigger this value the longer the envelope needs to decrease from attack-level to sustain-level. Choose a small value for instruments like pianos. - + (ADSR Decay) SUST - + SUST Sustain: - + 持幅： Use this knob for setting sustain-level of the current envelope. The bigger this value the higher the level on which the envelope stays before going down to zero. - + (ADSR Sustain) REL - + REL Release: - + 消退： Use this knob for setting release-time of the current envelope. The bigger this value the longer the envelope needs to decrease from sustain-level to zero. Choose a big value for soft instruments like strings. - + (ADSR Release) AMT @@ -1233,7 +1233,7 @@ Right clicking will bring up a context menu where you can change the order in wh Please note that not all of the parameters above apply for all file formats. - 请注意上面的参数不一定适用于所有文件格式。 + 请注意：上面的参数不一定适用于所有文件格式。 Quality settings From d98c2392b24cd0f7cb1883992c1b3f1aea20cdb2 Mon Sep 17 00:00:00 2001 From: Vesa Date: Tue, 18 Nov 2014 10:48:03 +0200 Subject: [PATCH 2/2] Move the denormals protection to the run() function of the thread The constructor was probably the wrong place to put it, run() is definitely executed in the new thread so that's where the setting should be applied I think? --- src/core/Mixer.cpp | 19 ++++++++++--------- src/core/MixerWorkerThread.cpp | 19 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/core/Mixer.cpp b/src/core/Mixer.cpp index 488ea3138..1868d9ab0 100644 --- a/src/core/Mixer.cpp +++ b/src/core/Mixer.cpp @@ -902,15 +902,6 @@ 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 } @@ -926,6 +917,16 @@ void Mixer::fifoWriter::finish() void Mixer::fifoWriter::run() { +// 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 + #if 0 #ifdef LMMS_BUILD_LINUX #ifdef LMMS_HAVE_SCHED_H diff --git a/src/core/MixerWorkerThread.cpp b/src/core/MixerWorkerThread.cpp index 817d19c71..c82f9e035 100644 --- a/src/core/MixerWorkerThread.cpp +++ b/src/core/MixerWorkerThread.cpp @@ -101,16 +101,6 @@ MixerWorkerThread::MixerWorkerThread( Mixer* mixer ) : m_workingBuf( new sampleFrame[mixer->framesPerPeriod()] ), m_quit( false ) { - // 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 - // initialize global static data if( queueReadyWaitCond == NULL ) { @@ -162,6 +152,15 @@ void MixerWorkerThread::startAndWaitForJobs() void MixerWorkerThread::run() { +// 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 QMutex m; while( m_quit == false ) {