From c245a226ce5d456bc5568fc180e3f89bcaf03688 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jean-marc.valin@usherbrooke.ca>
Date: Thu, 6 Dec 2007 19:14:20 +1100
Subject: [PATCH] minor cleanup
---
celt.kdevelop | 69 ++++++++++++++++++++++++++++++++++++++++------
libcelt/celt.c | 5 +++-
libcelt/celt.h | 6 ++--
libcelt/modes.h | 2 +-
libcelt/testcelt.c | 2 ++
5 files changed, 69 insertions(+), 15 deletions(-)
diff --git a/celt.kdevelop b/celt.kdevelop
index 758357c0a..4ff1619ad 100644
--- a/celt.kdevelop
+++ b/celt.kdevelop
@@ -8,13 +8,28 @@
<primarylanguage>C</primarylanguage>
<ignoreparts/>
<projectname>celt</projectname>
+ <projectdirectory>.</projectdirectory>
+ <absoluteprojectpath>false</absoluteprojectpath>
+ <description></description>
+ <defaultencoding></defaultencoding>
</general>
<kdevautoproject>
<general>
<useconfiguration>default</useconfiguration>
<activetarget>libcelt/libcelt.la</activetarget>
</general>
- <run/>
+ <run>
+ <mainprogram/>
+ <programargs/>
+ <globaldebugarguments/>
+ <globalcwd/>
+ <useglobalprogram>true</useglobalprogram>
+ <terminal>false</terminal>
+ <autocompile>false</autocompile>
+ <autoinstall>false</autoinstall>
+ <autokdesu>false</autokdesu>
+ <envvars/>
+ </run>
<configurations>
<optimized>
<builddir>optimized</builddir>
@@ -42,7 +57,20 @@
<kdevdebugger>
<general>
<dbgshell>libtool</dbgshell>
+ <gdbpath></gdbpath>
+ <configGdbScript></configGdbScript>
+ <runShellScript></runShellScript>
+ <runGdbScript></runGdbScript>
+ <breakonloadinglibs>true</breakonloadinglibs>
+ <separatetty>false</separatetty>
+ <floatingtoolbar>false</floatingtoolbar>
+ <raiseGDBOnStart>false</raiseGDBOnStart>
</general>
+ <display>
+ <staticmembers>false</staticmembers>
+ <demanglenames>true</demanglenames>
+ <outputradix>10</outputradix>
+ </display>
</kdevdebugger>
<kdevdoctreeview>
<ignoretocs>
@@ -104,13 +132,12 @@
<used>false</used>
<version>3</version>
<includestyle>3</includestyle>
- <root>/usr/share/qt3</root>
+ <root></root>
<designerintegration>EmbeddedKDevDesigner</designerintegration>
- <qmake>/usr/bin/qmake-qt3</qmake>
- <designer>/usr/bin/designer</designer>
+ <qmake></qmake>
+ <designer></designer>
<designerpluginpaths/>
</qt>
- <references/>
<codecompletion>
<automaticCodeCompletion>false</automaticCodeCompletion>
<automaticArgumentsHint>true</automaticArgumentsHint>
@@ -134,15 +161,39 @@
<alwaysIncludeNamespaces>false</alwaysIncludeNamespaces>
<includePaths>.;</includePaths>
</codecompletion>
+ <creategettersetter>
+ <prefixGet></prefixGet>
+ <prefixSet>set</prefixSet>
+ <prefixVariable>m_,_</prefixVariable>
+ <parameterName>theValue</parameterName>
+ <inlineGet>true</inlineGet>
+ <inlineSet>true</inlineSet>
+ </creategettersetter>
+ <splitheadersource>
+ <enabled>true</enabled>
+ <synchronize>true</synchronize>
+ <orientation>Horizontal</orientation>
+ </splitheadersource>
+ <references/>
</kdevcppsupport>
+ <cppsupportpart>
+ <filetemplates>
+ <interfacesuffix>.h</interfacesuffix>
+ <implementationsuffix>.cpp</implementationsuffix>
+ </filetemplates>
+ </cppsupportpart>
<kdevfileview>
- <groups>
- <hidenonprojectfiles>false</hidenonprojectfiles>
- <hidenonlocation>false</hidenonlocation>
- </groups>
+ <groups/>
<tree>
<hidepatterns>*.o,*.lo,CVS</hidepatterns>
<hidenonprojectfiles>false</hidenonprojectfiles>
</tree>
</kdevfileview>
+ <kdevdocumentation>
+ <projectdoc>
+ <docsystem></docsystem>
+ <docurl></docurl>
+ <usermanualurl></usermanualurl>
+ </projectdoc>
+ </kdevdocumentation>
</kdevelop>
diff --git a/libcelt/celt.c b/libcelt/celt.c
index 2c82f2195..2a6607f6e 100644
--- a/libcelt/celt.c
+++ b/libcelt/celt.c
@@ -41,7 +41,7 @@
#define MAX_PERIOD 1024
-struct CELTState_ {
+struct CELTState {
const CELTMode *mode;
int frame_size;
int block_size;
@@ -104,6 +104,8 @@ void celt_encoder_destroy(CELTState *st)
celt_warning("NULL passed to celt_encoder_destroy");
return;
}
+ ec_byte_writeclear(&st->buf);
+
mdct_clear(&st->mdct_lookup);
spx_fft_destroy(st->fft);
@@ -112,6 +114,7 @@ void celt_encoder_destroy(CELTState *st)
celt_free(st->mdct_overlap);
celt_free(st->out_mem);
+ celt_free(st->oldBandE);
celt_free(st);
}
diff --git a/libcelt/celt.h b/libcelt/celt.h
index d9a75d657..53cbb8948 100644
--- a/libcelt/celt.h
+++ b/libcelt/celt.h
@@ -32,11 +32,9 @@
#ifndef CELT_H
#define CELT_H
-struct CELTState_;
-typedef struct CELTState_ CELTState;
+typedef struct CELTState CELTState;
-struct CELTMode_;
-typedef struct CELTMode_ CELTMode;
+typedef struct CELTMode CELTMode;
extern const CELTMode const *celt_mode1;
diff --git a/libcelt/modes.h b/libcelt/modes.h
index 1d5146d8d..ed9ed6ce9 100644
--- a/libcelt/modes.h
+++ b/libcelt/modes.h
@@ -34,7 +34,7 @@
#include "celt.h"
-struct CELTMode_ {
+struct CELTMode {
int frameSize;
int mdctSize;
int nbMdctBlocks;
diff --git a/libcelt/testcelt.c b/libcelt/testcelt.c
index 23403dcf7..09b5a0e87 100644
--- a/libcelt/testcelt.c
+++ b/libcelt/testcelt.c
@@ -57,6 +57,8 @@ int main(int argc, char *argv[])
fwrite(in, sizeof(short), FRAME_SIZE, fout);
}
celt_encoder_destroy(st);
+ fclose(fin);
+ fclose(fout);
return 0;
}
--
GitLab