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

app/cmTimeLine.h/c : cMTlXXXObjPtr() now returns NULL if the 'op' arg. is NULL.

Browse Source
This commit is contained in:
Kevin Larke 2015-02-24 15:40:49 -08:00
parent ec6c2d8593
commit a89cadec84
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/cmTimeLine.c
View File

@ -131,7 +131,7 @@ unsigned _cmTlIdLabelToId( _cmTl_t* p, const cmChar_t* label )
// cast a generic object to a midi file object // cast a generic object to a midi file object
cmTlMidiFile_t* _cmTlMidiFileObjPtr( _cmTl_t* p, cmTlObj_t* op, bool errFl ) cmTlMidiFile_t* _cmTlMidiFileObjPtr( _cmTl_t* p, cmTlObj_t* op, bool errFl )
{ {
if( op->typeId != kMidiFileTlId ) if( op==NULL || op->typeId != kMidiFileTlId )
{ {
if( errFl && p != NULL) if( errFl && p != NULL)
cmErrMsg(&p->err,kTypeCvtFailTlRC,"A time line object type promotion failed."); cmErrMsg(&p->err,kTypeCvtFailTlRC,"A time line object type promotion failed.");
@ -144,7 +144,7 @@ cmTlMidiFile_t* _cmTlMidiFileObjPtr( _cmTl_t* p, cmTlObj_t* op, bool errFl )
// cast a generic object to a midi event object // cast a generic object to a midi event object
cmTlMidiEvt_t* _cmTlMidiEvtObjPtr( _cmTl_t* p, cmTlObj_t* op, bool errFl ) cmTlMidiEvt_t* _cmTlMidiEvtObjPtr( _cmTl_t* p, cmTlObj_t* op, bool errFl )
{ {
if( op->typeId != kMidiEvtTlId ) if( op==NULL || op->typeId != kMidiEvtTlId )
{ {
if( errFl && p != NULL ) if( errFl && p != NULL )
cmErrMsg(&p->err,kTypeCvtFailTlRC,"A time line object type promotion failed."); cmErrMsg(&p->err,kTypeCvtFailTlRC,"A time line object type promotion failed.");
@ -157,7 +157,7 @@ cmTlMidiEvt_t* _cmTlMidiEvtObjPtr( _cmTl_t* p, cmTlObj_t* op, bool errFl )
// case a generic object to an audio file object // case a generic object to an audio file object
cmTlAudioFile_t* _cmTlAudioFileObjPtr( _cmTl_t* p, cmTlObj_t* op, bool errFl ) cmTlAudioFile_t* _cmTlAudioFileObjPtr( _cmTl_t* p, cmTlObj_t* op, bool errFl )
{ {
if( op->typeId != kAudioFileTlId ) if( op==NULL || op->typeId != kAudioFileTlId )
{ {
if( errFl && p != NULL) if( errFl && p != NULL)
cmErrMsg(&p->err,kTypeCvtFailTlRC,"A time line object type promotion failed."); cmErrMsg(&p->err,kTypeCvtFailTlRC,"A time line object type promotion failed.");
@ -170,7 +170,7 @@ cmTlAudioFile_t* _cmTlAudioFileObjPtr( _cmTl_t* p, cmTlObj_t* op, bool errFl )
// cast a generic object an audio event object to // cast a generic object an audio event object to
cmTlAudioEvt_t* _cmTlAudioEvtObjPtr( _cmTl_t* p, cmTlObj_t* op, bool errFl ) cmTlAudioEvt_t* _cmTlAudioEvtObjPtr( _cmTl_t* p, cmTlObj_t* op, bool errFl )
{ {
if( op->typeId != kAudioEvtTlId ) if( op==NULL || op->typeId != kAudioEvtTlId )
{ {
if( errFl && p != NULL) if( errFl && p != NULL)
cmErrMsg(&p->err,kTypeCvtFailTlRC,"A time line object type promotion failed."); cmErrMsg(&p->err,kTypeCvtFailTlRC,"A time line object type promotion failed.");
@ -183,7 +183,7 @@ cmTlAudioEvt_t* _cmTlAudioEvtObjPtr( _cmTl_t* p, cmTlObj_t* op, bool errFl )
// cast a generic object to a marker object // cast a generic object to a marker object
cmTlMarker_t* _cmTlMarkerObjPtr( _cmTl_t* p, cmTlObj_t* op, bool errFl ) cmTlMarker_t* _cmTlMarkerObjPtr( _cmTl_t* p, cmTlObj_t* op, bool errFl )
{ {
if( op->typeId != kMarkerTlId ) if( op==NULL || op->typeId != kMarkerTlId )
{ {
if( errFl && p != NULL) if( errFl && p != NULL)
cmErrMsg(&p->err,kTypeCvtFailTlRC,"A time line object type promotion failed."); cmErrMsg(&p->err,kTypeCvtFailTlRC,"A time line object type promotion failed.");

2
app/cmTimeLine.h
View File

@ -161,7 +161,7 @@ extern "C" {
// Same as cmTimeLineXXXObjPtr() but does not generate an error when // Same as cmTimeLineXXXObjPtr() but does not generate an error when
// 'op' does not point to the correct type. These function quietly // 'op' does not point to the correct type. These function quietly
// return NULL if the requested type does not match. // return NULL if the requested type does not match or 'op' == NULL.
cmTlMidiFile_t* cmTlMidiFileObjPtr( cmTlH_t h, cmTlObj_t* op ); cmTlMidiFile_t* cmTlMidiFileObjPtr( cmTlH_t h, cmTlObj_t* op );
cmTlAudioFile_t* cmTlAudioFileObjPtr( cmTlH_t h, cmTlObj_t* op ); cmTlAudioFile_t* cmTlAudioFileObjPtr( cmTlH_t h, cmTlObj_t* op );
cmTlMidiEvt_t* cmTlMidiEvtObjPtr( cmTlH_t h, cmTlObj_t* op ); cmTlMidiEvt_t* cmTlMidiEvtObjPtr( cmTlH_t h, cmTlObj_t* op );