# HG changeset patch # User Matti Hamalainen # Date 1350339483 -10800 # Node ID 834f3b686ad330ab897a9ae0d86c25b430414ac3 # Parent 65b19a8cc84fde7499a43147d64ba9ff6687e0be More work on timeline stuff. diff -r 65b19a8cc84f -r 834f3b686ad3 dmtimeline.c --- a/dmtimeline.c Tue Oct 16 01:13:36 2012 +0300 +++ b/dmtimeline.c Tue Oct 16 01:18:03 2012 +0300 @@ -90,7 +90,7 @@ } -BOOL dmLoadFloatValue(DMResource *res, DMFloat *val) +static BOOL dmLoadFloatValue(DMResource *res, DMFloat *val) { char tmp[DT_FLOAT_STORE_SIZE + 1]; if (dmf_read_str(res, (Uint8 *) tmp, DT_FLOAT_STORE_SIZE) != DT_FLOAT_STORE_SIZE) @@ -102,7 +102,7 @@ } -int dmLoadTimelinePoints(DMResource *res, DMTimelinePoints *points, int type) +static int dmLoadTimelinePoints(DMResource *res, DMTimelinePoints *points, int type) { int point; Uint32 npoints; @@ -172,7 +172,7 @@ } -int dmLoadTimelineEventParam(DMResource *res, DMTimelineEventParam *param) +static int dmLoadTimelineEventParam(DMResource *res, DMTimelineEventParam *param) { int err; DMFTimelineEventParam hdr; @@ -213,7 +213,7 @@ } -int dmLoadTimelineEvent(DMResource *res, DMTimelineEvent **pevent) +static int dmLoadTimelineEvent(DMResource *res, DMTimelineEvent **pevent) { int param; DMFTimelineEvent hdr; @@ -265,7 +265,7 @@ } -int dmLoadTimelineCurve(DMResource *res, DMTimelineCurve *curve) +static int dmLoadTimelineCurve(DMResource *res, DMTimelineCurve *curve) { int err; @@ -277,7 +277,7 @@ } -int dmLoadTimelineTrack(DMResource *res, DMTimelineTrack **ptrack) +static int dmLoadTimelineTrack(DMResource *res, DMTimelineTrack **ptrack) { int event, err; DMFTimelineTrack hdr; @@ -420,7 +420,7 @@ } -void dmFreePreparedEventGroup(DMPreparedEventGroup *group) +static void dmFreePreparedEventGroup(DMPreparedEventGroup *group) { if (group != NULL) { diff -r 65b19a8cc84f -r 834f3b686ad3 dmtimeline.h --- a/dmtimeline.h Tue Oct 16 01:13:36 2012 +0300 +++ b/dmtimeline.h Tue Oct 16 01:18:03 2012 +0300 @@ -188,9 +188,16 @@ int dmLoadTimeline(DMResource *res, DMTimeline **tl); void dmFreeTimeline(DMTimeline *tl); +void dmFreeTimelinePoints(DMTimelinePoints *points); +void dmFreeTimelineEventParam(DMTimelineEventParam *param); +void dmFreeTimelineEvent(DMTimelineEvent *event); +void dmFreeTimelineTrack(DMTimelineTrack *track); + // Execution related int dmPrepareTimeline(DMTimeline *tl, DMPreparedTimeline *ptl); +void dmFreePreparedTimelineData(DMPreparedTimeline *ptl); + int dmSeekTimeline(DMPreparedTimeline *tl, int time); int dmExecuteTimeline(DMPreparedTimeline *tl, SDL_Surface *screen, int time); @@ -206,8 +213,6 @@ DMTimelineEvent *dmTimelineGetEventAt(DMTimelineTrack *track, int time); - - #ifdef __cplusplus } #endif diff -r 65b19a8cc84f -r 834f3b686ad3 dmtimelinew.c --- a/dmtimelinew.c Tue Oct 16 01:13:36 2012 +0300 +++ b/dmtimelinew.c Tue Oct 16 01:18:03 2012 +0300 @@ -2,7 +2,7 @@ #include "dmresw.h" -BOOL dmSaveFloatValue(DMResource *res, DMFloat val) +static BOOL dmSaveFloatValue(DMResource *res, DMFloat val) { char tmp[DT_FLOAT_STORE_SIZE]; snprintf(tmp, DT_FLOAT_STORE_SIZE, "%f", val); @@ -10,7 +10,7 @@ } -int dmSaveTimelinePoints(DMResource *res, DMTimelinePoints *points, int type) +static int dmSaveTimelinePoints(DMResource *res, DMTimelinePoints *points, int type) { int point; Uint32 npoints; @@ -68,7 +68,7 @@ } -int dmSaveTimelineCurve(DMResource *res, DMTimelineCurve *curve) +static int dmSaveTimelineCurve(DMResource *res, DMTimelineCurve *curve) { int err; @@ -80,7 +80,7 @@ } -int dmSaveTimelineEventParam(DMResource *res, DMTimelineEventParam *param) +static int dmSaveTimelineEventParam(DMResource *res, DMTimelineEventParam *param) { int err; DMFTimelineEventParam hdr; @@ -117,7 +117,7 @@ } -int dmSaveTimelineEvent(DMResource *res, DMTimelineEvent *event) +static int dmSaveTimelineEvent(DMResource *res, DMTimelineEvent *event) { int param, err; DMFTimelineEvent hdr; @@ -143,7 +143,7 @@ } -int dmSaveTimelineTrack(DMResource *res, DMTimelineTrack *track) +static int dmSaveTimelineTrack(DMResource *res, DMTimelineTrack *track) { int event, err; DMFTimelineTrack hdr;