Skip to content

Commit 1e705d4

Browse files
committed
fix startup issues
1 parent 0a17c32 commit 1e705d4

File tree

7 files changed

+18
-9
lines changed

7 files changed

+18
-9
lines changed

src/ARP700.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ ARP700_Widget::ARP700_Widget( ARP700 *module ) : ModuleWidget(module)
434434
module->m_Clock.IgnoreClockCount = 2;
435435
module->m_bInitialized = true;
436436

437-
module->reset();
437+
module->onReset();
438438
}
439439

440440
//-----------------------------------------------------

src/MasterClockx4.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,9 @@ struct MasterClockx4 : Module
124124

125125
if( mymodule )
126126
{
127+
//if( !mymodule->m_bInitialized )
128+
//return;
129+
127130
param = paramId - MasterClockx4::PARAM_MULT;
128131

129132
if( mymodule->m_ChannelMultSelect[ param ] != (int)value )
@@ -348,7 +351,8 @@ void MasterClockx4::fromJson(json_t *rootJ)
348351
for( int ch = 0; ch < nCHANNELS; ch++ )
349352
{
350353
m_pButtonStop[ ch ]->Set( m_bStopState[ ch ] );
351-
SetDisplayLED( ch, (int)params[ PARAM_MULT + ch ].value );
354+
//lg.f( "value = %d\n", (int)params[ PARAM_MULT + ch ].value );
355+
//SetDisplayLED( ch, (int)params[ PARAM_MULT + ch ].value );
352356
}
353357

354358
m_fMainClockCount = 0;
@@ -377,9 +381,10 @@ void MasterClockx4::onReset()
377381

378382
for( int ch = 0; ch < nCHANNELS; ch++ )
379383
{
384+
380385
m_bStopState[ ch ] = false;
381386
m_pButtonStop[ ch ]->Set( m_bStopState[ ch ] );
382-
SetDisplayLED( ch, (int)params[ PARAM_MULT + ch ].value );
387+
SetDisplayLED( ch, 12 );
383388
}
384389

385390
BPMChange( m_fBPM, true );

src/Mixer_1x4_Stereo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ Mix_1x4_Stereo_Widget::Mix_1x4_Stereo_Widget( Mix_1x4_Stereo *module ) : ModuleW
484484
- (fx7 * 0.0001984126984126984126984126984127));
485485

486486
module->m_bInitialized = true;
487-
module->reset();
487+
module->onReset();
488488
}
489489

490490
//-----------------------------------------------------

src/Mixer_2x4_Stereo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ Mix_2x4_Stereo_Widget::Mix_2x4_Stereo_Widget( Mix_2x4_Stereo *module ) : ModuleW
499499
- (fx7 * 0.0001984126984126984126984126984127));
500500

501501
module->m_bInitialized = true;
502-
module->reset();
502+
module->onReset();
503503
}
504504

505505
//-----------------------------------------------------

src/Mixer_4x4_Stereo.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ Mix_4x4_Stereo_Widget::Mix_4x4_Stereo_Widget( Mix_4x4_Stereo *module ) : ModuleW
502502
- (fx7 * 0.0001984126984126984126984126984127));
503503

504504
module->m_bInitialized = true;
505-
module->reset();
505+
module->onReset();
506506
}
507507

508508
//-----------------------------------------------------
@@ -740,6 +740,8 @@ void Mix_4x4_Stereo::fromJson(json_t *rootJ)
740740

741741
m_pButtonChannelMute[ ch ]->Set( m_bMuteStates[ ch ] );
742742
m_pButtonChannelSolo[ ch ]->Set( m_bSoloStates[ ch ] );
743+
744+
//lg.f("channel mute fade = %.3f\n", m_fMuteFade[ ch ] );
743745
}
744746

745747
// anybody group soloing?
@@ -773,6 +775,8 @@ void Mix_4x4_Stereo::fromJson(json_t *rootJ)
773775

774776
m_pButtonGroupMute[ i ]->Set( m_bGroupMuteStates[ i ] );
775777
m_pButtonGroupSolo[ i ]->Set( m_bGroupSoloStates[ i ] );
778+
779+
//lg.f("group mute fade = %.3f\n", m_fGroupMuteFade[ i ] );
776780
}
777781
}
778782

src/SEQ_6x32x16.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ SEQ_6x32x16_Widget::SEQ_6x32x16_Widget( SEQ_6x32x16 *module ) : ModuleWidget(mod
302302

303303
module->m_bInitialized = true;
304304

305-
reset();
305+
module->onReset();
306306
}
307307

308308
//-----------------------------------------------------

src/Seq_Triad2.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ Seq_Triad2_Widget::Seq_Triad2_Widget( Seq_Triad2 *module ) : ModuleWidget(module
252252
addChild(panel);
253253
}
254254

255-
module->lg.Open("TriadSequencer2.txt");
255+
//module->lg.Open("TriadSequencer2.txt");
256256

257257
//----------------------------------------------------
258258
// Keyboard Keys
@@ -321,7 +321,7 @@ Seq_Triad2_Widget::Seq_Triad2_Widget( Seq_Triad2 *module ) : ModuleWidget(module
321321

322322
module->m_bInitialized = true;
323323

324-
reset();
324+
module->onReset();
325325
}
326326

327327
//-----------------------------------------------------

0 commit comments

Comments
 (0)