整理代码

src/Player/MediaPlayer.cpp

@@ -5,10 +5,10 @@
  *      Author: xzl
  */
 
+#include <algorithm>
+#include "MediaPlayer.h"
 #include "Rtmp/RtmpPlayerImp.h"
 #include "Rtsp/RtspPlayerImp.h"
-#include "MediaPlayer.h"
-#include <algorithm>
 
 using namespace ZL::Rtmp;
 using namespace ZL::Rtsp;

src/Player/MediaPlayer.h

@@ -8,12 +8,12 @@
 #ifndef SRC_PLAYER_MEDIAPLAYER_H_
 #define SRC_PLAYER_MEDIAPLAYER_H_
 
+#include <memory>
+#include <string>
 #include "Player.h"
 #include "PlayerBase.h"
-#include <string>
-#include <memory>
-using namespace std;
 
+using namespace std;
 
 namespace ZL {
 namespace Player {

src/Player/Player.cpp

@@ -5,12 +5,12 @@
  *      Author: xzl
  */
 
+#include <cstring>
 #include "Player.h"
 #include "H264/SPSParser.h"
-#include <cstring>
 #include "Util/logger.h"
-using namespace ZL::Util;
 
+using namespace ZL::Util;
 
 static unsigned const samplingFrequencyTable[16] = { 96000, 88200,
 					64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025,

src/Player/PlayerBase.cpp

@@ -5,11 +5,11 @@
  *      Author: xzl
  */
 
-#include "PlayerBase.h"
-#include "Rtmp/RtmpPlayerImp.h"
-#include "Rtsp/RtspPlayerImp.h"
-#include "Rtsp/Rtsp.h"
 #include <algorithm>
+#include "PlayerBase.h"
+#include "Rtsp/Rtsp.h"
+#include "Rtsp/RtspPlayerImp.h"
+#include "Rtmp/RtmpPlayerImp.h"
 
 using namespace std;
 using namespace ZL::Rtmp;

src/Player/PlayerBase.h

@@ -8,18 +8,18 @@
 #ifndef SRC_PLAYER_PLAYERBASE_H_
 #define SRC_PLAYER_PLAYERBASE_H_
 
-#include "Player.h"
-#include "Network/Socket.hpp"
-#include <functional>
 #include <memory>
 #include <string>
+#include <functional>
+#include "Player.h"
+#include "Network/Socket.h"
+
 using namespace std;
 using namespace ZL::Network;
 
 namespace ZL {
 namespace Player {
 
-
 class PlayerBase{
 public:
 	typedef std::shared_ptr<PlayerBase> Ptr;