mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-10-30 15:14:17 +00:00
Fix win32 Build
Update win32 Setup add show calls and show channels git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1884 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
1 parent
4aab8842cd
commit
0d82c97797
6 files changed
+575
-98
No files matched your search
@@ -207,10 +207,16 @@ static switch_status_t show_function(char *cmd, switch_stream_handle_t *stream)
|
||||
) {
|
||||
sprintf (sql, "select * from interfaces where type = '%s'", cmd);
|
||||
}
|
||||
else if ( !strcmp(cmd,"calls")) {
|
||||
sprintf (sql, "select * from calls", cmd);
|
||||
}
|
||||
else if ( !strcmp(cmd,"channels")) {
|
||||
sprintf (sql, "select * from channels", cmd);
|
||||
}
|
||||
else {
|
||||
stream->write_function(stream, "Invalid interfaces type!\n");
|
||||
stream->write_function(stream, "Example:\n");
|
||||
stream->write_function(stream, "show <blank>|codec|application|api|dialplan|file|timer\n");
|
||||
stream->write_function(stream, "show <blank>|codec|application|api|dialplan|file|timer|calls|channels\n");
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
@@ -475,7 +475,7 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
|
||||
switch_mutex_lock(imember->audio_in_mutex);
|
||||
/* if there is audio in the resample buffer it takes precedence over the other data */
|
||||
if (imember->mux_resampler && switch_buffer_inuse(imember->resample_buffer) >= bytes) {
|
||||
imember->read = switch_buffer_read(imember->resample_buffer, imember->frame, bytes);
|
||||
imember->read = (uint32_t)switch_buffer_read(imember->resample_buffer, imember->frame, bytes);
|
||||
ready++;
|
||||
} else if ((imember->read = (uint32_t)switch_buffer_read(imember->audio_buffer, imember->frame, imember->buflen))) {
|
||||
/* If the caller is not at the right sample rate resample him to suit and buffer accordingly */
|
||||
@@ -492,7 +492,7 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
|
||||
len = imember->mux_resampler->to_len * 2;
|
||||
switch_buffer_write(imember->resample_buffer, out, len);
|
||||
if (switch_buffer_inuse(imember->resample_buffer) >= bytes) {
|
||||
imember->read = switch_buffer_read(imember->resample_buffer, imember->frame, bytes);
|
||||
imember->read = (uint32_t)switch_buffer_read(imember->resample_buffer, imember->frame, bytes);
|
||||
ready++;
|
||||
}
|
||||
} else {
|
||||
@@ -895,7 +895,7 @@ static void conference_loop(conference_member_t *member)
|
||||
}
|
||||
} else {
|
||||
switch_buffer_t *use_buffer = NULL;
|
||||
uint32_t mux_used = switch_buffer_inuse(member->mux_buffer);
|
||||
uint32_t mux_used = (uint32_t)switch_buffer_inuse(member->mux_buffer);
|
||||
//uint32_t res_used = member->mux_resampler ? switch_buffer_inuse(member->resample_buffer) : 0;
|
||||
|
||||
if (mux_used) {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
ProjectType="Visual C++"
|
||||
Version="8.00"
|
||||
Name="mod_dptools"
|
||||
ProjectGUID="{78100236-7CEA-4948-96CC-E8ED3160329C}"
|
||||
ProjectGUID="{B5881A85-FE70-4F64-8607-2CAAE52669C6}"
|
||||
RootNamespace="mod_dptools"
|
||||
Keyword="Win32Proj"
|
||||
>
|
||||
|
||||
@@ -196,7 +196,7 @@ static switch_status_t cepstral_speech_feed_tts(switch_speech_handle_t *sh, char
|
||||
{
|
||||
cepstral_t *cepstral;
|
||||
const char *fp = "file:";
|
||||
int len = strlen(fp);
|
||||
int len = (int)strlen(fp);
|
||||
|
||||
assert(sh != NULL);
|
||||
cepstral = sh->private_info;
|
||||
|
||||
Reference in new issue
Block a user