From de009f9cd86a27c4e678f8f9f24d945b41b4961a Mon Sep 17 00:00:00 2001 From: kpl Date: Tue, 9 Jul 2013 14:06:42 -0700 Subject: [PATCH] cmTimeLine.h/c:Added the 'bar' and 'sectionStr' field to cmTlMarker_t. --- app/cmTimeLine.c | 2 +- app/cmTimeLine.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/cmTimeLine.c b/app/cmTimeLine.c index ada891f..eed95b0 100644 --- a/app/cmTimeLine.c +++ b/app/cmTimeLine.c @@ -800,7 +800,7 @@ cmTlRC_t _cmTlAllocMarkerRecd( _cmTl_t* p, const cmChar_t* nameStr, const cmChar strcpy(tp,textStr); // copy the section label string into memory just past the markers text string - cmChar_t* sp = strlen(tp) + 1; + cmChar_t* sp = tp + strlen(tp) + 1; strcpy(sp,sectStr); mp->text = tp; diff --git a/app/cmTimeLine.h b/app/cmTimeLine.h index 5655b3c..3965e68 100644 --- a/app/cmTimeLine.h +++ b/app/cmTimeLine.h @@ -96,8 +96,8 @@ extern "C" { { cmTlObj_t obj; const cmChar_t* text; - unsigned bar; - const cmChar_t* sectionStr; + unsigned bar; // measure (bar) in which this marker starts + const cmChar_t* sectionStr; // the section in which this marker starts } cmTlMarker_t; extern cmTlH_t cmTimeLineNullHandle; @@ -137,7 +137,7 @@ extern "C" { cmTlObj_t* cmTlIdToObjPtr( cmTlH_t h, unsigned uid ); - // Cast a genereic cmTlObj_t pointer to a specificy type. + // Cast a genereic cmTlObj_t pointer to a specific type. cmTlMidiFile_t* cmTimeLineMidiFileObjPtr( cmTlH_t h, cmTlObj_t* op ); cmTlAudioFile_t* cmTimeLineAudioFileObjPtr( cmTlH_t h, cmTlObj_t* op ); cmTlMidiEvt_t* cmTimeLineMidiEvtObjPtr( cmTlH_t h, cmTlObj_t* op );