正在显示
2 个修改的文件
包含
2 行增加
和
48 行删除
| @@ -1621,8 +1621,8 @@ int SrsSharedPtrMessage::initialize(SrsMessageHeader* source, char* payload, int | @@ -1621,8 +1621,8 @@ int SrsSharedPtrMessage::initialize(SrsMessageHeader* source, char* payload, int | ||
| 1621 | ptr->perfer_cid = RTMP_CID_OverConnection2; | 1621 | ptr->perfer_cid = RTMP_CID_OverConnection2; |
| 1622 | } | 1622 | } |
| 1623 | 1623 | ||
| 1624 | - super::payload = (int8_t*)ptr->payload; | ||
| 1625 | - super::size = ptr->size; | 1624 | + ISrsMessage::payload = (int8_t*)ptr->payload; |
| 1625 | + ISrsMessage::size = ptr->size; | ||
| 1626 | 1626 | ||
| 1627 | return ret; | 1627 | return ret; |
| 1628 | } | 1628 | } |
| @@ -332,7 +332,6 @@ public: | @@ -332,7 +332,6 @@ public: | ||
| 332 | class SrsCommonMessage : public ISrsMessage | 332 | class SrsCommonMessage : public ISrsMessage |
| 333 | { | 333 | { |
| 334 | private: | 334 | private: |
| 335 | - typedef ISrsMessage super; | ||
| 336 | disable_default_copy(SrsCommonMessage); | 335 | disable_default_copy(SrsCommonMessage); |
| 337 | // decoded message payload. | 336 | // decoded message payload. |
| 338 | private: | 337 | private: |
| @@ -392,8 +391,6 @@ public: | @@ -392,8 +391,6 @@ public: | ||
| 392 | class SrsSharedPtrMessage : public ISrsMessage | 391 | class SrsSharedPtrMessage : public ISrsMessage |
| 393 | { | 392 | { |
| 394 | private: | 393 | private: |
| 395 | - typedef ISrsMessage super; | ||
| 396 | -private: | ||
| 397 | struct SrsSharedPtr | 394 | struct SrsSharedPtr |
| 398 | { | 395 | { |
| 399 | char* payload; | 396 | char* payload; |
| @@ -503,8 +500,6 @@ protected: | @@ -503,8 +500,6 @@ protected: | ||
| 503 | */ | 500 | */ |
| 504 | class SrsConnectAppPacket : public SrsPacket | 501 | class SrsConnectAppPacket : public SrsPacket |
| 505 | { | 502 | { |
| 506 | -private: | ||
| 507 | - typedef SrsPacket super; | ||
| 508 | protected: | 503 | protected: |
| 509 | virtual const char* get_class_name() | 504 | virtual const char* get_class_name() |
| 510 | { | 505 | { |
| @@ -532,8 +527,6 @@ protected: | @@ -532,8 +527,6 @@ protected: | ||
| 532 | */ | 527 | */ |
| 533 | class SrsConnectAppResPacket : public SrsPacket | 528 | class SrsConnectAppResPacket : public SrsPacket |
| 534 | { | 529 | { |
| 535 | -private: | ||
| 536 | - typedef SrsPacket super; | ||
| 537 | protected: | 530 | protected: |
| 538 | virtual const char* get_class_name() | 531 | virtual const char* get_class_name() |
| 539 | { | 532 | { |
| @@ -567,8 +560,6 @@ protected: | @@ -567,8 +560,6 @@ protected: | ||
| 567 | */ | 560 | */ |
| 568 | class SrsCreateStreamPacket : public SrsPacket | 561 | class SrsCreateStreamPacket : public SrsPacket |
| 569 | { | 562 | { |
| 570 | -private: | ||
| 571 | - typedef SrsPacket super; | ||
| 572 | protected: | 563 | protected: |
| 573 | virtual const char* get_class_name() | 564 | virtual const char* get_class_name() |
| 574 | { | 565 | { |
| @@ -596,8 +587,6 @@ protected: | @@ -596,8 +587,6 @@ protected: | ||
| 596 | */ | 587 | */ |
| 597 | class SrsCreateStreamResPacket : public SrsPacket | 588 | class SrsCreateStreamResPacket : public SrsPacket |
| 598 | { | 589 | { |
| 599 | -private: | ||
| 600 | - typedef SrsPacket super; | ||
| 601 | protected: | 590 | protected: |
| 602 | virtual const char* get_class_name() | 591 | virtual const char* get_class_name() |
| 603 | { | 592 | { |
| @@ -626,8 +615,6 @@ protected: | @@ -626,8 +615,6 @@ protected: | ||
| 626 | */ | 615 | */ |
| 627 | class SrsCloseStreamPacket : public SrsPacket | 616 | class SrsCloseStreamPacket : public SrsPacket |
| 628 | { | 617 | { |
| 629 | -private: | ||
| 630 | - typedef SrsPacket super; | ||
| 631 | protected: | 618 | protected: |
| 632 | virtual const char* get_class_name() | 619 | virtual const char* get_class_name() |
| 633 | { | 620 | { |
| @@ -649,8 +636,6 @@ public: | @@ -649,8 +636,6 @@ public: | ||
| 649 | */ | 636 | */ |
| 650 | class SrsFMLEStartPacket : public SrsPacket | 637 | class SrsFMLEStartPacket : public SrsPacket |
| 651 | { | 638 | { |
| 652 | -private: | ||
| 653 | - typedef SrsPacket super; | ||
| 654 | protected: | 639 | protected: |
| 655 | virtual const char* get_class_name() | 640 | virtual const char* get_class_name() |
| 656 | { | 641 | { |
| @@ -682,8 +667,6 @@ public: | @@ -682,8 +667,6 @@ public: | ||
| 682 | */ | 667 | */ |
| 683 | class SrsFMLEStartResPacket : public SrsPacket | 668 | class SrsFMLEStartResPacket : public SrsPacket |
| 684 | { | 669 | { |
| 685 | -private: | ||
| 686 | - typedef SrsPacket super; | ||
| 687 | protected: | 670 | protected: |
| 688 | virtual const char* get_class_name() | 671 | virtual const char* get_class_name() |
| 689 | { | 672 | { |
| @@ -717,8 +700,6 @@ protected: | @@ -717,8 +700,6 @@ protected: | ||
| 717 | */ | 700 | */ |
| 718 | class SrsPublishPacket : public SrsPacket | 701 | class SrsPublishPacket : public SrsPacket |
| 719 | { | 702 | { |
| 720 | -private: | ||
| 721 | - typedef SrsPacket super; | ||
| 722 | protected: | 703 | protected: |
| 723 | virtual const char* get_class_name() | 704 | virtual const char* get_class_name() |
| 724 | { | 705 | { |
| @@ -752,8 +733,6 @@ protected: | @@ -752,8 +733,6 @@ protected: | ||
| 752 | */ | 733 | */ |
| 753 | class SrsPausePacket : public SrsPacket | 734 | class SrsPausePacket : public SrsPacket |
| 754 | { | 735 | { |
| 755 | -private: | ||
| 756 | - typedef SrsPacket super; | ||
| 757 | protected: | 736 | protected: |
| 758 | virtual const char* get_class_name() | 737 | virtual const char* get_class_name() |
| 759 | { | 738 | { |
| @@ -778,8 +757,6 @@ public: | @@ -778,8 +757,6 @@ public: | ||
| 778 | */ | 757 | */ |
| 779 | class SrsPlayPacket : public SrsPacket | 758 | class SrsPlayPacket : public SrsPacket |
| 780 | { | 759 | { |
| 781 | -private: | ||
| 782 | - typedef SrsPacket super; | ||
| 783 | protected: | 760 | protected: |
| 784 | virtual const char* get_class_name() | 761 | virtual const char* get_class_name() |
| 785 | { | 762 | { |
| @@ -812,8 +789,6 @@ protected: | @@ -812,8 +789,6 @@ protected: | ||
| 812 | */ | 789 | */ |
| 813 | class SrsPlayResPacket : public SrsPacket | 790 | class SrsPlayResPacket : public SrsPacket |
| 814 | { | 791 | { |
| 815 | -private: | ||
| 816 | - typedef SrsPacket super; | ||
| 817 | protected: | 792 | protected: |
| 818 | virtual const char* get_class_name() | 793 | virtual const char* get_class_name() |
| 819 | { | 794 | { |
| @@ -841,8 +816,6 @@ protected: | @@ -841,8 +816,6 @@ protected: | ||
| 841 | */ | 816 | */ |
| 842 | class SrsOnBWDonePacket : public SrsPacket | 817 | class SrsOnBWDonePacket : public SrsPacket |
| 843 | { | 818 | { |
| 844 | -private: | ||
| 845 | - typedef SrsPacket super; | ||
| 846 | protected: | 819 | protected: |
| 847 | virtual const char* get_class_name() | 820 | virtual const char* get_class_name() |
| 848 | { | 821 | { |
| @@ -870,8 +843,6 @@ protected: | @@ -870,8 +843,6 @@ protected: | ||
| 870 | */ | 843 | */ |
| 871 | class SrsOnStatusCallPacket : public SrsPacket | 844 | class SrsOnStatusCallPacket : public SrsPacket |
| 872 | { | 845 | { |
| 873 | -private: | ||
| 874 | - typedef SrsPacket super; | ||
| 875 | protected: | 846 | protected: |
| 876 | virtual const char* get_class_name() | 847 | virtual const char* get_class_name() |
| 877 | { | 848 | { |
| @@ -903,7 +874,6 @@ protected: | @@ -903,7 +874,6 @@ protected: | ||
| 903 | class SrsBandwidthPacket : public SrsPacket | 874 | class SrsBandwidthPacket : public SrsPacket |
| 904 | { | 875 | { |
| 905 | private: | 876 | private: |
| 906 | - typedef SrsPacket super; | ||
| 907 | disable_default_copy(SrsBandwidthPacket); | 877 | disable_default_copy(SrsBandwidthPacket); |
| 908 | protected: | 878 | protected: |
| 909 | virtual const char* get_class_name() | 879 | virtual const char* get_class_name() |
| @@ -949,8 +919,6 @@ private: | @@ -949,8 +919,6 @@ private: | ||
| 949 | */ | 919 | */ |
| 950 | class SrsOnStatusDataPacket : public SrsPacket | 920 | class SrsOnStatusDataPacket : public SrsPacket |
| 951 | { | 921 | { |
| 952 | -private: | ||
| 953 | - typedef SrsPacket super; | ||
| 954 | protected: | 922 | protected: |
| 955 | virtual const char* get_class_name() | 923 | virtual const char* get_class_name() |
| 956 | { | 924 | { |
| @@ -977,8 +945,6 @@ protected: | @@ -977,8 +945,6 @@ protected: | ||
| 977 | */ | 945 | */ |
| 978 | class SrsSampleAccessPacket : public SrsPacket | 946 | class SrsSampleAccessPacket : public SrsPacket |
| 979 | { | 947 | { |
| 980 | -private: | ||
| 981 | - typedef SrsPacket super; | ||
| 982 | protected: | 948 | protected: |
| 983 | virtual const char* get_class_name() | 949 | virtual const char* get_class_name() |
| 984 | { | 950 | { |
| @@ -1007,8 +973,6 @@ protected: | @@ -1007,8 +973,6 @@ protected: | ||
| 1007 | */ | 973 | */ |
| 1008 | class SrsOnMetaDataPacket : public SrsPacket | 974 | class SrsOnMetaDataPacket : public SrsPacket |
| 1009 | { | 975 | { |
| 1010 | -private: | ||
| 1011 | - typedef SrsPacket super; | ||
| 1012 | protected: | 976 | protected: |
| 1013 | virtual const char* get_class_name() | 977 | virtual const char* get_class_name() |
| 1014 | { | 978 | { |
| @@ -1038,8 +1002,6 @@ protected: | @@ -1038,8 +1002,6 @@ protected: | ||
| 1038 | */ | 1002 | */ |
| 1039 | class SrsSetWindowAckSizePacket : public SrsPacket | 1003 | class SrsSetWindowAckSizePacket : public SrsPacket |
| 1040 | { | 1004 | { |
| 1041 | -private: | ||
| 1042 | - typedef SrsPacket super; | ||
| 1043 | protected: | 1005 | protected: |
| 1044 | virtual const char* get_class_name() | 1006 | virtual const char* get_class_name() |
| 1045 | { | 1007 | { |
| @@ -1068,8 +1030,6 @@ protected: | @@ -1068,8 +1030,6 @@ protected: | ||
| 1068 | */ | 1030 | */ |
| 1069 | class SrsAcknowledgementPacket : public SrsPacket | 1031 | class SrsAcknowledgementPacket : public SrsPacket |
| 1070 | { | 1032 | { |
| 1071 | -private: | ||
| 1072 | - typedef SrsPacket super; | ||
| 1073 | protected: | 1033 | protected: |
| 1074 | virtual const char* get_class_name() | 1034 | virtual const char* get_class_name() |
| 1075 | { | 1035 | { |
| @@ -1096,8 +1056,6 @@ protected: | @@ -1096,8 +1056,6 @@ protected: | ||
| 1096 | */ | 1056 | */ |
| 1097 | class SrsSetChunkSizePacket : public SrsPacket | 1057 | class SrsSetChunkSizePacket : public SrsPacket |
| 1098 | { | 1058 | { |
| 1099 | -private: | ||
| 1100 | - typedef SrsPacket super; | ||
| 1101 | protected: | 1059 | protected: |
| 1102 | virtual const char* get_class_name() | 1060 | virtual const char* get_class_name() |
| 1103 | { | 1061 | { |
| @@ -1126,8 +1084,6 @@ protected: | @@ -1126,8 +1084,6 @@ protected: | ||
| 1126 | */ | 1084 | */ |
| 1127 | class SrsSetPeerBandwidthPacket : public SrsPacket | 1085 | class SrsSetPeerBandwidthPacket : public SrsPacket |
| 1128 | { | 1086 | { |
| 1129 | -private: | ||
| 1130 | - typedef SrsPacket super; | ||
| 1131 | protected: | 1087 | protected: |
| 1132 | virtual const char* get_class_name() | 1088 | virtual const char* get_class_name() |
| 1133 | { | 1089 | { |
| @@ -1179,8 +1135,6 @@ enum SrcPCUCEventType | @@ -1179,8 +1135,6 @@ enum SrcPCUCEventType | ||
| 1179 | */ | 1135 | */ |
| 1180 | class SrsUserControlPacket : public SrsPacket | 1136 | class SrsUserControlPacket : public SrsPacket |
| 1181 | { | 1137 | { |
| 1182 | -private: | ||
| 1183 | - typedef SrsPacket super; | ||
| 1184 | protected: | 1138 | protected: |
| 1185 | virtual const char* get_class_name() | 1139 | virtual const char* get_class_name() |
| 1186 | { | 1140 | { |
-
请 注册 或 登录 后发表评论