From 3d9dc25f0b1fdc5b887a266a7004e64c90706abb Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Fri, 5 Jun 2009 01:09:07 +0200 Subject: [PATCH] InstrumentTrack: presetPreviewPlayHandle no longer a friend class For a long time presetPreviewPlayHandle has been a friend class of InstrumentTrack as it had to modify MidiPort settings. However the InstrumentTrack's MidiPort is now accessible via getMidiPort() so there's no need for keeping presetPreviewPlayHandle a friend class anymore. Signed-off-by: Tobias Doerffel (cherry picked from commit a6090ebe23487b85c8dd27187718046457f93b67) --- include/instrument_track.h | 2 -- src/core/preset_preview_play_handle.cpp | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/instrument_track.h b/include/instrument_track.h index 8d700c417..dbbefbece 100644 --- a/include/instrument_track.h +++ b/include/instrument_track.h @@ -53,7 +53,6 @@ class midiPortMenu; class multimediaProject; class notePlayHandle; class pluginView; -class presetPreviewPlayHandle; class tabWidget; class trackLabelButton; @@ -233,7 +232,6 @@ private: friend class instrumentTrackView; friend class instrumentTrackWindow; friend class notePlayHandle; - friend class presetPreviewPlayHandle; friend class flpImport; } ; diff --git a/src/core/preset_preview_play_handle.cpp b/src/core/preset_preview_play_handle.cpp index 0812f64e2..bb2bccf60 100644 --- a/src/core/preset_preview_play_handle.cpp +++ b/src/core/preset_preview_play_handle.cpp @@ -151,8 +151,8 @@ presetPreviewPlayHandle::presetPreviewPlayHandle( const QString & _preset_file, // make sure, our preset-preview-track does not appear in any MIDI- // devices list, so just disable receiving/sending MIDI-events at all - s_previewTC->previewInstrumentTrack()->m_midiPort.setMode( - midiPort::Disabled ); + s_previewTC->previewInstrumentTrack()-> + getMidiPort()->setMode( midiPort::Disabled ); // create note-play-handle for it m_previewNote = new notePlayHandle(