Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31971/src
Modified Files:
LoadModules.cpp
Log Message:
Update scripting on the Audacity side to use ResponseQueue to get command
responses back to the script.
Index: LoadModules.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/LoadModules.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- LoadModules.cpp 30 May 2009 04:32:02 -0000 1.11
+++ LoadModules.cpp 7 Jun 2009 15:35:49 -0000 1.12
@@ -34,7 +34,6 @@
#define initFnName "ExtensionModuleInit"
#define scriptFnName "RegScriptServerFunc"
-#define scriptOutFnName "ScriptServerResponseFunc"
#define mainPanelFnName "MainPanelFunc"
typedef wxWindow * pwxWindow;
@@ -69,10 +68,6 @@
// starts a thread and reads script commands.
tpRegScriptServerFunc scriptFn;
-// This variable will hold the address of a subroutine in a DLL that
-// recieves responses from the main program.
-tpScriptServerResponseFunc scriptOutFn;
-
void LoadModule(wxString fname)
{
wxLogDebug(wxT("About to load %s"), fname.c_str() );
@@ -98,8 +93,6 @@
if(( scriptFn == NULL ) &&(result>=0 ))
scriptFn =
(tpRegScriptServerFunc)(pDLL->GetSymbol(wxT(scriptFnName)));
- if(( scriptOutFn == NULL ) &&(result>=0 ))
- scriptOutFn =
(tpScriptServerResponseFunc)(pDLL->GetSymbol(wxT(scriptOutFnName)));
if((pPanelHijack==NULL ) && (result>=0))
pPanelHijack = (tPanelFn)(pDLL->GetSymbol(wxT(mainPanelFnName)));
@@ -144,11 +137,10 @@
for(i=0; i<files.GetCount(); i++)
LoadModule(files[i]);
// After loading all the modules, we may have a registered scripting
function.
- if(scriptFn && scriptOutFn)
+ if(scriptFn)
{
ScriptCommandRelay::SetCommandHandler(cmdHandler);
ScriptCommandRelay::SetRegScriptServerFunc(scriptFn);
- ScriptCommandRelay::SetScriptServerResponseFunc(scriptOutFn);
NonGuiThread::StartChild(&ScriptCommandRelay::Run);
}
}
------------------------------------------------------------------------------
OpenSolaris 2009.06 is a cutting edge operating system for enterprises
looking to deploy the next generation of Solaris that includes the latest
innovations from Sun and the OpenSource community. Download a copy and
enjoy capabilities such as Networking, Storage and Virtualization.
Go to: http://p.sf.net/sfu/opensolaris-get
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
