删除多余文件

src/Rtmp/RtmpMediaSource.cpp

-/*
- * MIT License
- *
- * Copyright (c) 2016 xiongziliang <771730766@qq.com>
- *
- * This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit).
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER 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 "RtmpMediaSource.h"
-#include "MediaFile/MediaReader.h"
-
-using namespace ZL::MediaFile;
-
-namespace ZL {
-namespace Rtmp {
-
-
-} /* namespace Rtmp */
-} /* namespace ZL */

src/Rtmp/RtmpPlayerImp.cpp

-/*
- * MIT License
- *
- * Copyright (c) 2016 xiongziliang <771730766@qq.com>
- *
- * This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit).
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER 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 "RtmpPlayerImp.h"
-
-namespace ZL {
-namespace Rtmp {
-
-RtmpPlayerImp::RtmpPlayerImp() {
-
-}
-
-RtmpPlayerImp::~RtmpPlayerImp() {
-    DebugL<<endl;
-    teardown();
-}
-
-} /* namespace Rtmp */
-} /* namespace ZL */

src/Rtmp/RtmpPlayerImp.h

@@ -44,8 +44,11 @@ namespace Rtmp {
 class RtmpPlayerImp: public PlayerImp<RtmpPlayer,RtmpParser> {
 public:
     typedef std::shared_ptr<RtmpPlayerImp> Ptr;
-    RtmpPlayerImp();
-    virtual ~RtmpPlayerImp();
+    RtmpPlayerImp(){};
+    virtual ~RtmpPlayerImp(){
+        DebugL<<endl;
+        teardown();
+    };
     float getProgress() const override{
         if(getDuration() > 0){
             return getProgressTime() / getDuration();

src/Rtsp/RtspMediaSource.cpp

-/*
- * MIT License
- *
- * Copyright (c) 2016 xiongziliang <771730766@qq.com>
- *
- * This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit).
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER 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 "RtspMediaSource.h"
-#include "MediaFile/MediaReader.h"
-
-using namespace ZL::MediaFile;
-
-namespace ZL {
-namespace Rtsp {
-
-} /* namespace Rtsp */
-} /* namespace ZL */

src/Rtsp/RtspPlayerImp.cpp

-/*
- * MIT License
- *
- * Copyright (c) 2016 xiongziliang <771730766@qq.com>
- *
- * This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit).
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER 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 "RtspPlayerImp.h"
-
-namespace ZL {
-    namespace Rtsp {
-        
-        RtspPlayerImp::RtspPlayerImp() {
-        }
-        
-        RtspPlayerImp::~RtspPlayerImp() {
-            DebugL<<endl;
-            teardown();
-        }
-        
-        
-    } /* namespace Rtsp */
-} /* namespace ZL */

src/Rtsp/RtspPlayerImp.h

@@ -46,8 +46,11 @@ namespace Rtsp {
 class RtspPlayerImp: public PlayerImp<RtspPlayer,RtpParser> {
 public:
 	typedef std::shared_ptr<RtspPlayerImp> Ptr;
-	RtspPlayerImp();
-	virtual ~RtspPlayerImp();
+	RtspPlayerImp(){};
+	virtual ~RtspPlayerImp(){
+        DebugL<<endl;
+        teardown();
+    };
     float getProgress() const override{
         if(getDuration() > 0){
             return getProgressTime() / getDuration();