简化命名空间

src/Player/Frame.cpp

@@ -3,3 +3,7 @@
 //
 
 #include "Frame.h"
+
+namespace mediakit{
+
+}

src/Player/Frame.h

@@ -7,9 +7,9 @@
 
 #include "Util/RingBuffer.h"
 #include "Network/Socket.h"
+using namespace toolkit;
 
-using namespace ZL::Util;
-using namespace ZL::Network;
+namespace mediakit{
 
 typedef enum {
     CodecInvalid = -1,
@@ -290,6 +290,6 @@ public:
 } ;
 
 
-
+}//namespace mediakit
 
 #endif //ZLMEDIAKIT_FRAME_H

src/Player/MediaPlayer.cpp

@@ -28,12 +28,9 @@
 #include "MediaPlayer.h"
 #include "Rtmp/RtmpPlayerImp.h"
 #include "Rtsp/RtspPlayerImp.h"
+using namespace toolkit;
 
-using namespace ZL::Rtmp;
-using namespace ZL::Rtsp;
-
-namespace ZL {
-namespace Player {
+namespace mediakit {
 
 MediaPlayer::MediaPlayer() {
 }
@@ -78,5 +75,4 @@ void MediaPlayer::teardown() {
 }
 
 
-} /* namespace Player */
-} /* namespace ZL */
+} /* namespace mediakit */

src/Player/MediaPlayer.h

@@ -34,14 +34,9 @@
 #include "Rtsp/RtspPlayer.h"
 #include "Rtmp/RtmpPlayer.h"
 #include "Thread/TaskExecutor.h"
+using namespace toolkit;
 
-using namespace std;
-using namespace ZL::Rtsp;
-using namespace ZL::Rtmp;
-using namespace ZL::Thread;
-
-namespace ZL {
-namespace Player {
+namespace mediakit {
 
 class MediaPlayer : public PlayerImp<PlayerBase,PlayerBase> {
 public:
@@ -58,7 +53,6 @@ private:
 
 };
 
-} /* namespace Player */
-} /* namespace ZL */
+} /* namespace mediakit */
 
 #endif /* SRC_PLAYER_MEDIAPLAYER_H_ */

src/Player/Player.cpp

@@ -28,9 +28,7 @@
 #include "Player.h"
 #include "H264/SPSParser.h"
 #include "Util/logger.h"
-
-using namespace ZL::Util;
-
+using namespace toolkit;
 
 void writeAdtsHeader(const AACFrame &hed, uint8_t *pcAdts) {
 	pcAdts[0] = (hed.syncword >> 4 & 0xFF); //8bit

src/Player/Player.h

@@ -31,6 +31,7 @@
 #include "Frame.h"
 
 using namespace std;
+using namespace mediakit;
 
 unsigned const samplingFrequencyTable[16] = { 96000, 88200,
 											  64000, 48000,

src/Player/PlayerBase.cpp

@@ -29,13 +29,9 @@
 #include "Rtsp/Rtsp.h"
 #include "Rtsp/RtspPlayerImp.h"
 #include "Rtmp/RtmpPlayerImp.h"
+using namespace toolkit;
 
-using namespace std;
-using namespace ZL::Rtmp;
-using namespace ZL::Rtsp;
-
-namespace ZL {
-namespace Player {
+namespace mediakit {
 
 const char PlayerBase::kNetAdapter[] = "net_adapter";
 const char PlayerBase::kRtpType[] = "rtp_type";
@@ -55,5 +51,4 @@ PlayerBase::Ptr PlayerBase::createPlayer(const char* strUrl) {
 	return PlayerBase::Ptr(new RtspPlayerImp());
 }
 
-} /* namespace Player */
-} /* namespace ZL */
+} /* namespace mediakit */

src/Player/PlayerBase.h

@@ -38,14 +38,9 @@
 #include "Common/MediaSource.h"
 #include "Frame.h"
 #include "Track.h"
+using namespace toolkit;
 
-using namespace std;
-using namespace ZL::Util;
-using namespace ZL::Media;
-using namespace ZL::Network;
-
-namespace ZL {
-namespace Player {
+namespace mediakit {
 
 class PlayerBase : public mINI{
 public:
@@ -170,7 +165,6 @@ protected:
 	MediaSource::Ptr _pMediaSrc;
 };
 
-} /* namespace Player */
-} /* namespace ZL */
+} /* namespace mediakit */
 
 #endif /* SRC_PLAYER_PLAYERBASE_H_ */

src/Player/Track.h

@@ -11,9 +11,9 @@
 #include "Util/RingBuffer.h"
 #include "Rtsp/Rtsp.h"
 #include "Player.h"
+using namespace toolkit;
 
-using namespace std;
-using namespace ZL::Util;
+namespace mediakit{
 
 class Track : public FrameRing , public CodecInfo{
 public:
@@ -324,5 +324,6 @@ private:
     int _channel = 0;
 };
 
+}//namespace mediakit
 
 #endif //ZLMEDIAKIT_TRACK_H