]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
don't rebuild mod_shout on every make
authorAnthony Minessale <anthony.minessale@gmail.com>
Tue, 14 Aug 2007 19:34:53 +0000 (19:34 +0000)
committerAnthony Minessale <anthony.minessale@gmail.com>
Tue, 14 Aug 2007 19:34:53 +0000 (19:34 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5601 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/mod/applications/mod_conference/mod_conference.c
src/mod/formats/mod_shout/Makefile

index de1204eb919d6b206092f840d6d1d784957ce351..087173e1310cfb40e81d620614589d3782e236e4 100644 (file)
@@ -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 */
index 5f5a7933241edb93220aa0588cec7de919d27702..b39970bcaabaf23158ac355aeb2e34a8811ab54a 100644 (file)
@@ -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)