From b74028de64a907abd0bbaa2faaaafaa87138009e Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Tue, 2 May 2017 16:33:49 +0800
Subject: [PATCH] fix MedaiFile to MediaFile

---
 src/{MedaiFile => MediaFile}/HLSMaker.cpp      | 2 +-
 src/{MedaiFile => MediaFile}/HLSMaker.h        | 2 +-
 src/{MedaiFile => MediaFile}/MediaReader.cpp   | 2 +-
 src/{MedaiFile => MediaFile}/MediaReader.h     | 6 +++---
 src/{MedaiFile => MediaFile}/MediaRecorder.cpp | 2 +-
 src/{MedaiFile => MediaFile}/MediaRecorder.h   | 6 +++---
 src/{MedaiFile => MediaFile}/Mp4Maker.cpp      | 0
 src/{MedaiFile => MediaFile}/Mp4Maker.h        | 0
 src/{MedaiFile => MediaFile}/TSMaker.cpp       | 2 +-
 src/{MedaiFile => MediaFile}/TSMaker.h         | 2 +-
 src/{MedaiFile/CRC => MediaFile}/crc32.cpp     | 0
 src/{MedaiFile/CRC => MediaFile}/crc32.h       | 0
 src/Rtmp/RtmpMediaSource.cpp                   | 2 +-
 src/Rtmp/RtmpToRtspMediaSource.h               | 2 +-
 src/Rtsp/RtspMediaSource.cpp                   | 2 +-
 src/Rtsp/RtspToRtmpMediaSource.h               | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)
 rename src/{MedaiFile => MediaFile}/HLSMaker.cpp (100%)
 rename src/{MedaiFile => MediaFile}/HLSMaker.h (100%)
 rename src/{MedaiFile => MediaFile}/MediaReader.cpp (100%)
 rename src/{MedaiFile => MediaFile}/MediaReader.h (95%)
 rename src/{MedaiFile => MediaFile}/MediaRecorder.cpp (100%)
 rename src/{MedaiFile => MediaFile}/MediaRecorder.h (88%)
 rename src/{MedaiFile => MediaFile}/Mp4Maker.cpp (100%)
 rename src/{MedaiFile => MediaFile}/Mp4Maker.h (100%)
 rename src/{MedaiFile => MediaFile}/TSMaker.cpp (100%)
 rename src/{MedaiFile => MediaFile}/TSMaker.h (99%)
 rename src/{MedaiFile/CRC => MediaFile}/crc32.cpp (100%)
 rename src/{MedaiFile/CRC => MediaFile}/crc32.h (100%)

diff --git a/src/MedaiFile/HLSMaker.cpp b/src/MediaFile/HLSMaker.cpp
similarity index 100%
rename from src/MedaiFile/HLSMaker.cpp
rename to src/MediaFile/HLSMaker.cpp
index a897decf..c342e1ad 100644
--- a/src/MedaiFile/HLSMaker.cpp
+++ b/src/MediaFile/HLSMaker.cpp
@@ -5,8 +5,8 @@
  *      Author: root
  */
 
-#include <sys/time.h>
 #include "HLSMaker.h"
+#include <sys/time.h>
 
 namespace ZL {
 namespace MediaFile {
diff --git a/src/MedaiFile/HLSMaker.h b/src/MediaFile/HLSMaker.h
similarity index 100%
rename from src/MedaiFile/HLSMaker.h
rename to src/MediaFile/HLSMaker.h
index 8f28a81b..d1ece54c 100644
--- a/src/MedaiFile/HLSMaker.h
+++ b/src/MediaFile/HLSMaker.h
@@ -8,8 +8,8 @@
 #ifndef HLSMAKER_H_
 #define HLSMAKER_H_
 
-#include "config.h"
 #include "TSMaker.h"
+#include "config.h"
 #include "Util/TimeTicker.h"
 #include "Util/File.h"
 #include "Util/util.h"
diff --git a/src/MedaiFile/MediaReader.cpp b/src/MediaFile/MediaReader.cpp
similarity index 100%
rename from src/MedaiFile/MediaReader.cpp
rename to src/MediaFile/MediaReader.cpp
index cdd6228a..8b7c8e84 100644
--- a/src/MedaiFile/MediaReader.cpp
+++ b/src/MediaFile/MediaReader.cpp
@@ -5,8 +5,8 @@
  *      Author: xzl
  */
 
-#include "config.h"
 #include "MediaReader.h"
+#include "config.h"
 #include "Util/mini.h"
 #include "Http/HttpSession.h"
 
diff --git a/src/MedaiFile/MediaReader.h b/src/MediaFile/MediaReader.h
similarity index 95%
rename from src/MedaiFile/MediaReader.h
rename to src/MediaFile/MediaReader.h
index bd09a9c4..862999c1 100644
--- a/src/MedaiFile/MediaReader.h
+++ b/src/MediaFile/MediaReader.h
@@ -5,8 +5,8 @@
  *      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 "Rtsp/RtspMediaSource.h"
@@ -82,4 +82,4 @@ private:
 } /* namespace MediaFile */
 } /* namespace ZL */
 
-#endif /* SRC_MEDAIFILE_MEDIAREADER_H_ */
+#endif /* SRC_MEDIAFILE_MEDIAREADER_H_ */
diff --git a/src/MedaiFile/MediaRecorder.cpp b/src/MediaFile/MediaRecorder.cpp
similarity index 100%
rename from src/MedaiFile/MediaRecorder.cpp
rename to src/MediaFile/MediaRecorder.cpp
index 4cf625cf..64bf1234 100644
--- a/src/MedaiFile/MediaRecorder.cpp
+++ b/src/MediaFile/MediaRecorder.cpp
@@ -5,8 +5,8 @@
  *      Author: xzl
  */
 
-#include "config.h"
 #include "MediaRecorder.h"
+#include "config.h"
 #include "Http/HttpSession.h"
 #include "Util/util.h"
 #include "Util/mini.h"
diff --git a/src/MedaiFile/MediaRecorder.h b/src/MediaFile/MediaRecorder.h
similarity index 88%
rename from src/MedaiFile/MediaRecorder.h
rename to src/MediaFile/MediaRecorder.h
index d05d5300..a36c2c82 100644
--- a/src/MedaiFile/MediaRecorder.h
+++ b/src/MediaFile/MediaRecorder.h
@@ -5,8 +5,8 @@
  *      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 "Player/PlayerBase.h"
@@ -47,4 +47,4 @@ private:
 } /* namespace MediaFile */
 } /* namespace ZL */
 
-#endif /* SRC_MEDAIFILE_MEDIARECORDER_H_ */
+#endif /* SRC_MEDIAFILE_MEDIARECORDER_H_ */
diff --git a/src/MedaiFile/Mp4Maker.cpp b/src/MediaFile/Mp4Maker.cpp
similarity index 100%
rename from src/MedaiFile/Mp4Maker.cpp
rename to src/MediaFile/Mp4Maker.cpp
diff --git a/src/MedaiFile/Mp4Maker.h b/src/MediaFile/Mp4Maker.h
similarity index 100%
rename from src/MedaiFile/Mp4Maker.h
rename to src/MediaFile/Mp4Maker.h
diff --git a/src/MedaiFile/TSMaker.cpp b/src/MediaFile/TSMaker.cpp
similarity index 100%
rename from src/MedaiFile/TSMaker.cpp
rename to src/MediaFile/TSMaker.cpp
index 4561b249..efb46a3f 100644
--- a/src/MedaiFile/TSMaker.cpp
+++ b/src/MediaFile/TSMaker.cpp
@@ -5,8 +5,8 @@
  *      Author: root
  */
 
-#include <sys/time.h>
 #include "TSMaker.h"
+#include <sys/time.h>
 #include "Util/logger.h"
 
 using namespace ZL::Util;
diff --git a/src/MedaiFile/TSMaker.h b/src/MediaFile/TSMaker.h
similarity index 99%
rename from src/MedaiFile/TSMaker.h
rename to src/MediaFile/TSMaker.h
index 915a7739..2bb00b40 100644
--- a/src/MedaiFile/TSMaker.h
+++ b/src/MediaFile/TSMaker.h
@@ -8,12 +8,12 @@
 #ifndef TSMAKER_H_
 #define TSMAKER_H_
 
+#include "crc32.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <string>
 #include <iostream>
-#include "CRC/crc32.h"
 #include "Util/File.h"
 
 using namespace std;
diff --git a/src/MedaiFile/CRC/crc32.cpp b/src/MediaFile/crc32.cpp
similarity index 100%
rename from src/MedaiFile/CRC/crc32.cpp
rename to src/MediaFile/crc32.cpp
diff --git a/src/MedaiFile/CRC/crc32.h b/src/MediaFile/crc32.h
similarity index 100%
rename from src/MedaiFile/CRC/crc32.h
rename to src/MediaFile/crc32.h
diff --git a/src/Rtmp/RtmpMediaSource.cpp b/src/Rtmp/RtmpMediaSource.cpp
index f5a1c654..6a68fac8 100644
--- a/src/Rtmp/RtmpMediaSource.cpp
+++ b/src/Rtmp/RtmpMediaSource.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "RtmpMediaSource.h"
-#include "MedaiFile/MediaReader.h"
+#include "MediaFile/MediaReader.h"
 
 using namespace ZL::MediaFile;
 
diff --git a/src/Rtmp/RtmpToRtspMediaSource.h b/src/Rtmp/RtmpToRtspMediaSource.h
index 89544d7a..99790103 100644
--- a/src/Rtmp/RtmpToRtspMediaSource.h
+++ b/src/Rtmp/RtmpToRtspMediaSource.h
@@ -21,9 +21,9 @@
 #include "RTP/RtpMakerAAC.h"
 #include "Rtsp/RtpParser.h"
 #include "Rtsp/RtspMediaSource.h"
-#include "MedaiFile/MediaRecorder.h"
 #include "Util/util.h"
 #include "Util/logger.h"
+#include "MediaFile/MediaRecorder.h"
 
 using namespace std;
 using namespace ZL::Util;
diff --git a/src/Rtsp/RtspMediaSource.cpp b/src/Rtsp/RtspMediaSource.cpp
index b5cc8ed6..6291c2ca 100644
--- a/src/Rtsp/RtspMediaSource.cpp
+++ b/src/Rtsp/RtspMediaSource.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "RtspMediaSource.h"
-#include "MedaiFile/MediaReader.h"
+#include "MediaFile/MediaReader.h"
 
 using namespace ZL::MediaFile;
 
diff --git a/src/Rtsp/RtspToRtmpMediaSource.h b/src/Rtsp/RtspToRtmpMediaSource.h
index 6ee6716d..2f2e0df5 100644
--- a/src/Rtsp/RtspToRtmpMediaSource.h
+++ b/src/Rtsp/RtspToRtmpMediaSource.h
@@ -12,7 +12,7 @@
 #include "RtspMediaSource.h"
 #include "Rtmp/amf.h"
 #include "Rtmp/RtmpMediaSource.h"
-#include "MedaiFile/MediaRecorder.h"
+#include "MediaFile/MediaRecorder.h"
 
 using namespace ZL::Rtmp;
 using namespace ZL::MediaFile;