oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed icon

Browse Source
This commit is contained in:
itsmattkc
2018-09-29 12:26:01 +10:00
parent af738b9020
commit ee7b5476bf
11 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
effects/audio/audionoiseeffect.cpp
+2 -2
View File
@@ -33,8 +33,8 @@ void AudioNoiseEffect::process_audio(double timecode_start, double timecode_end,
if (mix_val->get_bool_value(timecode)) {
qint16 left_sample = (qint16) (((samples[i+1] & 0xFF) << 8) | (samples[i] & 0xFF));
qint16 right_sample = (qint16) (((samples[i+3] & 0xFF) << 8) | (samples[i+2] & 0xFF));
left_noise_sample = mixAudioSample(left_noise_sample, left_sample);
right_noise_sample = mixAudioSample(right_noise_sample, right_sample);
left_noise_sample = mix_audio_sample(left_noise_sample, left_sample);
right_noise_sample = mix_audio_sample(right_noise_sample, right_sample);
}
samples[i+3] = (quint8) (right_noise_sample >> 8);
effects/audio/toneeffect.cpp
+2 -2
View File
@@ -42,8 +42,8 @@ void ToneEffect::process_audio(double timecode_start, double timecode_end, quint
if (mix_val->get_bool_value(timecode)) {
qint16 left_sample = (qint16) (((samples[i+1] & 0xFF) << 8) | (samples[i] & 0xFF));
qint16 right_sample = (qint16) (((samples[i+3] & 0xFF) << 8) | (samples[i+2] & 0xFF));
left_tone_sample = mixAudioSample(left_tone_sample, left_sample);
right_tone_sample = mixAudioSample(right_tone_sample, right_sample);
left_tone_sample = mix_audio_sample(left_tone_sample, left_sample);
right_tone_sample = mix_audio_sample(right_tone_sample, right_sample);
}
samples[i+3] = (quint8) (right_tone_sample >> 8);
effects/effect.cpp
+1 -1
View File
@@ -835,7 +835,7 @@ void EffectField::set_color_value(QColor color) {
static_cast<ColorButton*>(ui_element)->set_color(color);
}
qint16 mixAudioSample(qint16 a, qint16 b) {
qint16 mix_audio_sample(qint16 a, qint16 b) {
qint32 mixed_sample = static_cast<qint32>(a) + static_cast<qint32>(b);
mixed_sample = qMax(qMin(mixed_sample, static_cast<qint32>(INT16_MAX)), static_cast<qint32>(INT16_MIN));
return static_cast<qint16>(mixed_sample);
effects/effect.h
+1 -1
View File
@@ -83,7 +83,7 @@ struct GLTextureCoords {
double textureBottomLeftY;
};
qint16 mixAudioSample(qint16 a, qint16 b);
qint16 mix_audio_sample(qint16 a, qint16 b);
class EffectField : public QObject {
Q_OBJECT