diff --git a/corec/corec/helpers/parser/parser2.c b/corec/corec/helpers/parser/parser2.c index 06ca5364..d29cf3ca 100644 --- a/corec/corec/helpers/parser/parser2.c +++ b/corec/corec/helpers/parser/parser2.c @@ -350,10 +350,6 @@ NOINLINE bool_t DataToString(tchar_t* Value, size_t ValueLen, const void* Data, RGBToString(Value,ValueLen,*(rgbval_t*)Data); break; - case TYPE_TICK: - TickToString(Value,ValueLen,*(tick_t*)Data); - break; - case TYPE_SIZE: #if SIZE_MAX > INT32_MAX Int64ToString(Value,ValueLen,*(size_t*)Data,0); diff --git a/corec/corec/helpers/parser/strtypes.c b/corec/corec/helpers/parser/strtypes.c index 92be39f9..aae049cb 100644 --- a/corec/corec/helpers/parser/strtypes.c +++ b/corec/corec/helpers/parser/strtypes.c @@ -128,36 +128,6 @@ void RGBToString(tchar_t* Out, size_t OutLen, rgbval_t RGB) Out[7] = 0; } -void TickToString(tchar_t* Out, size_t OutLen, tick_t Tick) -{ - tchar_t Sign[2] = {0}; - if (Tick<0) - { - Sign[0] = '-'; - Tick = -Tick; - } - - int Hour,Min,Sec; - Tick += TICKSPERSEC/2000; - Hour = (int)(Tick / 3600 / TICKSPERSEC); - Tick -= Hour * 3600 * TICKSPERSEC; - Min = (int)(Tick / 60 / TICKSPERSEC); - Tick -= Min * 60 * TICKSPERSEC; - Sec = (int)(Tick / TICKSPERSEC); - Tick -= Sec * TICKSPERSEC; - if (!Hour && !Min) - stprintf_s(Out,OutLen,T("%s%d"),Sign,Sec); - else - { - if (Hour) - stprintf_s(Out,OutLen,T("%s%d:%02d"),Sign,Hour,Min); - else - stprintf_s(Out,OutLen,T("%s%d"),Sign,Min); - stcatprintf_s(Out,OutLen,T(":%02d"),Sec); - } - stcatprintf_s(Out,OutLen,T(".%03d"),(int)((Tick*1000)/TICKSPERSEC)); -} - void SysTickToString(tchar_t* Out, size_t OutLen, systick_t Tick) { tchar_t Sign[2] = {0}; diff --git a/corec/corec/helpers/parser/strtypes.h b/corec/corec/helpers/parser/strtypes.h index 1eccb1ca..947bab31 100644 --- a/corec/corec/helpers/parser/strtypes.h +++ b/corec/corec/helpers/parser/strtypes.h @@ -16,7 +16,6 @@ NODE_DLL int StringToInt(const tchar_t* In, int Hex); NODE_DLL int64_t StringToInt64(const tchar_t* In); void IntToString(tchar_t* Out, size_t OutLen, int32_t Int, bool_t Hex); void Int64ToString(tchar_t* Out, size_t OutLen, int64_t Int, bool_t Hex); -void TickToString(tchar_t* Out, size_t OutLen, tick_t Tick); NODE_DLL void SysTickToString(tchar_t* Out, size_t OutLen, systick_t Tick); void RGBToString(tchar_t* Out, size_t OutLen, rgbval_t RGB); void GUIDToString(tchar_t* Out, size_t OutLen, const cc_guid*); diff --git a/corec/corec/node/corec.html b/corec/corec/node/corec.html index 8d4454f4..b25afd9b 100644 --- a/corec/corec/node/corec.html +++ b/corec/corec/node/corec.html @@ -89,10 +89,6 @@

The possible types include:

TYPE_FILEPOS
a file position, with the type filepos_t.
-
- TYPE_TICK -
a tick value, with the type tick_t.
-
TYPE_PTR
a pointer, with the type void*.
diff --git a/corec/corec/node/node.c b/corec/corec/node/node.c index 14894af4..5725ee97 100644 --- a/corec/corec/node/node.c +++ b/corec/corec/node/node.c @@ -30,7 +30,7 @@ static const uint16_t ParamSize[MAX_PARAMTYPE] = sizeof(node*), //TYPE_NODE 0, //TYPE_META sizeof(pin), //TYPE_PACKET - sizeof(tick_t), //TYPE_TICK + 0, //TYPE_TICK sizeof(nodenotify), //TYPE_NODENOTIFY sizeof(void*), //TYPE_PTR MAXDATA, //TYPE_BINARY @@ -76,7 +76,7 @@ static const tchar_t* ParamName[MAX_PARAMTYPE] = T("node"), //TYPE_NODE NULL, //TYPE_META T("packet"), //TYPE_PACKET - T("tick"), //TYPE_TICK + NULL, //TYPE_TICK NULL, //TYPE_NODENOTIFY T("pointer"), //TYPE_PTR NULL, //TYPE_BINARY diff --git a/corec/corec/node/nodebase.h b/corec/corec/node/nodebase.h index aa732025..068ab9d0 100644 --- a/corec/corec/node/nodebase.h +++ b/corec/corec/node/nodebase.h @@ -28,7 +28,7 @@ #define TYPE_NODE 10 // node* (format1: node class) #define TYPE_META 11 #define TYPE_PACKET 12 // flow packet pin -#define TYPE_TICK 13 // tick_t +#define TYPE_TICK 13 #define TYPE_NODENOTIFY 14 // nodenotify (private) #define TYPE_PTR 15 // void* #define TYPE_BINARY 16 // binary data (format1: size) @@ -127,8 +127,8 @@ typedef struct datadef #define META_PARAM_NAME 30 //const tchar_t* #define META_PARAM_TYPE 31 //uint32_t (with flags) -#define META_PARAM_MIN 32 //int (for TYPE_INT or TYPE_TICK) -#define META_PARAM_MAX 33 //int (for TYPE_INT or TYPE_TICK) +#define META_PARAM_MIN 32 //int (for TYPE_INT) +#define META_PARAM_MAX 33 //int (for TYPE_INT) #define META_PARAM_CLASS 34 //fourcc_t (for TYPE_NODE or TYPE_FOURCC) #define META_PARAM_ENUMLANG 36 //fourcc_t (for TYPE_INT or TYPE_FOURCC) #define META_PARAM_ENUMNAME 37 //const tchar_t* (for TYPE_INT or TYPE_FOURCC) diff --git a/corec/corec/portab.h b/corec/corec/portab.h index eca6e5d5..45fa626d 100644 --- a/corec/corec/portab.h +++ b/corec/corec/portab.h @@ -96,9 +96,6 @@ #define IS_LITTLE_ENDIAN #endif -#define TICKSPERSEC 16384 -#define TIMEPERSEC (TICKSPERSEC>>4) - #ifndef M_PI #define M_PI 3.14159265358979323846264338327950288 #endif @@ -191,7 +188,6 @@ typedef int_fast32_t err_t; typedef int_fast32_t bool_t; -typedef int_fast32_t tick_t; typedef uint8_t boolmem_t; /* unsigned so ":1" bitmode should work */ typedef uint32_t fourcc_t; typedef uint32_t rgbval_t;