hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Check if object already exists instead of deleting and recreating it

Browse Source
This commit is contained in:
Daniel Winzen
2014-12-20 16:30:28 +01:00
parent 0a732fbc04
commit e0f7ea57ac
2 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/zynaddsubfx/LocalZynAddSubFx.cpp
View File

@@ -102,16 +102,6 @@ LocalZynAddSubFx::~LocalZynAddSubFx()
void LocalZynAddSubFx::initConfig()
{
//Delete existing objects before recreating them in config.init(). Neccesarry, because the constructor and setLmmsWorkingDir() invoke this function.
if( config.cfg.LinuxOSSWaveOutDev != NULL )
{
delete[] config.cfg.LinuxOSSWaveOutDev;
delete[] config.cfg.LinuxOSSSeqInDev;
for(int i = 0; i < config.winmidimax; ++i)
delete[] config.winmididevices[i].name;
delete[] config.winmididevices;
}
config.init();
config.cfg.GzipCompression = 0;

27
plugins/zynaddsubfx/zynaddsubfx/src/Misc/Config.cpp
View File

@@ -42,10 +42,16 @@ void Config::init()
cfg.OscilSize = 1024;
cfg.SwapStereo = 0;
cfg.LinuxOSSWaveOutDev = new char[MAX_STRING_SIZE];
snprintf(cfg.LinuxOSSWaveOutDev, MAX_STRING_SIZE, "/dev/dsp");
cfg.LinuxOSSSeqInDev = new char[MAX_STRING_SIZE];
snprintf(cfg.LinuxOSSSeqInDev, MAX_STRING_SIZE, "/dev/sequencer");
if( cfg.LinuxOSSWaveOutDev == NULL ) //Check, if object already exists befroe creating it.
{
cfg.LinuxOSSWaveOutDev = new char[MAX_STRING_SIZE];
snprintf(cfg.LinuxOSSWaveOutDev, MAX_STRING_SIZE, "/dev/dsp");
}
if( cfg.LinuxOSSSeqInDev == NULL ) //Check, if object already exists befroe creating it.
{
cfg.LinuxOSSSeqInDev = new char[MAX_STRING_SIZE];
snprintf(cfg.LinuxOSSSeqInDev, MAX_STRING_SIZE, "/dev/sequencer");
}
cfg.DumpFile = "zynaddsubfx_dump.txt";
@@ -67,11 +73,14 @@ void Config::init()
winwavemax = 1;
winmidimax = 1;
//try to find out how many input midi devices are there
winmididevices = new winmidionedevice[winmidimax];
for(int i = 0; i < winmidimax; ++i) {
winmididevices[i].name = new char[MAX_STRING_SIZE];
for(int j = 0; j < MAX_STRING_SIZE; ++j)
winmididevices[i].name[j] = '\0';
if( winmididevices == NULL ) //Check, if object already exists befroe creating it.
{
winmididevices = new winmidionedevice[winmidimax];
for(int i = 0; i < winmidimax; ++i) {
winmididevices[i].name = new char[MAX_STRING_SIZE];
for(int j = 0; j < MAX_STRING_SIZE; ++j)
winmididevices[i].name[j] = '\0';
}
}