整理代码

src/Device/Device.cpp

@@ -5,14 +5,14 @@
  *      Author: xzl
  */
 
+#include <stdio.h>
+#include <stdio.h>
+#include "base64.h"
 #include "Device.h"
 #include "Util/logger.h"
-#include <stdio.h>
 #include "Util/util.h"
-#include <cstdio>
-#include "base64.h"
-
 #include "Util/TimeTicker.h"
+
 using namespace ZL::Util;
 
 namespace ZL {

src/Device/Device.h

@@ -7,14 +7,16 @@
 
 #ifndef DEVICE_DEVICE_H_
 #define DEVICE_DEVICE_H_
+
 #include <sys/time.h>
+#include <memory>
 #include <string>
 #include <functional>
-#include <memory>
 #include "Util/util.h"
 #include "RTP/RtpMakerAAC.h"
 #include "RTP/RtpMakerH264.h"
 #include "Rtsp/RtspToRtmpMediaSource.h"
+
 using namespace std;
 using namespace ZL::Rtsp;
 using namespace ZL::Util;
@@ -29,7 +31,6 @@ using namespace ZL::Codec;
 using namespace ZL::Codec;
 #endif //ENABLE_X264
 
-using namespace ZL::Rtsp;
 namespace ZL {
 namespace DEV {
 
@@ -46,7 +47,6 @@ public:
 	int iSampleRate;
 };
 
-
 class DevChannel {
 public:
 	typedef std::shared_ptr<DevChannel> Ptr;

src/Device/PlayerProxy.cpp

@@ -5,12 +5,12 @@
  *      Author: xzl
  */
 
+#include "config.h"
 #include "PlayerProxy.h"
-#include "Thread/AsyncTaskThread.h"
+#include "Util/mini.h"
 #include "Util/MD5.h"
 #include "Util/logger.h"
-#include "config.h"
-#include "Util/mini.hpp"
+#include "Thread/AsyncTaskThread.h"
 
 using namespace ZL::Util;
 using namespace ZL::Thread;

src/Device/PlayerProxy.h

@@ -8,8 +8,8 @@
 #ifndef SRC_DEVICE_PLAYERPROXY_H_
 #define SRC_DEVICE_PLAYERPROXY_H_
 
-#include "Device.h"
 #include <memory>
+#include "Device.h"
 #include "Player/MediaPlayer.h"
 #include "Util/TimeTicker.h"