--- linuxsampler/trunk/src/plugins/InstrumentEditor.cpp 2009/03/27 12:16:12 1876 +++ linuxsampler/trunk/src/plugins/InstrumentEditor.cpp 2015/08/23 06:14:00 2837 @@ -1,6 +1,6 @@ /*************************************************************************** * * - * Copyright (C) 2007 - 2009 Christian Schoenebeck * + * Copyright (C) 2007 - 2015 Christian Schoenebeck * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -21,7 +21,6 @@ #include "InstrumentEditor.h" #include "../common/global_private.h" -#include "../common/atomic.h" #include #include @@ -31,18 +30,20 @@ InstrumentEditor::InstrumentEditor() : Thread(false, false, -1, 0) { pInstrument = NULL; pUserData = NULL; + pEngineChannel = NULL; } InstrumentEditor::~InstrumentEditor() { } - void InstrumentEditor::Launch(void* pInstrument, String sTypeName, String sTypeVersion, void* pUserData) { - dmsg(1,("InstrumentEditor::Launch(instr=%x,type=%s,version=%s)\n", pInstrument, sTypeName.c_str(), sTypeVersion.c_str())); + void InstrumentEditor::Launch(EngineChannel* pEngineChannel, void* pInstrument, String sTypeName, String sTypeVersion, void* pUserData) { + dmsg(1,("InstrumentEditor::Launch(instr=%p,type=%s,version=%s)\n", pInstrument, sTypeName.c_str(), sTypeVersion.c_str())); // prepare the editor's mandatory parameters this->pInstrument = pInstrument; this->sTypeName = sTypeName; this->sTypeVersion = sTypeVersion; this->pUserData = pUserData; + this->pEngineChannel = pEngineChannel; // start the editor in its own thread StartThread(); } @@ -66,6 +67,10 @@ return iResult; } + EngineChannel* InstrumentEditor::GetEngineChannel() { + return pEngineChannel; + } + void InstrumentEditor::AddListener(InstrumentEditorListener* pListener) { listeners.insert(pListener); }