Mercurial > hg > dmlib

changeset 350:834f3b686ad3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More work on timeline stuff.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 16 Oct 2012 01:18:03 +0300
parents 65b19a8cc84f
children a8f00ee363e1
files dmtimeline.c dmtimeline.h dmtimelinew.c
diffstat 3 files changed, 20 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- 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)
     {
--- 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
--- 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;