winlin

rename config and pithy-print to app module.

@@ -154,7 +154,7 @@ ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${SRS_OBJS}) @@ -154,7 +154,7 @@ ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${SRS_OBJS})
154 MODULE_FILES=("srs_core_server" "srs_core_conn" "srs_core_client" "srs_core_socket" "srs_core_source" 154 MODULE_FILES=("srs_core_server" "srs_core_conn" "srs_core_client" "srs_core_socket" "srs_core_source"
155 "srs_core_codec" "srs_core_refer" "srs_core_hls" "srs_core_forward" "srs_core_encoder" 155 "srs_core_codec" "srs_core_refer" "srs_core_hls" "srs_core_forward" "srs_core_encoder"
156 "srs_core_http" "srs_core_thread" "srs_core_bandwidth" "srs_core_st" "srs_core_log_context" 156 "srs_core_http" "srs_core_thread" "srs_core_bandwidth" "srs_core_st" "srs_core_log_context"
157 - "srs_kernel_config" "srs_kernel_pithy_print") 157 + "srs_core_config" "srs_core_pithy_print")
158 MODULE_DIR="src/app" . auto/modules.sh 158 MODULE_DIR="src/app" . auto/modules.sh
159 APP_OBJS="${MODULE_OBJS[@]}" 159 APP_OBJS="${MODULE_OBJS[@]}"
160 # 160 #
@@ -32,7 +32,7 @@ using namespace std; @@ -32,7 +32,7 @@ using namespace std;
32 #include <srs_kernel_error.hpp> 32 #include <srs_kernel_error.hpp>
33 #include <srs_protocol_amf0.hpp> 33 #include <srs_protocol_amf0.hpp>
34 #include <srs_protocol_rtmp_stack.hpp> 34 #include <srs_protocol_rtmp_stack.hpp>
35 -#include <srs_kernel_config.hpp> 35 +#include <srs_core_config.hpp>
36 #include <srs_core_autofree.hpp> 36 #include <srs_core_autofree.hpp>
37 37
38 SrsBandwidth::SrsBandwidth() 38 SrsBandwidth::SrsBandwidth()
@@ -35,8 +35,8 @@ using namespace std; @@ -35,8 +35,8 @@ using namespace std;
35 #include <srs_core_autofree.hpp> 35 #include <srs_core_autofree.hpp>
36 #include <srs_core_source.hpp> 36 #include <srs_core_source.hpp>
37 #include <srs_core_server.hpp> 37 #include <srs_core_server.hpp>
38 -#include <srs_kernel_pithy_print.hpp>  
39 -#include <srs_kernel_config.hpp> 38 +#include <srs_core_pithy_print.hpp>
  39 +#include <srs_core_config.hpp>
40 #include <srs_core_refer.hpp> 40 #include <srs_core_refer.hpp>
41 #include <srs_core_hls.hpp> 41 #include <srs_core_hls.hpp>
42 #include <srs_core_http.hpp> 42 #include <srs_core_http.hpp>
@@ -21,7 +21,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN @@ -21,7 +21,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
21 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 21 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22 */ 22 */
23 23
24 -#include <srs_kernel_config.hpp> 24 +#include <srs_core_config.hpp>
25 25
26 #include <stdio.h> 26 #include <stdio.h>
27 #include <stdlib.h> 27 #include <stdlib.h>
@@ -21,11 +21,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN @@ -21,11 +21,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
21 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 21 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22 */ 22 */
23 23
24 -#ifndef SRS_KERNEL_CONIFG_HPP  
25 -#define SRS_KERNEL_CONIFG_HPP 24 +#ifndef SRS_CORE_CONIFG_HPP
  25 +#define SRS_CORE_CONIFG_HPP
26 26
27 /* 27 /*
28 -#include <srs_kernel_config.hpp> 28 +#include <srs_core_config.hpp>
29 */ 29 */
30 #include <srs_core.hpp> 30 #include <srs_core.hpp>
31 31
@@ -34,9 +34,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -34,9 +34,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
34 34
35 #include <srs_kernel_error.hpp> 35 #include <srs_kernel_error.hpp>
36 #include <srs_kernel_log.hpp> 36 #include <srs_kernel_log.hpp>
37 -#include <srs_kernel_config.hpp> 37 +#include <srs_core_config.hpp>
38 #include <srs_protocol_rtmp.hpp> 38 #include <srs_protocol_rtmp.hpp>
39 -#include <srs_kernel_pithy_print.hpp> 39 +#include <srs_core_pithy_print.hpp>
40 #include <srs_protocol_rtmp_stack.hpp> 40 #include <srs_protocol_rtmp_stack.hpp>
41 41
42 #ifdef SRS_FFMPEG 42 #ifdef SRS_FFMPEG
@@ -33,8 +33,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -33,8 +33,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
33 #include <srs_core_socket.hpp> 33 #include <srs_core_socket.hpp>
34 #include <srs_kernel_error.hpp> 34 #include <srs_kernel_error.hpp>
35 #include <srs_kernel_log.hpp> 35 #include <srs_kernel_log.hpp>
36 -#include <srs_kernel_config.hpp>  
37 -#include <srs_kernel_pithy_print.hpp> 36 +#include <srs_core_config.hpp>
  37 +#include <srs_core_pithy_print.hpp>
38 #include <srs_protocol_rtmp.hpp> 38 #include <srs_protocol_rtmp.hpp>
39 #include <srs_protocol_rtmp_stack.hpp> 39 #include <srs_protocol_rtmp_stack.hpp>
40 #include <srs_protocol_utility.hpp> 40 #include <srs_protocol_utility.hpp>
@@ -37,11 +37,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -37,11 +37,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
37 #include <srs_core_codec.hpp> 37 #include <srs_core_codec.hpp>
38 #include <srs_protocol_amf0.hpp> 38 #include <srs_protocol_amf0.hpp>
39 #include <srs_protocol_rtmp_stack.hpp> 39 #include <srs_protocol_rtmp_stack.hpp>
40 -#include <srs_kernel_config.hpp> 40 +#include <srs_core_config.hpp>
41 #include <srs_core_source.hpp> 41 #include <srs_core_source.hpp>
42 #include <srs_core_autofree.hpp> 42 #include <srs_core_autofree.hpp>
43 #include <srs_protocol_rtmp.hpp> 43 #include <srs_protocol_rtmp.hpp>
44 -#include <srs_kernel_pithy_print.hpp> 44 +#include <srs_core_pithy_print.hpp>
45 45
46 // max PES packets size to flush the video. 46 // max PES packets size to flush the video.
47 #define SRS_HLS_AUDIO_CACHE_SIZE 512 * 1024 47 #define SRS_HLS_AUDIO_CACHE_SIZE 512 * 1024
@@ -21,13 +21,13 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN @@ -21,13 +21,13 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
21 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 21 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22 */ 22 */
23 23
24 -#include <srs_kernel_pithy_print.hpp> 24 +#include <srs_core_pithy_print.hpp>
25 25
26 #include <stdlib.h> 26 #include <stdlib.h>
27 #include <map> 27 #include <map>
28 28
29 #include <srs_kernel_log.hpp> 29 #include <srs_kernel_log.hpp>
30 -#include <srs_kernel_config.hpp> 30 +#include <srs_core_config.hpp>
31 #include <srs_kernel_reload.hpp> 31 #include <srs_kernel_reload.hpp>
32 #include <srs_kernel_error.hpp> 32 #include <srs_kernel_error.hpp>
33 33
@@ -21,11 +21,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN @@ -21,11 +21,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
21 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 21 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22 */ 22 */
23 23
24 -#ifndef SRS_KERNEL_PITHY_PRINT_HPP  
25 -#define SRS_KERNEL_PITHY_PRINT_HPP 24 +#ifndef SRS_CORE_PITHY_PRINT_HPP
  25 +#define SRS_CORE_PITHY_PRINT_HPP
26 26
27 /* 27 /*
28 -#include <srs_kernel_pithy_print.hpp> 28 +#include <srs_core_pithy_print.hpp>
29 */ 29 */
30 30
31 #include <srs_core.hpp> 31 #include <srs_core.hpp>
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
25 25
26 #include <srs_kernel_error.hpp> 26 #include <srs_kernel_error.hpp>
27 #include <srs_kernel_log.hpp> 27 #include <srs_kernel_log.hpp>
28 -#include <srs_kernel_config.hpp> 28 +#include <srs_core_config.hpp>
29 29
30 int SrsRefer::check(std::string page_url, SrsConfDirective* refer) 30 int SrsRefer::check(std::string page_url, SrsConfDirective* refer)
31 { 31 {
@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
33 #include <srs_kernel_log.hpp> 33 #include <srs_kernel_log.hpp>
34 #include <srs_kernel_error.hpp> 34 #include <srs_kernel_error.hpp>
35 #include <srs_core_client.hpp> 35 #include <srs_core_client.hpp>
36 -#include <srs_kernel_config.hpp> 36 +#include <srs_core_config.hpp>
37 37
38 #define SERVER_LISTEN_BACKLOG 512 38 #define SERVER_LISTEN_BACKLOG 512
39 #define SRS_TIME_RESOLUTION_MS 500 39 #define SRS_TIME_RESOLUTION_MS 500
@@ -33,7 +33,7 @@ using namespace std; @@ -33,7 +33,7 @@ using namespace std;
33 #include <srs_core_codec.hpp> 33 #include <srs_core_codec.hpp>
34 #include <srs_core_hls.hpp> 34 #include <srs_core_hls.hpp>
35 #include <srs_core_forward.hpp> 35 #include <srs_core_forward.hpp>
36 -#include <srs_kernel_config.hpp> 36 +#include <srs_core_config.hpp>
37 #include <srs_core_encoder.hpp> 37 #include <srs_core_encoder.hpp>
38 #include <srs_protocol_rtmp.hpp> 38 #include <srs_protocol_rtmp.hpp>
39 39
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
24 #include <srs_kernel_log.hpp> 24 #include <srs_kernel_log.hpp>
25 #include <srs_kernel_error.hpp> 25 #include <srs_kernel_error.hpp>
26 #include <srs_core_server.hpp> 26 #include <srs_core_server.hpp>
27 -#include <srs_kernel_config.hpp> 27 +#include <srs_core_config.hpp>
28 28
29 #include <stdlib.h> 29 #include <stdlib.h>
30 #include <signal.h> 30 #include <signal.h>
@@ -42,8 +42,8 @@ file @@ -42,8 +42,8 @@ file
42 ..\app\srs_core_codec.cpp, 42 ..\app\srs_core_codec.cpp,
43 ..\app\srs_core_conn.hpp, 43 ..\app\srs_core_conn.hpp,
44 ..\app\srs_core_conn.cpp, 44 ..\app\srs_core_conn.cpp,
45 - ..\app\srs_kernel_config.hpp,  
46 - ..\app\srs_kernel_config.cpp, 45 + ..\app\srs_core_config.hpp,
  46 + ..\app\srs_core_config.cpp,
47 ..\app\srs_core_encoder.hpp, 47 ..\app\srs_core_encoder.hpp,
48 ..\app\srs_core_encoder.cpp, 48 ..\app\srs_core_encoder.cpp,
49 ..\app\srs_core_forward.hpp, 49 ..\app\srs_core_forward.hpp,
@@ -56,8 +56,8 @@ file @@ -56,8 +56,8 @@ file
56 ..\app\srs_core_log_context.cpp, 56 ..\app\srs_core_log_context.cpp,
57 ..\app\srs_core_refer.hpp, 57 ..\app\srs_core_refer.hpp,
58 ..\app\srs_core_refer.cpp, 58 ..\app\srs_core_refer.cpp,
59 - ..\app\srs_kernel_pithy_print.hpp,  
60 - ..\app\srs_kernel_pithy_print.cpp, 59 + ..\app\srs_core_pithy_print.hpp,
  60 + ..\app\srs_core_pithy_print.cpp,
61 ..\app\srs_core_thread.hpp, 61 ..\app\srs_core_thread.hpp,
62 ..\app\srs_core_thread.cpp, 62 ..\app\srs_core_thread.cpp,
63 ..\app\srs_core_server.hpp, 63 ..\app\srs_core_server.hpp,