commit 2cb65687a6a93611125d7623bbdcf7b7db361404
parent 8ab9dcf1999ad351aad3b790a46a42824d509286
Author: fundamental <mark.d.mccurry@gmail.com>
Date: Sun, 17 May 2015 13:54:04 -0400
Fix Bad Rebase Of Middleware Test
Diffstat:
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/Misc/MiddleWare.cpp b/src/Misc/MiddleWare.cpp
@@ -441,7 +441,7 @@ class MiddleWareImpl
ifs >> comm_name;
return comm_name != "zynaddsubfx";
}
- return false;
+ return true;
}
//! returns file name to where UDP port is saved
@@ -850,7 +850,7 @@ public:
};
MiddleWareImpl::MiddleWareImpl(MiddleWare *mw, SYNTH_T synth_, int prefered_port)
- :parent(mw), synth(synth_), ui(0)
+ :parent(mw), ui(nullptr), synth(synth_)
{
bToU = new rtosc::ThreadLink(4096*2,1024);
uToB = new rtosc::ThreadLink(4096*2,1024);
@@ -862,8 +862,6 @@ MiddleWareImpl::MiddleWareImpl(MiddleWare *mw, SYNTH_T synth_, int prefered_port
fprintf(stderr, "lo server running on %d\n", lo_server_get_port(server));
#ifndef PLUGINVERSION
- clean_up_tmp_nams();
- create_tmp_file((unsigned)lo_server_get_port(server));
if(!isPlugin()) {
clean_up_tmp_nams();
create_tmp_file((unsigned)lo_server_get_port(server));