胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
517d346a 1 parent 4c498b67

change macro for all rtmp protocol files.

内嵌 并排对比
正在显示 7 个修改的文件 包含 85 行增加 和 85 行删除
... ... @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
// current release version
#define RTMP_SIG_SRS_VERSION "0.9.6"
#define RTMP_SIG_SRS_VERSION "0.9.7"
// server info.
#define RTMP_SIG_SRS_KEY "srs"
#define RTMP_SIG_SRS_ROLE "origin server"
... ...
... ... @@ -21,8 +21,8 @@ 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_PROTOCOL_AMF0_HPP
#define SRS_PROTOCOL_AMF0_HPP
#ifndef SRS_RTMP_PROTOCOL_AMF0_HPP
#define SRS_RTMP_PROTOCOL_AMF0_HPP
/*
#include <srs_protocol_amf0.hpp>
... ...
... ... @@ -21,8 +21,8 @@ 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_PROTOCOL_HANDSHKAE_HPP
#define SRS_PROTOCOL_HANDSHKAE_HPP
#ifndef SRS_RTMP_PROTOCOL_HANDSHKAE_HPP
#define SRS_RTMP_PROTOCOL_HANDSHKAE_HPP
/*
#include <srs_protocol_handshake.hpp>
... ...
... ... @@ -21,8 +21,8 @@ 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_PROTOCOL_IO_HPP
#define SRS_PROTOCOL_IO_HPP
#ifndef SRS_RTMP_PROTOCOL_IO_HPP
#define SRS_RTMP_PROTOCOL_IO_HPP
/*
#include <srs_protocol_io.hpp>
... ...
... ... @@ -21,8 +21,8 @@ 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_PROTOCOL_RTMP_HPP
#define SRS_PROTOCOL_RTMP_HPP
#ifndef SRS_RTMP_PROTOCOL_RTMP_HPP
#define SRS_RTMP_PROTOCOL_RTMP_HPP
/*
#include <srs_protocol_rtmp.hpp>
... ...
... ... @@ -21,8 +21,8 @@ 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_PROTOCOL_RTMP_STACK_HPP
#define SRS_PROTOCOL_RTMP_STACK_HPP
#ifndef SRS_RTMP_PROTOCOL_RTMP_STACK_HPP
#define SRS_RTMP_PROTOCOL_RTMP_STACK_HPP
/*
#include <srs_protocol_rtmp_stack.hpp>
... ...
file
main readonly separator,
..\main\srs_main_server.cpp,
..\main\srs_main_bandcheck.cpp,
auto readonly separator,
..\..\objs\srs_auto_headers.hpp,
core readonly separator,
..\core\srs_core.hpp,
..\core\srs_core.cpp,
..\core\srs_core_autofree.hpp,
..\core\srs_core_autofree.cpp,
kernel readonly separator,
..\kernel\srs_kernel_buffer.hpp,
..\kernel\srs_kernel_buffer.cpp,
..\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,
..\kernel\srs_kernel_log.cpp,
..\kernel\srs_kernel_pithy_print.hpp,
..\kernel\srs_kernel_pithy_print.cpp,
..\kernel\srs_kernel_reload.hpp,
..\kernel\srs_kernel_reload.cpp,
..\kernel\srs_kernel_stream.hpp,
..\kernel\srs_kernel_stream.cpp,
rtmp protocol readonly separator,
..\rtmp\srs_protocol_amf0.hpp,
..\rtmp\srs_protocol_amf0.cpp,
..\rtmp\srs_protocol_handshake.hpp,
..\rtmp\srs_protocol_handshake.cpp,
..\rtmp\srs_protocol_io.hpp,
..\rtmp\srs_protocol_io.cpp,
..\rtmp\srs_protocol_rtmp.hpp,
..\rtmp\srs_protocol_rtmp.cpp,
..\rtmp\srs_protocol_rtmp_stack.hpp,
..\rtmp\srs_protocol_rtmp_stack.cpp,
app readonly separator,
..\app\srs_core_bandwidth.hpp,
..\app\srs_core_bandwidth.cpp,
..\app\srs_core_client.hpp,
..\app\srs_core_client.cpp,
..\app\srs_core_codec.hpp,
..\app\srs_core_codec.cpp,
..\app\srs_core_conn.hpp,
..\app\srs_core_conn.cpp,
..\app\srs_core_encoder.hpp,
..\app\srs_core_encoder.cpp,
..\app\srs_core_forward.hpp,
..\app\srs_core_forward.cpp,
..\app\srs_core_hls.hpp,
..\app\srs_core_hls.cpp,
..\app\srs_core_http.hpp,
..\app\srs_core_http.cpp,
..\app\srs_core_log_context.hpp,
..\app\srs_core_log_context.cpp,
..\app\srs_core_refer.hpp,
..\app\srs_core_refer.cpp,
..\app\srs_core_thread.hpp,
..\app\srs_core_thread.cpp,
..\app\srs_core_server.hpp,
..\app\srs_core_server.cpp,
..\app\srs_core_st.hpp,
..\app\srs_core_st.cpp,
..\app\srs_core_socket.hpp,
..\app\srs_core_socket.cpp,
..\app\srs_core_source.hpp,
..\app\srs_core_source.cpp,
research readonly separator,
..\..\research\hls\ts_info.cc;
mainconfig
"" = "MAIN";
file
main readonly separator,
..\main\srs_main_server.cpp,
..\main\srs_main_bandcheck.cpp,
auto readonly separator,
..\..\objs\srs_auto_headers.hpp,
core readonly separator,
..\core\srs_core.hpp,
..\core\srs_core.cpp,
..\core\srs_core_autofree.hpp,
..\core\srs_core_autofree.cpp,
kernel readonly separator,
..\kernel\srs_kernel_buffer.hpp,
..\kernel\srs_kernel_buffer.cpp,
..\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,
..\kernel\srs_kernel_log.cpp,
..\kernel\srs_kernel_pithy_print.hpp,
..\kernel\srs_kernel_pithy_print.cpp,
..\kernel\srs_kernel_reload.hpp,
..\kernel\srs_kernel_reload.cpp,
..\kernel\srs_kernel_stream.hpp,
..\kernel\srs_kernel_stream.cpp,
rtmp-protocol readonly separator,
..\rtmp\srs_protocol_amf0.hpp,
..\rtmp\srs_protocol_amf0.cpp,
..\rtmp\srs_protocol_handshake.hpp,
..\rtmp\srs_protocol_handshake.cpp,
..\rtmp\srs_protocol_io.hpp,
..\rtmp\srs_protocol_io.cpp,
..\rtmp\srs_protocol_rtmp.hpp,
..\rtmp\srs_protocol_rtmp.cpp,
..\rtmp\srs_protocol_rtmp_stack.hpp,
..\rtmp\srs_protocol_rtmp_stack.cpp,
app readonly separator,
..\app\srs_core_bandwidth.hpp,
..\app\srs_core_bandwidth.cpp,
..\app\srs_core_client.hpp,
..\app\srs_core_client.cpp,
..\app\srs_core_codec.hpp,
..\app\srs_core_codec.cpp,
..\app\srs_core_conn.hpp,
..\app\srs_core_conn.cpp,
..\app\srs_core_encoder.hpp,
..\app\srs_core_encoder.cpp,
..\app\srs_core_forward.hpp,
..\app\srs_core_forward.cpp,
..\app\srs_core_hls.hpp,
..\app\srs_core_hls.cpp,
..\app\srs_core_http.hpp,
..\app\srs_core_http.cpp,
..\app\srs_core_log_context.hpp,
..\app\srs_core_log_context.cpp,
..\app\srs_core_refer.hpp,
..\app\srs_core_refer.cpp,
..\app\srs_core_thread.hpp,
..\app\srs_core_thread.cpp,
..\app\srs_core_server.hpp,
..\app\srs_core_server.cpp,
..\app\srs_core_st.hpp,
..\app\srs_core_st.cpp,
..\app\srs_core_socket.hpp,
..\app\srs_core_socket.cpp,
..\app\srs_core_source.hpp,
..\app\srs_core_source.cpp,
research readonly separator,
..\..\research\hls\ts_info.cc;
mainconfig
"" = "MAIN";
... ...