From a1c4992a89a196888bfb18b4e938aefa5856aa07 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Wed, 10 Jun 2009 23:03:30 +0200 Subject: [PATCH] ResourcePreviewer: disable journalling when previewing Globally disable journalling when previewing a ResourceItem (i.e. load a preset, sample etc.). Signed-off-by: Tobias Doerffel --- include/ResourcePreviewer.h | 2 +- src/core/ResourcePreviewer.cpp | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/include/ResourcePreviewer.h b/include/ResourcePreviewer.h index 5aa0fd239..3b2ca82d7 100644 --- a/include/ResourcePreviewer.h +++ b/include/ResourcePreviewer.h @@ -46,7 +46,7 @@ private: { virtual QString nodeName( void ) const { - return( "PreviewTrackContainer" ); + return "PreviewTrackContainer"; } } ; diff --git a/src/core/ResourcePreviewer.cpp b/src/core/ResourcePreviewer.cpp index 8509135fe..28a425c0a 100644 --- a/src/core/ResourcePreviewer.cpp +++ b/src/core/ResourcePreviewer.cpp @@ -25,8 +25,10 @@ #include "ResourcePreviewer.h" #include "ResourceItem.h" +#include "engine.h" #include "instrument_track.h" #include "mmp.h" +#include "project_journal.h" ResourcePreviewer::ResourcePreviewer() : @@ -48,6 +50,10 @@ ResourcePreviewer::ResourcePreviewer() : void ResourcePreviewer::preview( ResourceItem * _item ) { + const bool j = engine::getProjectJournal()->isJournalling(); + engine::getProjectJournal()->setJournalling( false ); + engine::setSuppressMessages( true ); + switch( _item->type() ) { case ResourceItem::TypePreset: @@ -60,6 +66,9 @@ void ResourcePreviewer::preview( ResourceItem * _item ) midiPort::Disabled ); break; } + + engine::setSuppressMessages( false ); + engine::getProjectJournal()->setJournalling( j ); }