external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

move reload to kernel module

Browse source
This commit is contained in:
winlin 2014-03-01 10:51:45 +08:00
parent 44f9638f0c
commit b0d20f57e1
9 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/app/srs_core_client.hpp
View file

@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core_st.hpp>
#include <srs_core_conn.hpp>
#include <srs_core_reload.hpp>
#include <srs_kernel_reload.hpp>
class SrsRtmp;
class SrsRequest;

2
trunk/src/app/srs_core_config.hpp
View file

@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <vector>
#include <string>
#include <srs_core_reload.hpp>
#include <srs_kernel_reload.hpp>
// default vhost for rtmp
#define RTMP_VHOST_DEFAULT "__defaultVhost__"

2
trunk/src/app/srs_core_pithy_print.cpp
View file

@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_kernel_log.hpp>
#include <srs_core_config.hpp>
#include <srs_core_reload.hpp>
#include <srs_kernel_reload.hpp>
#include <srs_kernel_error.hpp>
#define SRS_STAGE_DEFAULT_INTERVAL_MS 1200

2
trunk/src/app/srs_core_server.hpp
View file

@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <vector>
#include <srs_core_st.hpp>
#include <srs_core_reload.hpp>
#include <srs_kernel_reload.hpp>
#include <srs_core_thread.hpp>
class SrsServer;

2
trunk/src/app/srs_core_source.hpp
View file

@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <string>
#include <srs_core_st.hpp>
#include <srs_core_reload.hpp>
#include <srs_kernel_reload.hpp>
class SrsSource;
class SrsCommonMessage;

2
trunk/src/app/srs_core_reload.cpp → trunk/src/kernel/srs_kernel_reload.cpp
View file

@ -21,7 +21,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <srs_core_reload.hpp>
#include <srs_kernel_reload.hpp>
using namespace std;

2
trunk/src/app/srs_core_reload.hpp → trunk/src/kernel/srs_kernel_reload.hpp
View file

@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define SRS_CORE_RELOAD_HPP
/*
#include <srs_core_reload.hpp>
#include <srs_kernel_reload.hpp>
*/
#include <srs_core.hpp>

4
trunk/src/srs/srs.upp
View file

@ -14,6 +14,8 @@ file
..\kernel\srs_kernel_error.cpp,
..\kernel\srs_kernel_log.hpp,
..\kernel\srs_kernel_log.cpp,
..\kernel\srs_kernel_reload.hpp,
..\kernel\srs_kernel_reload.cpp,
app readonly separator,
..\app\srs_core_amf0.hpp,
..\app\srs_core_amf0.cpp,
@ -47,8 +49,6 @@ file
..\app\srs_core_protocol.cpp,
..\app\srs_core_refer.hpp,
..\app\srs_core_refer.cpp,
..\app\srs_core_reload.hpp,
..\app\srs_core_reload.cpp,
..\app\srs_core_rtmp.hpp,
..\app\srs_core_rtmp.cpp,
..\app\srs_core_thread.hpp,