← Back to branch summary

~ubuntu-branches/ubuntu/precise/lmms/precise-updates

« back to all changes in this revision

Viewing changes to src/core/note.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Артём Попов
  • Date: 2011-02-14 20:58:36 UTC
  • mfrom: (1.1.10 upstream) (3.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20110214205836-2u41xus1d2mj8nfz
Tags: 0.4.10-1ubuntu1
https://launchpad.net/bugs/718801
* Merge from debian unstable (LP: #718801).  Remaining changes:
  - Replace build-dep on libwine-dev with wine1.2-dev to build
    against the newer Wine.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/note.cpp
28
28
#include <math.h>
29
29
 
30
30
#include "note.h"
31
 
#include "detuning_helper.h"
 
31
#include "DetuningHelper.h"
32
32
#include "templates.h"
33
33
 
34
34
 
37
37
 
38
38
note::note( const midiTime & _length, const midiTime & _pos,
39
39
                int _key, volume_t _volume, panning_t _panning,
40
 
                                                detuningHelper * _detuning ) :
 
40
                                                DetuningHelper * _detuning ) :
41
41
        m_selected( false ),
42
42
        m_oldKey( tLimit( _key, 0, NumKeys ) ),
43
43
        m_oldPos( _pos ),
261
261
 
262
262
void note::editDetuningPattern()
263
263
{
264
 
        m_detuning->getAutomationPattern()->openInAutomationEditor();
 
264
        m_detuning->automationPattern()->openInAutomationEditor();
265
265
}
266
266
 
267
267
 
269
269
 
270
270
void note::createDetuning()
271
271
{
272
 
        m_detuning = new detuningHelper;
273
 
        (void) m_detuning->getAutomationPattern();
 
272
        m_detuning = new DetuningHelper;
 
273
        (void) m_detuning->automationPattern();
274
274
        m_detuning->setRange( -MaxDetuning, MaxDetuning, 0.1f );
275
275
}
276
276