cml/kc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added more variables to score GUI to reflect performance information.

Browse Source
This commit is contained in:
kevin 2012-12-13 15:43:24 -08:00
parent 82fff39f11
commit 6194c00c56
2 changed files with 62 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/kc/kcApp.cpp
View File

@ -1182,7 +1182,8 @@ void kcApp::_createScor( const cmDspUiHdr_t* m )
{ {
_tlCtl = new tlCtl(_ctx,this,_menu,this); _tlCtl = new tlCtl(_ctx,this,_menu,this);
cp->u.scor.tlctl = _tlCtl; cp->u.scor.tlctl = _tlCtl;
cp->u.scor.smpIdx = cmInvalidIdx;
} }
Fl_Widget* wdgt = cp->u.scor.tlctl->initScoreCtlr(x,y,w,h); Fl_Widget* wdgt = cp->u.scor.tlctl->initScoreCtlr(x,y,w,h);
@ -1217,6 +1218,47 @@ void kcApp::_setScorValue( ctl_t* cp, unsigned instVarId, const cmDspValue_t* vp
} }
break; break;
case kScorSmpIdxArgIdx:
cp->u.scor.smpIdx = cmDsvUInt(vp);
break;
case kScorPitchArgIdx:
cp->u.scor.pitch = cmDsvUInt(vp);
break;
case kScorVelArgIdx:
cp->u.scor.vel = cmDsvUInt(vp);
break;
case kScorEvtIdxArgIdx:
cp->u.scor.evtIdx = cmDsvUInt(vp);
break;
case kScorDynArgIdx:
{
assert(cp->u.scor.evtIdx!=cmInvalidIdx);
_tlCtl->setScoreDynLevel(cp->u.scor.evtIdx,cmDsvUInt(vp));
cp->u.scor.evtIdx = cmInvalidIdx;
}
break;
case kScorLocIdxArgIdx:
{
assert( cp->u.scor.smpIdx != cmInvalidIdx );
cp->u.scor.locIdx = cmDsvUInt(vp);
_tlCtl->setScoreLocation(cp->u.scor.locIdx,cp->u.scor.smpIdx,cp->u.scor.pitch,cp->u.scor.vel);
cp->u.scor.smpIdx = cmInvalidIdx;
}
break;
case kScorValTypeArgIdx:
cp->u.scor.varId = cmDsvUInt(vp);
break;
case kScorValueArgIdx:
_tlCtl->setScoreVarValue(cp->u.scor.locIdx,cp->u.scor.varId, cmDsvDouble(vp));
break;
default: default:
{ assert(0); } { assert(0); }
} }
@ -1748,8 +1790,6 @@ void kcApp::_handleUiMsg( const cmDspUiHdr_t* m )
// that are waiting in the audio DSP msg queue. // that are waiting in the audio DSP msg queue.
void kcApp::_getEngMsg() void kcApp::_getEngMsg()
{ {
if( cmAdIfIsValid(_aiH) ) if( cmAdIfIsValid(_aiH) )
{ {
unsigned i; unsigned i;
@ -1878,13 +1918,9 @@ bool kcApp::_status_timeout_cb()
return _stopTimerFl==false || cmTsMp1cIsValid(_printqH); return _stopTimerFl==false || cmTsMp1cIsValid(_printqH);
} }
void kcApp::_s_menu_cb(Fl_Widget *w, void *data) void kcApp::_s_menu_cb(Fl_Widget *w, void *data)
{ } { }
void kcApp::_s_tab_cb(Fl_Widget* w, void* data) void kcApp::_s_tab_cb(Fl_Widget* w, void* data)
{ ((kcApp*)data)->_tab_cb(w); } { ((kcApp*)data)->_tab_cb(w); }
@ -2014,7 +2050,7 @@ void kcApp::_ctl_cb(ctl_t* cp)
case kTmlnTypeId: case kTmlnTypeId:
{ {
instVarId = cp->u.text.varIdArray[ kTmlnSelArgIdx ]; instVarId = cp->u.tmln.varIdArray[ kTmlnSelArgIdx ];
unsigned selMarkerId = cp->u.tmln.tlctl->timeLineSelectedMarkerId(); unsigned selMarkerId = cp->u.tmln.tlctl->timeLineSelectedMarkerId();
cmDsvSetUInt(&value, selMarkerId ); cmDsvSetUInt(&value, selMarkerId );
} }
@ -2022,7 +2058,7 @@ void kcApp::_ctl_cb(ctl_t* cp)
case kScorTypeId: case kScorTypeId:
{ {
instVarId = cp->u.text.varIdArray[ kScorSelArgIdx ]; instVarId = cp->u.scor.varIdArray[ kScorSelArgIdx ];
unsigned selEleIdx = cp->u.scor.tlctl->scoreSelectedEleIndex(); unsigned selEleIdx = cp->u.scor.tlctl->scoreSelectedEleIndex();
cmDsvSetUInt(&value, selEleIdx ); cmDsvSetUInt(&value, selEleIdx );
} }

21
src/kc/kcApp.h
View File

@ -123,9 +123,17 @@ private:
kTmlnCursArgIdx= 3, kTmlnCursArgIdx= 3,
kTmlnVarCnt = 4, kTmlnVarCnt = 4,
kScorFileArgIdx = 0, kScorFileArgIdx = 0,
kScorSelArgIdx = 1, kScorSelArgIdx = 1,
kScorVarCnt = 2 kScorSmpIdxArgIdx = 2,
kScorPitchArgIdx = 3,
kScorVelArgIdx = 4,
kScorLocIdxArgIdx = 5,
kScorEvtIdxArgIdx = 6,
kScorDynArgIdx = 7,
kScorValTypeArgIdx = 8,
kScorValueArgIdx = 9,
kScorVarCnt = 10
}; };
@ -218,7 +226,12 @@ private:
typedef struct scor_str typedef struct scor_str
{ {
tlCtl* tlctl; tlCtl* tlctl;
char* val; unsigned smpIdx;
unsigned pitch;
unsigned vel;
unsigned evtIdx;
unsigned locIdx;
unsigned varId;
unsigned varIdArray[ kScorVarCnt ]; unsigned varIdArray[ kScorVarCnt ];
} scor_t; } scor_t;