From 09e96025e911f2b4d47ae5017f86787970056619 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Tue, 14 Aug 2007 19:34:53 +0000 Subject: [PATCH] don't rebuild mod_shout on every make git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5601 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/applications/mod_conference/mod_conference.c | 3 +-- src/mod/formats/mod_shout/Makefile | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index de1204eb91..087173e131 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -1703,7 +1703,6 @@ static void conference_loop_output(conference_member_t * member) write_frame.timestamp = timer.samplecount; switch_core_session_write_frame(member->session, &write_frame, -1, 0); switch_core_timer_next(&timer); - /* forget the conference data we played file node data instead */ switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER); } @@ -1775,7 +1774,7 @@ static void conference_loop_output(conference_member_t * member) switch_mutex_unlock(member->flag_mutex); if (use_timer) { - switch_core_timer_next(&timer); + //switch_core_timer_next(&timer); } } /* Rinse ... Repeat */ diff --git a/src/mod/formats/mod_shout/Makefile b/src/mod/formats/mod_shout/Makefile index 5f5a793324..b39970bcaa 100644 --- a/src/mod/formats/mod_shout/Makefile +++ b/src/mod/formats/mod_shout/Makefile @@ -30,6 +30,7 @@ $(LAME_DIR): $(LAME_DIR)/Makefile: $(LAME_DIR) cd $(LAME_DIR) && ./configure $(DEFAULT_ARGS) --disable-decoder + $(TOUCH_TARGET) $(LAMELA): $(LAME_DIR)/Makefile cd $(LAME_DIR) && $(MAKE) @@ -40,6 +41,7 @@ $(SHOUT_DIR): $(SHOUT_DIR)/Makefile: $(SHOUT_DIR) cd $(SHOUT_DIR) && ./configure $(DEFAULT_ARGS) --with-speex=no + $(TOUCH_TARGET) $(SHOUTLA): $(SHOUT_DIR)/Makefile cd $(SHOUT_DIR) && $(MAKE)