Includecleanup

src/Media/AlsaAudioSink.cpp

@@ -14,6 +14,9 @@
 *
 */
 
+#include <cstdio>
+#include <cstdlib>
+
 #include "AlsaAudioSink.h"
 
 

src/Media/AlsaAudioSink.h

@@ -16,19 +16,14 @@
 
 #pragma once
 
-#include "Codec.h"
-#include "Thread.h"
-#include "LockedQueue.h"
-
 #include <alsa/asoundlib.h>
 
-
-#include <vector>
-
 #include "Codec.h"
 #include "Element.h"
-#include "InPin.h"
 #include "IClock.h"
+#include "InPin.h"
+#include "LockedQueue.h"
+#include "Thread.h"
 
 
 

src/Media/AmlCodec.cpp

@@ -14,13 +14,16 @@
 *
 */
 
-#include "AmlCodec.h"
+#include <cstdio>
+#include <cstring>
 
-#include "Exception.h"
+#include <fcntl.h>
+#include <unistd.h>
 
 #include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <fcntl.h>
+
+#include "AmlCodec.h"
+#include "Exception.h"
 
 
 
@@ -856,4 +859,4 @@ int AmlCodec::WriteData(unsigned char* data, int length)
 
 	// This is done unlocked because it blocks	
 	return write(handle, data, length);
-}
+}

src/Media/AmlVideoSink.h

@@ -16,18 +16,12 @@
 
 #pragma once
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <cstring>
-
-
+#include <cstdio>
 #include <vector>
 
 #include "Codec.h"
 #include "Element.h"
 #include "InPin.h"
-#include "Thread.h"
 #include "Timer.h"
 #include "AmlCodec.h"
 

src/Media/AudioCodec.cpp

@@ -14,9 +14,11 @@
 *
 */
 
+#include <cstdio>
+#include <cstring>
+
 #include "AudioCodec.h"
 
-#include <algorithm>
 
 
 void AudioCodecElement::SetupCodec()

src/Media/AudioCodec.h

@@ -16,17 +16,12 @@
 
 #pragma once
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#include <vector>
-
 #include "Codec.h"
 #include "Element.h"
 #include "InPin.h"
 
 
+
 class AudioCodecElement : public Element
 {
 	const int alsa_channels = 2;

src/Media/Buffer.h

@@ -16,16 +16,16 @@
 
 #pragma once
 
-#include "Exception.h"
-//#include "Codec.h"
+#include <memory>
+#include <vector>
 
 extern "C"
 {
 #include <libavformat/avformat.h>
 }
 
-#include <memory>
-#include <vector>
+#include "Exception.h"
+
 
 
 enum class BufferTypeEnum

src/Media/Codec.h

@@ -16,21 +16,8 @@
 
 #pragma once
 
-//extern "C"
-//{
-//#include <libavformat/avformat.h>
-//#include <libavcodec/avcodec.h>
-//}
-
-#include <pthread.h>
-#include <queue>
 #include <memory>
 
-#include "Exception.h"
-#include "Thread.h"
-#include "LockedQueue.h"
-#include "Buffer.h"
-
 
 
 enum class MediaState

src/Media/Element.cpp

@@ -14,9 +14,12 @@
 *
 */
 
-#include "Element.h"
+#include <cstdarg>
+#include <cstdio>
 
+#include <sys/time.h>
 
+#include "Element.h"
 
 
 

src/Media/Element.h

@@ -16,16 +16,18 @@
 
 #pragma once
 
+#include <memory>
+#include <functional>
+#include <string>
 
 #include <pthread.h>
-#include <sys/time.h>
 
-#include "Codec.h"
 #include "InPin.h"
 #include "OutPin.h"
 #include "WaitCondition.h"
 
 
+
 // Push model
 //
 // source.Execute()

src/Media/Event.h

@@ -16,11 +16,12 @@
 
 #pragma once
 
+#include <vector>
+
 #include "Mutex.h"
 #include "Exception.h"
 #include "EventListener.h"
 
-#include <vector>
 
 
 template<typename T>  // where T : EventArgs

src/Media/EventListener.h

@@ -16,7 +16,9 @@
 
 #pragma once
 
-//#include "Event.h"
+#include <functional>
+#include <memory>
+
 
 
 template<typename T>

src/Media/Exception.h

@@ -16,8 +16,9 @@
 
 #pragma once
 
-#include <exception>
 #include <cstdio>
+#include <exception>
+
 
 
 class Exception : std::exception
@@ -104,4 +105,4 @@ class InvalidOperationException : Exception
 	InvalidOperationException(const char* message)
 		: Exception(message)
 	{}
-};
+};

src/Media/Image.cpp

@@ -12,10 +12,11 @@
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
 * more details.
 *
-*/
-
-#include "Image.h"
-
+*/
+
+#include "Exception.h"
+#include "Image.h"
+
 
 
 Image::Image(ImageFormatEnum format, int width, int height, int stride, void* data)

src/Media/Image.h

@@ -18,7 +18,6 @@
 
 #include <memory>
 
-#include "Exception.h"
 
 
 enum class ImageFormatEnum

src/Media/InPin.cpp

@@ -14,10 +14,12 @@
 *
 */
 
-#include "InPin.h"
+#include <cstdio>
+#include <functional>
 
-#include "OutPin.h"
 #include "Element.h"
+#include "InPin.h"
+#include "OutPin.h"
 
 void  InPin::WorkThread()
 {

src/Media/InPin.h

@@ -16,11 +16,15 @@
 
 #pragma once
 
-#include "Pin.h"
-#include "Thread.h"
-#include "WaitCondition.h"
+#include <memory>
+
 #include "Event.h"
 #include "EventArgs.h"
+#include "LockedQueue.h"
+#include "Thread.h"
+#include "Pin.h"
+#include "WaitCondition.h"
+
 
 
 //class OutPin;
@@ -147,4 +151,4 @@ class SubtitleInPin : public GenericInPin<SubtitlePinInfo>
 	}
 };
 
-typedef std::shared_ptr<SubtitleInPin> SubtitleInPinSPTR;
+typedef std::shared_ptr<SubtitleInPin> SubtitleInPinSPTR;

src/Media/LockedQueue.h

@@ -16,13 +16,14 @@
 
 #pragma once
 
-#include "Mutex.h"
-#include "Exception.h"
+#include <queue>
 
 #include <pthread.h>
-#include <queue>
 #include <unistd.h>
 
+#include "Mutex.h"
+#include "Exception.h"
+
 
 
 template <typename T>

src/Media/MediaPlayer.cpp

@@ -14,6 +14,8 @@
 *
 */
 
+#include <cstdio>
+
 #include "MediaPlayer.h"
 
 

src/Media/MediaPlayer.h

@@ -16,15 +16,15 @@
 
 #pragma once
 
-#include "MediaSourceElement.h"
+#include <memory>
+#include <string>
+
+#include "Compositor.h"
 #include "AlsaAudioSink.h"
 #include "AmlVideoSink.h"
 #include "AudioCodec.h"
+#include "MediaSourceElement.h"
 #include "SubtitleCodecElement.h"
-//#include "Egl.h"
-#include "Compositor.h"
-
-#include <string>
 
 
 

src/Media/MediaSourceElement.cpp

@@ -14,9 +14,12 @@
 *
 */
 
+#include <cstdio>
+
 #include "MediaSourceElement.h"
 
 
+
 void MediaSourceElement::outPin_BufferReturned(void* sender, const EventArgs& args)
 {
 	//printf("MediaSourceElement: outPin_BufferReturned entered.\n");

src/Media/MediaSourceElement.h

@@ -16,25 +16,20 @@
 
 #pragma once
 
-#include "Codec.h"
-#include "Element.h"
-#include "OutPin.h"
-#include "EventListener.h"
-
-
+#include <memory>
 #include <string>
-#include <map>
-
+#include <vector>
 
 extern "C"
 {
 #include <libavformat/avformat.h>
-#include <libavcodec/avcodec.h>
 #include <libavutil/error.h>
 }
 
-
-#include <memory>
+#include "Element.h"
+#include "OutPin.h"
+#include "EventListener.h"
+#include "Exception.h"