正在显示
7 个修改的文件
包含
12 行增加
和
12 行删除
| @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | // current release version | 31 | // current release version |
| 32 | -#define RTMP_SIG_SRS_VERSION "0.9.6" | 32 | +#define RTMP_SIG_SRS_VERSION "0.9.7" |
| 33 | // server info. | 33 | // server info. |
| 34 | #define RTMP_SIG_SRS_KEY "srs" | 34 | #define RTMP_SIG_SRS_KEY "srs" |
| 35 | #define RTMP_SIG_SRS_ROLE "origin server" | 35 | #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 | @@ -21,8 +21,8 @@ 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_PROTOCOL_AMF0_HPP | ||
| 25 | -#define SRS_PROTOCOL_AMF0_HPP | 24 | +#ifndef SRS_RTMP_PROTOCOL_AMF0_HPP |
| 25 | +#define SRS_RTMP_PROTOCOL_AMF0_HPP | ||
| 26 | 26 | ||
| 27 | /* | 27 | /* |
| 28 | #include <srs_protocol_amf0.hpp> | 28 | #include <srs_protocol_amf0.hpp> |
| @@ -21,8 +21,8 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | @@ -21,8 +21,8 @@ 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_PROTOCOL_HANDSHKAE_HPP | ||
| 25 | -#define SRS_PROTOCOL_HANDSHKAE_HPP | 24 | +#ifndef SRS_RTMP_PROTOCOL_HANDSHKAE_HPP |
| 25 | +#define SRS_RTMP_PROTOCOL_HANDSHKAE_HPP | ||
| 26 | 26 | ||
| 27 | /* | 27 | /* |
| 28 | #include <srs_protocol_handshake.hpp> | 28 | #include <srs_protocol_handshake.hpp> |
| @@ -21,8 +21,8 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | @@ -21,8 +21,8 @@ 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_PROTOCOL_IO_HPP | ||
| 25 | -#define SRS_PROTOCOL_IO_HPP | 24 | +#ifndef SRS_RTMP_PROTOCOL_IO_HPP |
| 25 | +#define SRS_RTMP_PROTOCOL_IO_HPP | ||
| 26 | 26 | ||
| 27 | /* | 27 | /* |
| 28 | #include <srs_protocol_io.hpp> | 28 | #include <srs_protocol_io.hpp> |
| @@ -21,8 +21,8 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | @@ -21,8 +21,8 @@ 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_PROTOCOL_RTMP_HPP | ||
| 25 | -#define SRS_PROTOCOL_RTMP_HPP | 24 | +#ifndef SRS_RTMP_PROTOCOL_RTMP_HPP |
| 25 | +#define SRS_RTMP_PROTOCOL_RTMP_HPP | ||
| 26 | 26 | ||
| 27 | /* | 27 | /* |
| 28 | #include <srs_protocol_rtmp.hpp> | 28 | #include <srs_protocol_rtmp.hpp> |
| @@ -21,8 +21,8 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | @@ -21,8 +21,8 @@ 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_PROTOCOL_RTMP_STACK_HPP | ||
| 25 | -#define SRS_PROTOCOL_RTMP_STACK_HPP | 24 | +#ifndef SRS_RTMP_PROTOCOL_RTMP_STACK_HPP |
| 25 | +#define SRS_RTMP_PROTOCOL_RTMP_STACK_HPP | ||
| 26 | 26 | ||
| 27 | /* | 27 | /* |
| 28 | #include <srs_protocol_rtmp_stack.hpp> | 28 | #include <srs_protocol_rtmp_stack.hpp> |
| @@ -24,7 +24,7 @@ file | @@ -24,7 +24,7 @@ file | ||
| 24 | ..\kernel\srs_kernel_reload.cpp, | 24 | ..\kernel\srs_kernel_reload.cpp, |
| 25 | ..\kernel\srs_kernel_stream.hpp, | 25 | ..\kernel\srs_kernel_stream.hpp, |
| 26 | ..\kernel\srs_kernel_stream.cpp, | 26 | ..\kernel\srs_kernel_stream.cpp, |
| 27 | - rtmp protocol readonly separator, | 27 | + rtmp-protocol readonly separator, |
| 28 | ..\rtmp\srs_protocol_amf0.hpp, | 28 | ..\rtmp\srs_protocol_amf0.hpp, |
| 29 | ..\rtmp\srs_protocol_amf0.cpp, | 29 | ..\rtmp\srs_protocol_amf0.cpp, |
| 30 | ..\rtmp\srs_protocol_handshake.hpp, | 30 | ..\rtmp\srs_protocol_handshake.hpp, |
-
请 注册 或 登录 后发表评论