← Back to branch summary

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

« back to all changes in this revision

Viewing changes to plugins/sf2_player/sf2_player.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:
plugins/sf2_player/sf2_player.cpp
128
128
        InstrumentPlayHandle * iph = new InstrumentPlayHandle( this );
129
129
        engine::getMixer()->addPlayHandle( iph );
130
130
 
131
 
        //loadFile( configManager::inst()->defaultSoundfont() );
 
131
        loadFile( configManager::inst()->defaultSoundfont() );
132
132
 
133
133
        updateSampleRate();
134
134
        updateReverbOn();
255
255
 
256
256
void sf2Instrument::loadFile( const QString & _file )
257
257
{
258
 
        if( !_file.isEmpty() )
 
258
        if( !_file.isEmpty() && QFileInfo( _file ).exists() )
259
259
        {
260
260
                openFile( _file );
261
261
                updatePatch();
608
608
                }
609
609
 
610
610
                fluid_synth_noteon( m_synth, m_channel, midiNote,
611
 
                                                        _n->getMidiVelocity() );
 
611
                                                        _n->midiVelocity() );
612
612
 
613
613
                // get new voice and save it
614
614
                fluid_synth_get_voicelist( m_synth, voices, poly, -1 );