kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-06-03 11:58:36 +00:00
Code Issues Projects Releases Wiki Activity

windows build cleanup

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9206 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2008-07-30 05:32:51 +00:00
parent 8dc955537b
commit ce1badf9c8
10 changed files with 49 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/win32/libmp3lame/libmp3lame_vc7.vcproj
View File

@ -51,7 +51,7 @@
AssemblerListingLocation=".\Release/" AssemblerListingLocation=".\Release/"
ObjectFile=".\Release/" ObjectFile=".\Release/"
ProgramDataBaseFileName=".\Release/" ProgramDataBaseFileName=".\Release/"
WarningLevel="3" WarningLevel="0"
SuppressStartupBanner="true" SuppressStartupBanner="true"
CompileAs="0" CompileAs="0"
/> />
@ -119,9 +119,9 @@
AssemblerListingLocation=".\Debug/" AssemblerListingLocation=".\Debug/"
ObjectFile=".\Debug/" ObjectFile=".\Debug/"
ProgramDataBaseFileName=".\Debug/" ProgramDataBaseFileName=".\Debug/"
WarningLevel="3" WarningLevel="0"
SuppressStartupBanner="true" SuppressStartupBanner="true"
DebugInformationFormat="4" DebugInformationFormat="3"
CompileAs="0" CompileAs="0"
/> />
<Tool <Tool

6
libs/win32/libogg/libogg.2008.vcproj
View File

@ -50,7 +50,7 @@
AssemblerListingLocation=".\Static_Release/" AssemblerListingLocation=".\Static_Release/"
ObjectFile=".\Static_Release/" ObjectFile=".\Static_Release/"
ProgramDataBaseFileName=".\Static_Release/" ProgramDataBaseFileName=".\Static_Release/"
WarningLevel="3" WarningLevel="0"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -121,9 +121,9 @@
AssemblerListingLocation=".\Static_Debug/" AssemblerListingLocation=".\Static_Debug/"
ObjectFile=".\Static_Debug/" ObjectFile=".\Static_Debug/"
ProgramDataBaseFileName=".\Static_Debug/" ProgramDataBaseFileName=".\Static_Debug/"
WarningLevel="3" WarningLevel="0"
SuppressStartupBanner="true" SuppressStartupBanner="true"
DebugInformationFormat="4" DebugInformationFormat="3"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"

6
libs/win32/libshout/libshout.vcproj
View File

@ -52,7 +52,7 @@
AssemblerListingLocation=".$(ConfigurationName)" AssemblerListingLocation=".$(ConfigurationName)"
ObjectFile=".\Release/" ObjectFile=".\Release/"
ProgramDataBaseFileName="$(ConfigurationName)" ProgramDataBaseFileName="$(ConfigurationName)"
WarningLevel="3" WarningLevel="0"
SuppressStartupBanner="true" SuppressStartupBanner="true"
/> />
<Tool <Tool
@ -126,9 +126,9 @@
AssemblerListingLocation="$(ConfigurationName)" AssemblerListingLocation="$(ConfigurationName)"
ObjectFile=".\Debug/" ObjectFile=".\Debug/"
ProgramDataBaseFileName="$(ConfigurationName)" ProgramDataBaseFileName="$(ConfigurationName)"
WarningLevel="3" WarningLevel="0"
SuppressStartupBanner="true" SuppressStartupBanner="true"
DebugInformationFormat="4" DebugInformationFormat="3"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"

2
src/include/switch_core.h
View File

@ -1236,7 +1236,7 @@ SWITCH_DECLARE(void) switch_core_db_test_reactive(switch_core_db_t *db, char *te
SWITCH_DECLARE(switch_status_t) switch_core_perform_file_open(const char *file, const char *func, int line, SWITCH_DECLARE(switch_status_t) switch_core_perform_file_open(const char *file, const char *func, int line,
_In_ switch_file_handle_t *fh, _In_ switch_file_handle_t *fh,
_In_z_ const char *file_path, _In_opt_z_ const char *file_path,
_In_ uint8_t channels, _In_ uint8_t channels,
_In_ uint32_t rate, _In_ unsigned int flags, _In_opt_ switch_memory_pool_t *pool); _In_ uint32_t rate, _In_ unsigned int flags, _In_opt_ switch_memory_pool_t *pool);

4
src/mod/formats/mod_shout/decode_i386.c
View File

@ -23,7 +23,9 @@
#define WRITE_SAMPLE(samples,sum,clip) \ #define WRITE_SAMPLE(samples,sum,clip) \
if( (sum) > 32767.0) { *(samples) = 0x7fff; (clip)++; } \ if( (sum) > 32767.0) { *(samples) = 0x7fff; (clip)++; } \
else if( (sum) < -32768.0) { *(samples) = -0x8000; (clip)++; } \ else if( (sum) < -32768.0) { *(samples) = -0x8000; (clip)++; } \
else { *(samples) = sum; } else { *(samples) = (short)sum; }
int synth_1to1(struct mpstr *mp, real * bandPtr, int channel, unsigned char *out, int *pnt);
int synth_1to1_mono(struct mpstr *mp, real * bandPtr, unsigned char *samples, int *pnt) int synth_1to1_mono(struct mpstr *mp, real * bandPtr, unsigned char *samples, int *pnt)
{ {

2
src/mod/formats/mod_shout/decode_ntom.c
View File

@ -18,7 +18,7 @@
#define WRITE_SAMPLE(samples,sum,clip) \ #define WRITE_SAMPLE(samples,sum,clip) \
if( (sum) > 32767.0) { *(samples) = 0x7fff; (clip)++; } \ if( (sum) > 32767.0) { *(samples) = 0x7fff; (clip)++; } \
else if( (sum) < -32768.0) { *(samples) = -0x8000; (clip)++; } \ else if( (sum) < -32768.0) { *(samples) = -0x8000; (clip)++; } \
else { *(samples) = sum; } else { *(samples) = (short)sum; }
//static unsigned long ntom_val[2] = { NTOM_MUL >> 1, NTOM_MUL >> 1 }; //static unsigned long ntom_val[2] = { NTOM_MUL >> 1, NTOM_MUL >> 1 };

58
src/mod/formats/mod_shout/layer3.c
View File

@ -112,45 +112,45 @@ void init_layer3_const(void)
int i, j, k, l; int i, j, k, l;
for (i = -256; i < 118 + 4; i++) for (i = -256; i < 118 + 4; i++)
gainpow2[i + 256] = pow((double) 2.0, -0.25 * (double) (i + 210)); gainpow2[i + 256] = (real)pow((double) 2.0, -0.25 * (double) (i + 210));
for (i = 0; i < 8207; i++) for (i = 0; i < 8207; i++)
__ispow[i] = pow((double) i, (double) 4.0 / 3.0); __ispow[i] = (real)pow((double) i, (double) 4.0 / 3.0);
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
static double Ci[8] = { -0.6, -0.535, -0.33, -0.185, -0.095, -0.041, -0.0142, -0.0037 }; static double Ci[8] = { -0.6, -0.535, -0.33, -0.185, -0.095, -0.041, -0.0142, -0.0037 };
double sq = sqrt(1.0 + Ci[i] * Ci[i]); double sq = sqrt(1.0 + Ci[i] * Ci[i]);
aa_cs[i] = 1.0 / sq; aa_cs[i] = (real)(1.0 / sq);
aa_ca[i] = Ci[i] / sq; aa_ca[i] = (real)(Ci[i] / sq);
} }
for (i = 0; i < 18; i++) { for (i = 0; i < 18; i++) {
win[0][i] = win[1][i] = 0.5 * sin(M_PI / 72.0 * (double) (2 * (i + 0) + 1)) / cos(M_PI * (double) (2 * (i + 0) + 19) / 72.0); win[0][i] = win[1][i] = (real)(0.5 * sin(M_PI / 72.0 * (double) (2 * (i + 0) + 1)) / cos(M_PI * (double) (2 * (i + 0) + 19) / 72.0));
win[0][i + 18] = win[3][i + 18] = 0.5 * sin(M_PI / 72.0 * (double) (2 * (i + 18) + 1)) / cos(M_PI * (double) (2 * (i + 18) + 19) / 72.0); win[0][i + 18] = win[3][i + 18] = (real)(0.5 * sin(M_PI / 72.0 * (double) (2 * (i + 18) + 1)) / cos(M_PI * (double) (2 * (i + 18) + 19) / 72.0));
} }
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++) {
win[1][i + 18] = 0.5 / cos(M_PI * (double) (2 * (i + 18) + 19) / 72.0); win[1][i + 18] = (real)(0.5 / cos(M_PI * (double) (2 * (i + 18) + 19) / 72.0));
win[3][i + 12] = 0.5 / cos(M_PI * (double) (2 * (i + 12) + 19) / 72.0); win[3][i + 12] = (real)(0.5 / cos(M_PI * (double) (2 * (i + 12) + 19) / 72.0));
win[1][i + 24] = 0.5 * sin(M_PI / 24.0 * (double) (2 * i + 13)) / cos(M_PI * (double) (2 * (i + 24) + 19) / 72.0); win[1][i + 24] = (real)(0.5 * sin(M_PI / 24.0 * (double) (2 * i + 13)) / cos(M_PI * (double) (2 * (i + 24) + 19) / 72.0));
win[1][i + 30] = win[3][i] = 0.0; win[1][i + 30] = win[3][i] = (real)(0.0);
win[3][i + 6] = 0.5 * sin(M_PI / 24.0 * (double) (2 * i + 1)) / cos(M_PI * (double) (2 * (i + 6) + 19) / 72.0); win[3][i + 6] = (real)(0.5 * sin(M_PI / 24.0 * (double) (2 * i + 1)) / cos(M_PI * (double) (2 * (i + 6) + 19) / 72.0));
} }
for (i = 0; i < 9; i++) for (i = 0; i < 9; i++)
COS9[i] = cos(M_PI / 18.0 * (double) i); COS9[i] = (real)(cos(M_PI / 18.0 * (double) i));
for (i = 0; i < 9; i++) for (i = 0; i < 9; i++)
tfcos36[i] = 0.5 / cos(M_PI * (double) (i * 2 + 1) / 36.0); tfcos36[i] = (real)(0.5 / cos(M_PI * (double) (i * 2 + 1) / 36.0));
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
tfcos12[i] = 0.5 / cos(M_PI * (double) (i * 2 + 1) / 12.0); tfcos12[i] = (real)(0.5 / cos(M_PI * (double) (i * 2 + 1) / 12.0));
COS6_1 = cos(M_PI / 6.0 * (double) 1); COS6_1 = (real)(cos(M_PI / 6.0 * (double) 1));
COS6_2 = cos(M_PI / 6.0 * (double) 2); COS6_2 = (real)(cos(M_PI / 6.0 * (double) 2));
for (i = 0; i < 12; i++) { for (i = 0; i < 12; i++) {
win[2][i] = 0.5 * sin(M_PI / 24.0 * (double) (2 * i + 1)) / cos(M_PI * (double) (2 * i + 7) / 24.0); win[2][i] = (real)(0.5 * sin(M_PI / 24.0 * (double) (2 * i + 1)) / cos(M_PI * (double) (2 * i + 7) / 24.0));
for (j = 0; j < 6; j++) for (j = 0; j < 6; j++)
COS1[i][j] = cos(M_PI / 24.0 * (double) ((2 * i + 7) * (2 * j + 1))); COS1[i][j] = (real)(cos(M_PI / 24.0 * (double) ((2 * i + 7) * (2 * j + 1))));
} }
for (j = 0; j < 4; j++) { for (j = 0; j < 4; j++) {
@ -163,10 +163,10 @@ void init_layer3_const(void)
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
double t = tan((double) i * M_PI / 12.0); double t = tan((double) i * M_PI / 12.0);
tan1_1[i] = t / (1.0 + t); tan1_1[i] = (real)(t / (1.0 + t));
tan2_1[i] = 1.0 / (1.0 + t); tan2_1[i] = (real)(1.0 / (1.0 + t));
tan1_2[i] = M_SQRT2 * t / (1.0 + t); tan1_2[i] = (real)(M_SQRT2 * t / (1.0 + t));
tan2_2[i] = M_SQRT2 / (1.0 + t); tan2_2[i] = (real)(M_SQRT2 / (1.0 + t));
for (j = 0; j < 2; j++) { for (j = 0; j < 2; j++) {
double base = pow(2.0, -0.25 * (j + 1.0)); double base = pow(2.0, -0.25 * (j + 1.0));
@ -177,10 +177,10 @@ void init_layer3_const(void)
else else
p2 = pow(base, i * 0.5); p2 = pow(base, i * 0.5);
} }
pow1_1[j][i] = p1; pow1_1[j][i] = (real)p1;
pow2_1[j][i] = p2; pow2_1[j][i] = (real)p2;
pow1_2[j][i] = M_SQRT2 * p1; pow1_2[j][i] = (real)(M_SQRT2 * p1);
pow2_2[j][i] = M_SQRT2 * p2; pow2_2[j][i] = (real)(M_SQRT2 * p2);
} }
} }
@ -1827,7 +1827,7 @@ static void III_hybrid(struct mpstr *mp, real fsIn[SBLIMIT][SSLIMIT], real tsOut
int *blc = mp->hybrid_blc; int *blc = mp->hybrid_blc;
real *rawout1, *rawout2; real *rawout1, *rawout2;
int bt; int bt;
int sb = 0; unsigned int sb = 0;
{ {
int b = blc[ch]; int b = blc[ch];
@ -1981,7 +1981,7 @@ int do_layer3(struct mpstr *mp, unsigned char *pcm_sample, int *pcm_point)
switch (single) { switch (single) {
case 3: case 3:
{ {
register int i; register unsigned int i;
register real *in0 = (real *) hybridIn[0], *in1 = (real *) hybridIn[1]; register real *in0 = (real *) hybridIn[0], *in1 = (real *) hybridIn[1];
for (i = 0; i < SSLIMIT * gr_info->maxb; i++, in0++) for (i = 0; i < SSLIMIT * gr_info->maxb; i++, in0++)
*in0 = (*in0 + *in1++); /* *0.5 done by pow-scale */ *in0 = (*in0 + *in1++); /* *0.5 done by pow-scale */
@ -1989,7 +1989,7 @@ int do_layer3(struct mpstr *mp, unsigned char *pcm_sample, int *pcm_point)
break; break;
case 1: case 1:
{ {
register int i; register unsigned int i;
register real *in0 = (real *) hybridIn[0], *in1 = (real *) hybridIn[1]; register real *in0 = (real *) hybridIn[0], *in1 = (real *) hybridIn[1];
for (i = 0; i < SSLIMIT * gr_info->maxb; i++) for (i = 0; i < SSLIMIT * gr_info->maxb; i++)
*in0++ = *in1++; *in0++ = *in1++;

4
src/mod/formats/mod_shout/mod_shout.c
View File

@ -249,7 +249,7 @@ static size_t decode_fd(shout_context_t *context, void *data, size_t bytes)
usedlen = 0; usedlen = 0;
x = 0; x = 0;
if (inlen < bytes) { if (lp < bytes) {
done = 1; done = 1;
} }
@ -1067,7 +1067,7 @@ void do_telecast(switch_stream_handle_t *stream)
stream->write_function(stream, "Content-type: text/html\r\n\r\n<h2>Not Found!</h2>\n" "<META http-equiv=\"refresh\" content=\"1;URL=%s\">", ref); stream->write_function(stream, "Content-type: text/html\r\n\r\n<h2>Not Found!</h2>\n" "<META http-equiv=\"refresh\" content=\"1;URL=%s\">", ref);
} else { } else {
switch_media_bug_t *bug = NULL; switch_media_bug_t *bug = NULL;
switch_buffer_t *buffer; switch_buffer_t *buffer = NULL;
switch_mutex_t *mutex; switch_mutex_t *mutex;
switch_channel_t *channel = switch_core_session_get_channel(tsession); switch_channel_t *channel = switch_core_session_get_channel(tsession);
lame_global_flags *gfp = NULL; lame_global_flags *gfp = NULL;

2
src/mod/formats/mod_shout/mod_shout.vcproj
View File

@ -48,7 +48,7 @@
RuntimeLibrary="3" RuntimeLibrary="3"
WarningLevel="3" WarningLevel="3"
WarnAsError="false" WarnAsError="false"
DebugInformationFormat="4" DebugInformationFormat="3"
EnablePREfast="false" EnablePREfast="false"
/> />
<Tool <Tool

6
src/mod/formats/mod_shout/tabinit.c
View File

@ -46,7 +46,7 @@ void make_decode_tables_const(void)
divv = 0x40 >> i; divv = 0x40 >> i;
costab = pnts[i]; costab = pnts[i];
for (k = 0; k < kr; k++) for (k = 0; k < kr; k++)
costab[k] = 1.0 / (2.0 * cos(M_PI * ((double) k * 2.0 + 1.0) / (double) divv)); costab[k] = (real)(1.0 / (2.0 * cos(M_PI * ((double) k * 2.0 + 1.0) / (double) divv)));
} }
} }
@ -60,7 +60,7 @@ void make_decode_tables_scale(struct mpstr *mp, long scaleval)
scaleval = -scaleval; scaleval = -scaleval;
for (i = 0, j = 0; i < 256; i++, j++, table += 32) { for (i = 0, j = 0; i < 256; i++, j++, table += 32) {
if (table < (mp->decwin) + 512 + 16) if (table < (mp->decwin) + 512 + 16)
table[16] = table[0] = (double) intwinbase[j] / 65536.0 * (double) scaleval; table[16] = table[0] = (real)((double) intwinbase[j] / 65536.0 * (double) scaleval);
if (i % 32 == 31) if (i % 32 == 31)
table -= 1023; table -= 1023;
if (i % 64 == 63) if (i % 64 == 63)
@ -69,7 +69,7 @@ void make_decode_tables_scale(struct mpstr *mp, long scaleval)
for ( /* i=256 */ ; i < 512; i++, j--, table += 32) { for ( /* i=256 */ ; i < 512; i++, j--, table += 32) {
if (table < (mp->decwin) + 512 + 16) if (table < (mp->decwin) + 512 + 16)
table[16] = table[0] = (double) intwinbase[j] / 65536.0 * (double) scaleval; table[16] = table[0] = (real)((double) intwinbase[j] / 65536.0 * (double) scaleval);
if (i % 32 == 31) if (i % 32 == 31)
table -= 1023; table -= 1023;
if (i % 64 == 63) if (i % 64 == 63)