ben.carrasco/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-07-22 12:11:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

FS-7500 S-7513: Few build fixes

Browse Source
This commit is contained in:
William King
2014-08-27 22:31:52 -07:00
committed by Michael Jerris
parent 99ed41a4bd
commit 4fc94e3907
6 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/private/switch_core_pvt.h
-2
View File
@@ -103,8 +103,6 @@ typedef enum {
SSF_MEDIA_BUG_TAP_ONLY = (1 << 10)
} switch_session_flag_t;
typedef switch_status_t (switch_core_video_thread_callback_func_t) (switch_core_session_t *session, switch_frame_t *frame, void *user_data);
struct switch_core_session {
switch_memory_pool_t *pool;
switch_thread_t *thread;
src/include/switch_core.h
+2 -3
View File
@@ -169,8 +169,7 @@ typedef enum {
DS_INVALID,
} dtls_state_t;
typedef switch_status_t (switch_core_video_thread_callback_func_t) (switch_core_session_t *session, switch_frame_t *frame, void *user_data);
@@ -2317,7 +2316,7 @@ SWITCH_DECLARE(uint8_t) switch_core_session_check_interface(switch_core_session_
Return SWITCH_STATUS_BREAK will break the loop and end the video thread
*/
SWITCH_DECLARE(switch_status_t) switch_core_session_set_video_thread_callback(switch_core_session_t *session, void *func, void *user_data);
SWITCH_DECLARE(switch_status_t) switch_core_session_set_video_thread_callback(switch_core_session_t *session, switch_core_video_thread_callback_func_t *func, void *user_data);
/*!
\brief Set a callback to let the core video thread call us
src/mod/applications/mod_conference/mod_conference.c
+1 -1
View File
@@ -9781,7 +9781,7 @@ SWITCH_STANDARD_APP(conference_function)
switch_core_session_receive_message(session, &msg);
/* Chime in the core video thread */
switch_core_session_set_video_thread_callback(session, (void *)video_thread_callback, (void *)&member);
switch_core_session_set_video_thread_callback(session, video_thread_callback, (void *)&member);
/* Run the conference loop */
do {
src/switch_core_session.c
+1 -1
View File
@@ -3063,7 +3063,7 @@ SWITCH_DECLARE(void) switch_core_session_debug_pool(switch_stream_handle_t *stre
session_manager.running, session_manager.busy, session_manager.popping);
}
SWITCH_DECLARE(switch_status_t) switch_core_session_set_video_thread_callback(switch_core_session_t *session, void *func, void *user_data)
SWITCH_DECLARE(switch_status_t) switch_core_session_set_video_thread_callback(switch_core_session_t *session, switch_core_video_thread_callback_func_t *func, void *user_data)
{
if (!func) {
session->_video_thread_callback = NULL;