February 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r12200 - in freeswitch/trunk/libs/spandsp/src: . msvc spandsp
by FreeSWITCH SVN 20 Feb '09

20 Feb '09

Author: mikej Date: Fri Feb 20 15:21:48 2009 New Revision: 12200 Log: cleanup msvc 2005 build warnings Modified: freeswitch/trunk/libs/spandsp/src/complex_vector_int.c freeswitch/trunk/libs/spandsp/src/dds_int.c freeswitch/trunk/libs/spandsp/src/g722.c freeswitch/trunk/libs/spandsp/src/lpc10_decode.c freeswitch/trunk/libs/spandsp/src/msvc/ (props changed) freeswitch/trunk/libs/spandsp/src/oki_adpcm.c freeswitch/trunk/libs/spandsp/src/spandsp/complex.h freeswitch/trunk/libs/spandsp/src/vector_int.c Modified: freeswitch/trunk/libs/spandsp/src/complex_vector_int.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/complex_vector_int.c (original) +++ freeswitch/trunk/libs/spandsp/src/complex_vector_int.c Fri Feb 20 15:21:48 2009 @@ -123,8 +123,8 @@ for (i = 0; i < n; i++) { - y[i].re += ((int32_t) x[i].im*(int32_t) error->im + (int32_t) x[i].re*(int32_t) error->re) >> 12; - y[i].im += ((int32_t) x[i].re*(int32_t) error->im - (int32_t) x[i].im*(int32_t) error->re) >> 12; + y[i].re = (int16_t)(y[i].re + (((int32_t) x[i].im*(int32_t) error->im + (int32_t) x[i].re*(int32_t) error->re) >> 12)); + y[i].im = (int16_t)(y[i].im + (((int32_t) x[i].re*(int32_t) error->im - (int32_t) x[i].im*(int32_t) error->re) >> 12)); } } /*- End of function --------------------------------------------------------*/ Modified: freeswitch/trunk/libs/spandsp/src/dds_int.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/dds_int.c (original) +++ freeswitch/trunk/libs/spandsp/src/dds_int.c Fri Feb 20 15:21:48 2009 @@ -309,8 +309,8 @@ { complexi16_t amp; - amp = complex_seti16(((int32_t) dds_lookup(*phase_acc + phase + (1 << 30))*(int32_t) scale) >> 15, - ((int32_t) dds_lookup(*phase_acc + phase)*(int32_t) scale) >> 15); + amp = complex_seti16((int16_t)(((int32_t) dds_lookup(*phase_acc + phase + (1 << 30))*(int32_t) scale) >> 15), + (int16_t)(((int32_t) dds_lookup(*phase_acc + phase)*(int32_t) scale) >> 15)); *phase_acc += phase_rate; return amp; } Modified: freeswitch/trunk/libs/spandsp/src/g722.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/g722.c (original) +++ freeswitch/trunk/libs/spandsp/src/g722.c Fri Feb 20 15:21:48 2009 @@ -214,7 +214,7 @@ /* UPPOL1 */ wd1 = ((p ^ s->p[0]) & 0x8000) ? -192 : 192; - wd2 = ((int32_t) s->a[0]*(int32_t) 32640) >> 15; + wd2 = (int16_t)(((int32_t) s->a[0]*(int32_t) 32640) >> 15); ap[0] = saturated_add16(wd1, wd2); wd3 = saturated_sub16(15360, ap[1]); @@ -223,9 +223,9 @@ /* FILTEP */ wd1 = saturated_add16(r, r); - wd1 = ((int32_t) ap[0]*(int32_t) wd1) >> 15; + wd1 = (int16_t)(((int32_t) ap[0]*(int32_t) wd1) >> 15); wd2 = saturated_add16(s->r, s->r); - wd2 = ((int32_t) ap[1]*(int32_t) wd2) >> 15; + wd2 = (int16_t)(((int32_t) ap[1]*(int32_t) wd2) >> 15); sp = saturated_add16(wd1, wd2); s->r = r; s->a[1] = ap[1]; @@ -242,7 +242,7 @@ for (i = 5; i >= 0; i--) { wd2 = ((s->d[i + 1] ^ dx) & 0x8000) ? -wd1 : wd1; - wd3 = ((int32_t) s->b[i]*(int32_t) 32640) >> 15; + wd3 = (int16_t)(((int32_t) s->b[i]*(int32_t) 32640) >> 15); s->b[i] = saturated_add16(wd2, wd3); wd3 = saturated_add16(s->d[i], s->d[i]); sz += ((int32_t) s->b[i]*(int32_t) wd3) >> 15; Modified: freeswitch/trunk/libs/spandsp/src/lpc10_decode.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/lpc10_decode.c (original) +++ freeswitch/trunk/libs/spandsp/src/lpc10_decode.c Fri Feb 20 15:21:48 2009 @@ -68,7 +68,7 @@ /* The following is a 16 bit 2's complement addition, with overflow checking disabled */ - s->y[s->k] += s->y[s->j]; + s->y[s->k] = (int16_t)(s->y[s->k] + s->y[s->j]); ret_val = s->y[s->k]; if (--s->k < 0) s->k = 4; Modified: freeswitch/trunk/libs/spandsp/src/oki_adpcm.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/oki_adpcm.c (original) +++ freeswitch/trunk/libs/spandsp/src/oki_adpcm.c Fri Feb 20 15:21:48 2009 @@ -178,7 +178,7 @@ e += (ss >> 1); /*endif*/ if (adpcm & 0x04) - e += ss; + e = (int16_t)(e + ss); /*endif*/ if (adpcm & 0x08) e = -e; @@ -193,7 +193,7 @@ /*endif*/ s->last = linear; - s->step_index += step_adjustment[adpcm & 0x07]; + s->step_index = (int16_t)(s->step_index + step_adjustment[adpcm & 0x07]); if (s->step_index < 0) s->step_index = 0; else if (s->step_index > 48) @@ -222,13 +222,13 @@ if (e >= ss) { adpcm |= (uint8_t) 0x04; - e -= ss; + e = (int16_t)(e - ss); } /*endif*/ if (e >= (ss >> 1)) { adpcm |= (uint8_t) 0x02; - e -= ss; + e = (int16_t)(e - ss); } /*endif*/ if (e >= (ss >> 2)) Modified: freeswitch/trunk/libs/spandsp/src/spandsp/complex.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/complex.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/complex.h Fri Feb 20 15:21:48 2009 @@ -343,8 +343,8 @@ { complexi16_t z; - z.re = (int32_t) x->re*(int32_t) y->re - (int32_t) x->im*(int32_t) y->im; - z.im = (int32_t) x->re*(int32_t) y->im + (int32_t) x->im*(int32_t) y->re; + z.re = (int16_t)((int32_t) x->re*(int32_t) y->re - (int32_t) x->im*(int32_t) y->im); + z.im = (int16_t)((int32_t) x->re*(int32_t) y->im + (int32_t) x->im*(int32_t) y->re); return z; } /*- End of function --------------------------------------------------------*/ @@ -353,8 +353,8 @@ { complexi16_t z; - z.re = ((int32_t) x->re*(int32_t) y->re - (int32_t) x->im*(int32_t) y->im) >> 15; - z.im = ((int32_t) x->re*(int32_t) y->im + (int32_t) x->im*(int32_t) y->re) >> 15; + z.re = (int16_t)(((int32_t) x->re*(int32_t) y->re - (int32_t) x->im*(int32_t) y->im) >> 15); + z.im = (int16_t)(((int32_t) x->re*(int32_t) y->im + (int32_t) x->im*(int32_t) y->re) >> 15); return z; } /*- End of function --------------------------------------------------------*/ Modified: freeswitch/trunk/libs/spandsp/src/vector_int.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/vector_int.c (original) +++ freeswitch/trunk/libs/spandsp/src/vector_int.c Fri Feb 20 15:21:48 2009 @@ -300,7 +300,7 @@ int i; for (i = 0; i < n; i++) - y[i] += ((int32_t) x[i]*(int32_t) error) >> 15; + y[i] = (int16_t) (y[i] + (((int32_t) x[i]*(int32_t) error) >> 15)); } /*- End of function --------------------------------------------------------*/

1 0

[commit] r12199 - in freeswitch/trunk/libs/spandsp/src: . msvc
by FreeSWITCH SVN 20 Feb '09

20 Feb '09

Author: mikej Date: Fri Feb 20 14:49:59 2009 New Revision: 12199 Log: fix msvc release mode build errors Modified: freeswitch/trunk/libs/spandsp/src/fax_modems.c freeswitch/trunk/libs/spandsp/src/msvc/ (props changed) freeswitch/trunk/libs/spandsp/src/t4.c Modified: freeswitch/trunk/libs/spandsp/src/fax_modems.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/fax_modems.c (original) +++ freeswitch/trunk/libs/spandsp/src/fax_modems.c Fri Feb 20 14:49:59 2009 @@ -87,7 +87,7 @@ #define HDLC_FRAMING_OK_THRESHOLD 5 -int fax_modems_v17_v21_rx(void *user_data, const int16_t amp[], int len) +SPAN_DECLARE(int) fax_modems_v17_v21_rx(void *user_data, const int16_t amp[], int len) { fax_modems_state_t *s; @@ -106,7 +106,7 @@ } /*- End of function --------------------------------------------------------*/ -int fax_modems_v27ter_v21_rx(void *user_data, const int16_t amp[], int len) +SPAN_DECLARE(int) fax_modems_v27ter_v21_rx(void *user_data, const int16_t amp[], int len) { fax_modems_state_t *s; @@ -125,7 +125,7 @@ } /*- End of function --------------------------------------------------------*/ -int fax_modems_v29_v21_rx(void *user_data, const int16_t amp[], int len) +SPAN_DECLARE(int) fax_modems_v29_v21_rx(void *user_data, const int16_t amp[], int len) { fax_modems_state_t *s; Modified: freeswitch/trunk/libs/spandsp/src/t4.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/t4.c (original) +++ freeswitch/trunk/libs/spandsp/src/t4.c Fri Feb 20 14:49:59 2009 @@ -410,7 +410,7 @@ return -1; parm = 0; TIFFGetField(t->tiff_file, TIFFTAG_IMAGEWIDTH, &parm); - if (s->image_width != parm) + if (s->image_width != (int)parm) { printf("Width changed\n"); return 1; @@ -1959,7 +1959,7 @@ s->stop_page = (stop_page >= 0) ? stop_page : INT_MAX; if (!TIFFSetDirectory(s->tiff.tiff_file, (tdir_t) s->current_page)) - return -1; + return NULL; if (get_tiff_directory_info(s)) { close_tiff_input_file(s);

1 0

[commit] r12198 - freeswitch/trunk/src/mod/applications/mod_lcr
by FreeSWITCH SVN 20 Feb '09

20 Feb '09

Author: rupa Date: Fri Feb 20 14:36:04 2009 New Revision: 12198 Log: allow channel vars in custom_sql - unescaped for now Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Fri Feb 20 14:36:04 2009 @@ -110,6 +110,9 @@ char *order_by; char *pre_order; char *custom_sql; + switch_bool_t custom_sql_has_percent; + switch_bool_t custom_sql_has_vars; + switch_bool_t reorder_by_rate; }; typedef struct profile_obj profile_t; @@ -121,6 +124,7 @@ switch_memory_pool_t *pool; char *lookup_number; profile_t *profile; + switch_core_session_t *session; }; typedef struct callback_obj callback_t; @@ -259,25 +263,6 @@ return SWITCH_FALSE; } -static switch_bool_t test_lcr_sql(const char *sql) -{ - char * tsql; - switch_bool_t retval = SWITCH_FALSE; - tsql = switch_mprintf(sql, "5555551212"); - - if (globals.odbc_dsn) { - if (switch_odbc_handle_exec(globals.master_odbc, tsql, NULL) - == SWITCH_ODBC_SUCCESS) { - retval = SWITCH_TRUE; - } else { - retval = SWITCH_FALSE; - } - } - - switch_safe_free(tsql); - return retval; -} - /* make a new string with digits only */ static char *string_digitsonly(switch_memory_pool_t *pool, const char *str) { @@ -302,6 +287,74 @@ return newstr; } +/* escape sql */ +#ifdef _WAITING_FOR_ESCAPE +static char *escape_sql(const char *sql) +{ + return switch_string_replace(sql, "'", "''"); +} +#endif + +/* expand the digits */ +static char *expand_digits(switch_memory_pool_t *pool, char *digits) +{ + switch_stream_handle_t dig_stream = { 0 }; + char *ret; + char *digits_copy; + int n; + int digit_len; + SWITCH_STANDARD_STREAM(dig_stream); + + digit_len = strlen(digits); + digits_copy = switch_core_strdup(pool, digits); + + for (n = digit_len; n > 0; n--) { + digits_copy[n] = '\0'; + dig_stream.write_function(&dig_stream, "%s%s", (n==digit_len ? "" : ", "), digits_copy); + } + + ret = switch_core_strdup(pool, dig_stream.data); + switch_safe_free(dig_stream.data); + return ret; +} + +/* format the custom sql */ +static char *format_custom_sql(const char *custom_sql, callback_t *cb_struct, const char *digits) +{ + char * tmpSQL; + char * newSQL; + switch_channel_t *channel; + + /* first replace %s with digits to maintain backward compat */ + if(cb_struct->profile->custom_sql_has_percent == SWITCH_TRUE) { + tmpSQL = switch_string_replace(custom_sql, "%q", digits); + newSQL = tmpSQL; + } + + /* expand the vars */ + if(cb_struct->profile->custom_sql_has_vars == SWITCH_TRUE) { + if(cb_struct->session) { + channel = switch_core_session_get_channel(cb_struct->session); + switch_assert(channel); + /* + newSQL = switch_channel_expand_variables_escape(channel, + tmpSQL ? tmpSQL : custom_sql, + escape_sql); + */ + newSQL = switch_channel_expand_variables(channel, + tmpSQL ? tmpSQL : custom_sql); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, + "mod_lcr called without a valid session while using a custom_sql that has channel variables.\n"); + } + } + + if(tmpSQL != newSQL) { + switch_safe_free(tmpSQL); + } + return newSQL; +} + static switch_bool_t lcr_execute_sql_callback(char *sql, switch_core_db_callback_func_t callback, void *pdata) { switch_bool_t retval = SWITCH_FALSE; @@ -438,8 +491,11 @@ switch_stream_handle_t sql_stream = { 0 }; size_t n, digit_len = strlen(digits); char *digits_copy; + char *digits_expanded; profile_t *profile = cb_struct->profile; switch_bool_t lookup_status; + switch_channel_t *channel; + char *id_str; digits_copy = string_digitsonly(cb_struct->pool, digits); if (switch_strlen_zero(digits_copy)) { @@ -454,6 +510,18 @@ /* SWITCH_STANDARD_STREAM doesn't use pools. but we only have to free sql_stream.data */ SWITCH_STANDARD_STREAM(sql_stream); + + digits_expanded = expand_digits(cb_struct->pool, digits_copy); + + /* set some channel vars if we have a session */ + if(cb_struct->session) { + if((channel = switch_core_session_get_channel(cb_struct->session))) { + switch_channel_set_variable_var_check(channel, "lcr_query_digits", digits_copy, SWITCH_FALSE); + id_str = switch_core_sprintf(cb_struct->pool, "%d", cb_struct->profile->id); + switch_channel_set_variable_var_check(channel, "lcr_query_profile", id_str, SWITCH_FALSE); + switch_channel_set_variable_var_check(channel, "lcr_query_expanded_digits", digits_expanded, SWITCH_FALSE); + } + } /* set up the query to be executed */ if (switch_strlen_zero(profile->custom_sql)) { @@ -479,12 +547,20 @@ sql_stream.write_function(&sql_stream, ";"); } else { char *safe_sql; - safe_sql = switch_mprintf(profile->custom_sql, digits_copy); + + /* format the custom_sql */ + safe_sql = format_custom_sql(profile->custom_sql, cb_struct, digits_copy); + if(!safe_sql) { + return SWITCH_STATUS_GENERR; + } sql_stream.write_function(&sql_stream, safe_sql); - switch_safe_free(safe_sql); + if(safe_sql != profile->custom_sql) { + /* channel_expand_variables returned the same string to us, no need to free */ + switch_safe_free(safe_sql); + } } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s\n", (char *)sql_stream.data); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SQL: %s\n", (char *)sql_stream.data); lookup_status = lcr_execute_sql_callback((char *)sql_stream.data, route_add_callback, cb_struct); @@ -646,13 +722,13 @@ } if (!switch_strlen_zero(custom_sql)) { - if (test_lcr_sql(custom_sql) == SWITCH_TRUE) { - profile->custom_sql = switch_core_strdup(globals.pool, (char *)custom_sql); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Using custom lcr sql: %s\n", profile->custom_sql); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Custom lcr sql invalid: %s\nDisabling profile: %s\n", custom_sql, name); - continue; + if(switch_string_var_check_const(custom_sql)) { + profile->custom_sql_has_vars = SWITCH_TRUE; } + if(strstr(custom_sql, "%")) { + profile->custom_sql_has_percent = SWITCH_TRUE; + } + profile->custom_sql = switch_core_strdup(globals.pool, (char *)custom_sql); } if (!switch_strlen_zero(reorder_by_rate)) { @@ -685,6 +761,7 @@ if (session) { pool = switch_core_session_get_pool(session); + routes.session = session; } else { switch_core_new_memory_pool(&pool); } @@ -759,6 +836,7 @@ if (session) { pool = switch_core_session_get_pool(session); + routes.session = session; } else { switch_core_new_memory_pool(&pool); } @@ -816,12 +894,18 @@ switch_memory_pool_t *pool; switch_status_t lookup_status = SWITCH_STATUS_SUCCESS; - switch_core_new_memory_pool(&pool); - if (switch_strlen_zero(cmd)) { goto usage; } + if (session) { + pool = switch_core_session_get_pool(session); + cb_struct.session = session; + } else { + switch_core_new_memory_pool(&pool); + } + cb_struct.pool = pool; + mydata = switch_core_strdup(pool, cmd); if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { @@ -831,7 +915,6 @@ lcr_profile = argv[1]; } cb_struct.lookup_number = destination_number; - cb_struct.pool = pool; if (!(cb_struct.profile = locate_profile(lcr_profile))) { stream->write_function(stream, "-ERR Unknown profile: %s\n", lcr_profile); goto end; @@ -904,7 +987,9 @@ } end: - switch_core_destroy_memory_pool(&pool); + if (!session) { + switch_core_destroy_memory_pool(&pool); + } return SWITCH_STATUS_SUCCESS; usage: stream->write_function(stream, "USAGE: %s\n", LCR_SYNTAX); @@ -945,6 +1030,8 @@ } } else { stream->write_function(stream, " custom sql:\t%s\n", profile->custom_sql); + stream->write_function(stream, " has %%:\t\t%s\n", profile->custom_sql_has_percent ? "true" : "false"); + stream->write_function(stream, " has vars:\t%s\n", profile->custom_sql_has_vars ? "true" : "false"); } stream->write_function(stream, " Reorder rate:\t%s\n", profile->reorder_by_rate ? "enabled" : "disabled"); @@ -978,18 +1065,23 @@ return SWITCH_STATUS_FALSE; #endif - switch_core_new_memory_pool(&globals.pool); + if (switch_core_new_memory_pool(&globals.pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to create global memory pool\n"); + return SWITCH_STATUS_FALSE; + } if (lcr_load_config() != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to load lcr config file\n"); return SWITCH_STATUS_FALSE; } + if (switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, globals.pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed to initialize mutex\n"); } if (switch_mutex_init(&globals.db_mutex, SWITCH_MUTEX_UNNESTED, globals.pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed to initialize db_mutex\n"); } + if (set_db_random() == SWITCH_TRUE) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Database RANDOM function set to %s\n", db_random); @@ -1009,6 +1101,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_lcr_shutdown) { + switch_odbc_handle_disconnect(globals.master_odbc); switch_odbc_handle_destroy(&globals.master_odbc); switch_core_hash_destroy(&globals.profile_hash);

1 0

[commit] r12197 - in freeswitch/trunk/libs/spandsp/src: . msvc
by FreeSWITCH SVN 20 Feb '09

20 Feb '09

Author: mikej Date: Fri Feb 20 14:33:39 2009 New Revision: 12197 Log: add msvc 2005 project files Added: freeswitch/trunk/libs/spandsp/src/libspandsp.2005.sln freeswitch/trunk/libs/spandsp/src/libspandsp.2005.vcproj freeswitch/trunk/libs/spandsp/src/libtiff.2005.vcproj freeswitch/trunk/libs/spandsp/src/msvc/make_at_dictionary.2005.vcproj freeswitch/trunk/libs/spandsp/src/msvc/make_modem_filter.2005.vcproj freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.foot freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.head Modified: freeswitch/trunk/libs/spandsp/src/Makefile.am freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.head Modified: freeswitch/trunk/libs/spandsp/src/Makefile.am ============================================================================== --- freeswitch/trunk/libs/spandsp/src/Makefile.am (original) +++ freeswitch/trunk/libs/spandsp/src/Makefile.am Fri Feb 20 14:33:39 2009 @@ -27,8 +27,11 @@ spandsp/version.h.in \ libspandsp.dsp \ libspandsp.2008.sln \ + libspandsp.2005.sln \ libspandsp.2008.vcproj \ libtiff.2008.vcproj \ + libspandsp.2005.vcproj \ + libtiff.2005.vcproj \ msvc/config.h \ msvc/getopt.c \ msvc/gettimeofday.c \ @@ -37,13 +40,17 @@ msvc/unistd.h \ msvc/spandsp.h \ msvc/sys/time.h \ - msvc/make_at_dictionary.2008.vcproj \ msvc/make_headers.bat \ + msvc/make_at_dictionary.2008.vcproj \ msvc/make_modem_filter.2008.vcproj \ + msvc/make_at_dictionary.2005.vcproj \ + msvc/make_modem_filter.2005.vcproj \ msvc/msvcproj.head \ msvc/msvcproj.foot \ msvc/vc8proj.head \ msvc/vc8proj.foot \ + msvc/vc9proj.head \ + msvc/vc9proj.foot \ spandsp/private/README INCLUDES = -I$(top_builddir) @@ -399,13 +406,15 @@ ./make_modem_filter$(EXEEXT) -m V.29 -t >v29tx_floating_rrc.h DSP = libspandsp.dsp -VCPROJ8 = libspandsp.2008.vcproj +VCPROJ8 = libspandsp.2005.vcproj +VCPROJ9 = libspandsp.2008.vcproj WIN32SOURCES = $(libspandsp_la_SOURCES) .\\msvc\\gettimeofday.c WIN32HEADERS = $(nobase_include_HEADERS) spandsp.h DSPOUT = | awk '{printf("%s\r\n", $$0)}' >> $(DSP) VCPROJOUT8 = | awk '{printf("%s\r\n", $$0)}' >> $(VCPROJ8) +VCPROJOUT9 = | awk '{printf("%s\r\n", $$0)}' >> $(VCPROJ9) $(DSP): msvc/msvcproj.head msvc/msvcproj.foot Makefile.am echo "creating $(DSP)" @@ -440,6 +449,18 @@ done; \ cat $(srcdir)/msvc/vc8proj.foot $(VCPROJOUT8) ) +$(VCPROJ9): msvc/vc9proj.head msvc/vc9proj.foot Makefile.am + echo "creating $(VCPROJ9)" + @(cp $(srcdir)/msvc/vc9proj.head $(VCPROJ9); \ + for file in $(WIN32SOURCES); do \ + echo "<File RelativePath=\""$$file"\"></File>" $(VCPROJOUT9); \ + done; \ + echo "</Filter><Filter Name=\"Header Files\">" $(VCPROJOUT9); \ + for file in $(WIN32HEADERS); do \ + echo "<File RelativePath=\""$$file"\"></File>" $(VCPROJOUT9); \ + done; \ + cat $(srcdir)/msvc/vc8proj.foot $(VCPROJOUT9) ) + $(srcdir)/msvc/spandsp.h: spandsp.h.in echo "creating $(srcdir)/msvc/spandsp.h" @cp $(srcdir)/spandsp.h.in $(srcdir)/msvc/spandsp.h Added: freeswitch/trunk/libs/spandsp/src/libspandsp.2005.sln ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/spandsp/src/libspandsp.2005.sln Fri Feb 20 14:33:39 2009 @@ -0,0 +1,33 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_at_dictionary", "msvc\make_at_dictionary.2005.vcproj", "{DEE932AB-5911-4700-9EEB-8C7090A0A330}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_modem_filter", "msvc\make_modem_filter.2005.vcproj", "{329A6FA0-0FCC-4435-A950-E670AEFA9838}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspandsp", "libspandsp.2005.vcproj", "{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}" + ProjectSection(ProjectDependencies) = postProject + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} = {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtiff", "libtiff.2005.vcproj", "{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Debug|Win32.ActiveCfg = Debug|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Debug|Win32.Build.0 = Debug|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|Win32.ActiveCfg = Release|Win32 + {1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|Win32.Build.0 = Release|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|Win32.ActiveCfg = Debug|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Debug|Win32.Build.0 = Debug|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|Win32.ActiveCfg = Release|Win32 + {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Added: freeswitch/trunk/libs/spandsp/src/libspandsp.2005.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/spandsp/src/libspandsp.2005.vcproj Fri Feb 20 14:33:39 2009 @@ -0,0 +1,305 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="libspandsp" + ProjectGUID="{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}" + RootNamespace="libspandsp" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)Debug" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;.\generated" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="4" + DebugInformationFormat="4" + CompileAs="1" + DisableSpecificWarnings="4127" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="./Debug\spandsp.lib" + TargetMachine="1" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)Release" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;.\generated" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="4" + DebugInformationFormat="3" + DisableSpecificWarnings="4127" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="./Release\spandsp.lib" + TargetMachine="1" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > +<File RelativePath="adsi.c"></File> +<File RelativePath="async.c"></File> +<File RelativePath="at_interpreter.c"></File> +<File RelativePath="awgn.c"></File> +<File RelativePath="bell_r2_mf.c"></File> +<File RelativePath="bert.c"></File> +<File RelativePath="bit_operations.c"></File> +<File RelativePath="bitstream.c"></File> +<File RelativePath="complex_filters.c"></File> +<File RelativePath="complex_vector_float.c"></File> +<File RelativePath="complex_vector_int.c"></File> +<File RelativePath="crc.c"></File> +<File RelativePath="dds_float.c"></File> +<File RelativePath="dds_int.c"></File> +<File RelativePath="dtmf.c"></File> +<File RelativePath="echo.c"></File> +<File RelativePath="fax.c"></File> +<File RelativePath="fax_modems.c"></File> +<File RelativePath="fsk.c"></File> +<File RelativePath="g711.c"></File> +<File RelativePath="g722.c"></File> +<File RelativePath="g726.c"></File> +<File RelativePath="gsm0610_decode.c"></File> +<File RelativePath="gsm0610_encode.c"></File> +<File RelativePath="gsm0610_long_term.c"></File> +<File RelativePath="gsm0610_lpc.c"></File> +<File RelativePath="gsm0610_preprocess.c"></File> +<File RelativePath="gsm0610_rpe.c"></File> +<File RelativePath="gsm0610_short_term.c"></File> +<File RelativePath="hdlc.c"></File> +<File RelativePath="ima_adpcm.c"></File> +<File RelativePath="logging.c"></File> +<File RelativePath="lpc10_analyse.c"></File> +<File RelativePath="lpc10_decode.c"></File> +<File RelativePath="lpc10_encode.c"></File> +<File RelativePath="lpc10_placev.c"></File> +<File RelativePath="lpc10_voicing.c"></File> +<File RelativePath="modem_echo.c"></File> +<File RelativePath="modem_connect_tones.c"></File> +<File RelativePath="noise.c"></File> +<File RelativePath="oki_adpcm.c"></File> +<File RelativePath="playout.c"></File> +<File RelativePath="plc.c"></File> +<File RelativePath="power_meter.c"></File> +<File RelativePath="queue.c"></File> +<File RelativePath="schedule.c"></File> +<File RelativePath="sig_tone.c"></File> +<File RelativePath="silence_gen.c"></File> +<File RelativePath="super_tone_rx.c"></File> +<File RelativePath="super_tone_tx.c"></File> +<File RelativePath="t4.c"></File> +<File RelativePath="t30.c"></File> +<File RelativePath="t30_api.c"></File> +<File RelativePath="t30_logging.c"></File> +<File RelativePath="t31.c"></File> +<File RelativePath="t35.c"></File> +<File RelativePath="t38_core.c"></File> +<File RelativePath="t38_gateway.c"></File> +<File RelativePath="t38_non_ecm_buffer.c"></File> +<File RelativePath="t38_terminal.c"></File> +<File RelativePath="testcpuid.c"></File> +<File RelativePath="time_scale.c"></File> +<File RelativePath="tone_detect.c"></File> +<File RelativePath="tone_generate.c"></File> +<File RelativePath="v17rx.c"></File> +<File RelativePath="v17tx.c"></File> +<File RelativePath="v22bis_rx.c"></File> +<File RelativePath="v22bis_tx.c"></File> +<File RelativePath="v27ter_rx.c"></File> +<File RelativePath="v27ter_tx.c"></File> +<File RelativePath="v29rx.c"></File> +<File RelativePath="v29tx.c"></File> +<File RelativePath="v42.c"></File> +<File RelativePath="v42bis.c"></File> +<File RelativePath="v8.c"></File> +<File RelativePath="vector_float.c"></File> +<File RelativePath="vector_int.c"></File> +<File RelativePath=".\msvc\gettimeofday.c"></File> +</Filter><Filter Name="Header Files"> +<File RelativePath="spandsp/adsi.h"></File> +<File RelativePath="spandsp/async.h"></File> +<File RelativePath="spandsp/arctan2.h"></File> +<File RelativePath="spandsp/at_interpreter.h"></File> +<File RelativePath="spandsp/awgn.h"></File> +<File RelativePath="spandsp/bell_r2_mf.h"></File> +<File RelativePath="spandsp/bert.h"></File> +<File RelativePath="spandsp/biquad.h"></File> +<File RelativePath="spandsp/bit_operations.h"></File> +<File RelativePath="spandsp/bitstream.h"></File> +<File RelativePath="spandsp/crc.h"></File> +<File RelativePath="spandsp/complex.h"></File> +<File RelativePath="spandsp/complex_filters.h"></File> +<File RelativePath="spandsp/complex_vector_float.h"></File> +<File RelativePath="spandsp/complex_vector_int.h"></File> +<File RelativePath="spandsp/dc_restore.h"></File> +<File RelativePath="spandsp/dds.h"></File> +<File RelativePath="spandsp/dtmf.h"></File> +<File RelativePath="spandsp/echo.h"></File> +<File RelativePath="spandsp/fast_convert.h"></File> +<File RelativePath="spandsp/fax.h"></File> +<File RelativePath="spandsp/fax_modems.h"></File> +<File RelativePath="spandsp/fir.h"></File> +<File RelativePath="spandsp/fsk.h"></File> +<File RelativePath="spandsp/g168models.h"></File> +<File RelativePath="spandsp/g711.h"></File> +<File RelativePath="spandsp/g722.h"></File> +<File RelativePath="spandsp/g726.h"></File> +<File RelativePath="spandsp/gsm0610.h"></File> +<File RelativePath="spandsp/hdlc.h"></File> +<File RelativePath="spandsp/ima_adpcm.h"></File> +<File RelativePath="spandsp/logging.h"></File> +<File RelativePath="spandsp/lpc10.h"></File> +<File RelativePath="spandsp/modem_echo.h"></File> +<File RelativePath="spandsp/modem_connect_tones.h"></File> +<File RelativePath="spandsp/noise.h"></File> +<File RelativePath="spandsp/oki_adpcm.h"></File> +<File RelativePath="spandsp/playout.h"></File> +<File RelativePath="spandsp/plc.h"></File> +<File RelativePath="spandsp/power_meter.h"></File> +<File RelativePath="spandsp/queue.h"></File> +<File RelativePath="spandsp/saturated.h"></File> +<File RelativePath="spandsp/schedule.h"></File> +<File RelativePath="spandsp/sig_tone.h"></File> +<File RelativePath="spandsp/silence_gen.h"></File> +<File RelativePath="spandsp/super_tone_rx.h"></File> +<File RelativePath="spandsp/super_tone_tx.h"></File> +<File RelativePath="spandsp/t4.h"></File> +<File RelativePath="spandsp/t30.h"></File> +<File RelativePath="spandsp/t30_api.h"></File> +<File RelativePath="spandsp/t30_fcf.h"></File> +<File RelativePath="spandsp/t30_logging.h"></File> +<File RelativePath="spandsp/t31.h"></File> +<File RelativePath="spandsp/t35.h"></File> +<File RelativePath="spandsp/t38_core.h"></File> +<File RelativePath="spandsp/t38_gateway.h"></File> +<File RelativePath="spandsp/t38_non_ecm_buffer.h"></File> +<File RelativePath="spandsp/t38_terminal.h"></File> +<File RelativePath="spandsp/telephony.h"></File> +<File RelativePath="spandsp/time_scale.h"></File> +<File RelativePath="spandsp/timing.h"></File> +<File RelativePath="spandsp/tone_detect.h"></File> +<File RelativePath="spandsp/tone_generate.h"></File> +<File RelativePath="spandsp/v17rx.h"></File> +<File RelativePath="spandsp/v17tx.h"></File> +<File RelativePath="spandsp/v22bis.h"></File> +<File RelativePath="spandsp/v27ter_rx.h"></File> +<File RelativePath="spandsp/v27ter_tx.h"></File> +<File RelativePath="spandsp/v29rx.h"></File> +<File RelativePath="spandsp/v29tx.h"></File> +<File RelativePath="spandsp/v42.h"></File> +<File RelativePath="spandsp/v42bis.h"></File> +<File RelativePath="spandsp/v8.h"></File> +<File RelativePath="spandsp/vector_float.h"></File> +<File RelativePath="spandsp/vector_int.h"></File> +<File RelativePath="spandsp/version.h"></File> +<File RelativePath="spandsp/private/adsi.h"></File> +<File RelativePath="spandsp/private/async.h"></File> +<File RelativePath="spandsp/private/at_interpreter.h"></File> +<File RelativePath="spandsp/private/awgn.h"></File> +<File RelativePath="spandsp/private/bell_r2_mf.h"></File> +<File RelativePath="spandsp/private/bert.h"></File> +<File RelativePath="spandsp/private/bitstream.h"></File> +<File RelativePath="spandsp/private/dtmf.h"></File> +<File RelativePath="spandsp/private/fax.h"></File> +<File RelativePath="spandsp/private/fax_modems.h"></File> +<File RelativePath="spandsp/private/fsk.h"></File> +<File RelativePath="spandsp/private/g711.h"></File> +<File RelativePath="spandsp/private/g722.h"></File> +<File RelativePath="spandsp/private/g726.h"></File> +<File RelativePath="spandsp/private/gsm0610.h"></File> +<File RelativePath="spandsp/private/hdlc.h"></File> +<File RelativePath="spandsp/private/ima_adpcm.h"></File> +<File RelativePath="spandsp/private/logging.h"></File> +<File RelativePath="spandsp/private/lpc10.h"></File> +<File RelativePath="spandsp/private/modem_connect_tones.h"></File> +<File RelativePath="spandsp/private/noise.h"></File> +<File RelativePath="spandsp/private/oki_adpcm.h"></File> +<File RelativePath="spandsp/private/queue.h"></File> +<File RelativePath="spandsp/private/schedule.h"></File> +<File RelativePath="spandsp/private/sig_tone.h"></File> +<File RelativePath="spandsp/private/super_tone_rx.h"></File> +<File RelativePath="spandsp/private/super_tone_tx.h"></File> +<File RelativePath="spandsp/private/t30.h"></File> +<File RelativePath="spandsp/private/t31.h"></File> +<File RelativePath="spandsp/private/t38_core.h"></File> +<File RelativePath="spandsp/private/t38_gateway.h"></File> +<File RelativePath="spandsp/private/t38_non_ecm_buffer.h"></File> +<File RelativePath="spandsp/private/t38_terminal.h"></File> +<File RelativePath="spandsp/private/t4.h"></File> +<File RelativePath="spandsp/private/time_scale.h"></File> +<File RelativePath="spandsp/private/tone_detect.h"></File> +<File RelativePath="spandsp/private/tone_generate.h"></File> +<File RelativePath="spandsp/private/v17rx.h"></File> +<File RelativePath="spandsp/private/v17tx.h"></File> +<File RelativePath="spandsp/private/v22bis.h"></File> +<File RelativePath="spandsp/private/v27ter_rx.h"></File> +<File RelativePath="spandsp/private/v27ter_tx.h"></File> +<File RelativePath="spandsp/private/v29rx.h"></File> +<File RelativePath="spandsp/private/v29tx.h"></File> +<File RelativePath="spandsp/private/v42.h"></File> +<File RelativePath="spandsp/private/v42bis.h"></File> +<File RelativePath="spandsp/private/v8.h"></File> +<File RelativePath="spandsp/expose.h"></File> +<File RelativePath="spandsp.h"></File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/trunk/libs/spandsp/src/libtiff.2005.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/spandsp/src/libtiff.2005.vcproj Fri Feb 20 14:33:39 2009 @@ -0,0 +1,376 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="libtiff" + ProjectGUID="{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}" + RootNamespace="libtiff" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="if not exist "$(ProjectDir)../../tiff-3.8.2/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tiffconf.h.vc" "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tiffconf.h" /Y
if not exist "$(ProjectDir)../../tiff-3.8.2/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tif_config.h.vc" "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tif_config.h" /Y" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="." + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FILLODER_LSB2MSB;TIF_PLATFORM_CONSOLE;CCITT_SUPPORT;PACKBITS_SUPPORT;LZW_SUPPORT;THUNDER_SUPPORT;NEXT_SUPPORT;LOGLUV_SUPPORT;TRIPCHOP_DEFAULT=TIFF_STRIPCHOP;STRIP_SIZE_DEFAULT=8192;DEFAULT_EXTRASAMPLE_AS_ALPHA;CHECK_JPEG_YCBCR_SUBSAMPLING;AVOID_WIN32_FILEIO" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="0" + DebugInformationFormat="4" + CompileAs="1" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="if not exist "$(ProjectDir)../../tiff-3.8.2/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tiffconf.h.vc" "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tiffconf.h" /Y
if not exist "$(ProjectDir)../../tiff-3.8.2/libtiff/tif_config.h" copy "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tif_config.h.vc" "$(ProjectDir)..\..\tiff-3.8.2\libtiff\tif_config.h" /Y" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="." + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FILLODER_LSB2MSB;TIF_PLATFORM_CONSOLE;CCITT_SUPPORT;PACKBITS_SUPPORT;LZW_SUPPORT;THUNDER_SUPPORT;NEXT_SUPPORT;LOGLUV_SUPPORT;TRIPCHOP_DEFAULT=TIFF_STRIPCHOP;STRIP_SIZE_DEFAULT=8192;DEFAULT_EXTRASAMPLE_AS_ALPHA;CHECK_JPEG_YCBCR_SUBSAMPLING;AVOID_WIN32_FILEIO" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="0" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_aux.c" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_close.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_codec.c" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_color.c" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_compress.c" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_dir.c" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_dirinfo.c" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_dirread.c" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_dirwrite.c" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_dumpmode.c" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_error.c" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_extension.c" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_fax3.c" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_fax3sm.c" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_flush.c" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_getimage.c" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_jpeg.c" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_luv.c" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_lzw.c" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_next.c" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_ojpeg.c" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_open.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_packbits.c" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_pixarlog.c" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_predict.c" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_print.c" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_read.c" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_strip.c" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_swab.c" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_thunder.c" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_tile.c" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_unix.c" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_version.c" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_warning.c" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_write.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_zip.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + > + <File + RelativePath="..\..\tiff-3.8.2\libtiff\t4.h" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_dir.h" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_fax3.h" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tif_predict.h" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tiff.h" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tiffconf.h" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tiffio.h" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tiffio.hxx" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tiffiop.h" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\tiffvers.h" + > + </File> + <File + RelativePath="..\..\tiff-3.8.2\libtiff\uvcode.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/trunk/libs/spandsp/src/msvc/make_at_dictionary.2005.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/spandsp/src/msvc/make_at_dictionary.2005.vcproj Fri Feb 20 14:33:39 2009 @@ -0,0 +1,202 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="make_at_dictionary" + ProjectGUID="{DEE932AB-5911-4700-9EEB-8C7090A0A330}" + RootNamespace="make_at_dictionary" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;.\generated" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="2" + WarningLevel="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath="..\make_at_dictionary.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath=".\stdafx.h" + > + </File> + <File + RelativePath=".\targetver.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/trunk/libs/spandsp/src/msvc/make_modem_filter.2005.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/spandsp/src/msvc/make_modem_filter.2005.vcproj Fri Feb 20 14:33:39 2009 @@ -0,0 +1,214 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="make_modem_filter" + ProjectGUID="{329A6FA0-0FCC-4435-A950-E670AEFA9838}" + RootNamespace="make_modem_filter" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;.\generated" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath="getopt.c" + > + </File> + <File + RelativePath="..\make_modem_filter.c" + > + </File> + <File + RelativePath="..\filter_tools.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath="..\filter_tools.h" + > + </File> + <File + RelativePath=".\stdafx.h" + > + </File> + <File + RelativePath=".\targetver.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.head ============================================================================== --- freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.head (original) +++ freeswitch/trunk/libs/spandsp/src/msvc/vc8proj.head Fri Feb 20 14:33:39 2009 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="9.00" + Version="8.00" Name="libspandsp" ProjectGUID="{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}" RootNamespace="libspandsp" Added: freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.foot ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.foot Fri Feb 20 14:33:39 2009 @@ -0,0 +1,11 @@ + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.head ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/spandsp/src/msvc/vc9proj.head Fri Feb 20 14:33:39 2009 @@ -0,0 +1,90 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="libspandsp" + ProjectGUID="{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}" + RootNamespace="libspandsp" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)Debug" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;.\generated" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="4" + DebugInformationFormat="4" + CompileAs="1" + DisableSpecificWarnings="4127" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="./Debug\spandsp.lib" + TargetMachine="1" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)Release" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;.\generated" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="4" + DebugInformationFormat="3" + DisableSpecificWarnings="4127" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="./Release\spandsp.lib" + TargetMachine="1" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + >

1 0

[commit] r12196 - freeswitch/trunk/src/mod/applications/mod_lcr
by FreeSWITCH SVN 20 Feb '09

20 Feb '09

Author: rupa Date: Fri Feb 20 14:28:18 2009 New Revision: 12196 Log: actually honor profile when used as a app Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Fri Feb 20 14:28:18 2009 @@ -763,10 +763,6 @@ switch_core_new_memory_pool(&pool); } routes.pool = pool; - if (!(routes.profile = locate_profile(lcr_profile))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown profile: %s\n", lcr_profile); - goto end; - } if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { dest = argv[0]; @@ -774,8 +770,12 @@ lcr_profile = argv[1]; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "LCR Lookup on %s\n", dest); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "LCR Lookup on %s using profile %s\n", dest, lcr_profile); routes.lookup_number = dest; + if (!(routes.profile = locate_profile(lcr_profile))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown profile: %s\n", lcr_profile); + goto end; + } if (lcr_do_lookup(&routes, dest) == SWITCH_STATUS_SUCCESS) { for (cur_route = routes.head; cur_route; cur_route = cur_route->next) { switch_snprintf(vbuf, sizeof(vbuf), "lcr_route_%d", cnt++);

1 0

[commit] r12195 - in freeswitch/trunk: . libs/spandsp/src libs/spandsp/src/msvc
by FreeSWITCH SVN 20 Feb '09

20 Feb '09

Author: mikej Date: Fri Feb 20 14:19:58 2009 New Revision: 12195 Log: rename spandsp project files so we can add 2005 projects too. Added: freeswitch/trunk/libs/spandsp/src/libspandsp.2008.sln - copied, changed from r12186, /freeswitch/trunk/libs/spandsp/src/libspandsp.sln freeswitch/trunk/libs/spandsp/src/libspandsp.2008.vcproj - copied unchanged from r12188, /freeswitch/trunk/libs/spandsp/src/libspandsp.vcproj freeswitch/trunk/libs/spandsp/src/libtiff.2008.vcproj - copied unchanged from r12185, /freeswitch/trunk/libs/spandsp/src/libtiff.vcproj freeswitch/trunk/libs/spandsp/src/msvc/make_at_dictionary.2008.vcproj - copied unchanged from r12186, /freeswitch/trunk/libs/spandsp/src/msvc/make_at_dictionary.vcproj freeswitch/trunk/libs/spandsp/src/msvc/make_modem_filter.2008.vcproj - copied unchanged from r12186, /freeswitch/trunk/libs/spandsp/src/msvc/make_modem_filter.vcproj Removed: freeswitch/trunk/libs/spandsp/src/libspandsp.sln freeswitch/trunk/libs/spandsp/src/libspandsp.vcproj freeswitch/trunk/libs/spandsp/src/libtiff.vcproj freeswitch/trunk/libs/spandsp/src/msvc/make_at_dictionary.vcproj freeswitch/trunk/libs/spandsp/src/msvc/make_modem_filter.vcproj Modified: freeswitch/trunk/Freeswitch.2008.express.sln freeswitch/trunk/Freeswitch.2008.sln freeswitch/trunk/libs/spandsp/src/Makefile.am Modified: freeswitch/trunk/Freeswitch.2008.express.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.express.sln (original) +++ freeswitch/trunk/Freeswitch.2008.express.sln Fri Feb 20 14:19:58 2009 @@ -573,12 +573,12 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download TIFF", "libs\win32\Download TIFF.2008.vcproj", "{2B8A45C9-FEB4-4734-AB37-8DB9DB899917}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspandsp", "libs\spandsp\src\libspandsp.vcproj", "{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspandsp", "libs\spandsp\src\libspandsp.2008.vcproj", "{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}" ProjectSection(ProjectDependencies) = postProject {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} = {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtiff", "libs\spandsp\src\libtiff.vcproj", "{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtiff", "libs\spandsp\src\libtiff.2008.vcproj", "{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}" ProjectSection(ProjectDependencies) = postProject {2B8A45C9-FEB4-4734-AB37-8DB9DB899917} = {2B8A45C9-FEB4-4734-AB37-8DB9DB899917} EndProjectSection Modified: freeswitch/trunk/Freeswitch.2008.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.sln (original) +++ freeswitch/trunk/Freeswitch.2008.sln Fri Feb 20 14:19:58 2009 @@ -951,12 +951,12 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download TIFF", "libs\win32\Download TIFF.2008.vcproj", "{2B8A45C9-FEB4-4734-AB37-8DB9DB899917}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtiff", "libs\spandsp\src\libtiff.vcproj", "{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtiff", "libs\spandsp\src\libtiff.2008.vcproj", "{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}" ProjectSection(ProjectDependencies) = postProject {2B8A45C9-FEB4-4734-AB37-8DB9DB899917} = {2B8A45C9-FEB4-4734-AB37-8DB9DB899917} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspandsp", "libs\spandsp\src\libspandsp.vcproj", "{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspandsp", "libs\spandsp\src\libspandsp.2008.vcproj", "{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}" ProjectSection(ProjectDependencies) = postProject {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} = {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} EndProjectSection Modified: freeswitch/trunk/libs/spandsp/src/Makefile.am ============================================================================== --- freeswitch/trunk/libs/spandsp/src/Makefile.am (original) +++ freeswitch/trunk/libs/spandsp/src/Makefile.am Fri Feb 20 14:19:58 2009 @@ -1,461 +1,462 @@ -## -## SpanDSP - a series of DSP components for telephony -## -## Makefile.am - Process this file with automake to produce Makefile.in -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU Lesser General Public License version 2.1, -## as published by the Free Software Foundation. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with this program; if not, write to the Free Software -## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -## -## $Id: Makefile.am,v 1.124 2009/02/14 15:21:14 steveu Exp $ - -AM_CFLAGS = $(COMP_VENDOR_CFLAGS) -AM_LDFLAGS = $(COMP_VENDOR_LDFLAGS) - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = floating_fudge.h \ - spandsp/version.h.in \ - libspandsp.dsp \ - libspandsp.sln \ - libspandsp.vcproj \ - msvc/config.h \ - msvc/getopt.c \ - msvc/gettimeofday.c \ - msvc/inttypes.h \ - msvc/tgmath.h \ - msvc/unistd.h \ - msvc/spandsp.h \ - msvc/sys/time.h \ - msvc/make_at_dictionary.vcproj \ - msvc/make_headers.bat \ - msvc/make_modem_filter.vcproj \ - msvc/msvcproj.head \ - msvc/msvcproj.foot \ - msvc/vc8proj.head \ - msvc/vc8proj.foot \ - spandsp/private/README -INCLUDES = -I$(top_builddir) - -lib_LTLIBRARIES = libspandsp.la - -libspandsp_la_SOURCES = adsi.c \ - async.c \ - at_interpreter.c \ - awgn.c \ - bell_r2_mf.c \ - bert.c \ - bit_operations.c \ - bitstream.c \ - complex_filters.c \ - complex_vector_float.c \ - complex_vector_int.c \ - crc.c \ - dds_float.c \ - dds_int.c \ - dtmf.c \ - echo.c \ - fax.c \ - fax_modems.c \ - fsk.c \ - g711.c \ - g722.c \ - g726.c \ - gsm0610_decode.c \ - gsm0610_encode.c \ - gsm0610_long_term.c \ - gsm0610_lpc.c \ - gsm0610_preprocess.c \ - gsm0610_rpe.c \ - gsm0610_short_term.c \ - hdlc.c \ - ima_adpcm.c \ - logging.c \ - lpc10_analyse.c \ - lpc10_decode.c \ - lpc10_encode.c \ - lpc10_placev.c \ - lpc10_voicing.c \ - modem_echo.c \ - modem_connect_tones.c \ - noise.c \ - oki_adpcm.c \ - playout.c \ - plc.c \ - power_meter.c \ - queue.c \ - schedule.c \ - sig_tone.c \ - silence_gen.c \ - super_tone_rx.c \ - super_tone_tx.c \ - t4.c \ - t30.c \ - t30_api.c \ - t30_logging.c \ - t31.c \ - t35.c \ - t38_core.c \ - t38_gateway.c \ - t38_non_ecm_buffer.c \ - t38_terminal.c \ - testcpuid.c \ - time_scale.c \ - tone_detect.c \ - tone_generate.c \ - v17rx.c \ - v17tx.c \ - v22bis_rx.c \ - v22bis_tx.c \ - v27ter_rx.c \ - v27ter_tx.c \ - v29rx.c \ - v29tx.c \ - v42.c \ - v42bis.c \ - v8.c \ - vector_float.c \ - vector_int.c - -libspandsp_la_LDFLAGS = -version-info @SPANDSP_LT_CURRENT@:@SPANDSP_LT_REVISION@:@SPANDSP_LT_AGE@ $(COMP_VENDOR_FLAGS) - -nobase_include_HEADERS = spandsp/adsi.h \ - spandsp/async.h \ - spandsp/arctan2.h \ - spandsp/at_interpreter.h \ - spandsp/awgn.h \ - spandsp/bell_r2_mf.h \ - spandsp/bert.h \ - spandsp/biquad.h \ - spandsp/bit_operations.h \ - spandsp/bitstream.h \ - spandsp/crc.h \ - spandsp/complex.h \ - spandsp/complex_filters.h \ - spandsp/complex_vector_float.h \ - spandsp/complex_vector_int.h \ - spandsp/dc_restore.h \ - spandsp/dds.h \ - spandsp/dtmf.h \ - spandsp/echo.h \ - spandsp/fast_convert.h \ - spandsp/fax.h \ - spandsp/fax_modems.h \ - spandsp/fir.h \ - spandsp/fsk.h \ - spandsp/g168models.h \ - spandsp/g711.h \ - spandsp/g722.h \ - spandsp/g726.h \ - spandsp/gsm0610.h \ - spandsp/hdlc.h \ - spandsp/ima_adpcm.h \ - spandsp/logging.h \ - spandsp/lpc10.h \ - spandsp/modem_echo.h \ - spandsp/modem_connect_tones.h \ - spandsp/noise.h \ - spandsp/oki_adpcm.h \ - spandsp/playout.h \ - spandsp/plc.h \ - spandsp/power_meter.h \ - spandsp/queue.h \ - spandsp/saturated.h \ - spandsp/schedule.h \ - spandsp/sig_tone.h \ - spandsp/silence_gen.h \ - spandsp/super_tone_rx.h \ - spandsp/super_tone_tx.h \ - spandsp/t4.h \ - spandsp/t30.h \ - spandsp/t30_api.h \ - spandsp/t30_fcf.h \ - spandsp/t30_logging.h \ - spandsp/t31.h \ - spandsp/t35.h \ - spandsp/t38_core.h \ - spandsp/t38_gateway.h \ - spandsp/t38_non_ecm_buffer.h \ - spandsp/t38_terminal.h \ - spandsp/telephony.h \ - spandsp/time_scale.h \ - spandsp/timing.h \ - spandsp/tone_detect.h \ - spandsp/tone_generate.h \ - spandsp/v17rx.h \ - spandsp/v17tx.h \ - spandsp/v22bis.h \ - spandsp/v27ter_rx.h \ - spandsp/v27ter_tx.h \ - spandsp/v29rx.h \ - spandsp/v29tx.h \ - spandsp/v42.h \ - spandsp/v42bis.h \ - spandsp/v8.h \ - spandsp/vector_float.h \ - spandsp/vector_int.h \ - spandsp/version.h \ - spandsp/private/adsi.h \ - spandsp/private/async.h \ - spandsp/private/at_interpreter.h \ - spandsp/private/awgn.h \ - spandsp/private/bell_r2_mf.h \ - spandsp/private/bert.h \ - spandsp/private/bitstream.h \ - spandsp/private/dtmf.h \ - spandsp/private/fax.h \ - spandsp/private/fax_modems.h \ - spandsp/private/fsk.h \ - spandsp/private/g711.h \ - spandsp/private/g722.h \ - spandsp/private/g726.h \ - spandsp/private/gsm0610.h \ - spandsp/private/hdlc.h \ - spandsp/private/ima_adpcm.h \ - spandsp/private/logging.h \ - spandsp/private/lpc10.h \ - spandsp/private/modem_connect_tones.h \ - spandsp/private/noise.h \ - spandsp/private/oki_adpcm.h \ - spandsp/private/queue.h \ - spandsp/private/schedule.h \ - spandsp/private/sig_tone.h \ - spandsp/private/super_tone_rx.h \ - spandsp/private/super_tone_tx.h \ - spandsp/private/t30.h \ - spandsp/private/t31.h \ - spandsp/private/t38_core.h \ - spandsp/private/t38_gateway.h \ - spandsp/private/t38_non_ecm_buffer.h \ - spandsp/private/t38_terminal.h \ - spandsp/private/t4.h \ - spandsp/private/time_scale.h \ - spandsp/private/tone_detect.h \ - spandsp/private/tone_generate.h \ - spandsp/private/v17rx.h \ - spandsp/private/v17tx.h \ - spandsp/private/v22bis.h \ - spandsp/private/v27ter_rx.h \ - spandsp/private/v27ter_tx.h \ - spandsp/private/v29rx.h \ - spandsp/private/v29tx.h \ - spandsp/private/v42.h \ - spandsp/private/v42bis.h \ - spandsp/private/v8.h \ - spandsp/expose.h - -nodist_include_HEADERS = spandsp.h - -noinst_HEADERS = faxfont.h \ - filter_tools.h \ - gsm0610_local.h \ - lpc10_encdecs.h \ - t30_local.h \ - t4_states.h \ - v17rx_constellation_maps.h \ - v17tx_constellation_maps.h \ - v29tx_constellation_maps.h - -noinst_PROGRAMS = make_at_dictionary \ - make_modem_filter - -make_modem_filter_SOURCES = make_modem_filter.c \ - filter_tools.c - -# We need to run make_at_dictionary, so it generates the -# at_interpreter_dictionary.h file - -at_interpreter.$(OBJEXT): at_interpreter_dictionary.h - -at_interpreter.lo: at_interpreter_dictionary.h - -at_interpreter_dictionary.h: make_at_dictionary$(EXEEXT) - ./make_at_dictionary$(EXEEXT) >at_interpreter_dictionary.h - -v17rx.$(OBJEXT): v17rx_fixed_rrc.h v17rx_floating_rrc.h - -v17rx.lo: v17rx_fixed_rrc.h v17rx_floating_rrc.h - -v17rx_fixed_rrc.h: make_modem_filter$(EXEEXT) - ./make_modem_filter$(EXEEXT) -m V.17 -i -r >v17rx_fixed_rrc.h - -v17rx_floating_rrc.h: make_modem_filter$(EXEEXT) - ./make_modem_filter$(EXEEXT) -m V.17 -r >v17rx_floating_rrc.h - -v17tx.$(OBJEXT): v17tx_fixed_rrc.h v17tx_floating_rrc.h - -v17tx.lo: v17tx_fixed_rrc.h v17tx_floating_rrc.h - -v17tx_fixed_rrc.h: make_modem_filter$(EXEEXT) - ./make_modem_filter$(EXEEXT) -m V.17 -i -t >v17tx_fixed_rrc.h - -v17tx_floating_rrc.h: make_modem_filter$(EXEEXT) - ./make_modem_filter$(EXEEXT) -m V.17 -t >v17tx_floating_rrc.h - -v22bis_rx.$(OBJEXT): v22bis_rx_1200_fixed_rrc.h \ - v22bis_rx_2400_fixed_rrc.h \ - v22bis_rx_1200_floating_rrc.h \ - v22bis_rx_2400_floating_rrc.h - -v22bis_rx.lo: v22bis_rx_1200_fixed_rrc.h \ - v22bis_rx_2400_fixed_rrc.h \ - v22bis_rx_1200_floating_rrc.h \ - v22bis_rx_2400_floating_rrc.h - -v22bis_rx_1200_fixed_rrc.h: make_modem_filter$(EXEEXT) - ./make_modem_filter$(EXEEXT) -m V.22bis1200 -i -r >v22bis_rx_1200_fixed_rrc.h - -v22bis_rx_2400_fixed_rrc.h: make_modem_filter$(EXEEXT) - ./make_modem_filter$(EXEEXT) -m V.22bis2400 -i -r >v22bis_rx_2400_fixed_rrc.h - -v22bis_rx_1200_floating_rrc.h: make_modem_filter$(EXEEXT) - ./make_modem_filter$(EXEEXT) -m V.22bis1200 -r >v22bis_rx_1200_floating_rrc.h - -v22bis_rx_2400_floating_rrc.h: make_modem_filter$(EXEEXT) - ./make_modem_filter$(EXEEXT) -m V.22bis2400 -r >v22bis_rx_2400_floating_rrc.h - -v22bis_tx.$(OBJEXT): v22bis_tx_fixed_rrc.h v22bis_tx_floating_rrc.h - -v22bis_tx.lo: v22bis_tx_fixed_rrc.h v22bis_tx_floating_rrc.h - -v22bis_tx_fixed_rrc.h: make_modem_filter$(EXEEXT) - ./make_modem_filter$(EXEEXT) -m V.22bis -i -t >v22bis_tx_fixed_rrc.h - -v22bis_tx_floating_rrc.h: make_modem_filter$(EXEEXT) - ./make_modem_filter$(EXEEXT) -m V.22bis -t >v22bis_tx_floating_rrc.h - -v27ter_rx_.$(OBJEXT): v27ter_rx_2400_fixed_rrc.h \ - v27ter_rx_4800_fixed_rrc.h \ - v27ter_rx_2400_floating_rrc.h \ - v27ter_rx_4800_floating_rrc.h - -v27ter_rx.lo: v27ter_rx_2400_fixed_rrc.h \ - v27ter_rx_4800_fixed_rrc.h \ - v27ter_rx_2400_floating_rrc.h \ - v27ter_rx_4800_floating_rrc.h - -v27ter_rx_2400_fixed_rrc.h: make_modem_filter$(EXEEXT) - ./make_modem_filter$(EXEEXT) -m V.27ter2400 -i -r >v27ter_rx_2400_fixed_rrc.h - -v27ter_rx_4800_fixed_rrc.h: make_modem_filter$(EXEEXT) - ./make_modem_filter$(EXEEXT) -m V.27ter4800 -i -r >v27ter_rx_4800_fixed_rrc.h - -v27ter_rx_2400_floating_rrc.h: make_modem_filter$(EXEEXT) - ./make_modem_filter$(EXEEXT) -m V.27ter2400 -r >v27ter_rx_2400_floating_rrc.h - -v27ter_rx_4800_floating_rrc.h: make_modem_filter$(EXEEXT) - ./make_modem_filter$(EXEEXT) -m V.27ter4800 -r >v27ter_rx_4800_floating_rrc.h - -v27ter_tx_.$(OBJEXT): v27ter_tx_2400_fixed_rrc.h \ - v27ter_tx_4800_fixed_rrc.h \ - v27ter_tx_2400_floating_rrc.h \ - v27ter_tx_4800_floating_rrc.h - -v27ter_tx.lo: v27ter_tx_2400_fixed_rrc.h \ - v27ter_tx_4800_fixed_rrc.h \ - v27ter_tx_2400_floating_rrc.h \ - v27ter_tx_4800_floating_rrc.h - -v27ter_tx_2400_fixed_rrc.h: make_modem_filter$(EXEEXT) - ./make_modem_filter$(EXEEXT) -m V.27ter2400 -i -t >v27ter_tx_2400_fixed_rrc.h - -v27ter_tx_4800_fixed_rrc.h: make_modem_filter$(EXEEXT) - ./make_modem_filter$(EXEEXT) -m V.27ter4800 -i -t >v27ter_tx_4800_fixed_rrc.h - -v27ter_tx_2400_floating_rrc.h: make_modem_filter$(EXEEXT) - ./make_modem_filter$(EXEEXT) -m V.27ter2400 -t >v27ter_tx_2400_floating_rrc.h - -v27ter_tx_4800_floating_rrc.h: make_modem_filter$(EXEEXT) - ./make_modem_filter$(EXEEXT) -m V.27ter4800 -t >v27ter_tx_4800_floating_rrc.h - -v29rx.$(OBJEXT): v29rx_fixed_rrc.h v29rx_floating_rrc.h - -v29rx.lo: v29rx_fixed_rrc.h v29rx_floating_rrc.h - -v29rx_fixed_rrc.h: make_modem_filter$(EXEEXT) - ./make_modem_filter$(EXEEXT) -m V.29 -i -r >v29rx_fixed_rrc.h - -v29rx_floating_rrc.h: make_modem_filter$(EXEEXT) - ./make_modem_filter$(EXEEXT) -m V.29 -r >v29rx_floating_rrc.h - -v29tx.$(OBJEXT): v29tx_fixed_rrc.h v29tx_floating_rrc.h - -v29tx.lo: v29tx_fixed_rrc.h v29tx_floating_rrc.h - -v29tx_fixed_rrc.h: make_modem_filter$(EXEEXT) - ./make_modem_filter$(EXEEXT) -m V.29 -i -t >v29tx_fixed_rrc.h - -v29tx_floating_rrc.h: make_modem_filter$(EXEEXT) - ./make_modem_filter$(EXEEXT) -m V.29 -t >v29tx_floating_rrc.h - -DSP = libspandsp.dsp -VCPROJ = libspandsp.vcproj - -WIN32SOURCES = $(libspandsp_la_SOURCES) .\\msvc\\gettimeofday.c -WIN32HEADERS = $(nobase_include_HEADERS) spandsp.h - -DSPOUT = | awk '{printf("%s\r\n", $$0)}' >> $(DSP) -VCPROJOUT = | awk '{printf("%s\r\n", $$0)}' >> $(VCPROJ) - -$(DSP): msvc/msvcproj.head msvc/msvcproj.foot Makefile.am - echo "creating $(DSP)" - @(cp $(srcdir)/msvc/msvcproj.head $(DSP); \ - echo "# Begin Group \"Source Files\"" $(DSPOUT); \ - for file in $(WIN32SOURCES); do \ - echo "# Begin Source File" $(DSPOUT); \ - echo "" $(DSPOUT); \ - echo "SOURCE=.\\"$$file $(DSPOUT); \ - echo "# End Source File" $(DSPOUT); \ - done; \ - echo "# End Group" $(DSPOUT); \ - echo "# Begin Group \"Header Files\"" $(DSPOUT); \ - for file in $(WIN32HEADERS); do \ - echo "# Begin Source File" $(DSPOUT); \ - echo "" $(DSPOUT); \ - echo "SOURCE=.\\"$$file $(DSPOUT); \ - echo "# End Source File" $(DSPOUT); \ - done; \ - echo "# End Group" $(DSPOUT); \ - cat $(srcdir)/msvc/msvcproj.foot $(DSPOUT) ) - -$(VCPROJ): msvc/vc8proj.head msvc/vc8proj.foot Makefile.am - echo "creating $(VCPROJ)" - @(cp $(srcdir)/msvc/vc8proj.head $(VCPROJ); \ - for file in $(WIN32SOURCES); do \ - echo "<File RelativePath=\""$$file"\"></File>" $(VCPROJOUT); \ - done; \ - echo "</Filter><Filter Name=\"Header Files\">" $(VCPROJOUT); \ - for file in $(WIN32HEADERS); do \ - echo "<File RelativePath=\""$$file"\"></File>" $(VCPROJOUT); \ - done; \ - cat $(srcdir)/msvc/vc8proj.foot $(VCPROJOUT) ) - -$(srcdir)/msvc/spandsp.h: spandsp.h.in - echo "creating $(srcdir)/msvc/spandsp.h" - @cp $(srcdir)/spandsp.h.in $(srcdir)/msvc/spandsp.h - @sed -i -e "s/\@SPANDSP_USE_FIXED_POINT\@/#undef SPANDSP_USE_FIXED_POINT/" $(srcdir)/msvc/spandsp.h - @sed -i -e "s/\@SPANDSP_MISALIGNED_ACCESS_FAILS\@/#undef SPANDSP_MISALIGNED_ACCESS_FAILS/" $(srcdir)/msvc/spandsp.h - @sed -i -e "s/\@SPANDSP_USE_EXPORT_CAPABILITY\@/#define SPANDSP_USE_EXPORT_CAPABILITY 1/" $(srcdir)/msvc/spandsp.h - @sed -i -e "s/\@INSERT_INTTYPES_HEADER\@/#include <inttypes.h>/" $(srcdir)/msvc/spandsp.h - @sed -i -e "s/\@INSERT_MATH_HEADER\@/#include <math.h>/" $(srcdir)/msvc/spandsp.h - -spandsp/version.h: - NOWDATE=`date --utc +"%Y%m%d"` ; \ - NOWTIME=`date --utc +"%H%M%S"` ; \ - sed 's/$$SPANDSP_RELEASE_DATE/'$$NOWDATE'/;s/$$SPANDSP_RELEASE_TIME/'$$NOWTIME'/' \ - <spandsp/version.h.in >spandsp/version.h - -dist-hook: - NOWDATE=`date --utc +"%Y%m%d"` ; \ - NOWTIME=`date --utc +"%H%M%S"` ; \ - sed 's/$$SPANDSP_RELEASE_DATE/'$$NOWDATE'/;s/$$SPANDSP_RELEASE_TIME/'$$NOWTIME'/' \ - <spandsp/version.h.in >spandsp/version.h +## +## SpanDSP - a series of DSP components for telephony +## +## Makefile.am - Process this file with automake to produce Makefile.in +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU Lesser General Public License version 2.1, +## as published by the Free Software Foundation. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU Lesser General Public License for more details. +## +## You should have received a copy of the GNU Lesser General Public +## License along with this program; if not, write to the Free Software +## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +## +## $Id: Makefile.am,v 1.124 2009/02/14 15:21:14 steveu Exp $ + +AM_CFLAGS = $(COMP_VENDOR_CFLAGS) +AM_LDFLAGS = $(COMP_VENDOR_LDFLAGS) + +MAINTAINERCLEANFILES = Makefile.in + +EXTRA_DIST = floating_fudge.h \ + spandsp/version.h.in \ + libspandsp.dsp \ + libspandsp.2008.sln \ + libspandsp.2008.vcproj \ + libtiff.2008.vcproj \ + msvc/config.h \ + msvc/getopt.c \ + msvc/gettimeofday.c \ + msvc/inttypes.h \ + msvc/tgmath.h \ + msvc/unistd.h \ + msvc/spandsp.h \ + msvc/sys/time.h \ + msvc/make_at_dictionary.2008.vcproj \ + msvc/make_headers.bat \ + msvc/make_modem_filter.2008.vcproj \ + msvc/msvcproj.head \ + msvc/msvcproj.foot \ + msvc/vc8proj.head \ + msvc/vc8proj.foot \ + spandsp/private/README +INCLUDES = -I$(top_builddir) + +lib_LTLIBRARIES = libspandsp.la + +libspandsp_la_SOURCES = adsi.c \ + async.c \ + at_interpreter.c \ + awgn.c \ + bell_r2_mf.c \ + bert.c \ + bit_operations.c \ + bitstream.c \ + complex_filters.c \ + complex_vector_float.c \ + complex_vector_int.c \ + crc.c \ + dds_float.c \ + dds_int.c \ + dtmf.c \ + echo.c \ + fax.c \ + fax_modems.c \ + fsk.c \ + g711.c \ + g722.c \ + g726.c \ + gsm0610_decode.c \ + gsm0610_encode.c \ + gsm0610_long_term.c \ + gsm0610_lpc.c \ + gsm0610_preprocess.c \ + gsm0610_rpe.c \ + gsm0610_short_term.c \ + hdlc.c \ + ima_adpcm.c \ + logging.c \ + lpc10_analyse.c \ + lpc10_decode.c \ + lpc10_encode.c \ + lpc10_placev.c \ + lpc10_voicing.c \ + modem_echo.c \ + modem_connect_tones.c \ + noise.c \ + oki_adpcm.c \ + playout.c \ + plc.c \ + power_meter.c \ + queue.c \ + schedule.c \ + sig_tone.c \ + silence_gen.c \ + super_tone_rx.c \ + super_tone_tx.c \ + t4.c \ + t30.c \ + t30_api.c \ + t30_logging.c \ + t31.c \ + t35.c \ + t38_core.c \ + t38_gateway.c \ + t38_non_ecm_buffer.c \ + t38_terminal.c \ + testcpuid.c \ + time_scale.c \ + tone_detect.c \ + tone_generate.c \ + v17rx.c \ + v17tx.c \ + v22bis_rx.c \ + v22bis_tx.c \ + v27ter_rx.c \ + v27ter_tx.c \ + v29rx.c \ + v29tx.c \ + v42.c \ + v42bis.c \ + v8.c \ + vector_float.c \ + vector_int.c + +libspandsp_la_LDFLAGS = -version-info @SPANDSP_LT_CURRENT@:@SPANDSP_LT_REVISION@:@SPANDSP_LT_AGE@ $(COMP_VENDOR_FLAGS) + +nobase_include_HEADERS = spandsp/adsi.h \ + spandsp/async.h \ + spandsp/arctan2.h \ + spandsp/at_interpreter.h \ + spandsp/awgn.h \ + spandsp/bell_r2_mf.h \ + spandsp/bert.h \ + spandsp/biquad.h \ + spandsp/bit_operations.h \ + spandsp/bitstream.h \ + spandsp/crc.h \ + spandsp/complex.h \ + spandsp/complex_filters.h \ + spandsp/complex_vector_float.h \ + spandsp/complex_vector_int.h \ + spandsp/dc_restore.h \ + spandsp/dds.h \ + spandsp/dtmf.h \ + spandsp/echo.h \ + spandsp/fast_convert.h \ + spandsp/fax.h \ + spandsp/fax_modems.h \ + spandsp/fir.h \ + spandsp/fsk.h \ + spandsp/g168models.h \ + spandsp/g711.h \ + spandsp/g722.h \ + spandsp/g726.h \ + spandsp/gsm0610.h \ + spandsp/hdlc.h \ + spandsp/ima_adpcm.h \ + spandsp/logging.h \ + spandsp/lpc10.h \ + spandsp/modem_echo.h \ + spandsp/modem_connect_tones.h \ + spandsp/noise.h \ + spandsp/oki_adpcm.h \ + spandsp/playout.h \ + spandsp/plc.h \ + spandsp/power_meter.h \ + spandsp/queue.h \ + spandsp/saturated.h \ + spandsp/schedule.h \ + spandsp/sig_tone.h \ + spandsp/silence_gen.h \ + spandsp/super_tone_rx.h \ + spandsp/super_tone_tx.h \ + spandsp/t4.h \ + spandsp/t30.h \ + spandsp/t30_api.h \ + spandsp/t30_fcf.h \ + spandsp/t30_logging.h \ + spandsp/t31.h \ + spandsp/t35.h \ + spandsp/t38_core.h \ + spandsp/t38_gateway.h \ + spandsp/t38_non_ecm_buffer.h \ + spandsp/t38_terminal.h \ + spandsp/telephony.h \ + spandsp/time_scale.h \ + spandsp/timing.h \ + spandsp/tone_detect.h \ + spandsp/tone_generate.h \ + spandsp/v17rx.h \ + spandsp/v17tx.h \ + spandsp/v22bis.h \ + spandsp/v27ter_rx.h \ + spandsp/v27ter_tx.h \ + spandsp/v29rx.h \ + spandsp/v29tx.h \ + spandsp/v42.h \ + spandsp/v42bis.h \ + spandsp/v8.h \ + spandsp/vector_float.h \ + spandsp/vector_int.h \ + spandsp/version.h \ + spandsp/private/adsi.h \ + spandsp/private/async.h \ + spandsp/private/at_interpreter.h \ + spandsp/private/awgn.h \ + spandsp/private/bell_r2_mf.h \ + spandsp/private/bert.h \ + spandsp/private/bitstream.h \ + spandsp/private/dtmf.h \ + spandsp/private/fax.h \ + spandsp/private/fax_modems.h \ + spandsp/private/fsk.h \ + spandsp/private/g711.h \ + spandsp/private/g722.h \ + spandsp/private/g726.h \ + spandsp/private/gsm0610.h \ + spandsp/private/hdlc.h \ + spandsp/private/ima_adpcm.h \ + spandsp/private/logging.h \ + spandsp/private/lpc10.h \ + spandsp/private/modem_connect_tones.h \ + spandsp/private/noise.h \ + spandsp/private/oki_adpcm.h \ + spandsp/private/queue.h \ + spandsp/private/schedule.h \ + spandsp/private/sig_tone.h \ + spandsp/private/super_tone_rx.h \ + spandsp/private/super_tone_tx.h \ + spandsp/private/t30.h \ + spandsp/private/t31.h \ + spandsp/private/t38_core.h \ + spandsp/private/t38_gateway.h \ + spandsp/private/t38_non_ecm_buffer.h \ + spandsp/private/t38_terminal.h \ + spandsp/private/t4.h \ + spandsp/private/time_scale.h \ + spandsp/private/tone_detect.h \ + spandsp/private/tone_generate.h \ + spandsp/private/v17rx.h \ + spandsp/private/v17tx.h \ + spandsp/private/v22bis.h \ + spandsp/private/v27ter_rx.h \ + spandsp/private/v27ter_tx.h \ + spandsp/private/v29rx.h \ + spandsp/private/v29tx.h \ + spandsp/private/v42.h \ + spandsp/private/v42bis.h \ + spandsp/private/v8.h \ + spandsp/expose.h + +nodist_include_HEADERS = spandsp.h + +noinst_HEADERS = faxfont.h \ + filter_tools.h \ + gsm0610_local.h \ + lpc10_encdecs.h \ + t30_local.h \ + t4_states.h \ + v17rx_constellation_maps.h \ + v17tx_constellation_maps.h \ + v29tx_constellation_maps.h + +noinst_PROGRAMS = make_at_dictionary \ + make_modem_filter + +make_modem_filter_SOURCES = make_modem_filter.c \ + filter_tools.c + +# We need to run make_at_dictionary, so it generates the +# at_interpreter_dictionary.h file + +at_interpreter.$(OBJEXT): at_interpreter_dictionary.h + +at_interpreter.lo: at_interpreter_dictionary.h + +at_interpreter_dictionary.h: make_at_dictionary$(EXEEXT) + ./make_at_dictionary$(EXEEXT) >at_interpreter_dictionary.h + +v17rx.$(OBJEXT): v17rx_fixed_rrc.h v17rx_floating_rrc.h + +v17rx.lo: v17rx_fixed_rrc.h v17rx_floating_rrc.h + +v17rx_fixed_rrc.h: make_modem_filter$(EXEEXT) + ./make_modem_filter$(EXEEXT) -m V.17 -i -r >v17rx_fixed_rrc.h + +v17rx_floating_rrc.h: make_modem_filter$(EXEEXT) + ./make_modem_filter$(EXEEXT) -m V.17 -r >v17rx_floating_rrc.h + +v17tx.$(OBJEXT): v17tx_fixed_rrc.h v17tx_floating_rrc.h + +v17tx.lo: v17tx_fixed_rrc.h v17tx_floating_rrc.h + +v17tx_fixed_rrc.h: make_modem_filter$(EXEEXT) + ./make_modem_filter$(EXEEXT) -m V.17 -i -t >v17tx_fixed_rrc.h + +v17tx_floating_rrc.h: make_modem_filter$(EXEEXT) + ./make_modem_filter$(EXEEXT) -m V.17 -t >v17tx_floating_rrc.h + +v22bis_rx.$(OBJEXT): v22bis_rx_1200_fixed_rrc.h \ + v22bis_rx_2400_fixed_rrc.h \ + v22bis_rx_1200_floating_rrc.h \ + v22bis_rx_2400_floating_rrc.h + +v22bis_rx.lo: v22bis_rx_1200_fixed_rrc.h \ + v22bis_rx_2400_fixed_rrc.h \ + v22bis_rx_1200_floating_rrc.h \ + v22bis_rx_2400_floating_rrc.h + +v22bis_rx_1200_fixed_rrc.h: make_modem_filter$(EXEEXT) + ./make_modem_filter$(EXEEXT) -m V.22bis1200 -i -r >v22bis_rx_1200_fixed_rrc.h + +v22bis_rx_2400_fixed_rrc.h: make_modem_filter$(EXEEXT) + ./make_modem_filter$(EXEEXT) -m V.22bis2400 -i -r >v22bis_rx_2400_fixed_rrc.h + +v22bis_rx_1200_floating_rrc.h: make_modem_filter$(EXEEXT) + ./make_modem_filter$(EXEEXT) -m V.22bis1200 -r >v22bis_rx_1200_floating_rrc.h + +v22bis_rx_2400_floating_rrc.h: make_modem_filter$(EXEEXT) + ./make_modem_filter$(EXEEXT) -m V.22bis2400 -r >v22bis_rx_2400_floating_rrc.h + +v22bis_tx.$(OBJEXT): v22bis_tx_fixed_rrc.h v22bis_tx_floating_rrc.h + +v22bis_tx.lo: v22bis_tx_fixed_rrc.h v22bis_tx_floating_rrc.h + +v22bis_tx_fixed_rrc.h: make_modem_filter$(EXEEXT) + ./make_modem_filter$(EXEEXT) -m V.22bis -i -t >v22bis_tx_fixed_rrc.h + +v22bis_tx_floating_rrc.h: make_modem_filter$(EXEEXT) + ./make_modem_filter$(EXEEXT) -m V.22bis -t >v22bis_tx_floating_rrc.h + +v27ter_rx_.$(OBJEXT): v27ter_rx_2400_fixed_rrc.h \ + v27ter_rx_4800_fixed_rrc.h \ + v27ter_rx_2400_floating_rrc.h \ + v27ter_rx_4800_floating_rrc.h + +v27ter_rx.lo: v27ter_rx_2400_fixed_rrc.h \ + v27ter_rx_4800_fixed_rrc.h \ + v27ter_rx_2400_floating_rrc.h \ + v27ter_rx_4800_floating_rrc.h + +v27ter_rx_2400_fixed_rrc.h: make_modem_filter$(EXEEXT) + ./make_modem_filter$(EXEEXT) -m V.27ter2400 -i -r >v27ter_rx_2400_fixed_rrc.h + +v27ter_rx_4800_fixed_rrc.h: make_modem_filter$(EXEEXT) + ./make_modem_filter$(EXEEXT) -m V.27ter4800 -i -r >v27ter_rx_4800_fixed_rrc.h + +v27ter_rx_2400_floating_rrc.h: make_modem_filter$(EXEEXT) + ./make_modem_filter$(EXEEXT) -m V.27ter2400 -r >v27ter_rx_2400_floating_rrc.h + +v27ter_rx_4800_floating_rrc.h: make_modem_filter$(EXEEXT) + ./make_modem_filter$(EXEEXT) -m V.27ter4800 -r >v27ter_rx_4800_floating_rrc.h + +v27ter_tx_.$(OBJEXT): v27ter_tx_2400_fixed_rrc.h \ + v27ter_tx_4800_fixed_rrc.h \ + v27ter_tx_2400_floating_rrc.h \ + v27ter_tx_4800_floating_rrc.h + +v27ter_tx.lo: v27ter_tx_2400_fixed_rrc.h \ + v27ter_tx_4800_fixed_rrc.h \ + v27ter_tx_2400_floating_rrc.h \ + v27ter_tx_4800_floating_rrc.h + +v27ter_tx_2400_fixed_rrc.h: make_modem_filter$(EXEEXT) + ./make_modem_filter$(EXEEXT) -m V.27ter2400 -i -t >v27ter_tx_2400_fixed_rrc.h + +v27ter_tx_4800_fixed_rrc.h: make_modem_filter$(EXEEXT) + ./make_modem_filter$(EXEEXT) -m V.27ter4800 -i -t >v27ter_tx_4800_fixed_rrc.h + +v27ter_tx_2400_floating_rrc.h: make_modem_filter$(EXEEXT) + ./make_modem_filter$(EXEEXT) -m V.27ter2400 -t >v27ter_tx_2400_floating_rrc.h + +v27ter_tx_4800_floating_rrc.h: make_modem_filter$(EXEEXT) + ./make_modem_filter$(EXEEXT) -m V.27ter4800 -t >v27ter_tx_4800_floating_rrc.h + +v29rx.$(OBJEXT): v29rx_fixed_rrc.h v29rx_floating_rrc.h + +v29rx.lo: v29rx_fixed_rrc.h v29rx_floating_rrc.h + +v29rx_fixed_rrc.h: make_modem_filter$(EXEEXT) + ./make_modem_filter$(EXEEXT) -m V.29 -i -r >v29rx_fixed_rrc.h + +v29rx_floating_rrc.h: make_modem_filter$(EXEEXT) + ./make_modem_filter$(EXEEXT) -m V.29 -r >v29rx_floating_rrc.h + +v29tx.$(OBJEXT): v29tx_fixed_rrc.h v29tx_floating_rrc.h + +v29tx.lo: v29tx_fixed_rrc.h v29tx_floating_rrc.h + +v29tx_fixed_rrc.h: make_modem_filter$(EXEEXT) + ./make_modem_filter$(EXEEXT) -m V.29 -i -t >v29tx_fixed_rrc.h + +v29tx_floating_rrc.h: make_modem_filter$(EXEEXT) + ./make_modem_filter$(EXEEXT) -m V.29 -t >v29tx_floating_rrc.h + +DSP = libspandsp.dsp +VCPROJ8 = libspandsp.2008.vcproj + +WIN32SOURCES = $(libspandsp_la_SOURCES) .\\msvc\\gettimeofday.c +WIN32HEADERS = $(nobase_include_HEADERS) spandsp.h + +DSPOUT = | awk '{printf("%s\r\n", $$0)}' >> $(DSP) +VCPROJOUT8 = | awk '{printf("%s\r\n", $$0)}' >> $(VCPROJ8) + +$(DSP): msvc/msvcproj.head msvc/msvcproj.foot Makefile.am + echo "creating $(DSP)" + @(cp $(srcdir)/msvc/msvcproj.head $(DSP); \ + echo "# Begin Group \"Source Files\"" $(DSPOUT); \ + for file in $(WIN32SOURCES); do \ + echo "# Begin Source File" $(DSPOUT); \ + echo "" $(DSPOUT); \ + echo "SOURCE=.\\"$$file $(DSPOUT); \ + echo "# End Source File" $(DSPOUT); \ + done; \ + echo "# End Group" $(DSPOUT); \ + echo "# Begin Group \"Header Files\"" $(DSPOUT); \ + for file in $(WIN32HEADERS); do \ + echo "# Begin Source File" $(DSPOUT); \ + echo "" $(DSPOUT); \ + echo "SOURCE=.\\"$$file $(DSPOUT); \ + echo "# End Source File" $(DSPOUT); \ + done; \ + echo "# End Group" $(DSPOUT); \ + cat $(srcdir)/msvc/msvcproj.foot $(DSPOUT) ) + +$(VCPROJ8): msvc/vc8proj.head msvc/vc8proj.foot Makefile.am + echo "creating $(VCPROJ8)" + @(cp $(srcdir)/msvc/vc8proj.head $(VCPROJ8); \ + for file in $(WIN32SOURCES); do \ + echo "<File RelativePath=\""$$file"\"></File>" $(VCPROJOUT8); \ + done; \ + echo "</Filter><Filter Name=\"Header Files\">" $(VCPROJOUT8); \ + for file in $(WIN32HEADERS); do \ + echo "<File RelativePath=\""$$file"\"></File>" $(VCPROJOUT8); \ + done; \ + cat $(srcdir)/msvc/vc8proj.foot $(VCPROJOUT8) ) + +$(srcdir)/msvc/spandsp.h: spandsp.h.in + echo "creating $(srcdir)/msvc/spandsp.h" + @cp $(srcdir)/spandsp.h.in $(srcdir)/msvc/spandsp.h + @sed -i -e "s/\@SPANDSP_USE_FIXED_POINT\@/#undef SPANDSP_USE_FIXED_POINT/" $(srcdir)/msvc/spandsp.h + @sed -i -e "s/\@SPANDSP_MISALIGNED_ACCESS_FAILS\@/#undef SPANDSP_MISALIGNED_ACCESS_FAILS/" $(srcdir)/msvc/spandsp.h + @sed -i -e "s/\@SPANDSP_USE_EXPORT_CAPABILITY\@/#define SPANDSP_USE_EXPORT_CAPABILITY 1/" $(srcdir)/msvc/spandsp.h + @sed -i -e "s/\@INSERT_INTTYPES_HEADER\@/#include <inttypes.h>/" $(srcdir)/msvc/spandsp.h + @sed -i -e "s/\@INSERT_MATH_HEADER\@/#include <math.h>/" $(srcdir)/msvc/spandsp.h + +spandsp/version.h: + NOWDATE=`date --utc +"%Y%m%d"` ; \ + NOWTIME=`date --utc +"%H%M%S"` ; \ + sed 's/$$SPANDSP_RELEASE_DATE/'$$NOWDATE'/;s/$$SPANDSP_RELEASE_TIME/'$$NOWTIME'/' \ + <spandsp/version.h.in >spandsp/version.h + +dist-hook: + NOWDATE=`date --utc +"%Y%m%d"` ; \ + NOWTIME=`date --utc +"%H%M%S"` ; \ + sed 's/$$SPANDSP_RELEASE_DATE/'$$NOWDATE'/;s/$$SPANDSP_RELEASE_TIME/'$$NOWTIME'/' \ + <spandsp/version.h.in >spandsp/version.h Copied: freeswitch/trunk/libs/spandsp/src/libspandsp.2008.sln (from r12186, /freeswitch/trunk/libs/spandsp/src/libspandsp.sln) ============================================================================== --- /freeswitch/trunk/libs/spandsp/src/libspandsp.sln (original) +++ freeswitch/trunk/libs/spandsp/src/libspandsp.2008.sln Fri Feb 20 14:19:58 2009 @@ -1,16 +1,16 @@ Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_at_dictionary", "msvc\make_at_dictionary.vcproj", "{DEE932AB-5911-4700-9EEB-8C7090A0A330}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_at_dictionary", "msvc\make_at_dictionary.2008.vcproj", "{DEE932AB-5911-4700-9EEB-8C7090A0A330}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_modem_filter", "msvc\make_modem_filter.vcproj", "{329A6FA0-0FCC-4435-A950-E670AEFA9838}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_modem_filter", "msvc\make_modem_filter.2008.vcproj", "{329A6FA0-0FCC-4435-A950-E670AEFA9838}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspandsp", "libspandsp.vcproj", "{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspandsp", "libspandsp.2008.vcproj", "{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}" ProjectSection(ProjectDependencies) = postProject {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} = {401A40CD-5DB4-4E34-AC68-FA99E9FAC014} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtiff", "libtiff.vcproj", "{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtiff", "libtiff.2008.vcproj", "{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution

1 0

[commit] r12194 - freeswitch/trunk/src/mod/applications/mod_lcr
by FreeSWITCH SVN 20 Feb '09

20 Feb '09

Author: rupa Date: Fri Feb 20 14:17:55 2009 New Revision: 12194 Log: don't reuse the module loader's memory pool for our own Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Fri Feb 20 14:17:55 2009 @@ -978,8 +978,7 @@ return SWITCH_STATUS_FALSE; #endif - globals.pool = pool; - + switch_core_new_memory_pool(&globals.pool); if (lcr_load_config() != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to load lcr config file\n");

1 0

[commit] r12193 - freeswitch/trunk/src
by FreeSWITCH SVN 20 Feb '09

20 Feb '09

Author: anthm Date: Fri Feb 20 13:51:34 2009 New Revision: 12193 Log: reduce the yields Modified: freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Fri Feb 20 13:51:34 2009 @@ -1562,7 +1562,7 @@ goto notready; } - switch_yield(100000); + switch_cond_next(); } check_per_channel_timeouts(&oglobals, originate_status, and_argc, start); @@ -1821,7 +1821,7 @@ } } else { - switch_yield(100000); + switch_cond_next(); } }

1 0

[commit] r12192 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 20 Feb '09

20 Feb '09

Author: andrew Date: Fri Feb 20 12:52:29 2009 New Revision: 12192 Log: Use switch_strlen_zero_buf instead of switch_strlen_zero; Handle module init failures better Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c Fri Feb 20 12:52:29 2009 @@ -426,7 +426,7 @@ } else { switch_core_session_t *session; - if (!switch_strlen_zero(uuid) && (session = switch_core_session_locate(uuid))) { + if (!switch_strlen_zero_buf(uuid) && (session = switch_core_session_locate(uuid))) { switch_event_t *event; if (switch_event_create(&event, SWITCH_EVENT_SEND_MESSAGE) == SWITCH_STATUS_SUCCESS) { @@ -538,7 +538,7 @@ ei_x_encode_atom(rbuf, "badarg"); } else { switch_core_session_t *session; - if (!switch_strlen_zero(uuid_str) && (session = switch_core_session_locate(uuid_str))) { + if (!switch_strlen_zero_buf(uuid_str) && (session = switch_core_session_locate(uuid_str))) { /* create a new session list element and attach it to this listener */ if ((arity==2 && attach_call_to_pid(listener, &msg->from, session)) || (arity==3 && attach_call_to_registered_process(listener, reg_name, session))) { Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Fri Feb 20 12:52:29 2009 @@ -1365,10 +1365,10 @@ rv = inet_pton(AF_INET, prefs.ip, &server_addr.sin_addr.s_addr); if (rv == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not parse invalid ip address: %s\n", prefs.ip); - return SWITCH_STATUS_GENERR; + goto init_failed; } else if (rv == -1) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error when parsing ip address %s : %s\n", prefs.ip, strerror(errno)); - return SWITCH_STATUS_GENERR; + goto init_failed; } /* set the address family and port */ @@ -1406,22 +1406,20 @@ if (SWITCH_STATUS_SUCCESS!=initialise_ei(&ec)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to init ei connection\n"); - close_socket(&listen_list.sockfd); - return SWITCH_STATUS_GENERR; + goto init_failed; } /* return value is -1 for error, a descriptor pointing to epmd otherwise */ if ((epmdfd = ei_publish(&ec, prefs.port)) == -1) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Failed to publish port to empd, trying to start empd manually\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Failed to publish port to empd, trying to start empd via system()\n"); if (system("epmd -daemon")) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to start empd manually\n"); - close_socket(&listen_list.sockfd); - return SWITCH_STATUS_GENERR; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to start empd manually! Is epmd in $PATH? If not, start it yourself or run an erl shell with -sname or -name\n"); + goto init_failed; } + switch_yield(100000); if ((epmdfd = ei_publish(&ec, prefs.port)) == -1) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to publish port to empd AGAIN\n"); - close_socket(&listen_list.sockfd); - return SWITCH_STATUS_GENERR; + goto init_failed; } } @@ -1470,6 +1468,7 @@ ei_unpublish(&ec); close(epmdfd); +init_failed: close_socket(&listen_list.sockfd); if (pool) { switch_core_destroy_memory_pool(&pool); @@ -1491,7 +1490,8 @@ listener_t *l; int sanity = 0; - prefs.done = 1; + if (prefs.done == 0) /* main thread might already have exited */ + prefs.done = 1; switch_log_unbind_logger(socket_logger);

1 0

[commit] r12191 - freeswitch/trunk/src
by FreeSWITCH SVN 20 Feb '09

20 Feb '09

Author: anthm Date: Fri Feb 20 12:31:08 2009 New Revision: 12191 Log: add separate mutex for state related methods Modified: freeswitch/trunk/src/switch_channel.c Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Fri Feb 20 12:31:08 2009 @@ -112,6 +112,7 @@ switch_queue_t *dtmf_queue; switch_mutex_t *dtmf_mutex; switch_mutex_t *flag_mutex; + switch_mutex_t *state_mutex; switch_mutex_t *profile_mutex; switch_core_session_t *session; switch_channel_state_t state; @@ -224,6 +225,7 @@ switch_mutex_init(&(*channel)->dtmf_mutex, SWITCH_MUTEX_NESTED, pool); switch_mutex_init(&(*channel)->flag_mutex, SWITCH_MUTEX_NESTED, pool); + switch_mutex_init(&(*channel)->state_mutex, SWITCH_MUTEX_NESTED, pool); switch_mutex_init(&(*channel)->profile_mutex, SWITCH_MUTEX_NESTED, pool); (*channel)->hangup_cause = SWITCH_CAUSE_NONE; (*channel)->name = ""; @@ -845,9 +847,9 @@ switch_channel_state_t state; switch_assert(channel != NULL); - switch_mutex_lock(channel->flag_mutex); + switch_mutex_lock(channel->state_mutex); state = channel->state; - switch_mutex_unlock(channel->flag_mutex); + switch_mutex_unlock(channel->state_mutex); return state; } @@ -857,9 +859,9 @@ switch_channel_state_t state; switch_assert(channel != NULL); - switch_mutex_lock(channel->flag_mutex); + switch_mutex_lock(channel->state_mutex); state = channel->running_state; - switch_mutex_unlock(channel->flag_mutex); + switch_mutex_unlock(channel->state_mutex); return state; } @@ -926,7 +928,7 @@ const char *file, const char *func, int line) { int x; - switch_mutex_lock(channel->flag_mutex); + switch_mutex_lock(channel->state_mutex); switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_DEBUG, "(%s) Running State Change %s\n", channel->name, state_names[state]); channel->running_state = state; @@ -972,7 +974,7 @@ } } - switch_mutex_unlock(channel->flag_mutex); + switch_mutex_unlock(channel->state_mutex); return SWITCH_STATUS_SUCCESS; } @@ -985,7 +987,7 @@ switch_assert(channel != NULL); switch_assert(state <= CS_DONE); - switch_mutex_lock(channel->flag_mutex); + switch_mutex_lock(channel->state_mutex); last_state = channel->state; switch_assert(last_state <= CS_DONE); @@ -1165,9 +1167,9 @@ if (ok) { switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_DEBUG, "(%s) State Change %s -> %s\n", channel->name, state_names[last_state], state_names[state]); - switch_mutex_lock(channel->flag_mutex); + switch_mutex_lock(channel->state_mutex); channel->state = state; - switch_mutex_unlock(channel->flag_mutex); + switch_mutex_unlock(channel->state_mutex); if (state == CS_HANGUP && !channel->hangup_cause) { channel->hangup_cause = SWITCH_CAUSE_NORMAL_CLEARING; @@ -1185,7 +1187,7 @@ } done: - switch_mutex_unlock(channel->flag_mutex); + switch_mutex_unlock(channel->state_mutex); return channel->state; } @@ -1444,7 +1446,7 @@ int x, index; switch_assert(channel != NULL); - switch_mutex_lock(channel->flag_mutex); + switch_mutex_lock(channel->state_mutex); for (x = 0; x < SWITCH_MAX_STATE_HANDLERS; x++) { if (channel->state_handlers[x] == state_handler) { index = x; @@ -1461,7 +1463,7 @@ channel->state_handlers[index] = state_handler; end: - switch_mutex_unlock(channel->flag_mutex); + switch_mutex_unlock(channel->state_mutex); return index; } @@ -1475,9 +1477,9 @@ return NULL; } - switch_mutex_lock(channel->flag_mutex); + switch_mutex_lock(channel->state_mutex); h = channel->state_handlers[index]; - switch_mutex_unlock(channel->flag_mutex); + switch_mutex_unlock(channel->state_mutex); return h; } @@ -1489,7 +1491,7 @@ switch_assert(channel != NULL); - switch_mutex_lock(channel->flag_mutex); + switch_mutex_lock(channel->state_mutex); channel->state_handler_index = 0; if (state_handler) { @@ -1509,7 +1511,7 @@ } } - switch_mutex_unlock(channel->flag_mutex); + switch_mutex_unlock(channel->state_mutex); } SWITCH_DECLARE(void) switch_channel_set_caller_extension(switch_channel_t *channel, switch_caller_extension_t *caller_extension) @@ -1541,7 +1543,7 @@ const char *file, const char *func, int line, switch_call_cause_t hangup_cause) { switch_assert(channel != NULL); - switch_mutex_lock(channel->flag_mutex); + switch_mutex_lock(channel->state_mutex); if (channel->caller_profile && channel->caller_profile->times && !channel->caller_profile->times->hungup) { switch_mutex_lock(channel->profile_mutex); @@ -1576,7 +1578,7 @@ } - switch_mutex_unlock(channel->flag_mutex); + switch_mutex_unlock(channel->state_mutex); return channel->state; }

1 0