diff --git a/src/kc/kcApp.cpp b/src/kc/kcApp.cpp index e20ea9e..fc677ab 100644 --- a/src/kc/kcApp.cpp +++ b/src/kc/kcApp.cpp @@ -1164,7 +1164,11 @@ void kcApp::_setTmlnValue( ctl_t* cp, unsigned instVarId, const cmDspValue_t* vp case kTmlnSelArgIdx: //tp->value( cmDsvStrcz(vp)); break; - + + case kTmlnMeasArgIdx: + cp->u.tmln.tlctl->setTimeLineSelectBar( cmDsvUInt(vp)); + break; + case kTmlnCursArgIdx: cp->u.tmln.tlctl->setAudioFileCursor(cmDsvUInt(vp)); break; @@ -1272,6 +1276,10 @@ void kcApp::_setScorValue( ctl_t* cp, unsigned instVarId, const cmDspValue_t* vp _tlCtl->setScoreVarValue(cp->u.scor.locIdx,cp->u.scor.varId, cmDsvDouble(vp)); break; + case kScorMeasArgIdx: + _tlCtl->setScoreSelectBar( cmDsvUInt(vp)); + break; + default: { assert(0); } } @@ -1462,6 +1470,17 @@ void kcApp::_insertAudioSysCfgLabel(unsigned long idx, const char* label) _as_btn->add(label,0,NULL,(void*)idx,0); } +void kcApp::_setDfltAudioSysCfg(unsigned long idx, const char* label ) +{ + int i; + + if((i = _as_btn->find_index(label)) != -1 ) + { + _setMenuButton(_as_btn,i,"Audio System Cfg"); + cmAdIfSetAudioSysCfg(_aiH,_as_btn->mvalue()->argument()); + } +} + void kcApp::_insertDeviceLabel( unsigned long devIdx, bool inputFl, const cmChar_t* label ) { Fl_Menu_Button* bp = inputFl ? _ai_btn : _ao_btn; @@ -1481,6 +1500,18 @@ void kcApp::_insertProgramLabel( unsigned long idx, const cmChar_t* label ) _pgm_btn->add(label,0,NULL,(void*)idx,0); } +void kcApp::_setDfltProgram(unsigned long idx, const char* label ) +{ + int i; + + if((i = _pgm_btn->find_index(label)) != -1 ) + { + _setMenuButton(_pgm_btn,i,"Programs"); + cmAdIfLoadProgram(_aiH,_getCurAudioSubSysIdx(),_pgm_btn->mvalue()->argument()); + } +} + + void kcApp::_insertSubSysCnt( unsigned long subSysCnt ) { long unsigned i; @@ -1952,6 +1983,10 @@ void kcApp::_handleUiMsg( const cmDspUiHdr_t* m ) _insertAudioSysCfgLabel(m->instId,cmDsvStrcz(&m->value)); break; + case kAudioSysCfgDfltDuiId: + _setDfltAudioSysCfg(m->instId,cmDsvStrcz(&m->value)); + break; + case kDeviceDuiId: _insertDeviceLabel(m->instId,m->flags,cmDsvStrcz(&m->value)); break; @@ -1960,6 +1995,10 @@ void kcApp::_handleUiMsg( const cmDspUiHdr_t* m ) _insertProgramLabel(m->instId,cmDsvStrcz(&m->value)); break; + case kProgramDfltDuiId: + _setDfltProgram(m->instId,cmDsvStrcz(&m->value)); + break; + // the below codes are used to notify the application // of changes in state of the audio DSP system diff --git a/src/kc/kcApp.h b/src/kc/kcApp.h index 3f170ca..6acf177 100644 --- a/src/kc/kcApp.h +++ b/src/kc/kcApp.h @@ -123,8 +123,9 @@ private: kTmlnFileArgIdx= 0, kTmlnPathArgIdx= 1, kTmlnSelArgIdx = 2, - kTmlnCursArgIdx= 3, - kTmlnVarCnt = 4, + kTmlnMeasArgIdx= 3, + kTmlnCursArgIdx= 4, + kTmlnVarCnt = 5, kScorFileArgIdx = 0, kScorSelArgIdx = 1, @@ -136,7 +137,8 @@ private: kScorDynArgIdx = 7, kScorValTypeArgIdx = 8, kScorValueArgIdx = 9, - kScorVarCnt = 10, + kScorMeasArgIdx = 10, + kScorVarCnt = 11, kTksbFileArgIdx = 0, kTksbPtrArgIdx = 1, @@ -406,8 +408,10 @@ private: void _newColumn( const cmDspUiHdr_t* m ); void _insertAudioSysCfgLabel(unsigned long idx, const cmChar_t* label ); + void _setDfltAudioSysCfg(unsigned long idx, const cmChar_t* label ); void _insertDeviceLabel( unsigned long idx, bool inputFl, const cmChar_t* label ); void _insertProgramLabel( unsigned long idx, const cmChar_t* label ); + void _setDfltProgram(unsigned long idx, const cmChar_t* label ); void _insertSubSysCnt( unsigned long subSysCnt ); unsigned _getCurAudioSubSysIdx(); void _setMenuButton( Fl_Menu_Button* b, unsigned value, const char* dfltLabel );