/[svn]/linuxsampler/trunk/src/scriptvm/ScriptVM.cpp
ViewVC logotype

Diff of /linuxsampler/trunk/src/scriptvm/ScriptVM.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2941 by schoenebeck, Fri Apr 22 15:37:45 2016 UTC revision 2942 by schoenebeck, Wed Jul 13 15:51:06 2016 UTC
# Line 14  Line 14 
14  #include "../common/global_private.h"  #include "../common/global_private.h"
15  #include "tree.h"  #include "tree.h"
16  #include "CoreVMFunctions.h"  #include "CoreVMFunctions.h"
17    #include "CoreVMDynVars.h"
18  #include "editor/NkspScanner.h"  #include "editor/NkspScanner.h"
19    
20  #define DEBUG_SCRIPTVM_CORE 0  #define DEBUG_SCRIPTVM_CORE 0
# Line 98  namespace LinuxSampler { Line 99  namespace LinuxSampler {
99          m_fnAbs = new CoreVMFunction_abs;          m_fnAbs = new CoreVMFunction_abs;
100          m_fnRandom = new CoreVMFunction_random;          m_fnRandom = new CoreVMFunction_random;
101          m_fnNumElements = new CoreVMFunction_num_elements;          m_fnNumElements = new CoreVMFunction_num_elements;
102            m_varRealTimer = new CoreVMDynVar_NKSP_REAL_TIMER;
103            m_varPerfTimer = new CoreVMDynVar_NKSP_PERF_TIMER;
104      }      }
105    
106      ScriptVM::~ScriptVM() {      ScriptVM::~ScriptVM() {
# Line 107  namespace LinuxSampler { Line 110  namespace LinuxSampler {
110          delete m_fnAbs;          delete m_fnAbs;
111          delete m_fnRandom;          delete m_fnRandom;
112          delete m_fnNumElements;          delete m_fnNumElements;
113            delete m_varRealTimer;
114            delete m_varPerfTimer;
115      }      }
116    
117      VMParserContext* ScriptVM::loadScript(const String& s) {      VMParserContext* ScriptVM::loadScript(const String& s) {
# Line 121  namespace LinuxSampler { Line 126  namespace LinuxSampler {
126          context->registerBuiltInConstIntVariables( builtInConstIntVariables() );          context->registerBuiltInConstIntVariables( builtInConstIntVariables() );
127          context->registerBuiltInIntVariables( builtInIntVariables() );          context->registerBuiltInIntVariables( builtInIntVariables() );
128          context->registerBuiltInIntArrayVariables( builtInIntArrayVariables() );          context->registerBuiltInIntArrayVariables( builtInIntArrayVariables() );
129            context->registerBuiltInDynVariables( builtInDynamicVariables() );
130    
131          context->createScanner(is);          context->createScanner(is);
132    
# Line 214  namespace LinuxSampler { Line 220  namespace LinuxSampler {
220          return std::map<String,VMInt8Array*>();          return std::map<String,VMInt8Array*>();
221      }      }
222    
223        std::map<String,VMDynVar*> ScriptVM::builtInDynamicVariables() {
224            std::map<String,VMDynVar*> m;
225    
226            m["$NKSP_PERF_TIMER"] = m_varPerfTimer;
227            m["$NKSP_REAL_TIMER"] = m_varRealTimer;
228            m["$KSP_TIMER"] = m_varRealTimer;
229    
230            return m;
231        }
232    
233      std::map<String,int> ScriptVM::builtInConstIntVariables() {      std::map<String,int> ScriptVM::builtInConstIntVariables() {
234          return std::map<String,int>();          return std::map<String,int>();
235      }      }
Legend:
Removed from v.2941  
changed lines
  Added in v.2942
  ViewVC Help
Powered by ViewVC