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

move config to kernel module

This commit is contained in:
winlin 2014-03-01 10:55:43 +08:00
parent 5e14aa9c13
commit cb99de4462
15 changed files with 19 additions and 19 deletions

4
trunk/configure vendored
View file

@ -133,7 +133,7 @@ CORE_OBJS="${MODULE_OBJS[@]}"
MODULE_ID="KERNEL"
MODULE_DEPENDS=("CORE")
ModuleLibIncs=(${SRS_OBJS})
MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_reload")
MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_reload" "srs_kernel_config")
MODULE_DIR="src/kernel" . auto/modules.sh
KERNEL_OBJS="${MODULE_OBJS[@]}"
#
@ -147,7 +147,7 @@ MODULE_FILES=("srs_core_server"
"srs_core_protocol" "srs_core_amf0"
"srs_core_stream" "srs_core_source" "srs_core_codec"
"srs_core_handshake" "srs_core_pithy_print"
"srs_core_config" "srs_core_refer"
"srs_core_refer"
"srs_core_hls" "srs_core_forward" "srs_core_encoder"
"srs_core_http" "srs_core_thread" "srs_core_bandwidth"
"srs_core_st" "srs_core_log_context")

View file

@ -32,7 +32,7 @@ using namespace std;
#include <srs_kernel_error.hpp>
#include <srs_core_amf0.hpp>
#include <srs_core_protocol.hpp>
#include <srs_core_config.hpp>
#include <srs_kernel_config.hpp>
#include <srs_core_autofree.hpp>
SrsBandwidth::SrsBandwidth()

View file

@ -36,7 +36,7 @@ using namespace std;
#include <srs_core_source.hpp>
#include <srs_core_server.hpp>
#include <srs_core_pithy_print.hpp>
#include <srs_core_config.hpp>
#include <srs_kernel_config.hpp>
#include <srs_core_refer.hpp>
#include <srs_core_hls.hpp>
#include <srs_core_http.hpp>

View file

@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_kernel_error.hpp>
#include <srs_kernel_log.hpp>
#include <srs_core_config.hpp>
#include <srs_kernel_config.hpp>
#include <srs_core_rtmp.hpp>
#include <srs_core_pithy_print.hpp>
#include <srs_core_protocol.hpp>

View file

@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core_protocol.hpp>
#include <srs_core_pithy_print.hpp>
#include <srs_core_rtmp.hpp>
#include <srs_core_config.hpp>
#include <srs_kernel_config.hpp>
#include <srs_core_source.hpp>
#include <srs_core_autofree.hpp>

View file

@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core_codec.hpp>
#include <srs_core_amf0.hpp>
#include <srs_core_protocol.hpp>
#include <srs_core_config.hpp>
#include <srs_kernel_config.hpp>
#include <srs_core_source.hpp>
#include <srs_core_autofree.hpp>
#include <srs_core_rtmp.hpp>

View file

@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <map>
#include <srs_kernel_log.hpp>
#include <srs_core_config.hpp>
#include <srs_kernel_config.hpp>
#include <srs_kernel_reload.hpp>
#include <srs_kernel_error.hpp>

View file

@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_kernel_error.hpp>
#include <srs_kernel_log.hpp>
#include <srs_core_config.hpp>
#include <srs_kernel_config.hpp>
int SrsRefer::check(std::string page_url, SrsConfDirective* refer)
{

View file

@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core_autofree.hpp>
#include <srs_core_amf0.hpp>
#include <srs_core_handshake.hpp>
#include <srs_core_config.hpp>
#include <srs_kernel_config.hpp>
using namespace std;

View file

@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_kernel_log.hpp>
#include <srs_kernel_error.hpp>
#include <srs_core_client.hpp>
#include <srs_core_config.hpp>
#include <srs_kernel_config.hpp>
#define SERVER_LISTEN_BACKLOG 512
#define SRS_TIME_RESOLUTION_MS 500

View file

@ -33,7 +33,7 @@ using namespace std;
#include <srs_core_codec.hpp>
#include <srs_core_hls.hpp>
#include <srs_core_forward.hpp>
#include <srs_core_config.hpp>
#include <srs_kernel_config.hpp>
#include <srs_core_encoder.hpp>
#include <srs_core_rtmp.hpp>

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_config.hpp>
#include <srs_kernel_config.hpp>
#include <stdio.h>
#include <stdlib.h>

View file

@ -21,11 +21,11 @@ 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.
*/
#ifndef SRS_CORE_CONIFG_HPP
#define SRS_CORE_CONIFG_HPP
#ifndef SRS_KERNEL_CONIFG_HPP
#define SRS_KERNEL_CONIFG_HPP
/*
#include <srs_core_config.hpp>
#include <srs_kernel_config.hpp>
*/
#include <srs_core.hpp>

View file

@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_kernel_log.hpp>
#include <srs_kernel_error.hpp>
#include <srs_core_server.hpp>
#include <srs_core_config.hpp>
#include <srs_kernel_config.hpp>
#include <stdlib.h>
#include <signal.h>

View file

@ -10,6 +10,8 @@ file
..\core\srs_core_autofree.hpp,
..\core\srs_core_autofree.cpp,
kernel readonly separator,
..\kernel\srs_kernel_config.hpp,
..\kernel\srs_kernel_config.cpp,
..\kernel\srs_kernel_error.hpp,
..\kernel\srs_kernel_error.cpp,
..\kernel\srs_kernel_log.hpp,
@ -27,8 +29,6 @@ file
..\app\srs_core_client.cpp,
..\app\srs_core_codec.hpp,
..\app\srs_core_codec.cpp,
..\app\srs_core_config.hpp,
..\app\srs_core_config.cpp,
..\app\srs_core_conn.hpp,
..\app\srs_core_conn.cpp,
..\app\srs_core_encoder.hpp,