From f42196315c8c65148e8c65f435b885433fb36021 Mon Sep 17 00:00:00 2001 From: tresf Date: Wed, 4 Jun 2014 08:52:12 -0400 Subject: [PATCH] SF2/VST title rename #462 w/ #774 recommendations --- plugins/sf2_player/sf2_player.cpp | 4 ++-- plugins/vestige/vestige.cpp | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/plugins/sf2_player/sf2_player.cpp b/plugins/sf2_player/sf2_player.cpp index 4fba5c648..2647ca1f3 100644 --- a/plugins/sf2_player/sf2_player.cpp +++ b/plugins/sf2_player/sf2_player.cpp @@ -352,9 +352,9 @@ void sf2Instrument::openFile( const QString & _sf2File, bool updateTrackName ) delete[] sf2Ascii; - if( updateTrackName ) + if( updateTrackName || instrumentTrack()->displayName() == displayName()) { - instrumentTrack()->setName( QFileInfo( _sf2File ).baseName() ); + instrumentTrack()->setName( QFileInfo( _sf2File ).baseName() ); } } diff --git a/plugins/vestige/vestige.cpp b/plugins/vestige/vestige.cpp index 4c907c9a2..8413f3ebd 100644 --- a/plugins/vestige/vestige.cpp +++ b/plugins/vestige/vestige.cpp @@ -237,9 +237,10 @@ void vestigeInstrument::loadFile( const QString & _file ) { m_pluginMutex.lock(); const bool set_ch_name = ( m_plugin != NULL && - instrumentTrack()->name() == m_plugin->name() ) || - instrumentTrack()->name() == - InstrumentTrack::tr( "Default preset" ); + instrumentTrack()->name() == m_plugin->name() ) || + instrumentTrack()->name() == InstrumentTrack::tr( "Default preset" ) || + instrumentTrack()->name() == displayName(); + m_pluginMutex.unlock(); if ( m_plugin != NULL ) @@ -310,12 +311,12 @@ void vestigeInstrument::play( sampleFrame * _buf ) -bool vestigeInstrument::handleMidiEvent( const MidiEvent& event, const MidiTime& time, f_cnt_t offset ) +bool vestigeInstrument::handleMidiEvent( const MidiEvent& event, const MidiTime& time ) { m_pluginMutex.lock(); if( m_plugin != NULL ) { - m_plugin->processMidiEvent( event, offset ); + m_plugin->processMidiEvent( event, time ); } m_pluginMutex.unlock();