← Back to branch summary

~ubuntu-branches/ubuntu/trusty/lmms/trusty

« back to all changes in this revision

Viewing changes to src/core/FxMixer.cpp

  • Committer: Charlie Smotherman
  • Date: 2012-12-05 22:08:38 UTC
  • mfrom: (33.1.7 lmms_0.4.13)
  • Revision ID: cjsmo@cableone.net-20121205220838-09pjfzew9m5023hr
https://launchpad.net/bugs/824231
https://launchpad.net/bugs/863366
* New  Upstream release.
  - Minor tweaking to ZynAddSubFX, CALF, SWH plugins  and Stefan Fendt's RC
    filters.
  - Added UI fixes: Magnentic effect of knobs and Piano-roll fixes
  - Updated German localization and copyright year
* debian/lmms-common.install:
  - added /usr/share/applications so the lmms.desktop file will correctly
    install (LP: #863366)
  - This should also fix the Software Center not displaying lmms in sound
    and video (LP: #824231)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/FxMixer.cpp
3
3
/*
4
4
 * FxMixer.cpp - effect mixer for LMMS
5
5
 *
6
 
 * Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
 
6
 * Copyright (c) 2008-2011 Tobias Doerffel <tobydox/at/users.sourceforge.net>
7
7
 * 
8
8
 * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
9
9
 *
119
119
                        _buf = m_fxChannels[_ch]->m_buffer;
120
120
                }
121
121
                const fpp_t f = engine::getMixer()->framesPerPeriod();
122
 
                m_fxChannels[_ch]->m_fxChain.startRunning();
123
 
                m_fxChannels[_ch]->m_stillRunning =
124
 
                        m_fxChannels[_ch]->m_fxChain.processAudioBuffer(
125
 
                                                                _buf, f );
126
 
                m_fxChannels[_ch]->m_peakLeft =
127
 
                        engine::getMixer()->peakValueLeft( _buf, f ) *
128
 
                                m_fxChannels[_ch]->m_volumeModel.value();
129
 
                m_fxChannels[_ch]->m_peakRight =
130
 
                        engine::getMixer()->peakValueRight( _buf, f ) *
131
 
                                m_fxChannels[_ch]->m_volumeModel.value();
 
122
                if( !engine::getSong()->isFreezingPattern() )
 
123
                {
 
124
                        m_fxChannels[_ch]->m_fxChain.startRunning();
 
125
                        m_fxChannels[_ch]->m_stillRunning = m_fxChannels[_ch]->m_fxChain.processAudioBuffer( _buf, f );
 
126
                        m_fxChannels[_ch]->m_peakLeft = engine::getMixer()->peakValueLeft( _buf, f ) *
 
127
                                                                                                m_fxChannels[_ch]->m_volumeModel.value();
 
128
                        m_fxChannels[_ch]->m_peakRight = engine::getMixer()->peakValueRight( _buf, f ) *
 
129
                                                                                                m_fxChannels[_ch]->m_volumeModel.value();
 
130
                }
132
131
                m_fxChannels[_ch]->m_used = true;
133
132
        }
134
133
        else