[Freeswitch-svn] [commit] r5601 - in freeswitch/trunk/src/mod: applications/mod_conference formats/mod_shout

[Freeswitch SVN]

Author: anthm
Date: Tue Aug 14 15:34:53 2007
New Revision: 5601

Modified:
   freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c
   freeswitch/trunk/src/mod/formats/mod_shout/Makefile

Log:
don't rebuild mod_shout on every make

Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c	Tue Aug 14 15:34:53 2007
@@ -1703,7 +1703,6 @@
 						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 @@
 		switch_mutex_unlock(member->flag_mutex);
 
 		if (use_timer) {
-			switch_core_timer_next(&timer);
+			//switch_core_timer_next(&timer);
 		}
 
 	} /* Rinse ... Repeat */

Modified: freeswitch/trunk/src/mod/formats/mod_shout/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/formats/mod_shout/Makefile	(original)
+++ freeswitch/trunk/src/mod/formats/mod_shout/Makefile	Tue Aug 14 15:34:53 2007
@@ -30,6 +30,7 @@
 
 $(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)/Makefile: $(SHOUT_DIR)
 	cd $(SHOUT_DIR) && ./configure $(DEFAULT_ARGS) --with-speex=no
+	$(TOUCH_TARGET)
 
 $(SHOUTLA): $(SHOUT_DIR)/Makefile
 	cd $(SHOUT_DIR) && $(MAKE)