fix MedaiFile to MediaFile

src/MedaiFile/HLSMaker.cpp → src/MediaFile/HLSMaker.cpp

@@ -5,8 +5,8 @@
  *      Author: root
  *      Author: root
  */
  */
 
 
-#include <sys/time.h>
 #include "HLSMaker.h"
 #include "HLSMaker.h"
+#include <sys/time.h>
 
 
 namespace ZL {
 namespace ZL {
 namespace MediaFile {
 namespace MediaFile {

src/MedaiFile/HLSMaker.h → src/MediaFile/HLSMaker.h

@@ -8,8 +8,8 @@
 #ifndef HLSMAKER_H_
 #ifndef HLSMAKER_H_
 #define HLSMAKER_H_
 #define HLSMAKER_H_
 
 
-#include "config.h"
 #include "TSMaker.h"
 #include "TSMaker.h"
+#include "config.h"
 #include "Util/TimeTicker.h"
 #include "Util/TimeTicker.h"
 #include "Util/File.h"
 #include "Util/File.h"
 #include "Util/util.h"
 #include "Util/util.h"

src/MedaiFile/MediaReader.cpp → src/MediaFile/MediaReader.cpp

@@ -5,8 +5,8 @@
  *      Author: xzl
  *      Author: xzl
  */
  */
 
 
-#include "config.h"
 #include "MediaReader.h"
 #include "MediaReader.h"
+#include "config.h"
 #include "Util/mini.h"
 #include "Util/mini.h"
 #include "Http/HttpSession.h"
 #include "Http/HttpSession.h"
 
 

src/MedaiFile/MediaReader.h → src/MediaFile/MediaReader.h

@@ -5,8 +5,8 @@
  *      Author: xzl
  *      Author: xzl
  */
  */
 
 
-#ifndef SRC_MEDAIFILE_MEDIAREADER_H_
-#define SRC_MEDAIFILE_MEDIAREADER_H_
+#ifndef SRC_MEDIAFILE_MEDIAREADER_H_
+#define SRC_MEDIAFILE_MEDIAREADER_H_
 
 
 #include "Device/Device.h"
 #include "Device/Device.h"
 #include "Rtsp/RtspMediaSource.h"
 #include "Rtsp/RtspMediaSource.h"
@@ -82,4 +82,4 @@ private:
 } /* namespace MediaFile */
 } /* namespace MediaFile */
 } /* namespace ZL */
 } /* namespace ZL */
 
 
-#endif /* SRC_MEDAIFILE_MEDIAREADER_H_ */
+#endif /* SRC_MEDIAFILE_MEDIAREADER_H_ */

src/MedaiFile/MediaRecorder.cpp → src/MediaFile/MediaRecorder.cpp

@@ -5,8 +5,8 @@
  *      Author: xzl
  *      Author: xzl
  */
  */
 
 
-#include "config.h"
 #include "MediaRecorder.h"
 #include "MediaRecorder.h"
+#include "config.h"
 #include "Http/HttpSession.h"
 #include "Http/HttpSession.h"
 #include "Util/util.h"
 #include "Util/util.h"
 #include "Util/mini.h"
 #include "Util/mini.h"

src/MedaiFile/MediaRecorder.h → src/MediaFile/MediaRecorder.h

@@ -5,8 +5,8 @@
  *      Author: xzl
  *      Author: xzl
  */
  */
 
 
-#ifndef SRC_MEDAIFILE_MEDIARECORDER_H_
-#define SRC_MEDAIFILE_MEDIARECORDER_H_
+#ifndef SRC_MEDIAFILE_MEDIARECORDER_H_
+#define SRC_MEDIAFILE_MEDIARECORDER_H_
 
 
 #include <memory>
 #include <memory>
 #include "Player/PlayerBase.h"
 #include "Player/PlayerBase.h"
@@ -47,4 +47,4 @@ private:
 } /* namespace MediaFile */
 } /* namespace MediaFile */
 } /* namespace ZL */
 } /* namespace ZL */
 
 
-#endif /* SRC_MEDAIFILE_MEDIARECORDER_H_ */
+#endif /* SRC_MEDIAFILE_MEDIARECORDER_H_ */

src/MedaiFile/TSMaker.cpp → src/MediaFile/TSMaker.cpp

@@ -5,8 +5,8 @@
  *      Author: root
  *      Author: root
  */
  */
 
 
-#include <sys/time.h>
 #include "TSMaker.h"
 #include "TSMaker.h"
+#include <sys/time.h>
 #include "Util/logger.h"
 #include "Util/logger.h"
 
 
 using namespace ZL::Util;
 using namespace ZL::Util;

src/MedaiFile/TSMaker.h → src/MediaFile/TSMaker.h

@@ -8,12 +8,12 @@
 #ifndef TSMAKER_H_
 #ifndef TSMAKER_H_
 #define TSMAKER_H_
 #define TSMAKER_H_
 
 
+#include "crc32.h"
 #include <stdio.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <string.h>
 #include <string>
 #include <string>
 #include <iostream>
 #include <iostream>
-#include "CRC/crc32.h"
 #include "Util/File.h"
 #include "Util/File.h"
 
 
 using namespace std;
 using namespace std;

src/Rtmp/RtmpMediaSource.cpp

@@ -6,7 +6,7 @@
  */
  */
 
 
 #include "RtmpMediaSource.h"
 #include "RtmpMediaSource.h"
-#include "MedaiFile/MediaReader.h"
+#include "MediaFile/MediaReader.h"
 
 
 using namespace ZL::MediaFile;
 using namespace ZL::MediaFile;
 
 

src/Rtmp/RtmpToRtspMediaSource.h

@@ -21,9 +21,9 @@
 #include "RTP/RtpMakerAAC.h"
 #include "RTP/RtpMakerAAC.h"
 #include "Rtsp/RtpParser.h"
 #include "Rtsp/RtpParser.h"
 #include "Rtsp/RtspMediaSource.h"
 #include "Rtsp/RtspMediaSource.h"
-#include "MedaiFile/MediaRecorder.h"
 #include "Util/util.h"
 #include "Util/util.h"
 #include "Util/logger.h"
 #include "Util/logger.h"
+#include "MediaFile/MediaRecorder.h"
 
 
 using namespace std;
 using namespace std;
 using namespace ZL::Util;
 using namespace ZL::Util;

src/Rtsp/RtspMediaSource.cpp

@@ -6,7 +6,7 @@
  */
  */
 
 
 #include "RtspMediaSource.h"
 #include "RtspMediaSource.h"
-#include "MedaiFile/MediaReader.h"
+#include "MediaFile/MediaReader.h"
 
 
 using namespace ZL::MediaFile;
 using namespace ZL::MediaFile;
 
 

src/Rtsp/RtspToRtmpMediaSource.h

@@ -12,7 +12,7 @@
 #include "RtspMediaSource.h"
 #include "RtspMediaSource.h"
 #include "Rtmp/amf.h"
 #include "Rtmp/amf.h"
 #include "Rtmp/RtmpMediaSource.h"
 #include "Rtmp/RtmpMediaSource.h"
-#include "MedaiFile/MediaRecorder.h"
+#include "MediaFile/MediaRecorder.h"
 
 
 using namespace ZL::Rtmp;
 using namespace ZL::Rtmp;
 using namespace ZL::MediaFile;
 using namespace ZL::MediaFile;