From af16463b5a877c1662328bc80cd10cc1c552c986 Mon Sep 17 00:00:00 2001
From: John Glover <j@johnglover.net>
Date: Mon, 2 Jul 2012 19:33:32 +0100
Subject: [sms] Name header and data structs, no need for char parameter to
sms_fillHeader.
---
src/sms/fileIO.c | 3 +--
src/sms/sms.h | 6 +++---
2 files changed, 4 insertions(+), 5 deletions(-)
(limited to 'src/sms')
diff --git a/src/sms/fileIO.c b/src/sms/fileIO.c
index e870c5a..240a266 100644
--- a/src/sms/fileIO.c
+++ b/src/sms/fileIO.c
@@ -63,9 +63,8 @@ void sms_initHeader(SMS_Header *pSmsHeader)
*
* \param pSmsHeader header for SMS file (to be stored)
* \param pAnalParams structure of analysis parameters
- * \param pProgramString pointer to a string containing the name of the program that made the analysis data
*/
-void sms_fillHeader(SMS_Header *pSmsHeader, SMS_AnalParams *pAnalParams, char *pProgramString)
+void sms_fillHeader(SMS_Header *pSmsHeader, SMS_AnalParams *pAnalParams)
{
sms_initHeader(pSmsHeader);
pSmsHeader->nFrames = pAnalParams->nFrames;
diff --git a/src/sms/sms.h b/src/sms/sms.h
index 4e6e5c1..14399fc 100644
--- a/src/sms/sms.h
+++ b/src/sms/sms.h
@@ -58,7 +58,7 @@
* the documentation will be updated to reflect which members of the header
* are useful in manipulations, and what functions to use for these manipulatinos
*/
-typedef struct
+typedef struct SMSHeader
{
int iSmsMagic; /*!< identification constant */
int iHeadBSize; /*!< size in bytes of header */
@@ -88,7 +88,7 @@ typedef struct
* pFSinPha is optional in the final output, but it is always used to construct the
* residual signal.
*/
-typedef struct
+typedef struct SMSData
{
sfloat *pSmsData; /*!< pointer to all SMS data */
int sizeData; /*!< size of all the data */
@@ -671,7 +671,7 @@ void sms_sineSynthFrame(SMS_Data *pSmsFrame, sfloat *pBuffer,
void sms_initHeader(SMS_Header *pSmsHeader);
int sms_getHeader(char *pChFileName, SMS_Header **ppSmsHeader, FILE **ppInputFile);
-void sms_fillHeader(SMS_Header *pSmsHeader, SMS_AnalParams *pAnalParams, char *pProgramString);
+void sms_fillHeader(SMS_Header *pSmsHeader, SMS_AnalParams *pAnalParams);
int sms_writeHeader(char *pFileName, SMS_Header *pSmsHeader, FILE **ppOutSmsFile);
int sms_writeFile(FILE *pSmsFile, SMS_Header *pSmsHeader);
int sms_initFrame(int iCurrentFrame, SMS_AnalParams *pAnalParams, int sizeWindow);
--
cgit v1.2.3