From eabddfe934ed3bd5ffc568a89a59b51d903ba6ef Mon Sep 17 00:00:00 2001 From: Omni Flux Date: Sun, 11 Dec 2016 18:28:50 -0700 Subject: [PATCH 1/3] Clean up include statements --- src/Media/AlsaAudioSink.h | 11 +++------- src/Media/AmlCodec.cpp | 12 +++++------ src/Media/AmlVideoSink.h | 7 ------- src/Media/AudioCodec.cpp | 1 - src/Media/AudioCodec.h | 7 +------ src/Media/Buffer.h | 8 +++---- src/Media/Codec.h | 13 ------------ src/Media/Element.cpp | 4 ++-- src/Media/Element.h | 4 +--- src/Media/Event.h | 3 ++- src/Media/EventListener.h | 4 +++- src/Media/Exception.h | 5 +++-- src/Media/Image.cpp | 9 ++++---- src/Media/Image.h | 1 - src/Media/InPin.cpp | 1 - src/Media/InPin.h | 10 +++++---- src/Media/LockedQueue.h | 7 ++++--- src/Media/MediaPlayer.h | 9 ++++---- src/Media/MediaSourceElement.h | 16 +++++--------- src/Media/OutPin.h | 7 ++++--- src/Media/Pin.h | 6 +++--- src/Media/SubtitleCodecElement.h | 12 +++++------ src/Media/Thread.h | 5 +++-- src/Media/Timer.h | 6 +++--- src/UI/AmlWindow.cpp | 8 ++++++- src/UI/AmlWindow.h | 10 +-------- src/UI/Compositor.cpp | 11 +++++----- src/UI/Compositor.h | 9 +++----- src/UI/Egl.cpp | 14 ++++++++----- src/UI/Egl.h | 5 ----- src/UI/Fbdev/FbdevAmlWindow.h | 9 +++++++- src/UI/GL.cpp | 12 ++++++----- src/UI/GL.h | 4 ++-- src/UI/InputDevice.cpp | 7 +++++++ src/UI/InputDevice.h | 13 +++--------- src/UI/Matrix4.cpp | 5 +++-- src/UI/Osd.h | 8 +------ src/UI/QuadBatch.h | 8 +++---- src/UI/Shader.h | 3 ++- src/main.cpp | 36 ++++++-------------------------- 40 files changed, 135 insertions(+), 195 deletions(-) diff --git a/src/Media/AlsaAudioSink.h b/src/Media/AlsaAudioSink.h index 00f11de..7217b0f 100755 --- a/src/Media/AlsaAudioSink.h +++ b/src/Media/AlsaAudioSink.h @@ -16,19 +16,14 @@ #pragma once -#include "Codec.h" -#include "Thread.h" -#include "LockedQueue.h" - #include - -#include - #include "Codec.h" #include "Element.h" -#include "InPin.h" #include "IClock.h" +#include "InPin.h" +#include "LockedQueue.h" +#include "Thread.h" diff --git a/src/Media/AmlCodec.cpp b/src/Media/AmlCodec.cpp index 5a80c00..64671a3 100755 --- a/src/Media/AmlCodec.cpp +++ b/src/Media/AmlCodec.cpp @@ -14,13 +14,13 @@ * */ -#include "AmlCodec.h" - -#include "Exception.h" +#include +#include #include -#include -#include + +#include "AmlCodec.h" +#include "Exception.h" @@ -856,4 +856,4 @@ int AmlCodec::WriteData(unsigned char* data, int length) // This is done unlocked because it blocks return write(handle, data, length); -} \ No newline at end of file +} diff --git a/src/Media/AmlVideoSink.h b/src/Media/AmlVideoSink.h index 859e15b..f20a366 100755 --- a/src/Media/AmlVideoSink.h +++ b/src/Media/AmlVideoSink.h @@ -16,18 +16,11 @@ #pragma once -#include -#include -#include -#include - - #include #include "Codec.h" #include "Element.h" #include "InPin.h" -#include "Thread.h" #include "Timer.h" #include "AmlCodec.h" diff --git a/src/Media/AudioCodec.cpp b/src/Media/AudioCodec.cpp index 235406e..8a0b44d 100755 --- a/src/Media/AudioCodec.cpp +++ b/src/Media/AudioCodec.cpp @@ -16,7 +16,6 @@ #include "AudioCodec.h" -#include void AudioCodecElement::SetupCodec() diff --git a/src/Media/AudioCodec.h b/src/Media/AudioCodec.h index d6abfca..36cbcf5 100755 --- a/src/Media/AudioCodec.h +++ b/src/Media/AudioCodec.h @@ -16,17 +16,12 @@ #pragma once -#include -#include -#include - -#include - #include "Codec.h" #include "Element.h" #include "InPin.h" + class AudioCodecElement : public Element { const int alsa_channels = 2; diff --git a/src/Media/Buffer.h b/src/Media/Buffer.h index 154a81d..27d938a 100755 --- a/src/Media/Buffer.h +++ b/src/Media/Buffer.h @@ -16,16 +16,16 @@ #pragma once -#include "Exception.h" -//#include "Codec.h" +#include +#include extern "C" { #include } -#include -#include +#include "Exception.h" + enum class BufferTypeEnum diff --git a/src/Media/Codec.h b/src/Media/Codec.h index 0c661cf..2e32113 100755 --- a/src/Media/Codec.h +++ b/src/Media/Codec.h @@ -16,21 +16,8 @@ #pragma once -//extern "C" -//{ -//#include -//#include -//} - -#include -#include #include -#include "Exception.h" -#include "Thread.h" -#include "LockedQueue.h" -#include "Buffer.h" - enum class MediaState diff --git a/src/Media/Element.cpp b/src/Media/Element.cpp index b6765e7..3901dbf 100755 --- a/src/Media/Element.cpp +++ b/src/Media/Element.cpp @@ -14,9 +14,9 @@ * */ -#include "Element.h" - +#include +#include "Element.h" diff --git a/src/Media/Element.h b/src/Media/Element.h index 39e8142..de873e2 100755 --- a/src/Media/Element.h +++ b/src/Media/Element.h @@ -16,16 +16,14 @@ #pragma once - #include -#include -#include "Codec.h" #include "InPin.h" #include "OutPin.h" #include "WaitCondition.h" + // Push model // // source.Execute() diff --git a/src/Media/Event.h b/src/Media/Event.h index 65c6d00..6a6baa4 100755 --- a/src/Media/Event.h +++ b/src/Media/Event.h @@ -16,11 +16,12 @@ #pragma once +#include + #include "Mutex.h" #include "Exception.h" #include "EventListener.h" -#include template // where T : EventArgs diff --git a/src/Media/EventListener.h b/src/Media/EventListener.h index bb2bdd3..d9f8f50 100755 --- a/src/Media/EventListener.h +++ b/src/Media/EventListener.h @@ -16,7 +16,9 @@ #pragma once -//#include "Event.h" +#include +#include + template diff --git a/src/Media/Exception.h b/src/Media/Exception.h index 3839184..d7f35d3 100755 --- a/src/Media/Exception.h +++ b/src/Media/Exception.h @@ -16,8 +16,9 @@ #pragma once -#include #include +#include + class Exception : std::exception @@ -104,4 +105,4 @@ class InvalidOperationException : Exception InvalidOperationException(const char* message) : Exception(message) {} -}; \ No newline at end of file +}; diff --git a/src/Media/Image.cpp b/src/Media/Image.cpp index 55ea696..89830f8 100755 --- a/src/Media/Image.cpp +++ b/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) diff --git a/src/Media/Image.h b/src/Media/Image.h index 376d9ff..a4e79ab 100755 --- a/src/Media/Image.h +++ b/src/Media/Image.h @@ -18,7 +18,6 @@ #include -#include "Exception.h" enum class ImageFormatEnum diff --git a/src/Media/InPin.cpp b/src/Media/InPin.cpp index ee6a5f4..e627e3a 100755 --- a/src/Media/InPin.cpp +++ b/src/Media/InPin.cpp @@ -15,7 +15,6 @@ */ #include "InPin.h" - #include "OutPin.h" #include "Element.h" diff --git a/src/Media/InPin.h b/src/Media/InPin.h index 9479de0..1a8d3c6 100755 --- a/src/Media/InPin.h +++ b/src/Media/InPin.h @@ -16,11 +16,13 @@ #pragma once -#include "Pin.h" -#include "Thread.h" -#include "WaitCondition.h" #include "Event.h" #include "EventArgs.h" +#include "LockedQueue.h" +#include "Thread.h" +#include "Pin.h" +#include "WaitCondition.h" + //class OutPin; @@ -147,4 +149,4 @@ class SubtitleInPin : public GenericInPin } }; -typedef std::shared_ptr SubtitleInPinSPTR; \ No newline at end of file +typedef std::shared_ptr SubtitleInPinSPTR; diff --git a/src/Media/LockedQueue.h b/src/Media/LockedQueue.h index 2c12245..6afcee8 100755 --- a/src/Media/LockedQueue.h +++ b/src/Media/LockedQueue.h @@ -16,13 +16,14 @@ #pragma once -#include "Mutex.h" -#include "Exception.h" +#include #include -#include #include +#include "Mutex.h" +#include "Exception.h" + template diff --git a/src/Media/MediaPlayer.h b/src/Media/MediaPlayer.h index feb2dd6..dbb9a53 100755 --- a/src/Media/MediaPlayer.h +++ b/src/Media/MediaPlayer.h @@ -16,15 +16,14 @@ #pragma once -#include "MediaSourceElement.h" +#include + +#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 diff --git a/src/Media/MediaSourceElement.h b/src/Media/MediaSourceElement.h index e383a82..513ae25 100755 --- a/src/Media/MediaSourceElement.h +++ b/src/Media/MediaSourceElement.h @@ -16,25 +16,19 @@ #pragma once -#include "Codec.h" -#include "Element.h" -#include "OutPin.h" -#include "EventListener.h" - - +#include #include -#include - extern "C" { #include -#include #include } - -#include +#include "Element.h" +#include "OutPin.h" +#include "EventListener.h" +#include "Exception.h" diff --git a/src/Media/OutPin.h b/src/Media/OutPin.h index 1e0ce30..68986a9 100755 --- a/src/Media/OutPin.h +++ b/src/Media/OutPin.h @@ -16,12 +16,13 @@ #pragma once - +#include "Event.h" +#include "EventArgs.h" +#include "LockedQueue.h" #include "Pin.h" #include "Thread.h" #include "WaitCondition.h" -#include "Event.h" -#include "EventArgs.h" + //class InPin; diff --git a/src/Media/Pin.h b/src/Media/Pin.h index 3e90df0..4859a47 100755 --- a/src/Media/Pin.h +++ b/src/Media/Pin.h @@ -16,13 +16,13 @@ #pragma once +#include +#include + #include "Codec.h" #include "Buffer.h" -#include - - enum class PinDirectionEnum { diff --git a/src/Media/SubtitleCodecElement.h b/src/Media/SubtitleCodecElement.h index 14e536e..73eb676 100755 --- a/src/Media/SubtitleCodecElement.h +++ b/src/Media/SubtitleCodecElement.h @@ -16,23 +16,21 @@ #pragma once +#include + extern "C" { #include #include } -#include - +#include "Compositor.h" #include "Element.h" +#include "IClock.h" +#include "Image.h" #include "InPin.h" #include "OutPin.h" -#include "Image.h" -//#include "Egl.h" -//#include "QuadBatch.h" -#include "Compositor.h" #include "Timer.h" -#include "IClock.h" diff --git a/src/Media/Thread.h b/src/Media/Thread.h index e180d4d..7815c63 100755 --- a/src/Media/Thread.h +++ b/src/Media/Thread.h @@ -16,9 +16,10 @@ #pragma once -#include -#include #include +#include + +#include diff --git a/src/Media/Timer.h b/src/Media/Timer.h index 0d3ae36..2b4b591 100755 --- a/src/Media/Timer.h +++ b/src/Media/Timer.h @@ -1,8 +1,8 @@ -#pragma once - +#pragma once + +#include #include #include -#include diff --git a/src/UI/AmlWindow.cpp b/src/UI/AmlWindow.cpp index 0139574..c859353 100755 --- a/src/UI/AmlWindow.cpp +++ b/src/UI/AmlWindow.cpp @@ -14,8 +14,14 @@ * */ -#include "AmlWindow.h" +#include +#include + +#include +#include +#include "AmlWindow.h" +#include "Exception.h" diff --git a/src/UI/AmlWindow.h b/src/UI/AmlWindow.h index 942ca3e..fb2f37f 100755 --- a/src/UI/AmlWindow.h +++ b/src/UI/AmlWindow.h @@ -16,12 +16,7 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include "Window.h" // from include/linux/amlogic/amports/amstream.h //#define _A_M 'S' @@ -31,9 +26,6 @@ //#include // aml_lib //} -#include "Exception.h" -#include "Window.h" - class AmlWindow : public WindowBase diff --git a/src/UI/Compositor.cpp b/src/UI/Compositor.cpp index 3b537b4..d674eb4 100755 --- a/src/UI/Compositor.cpp +++ b/src/UI/Compositor.cpp @@ -12,10 +12,11 @@ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * more details. * -*/ - -#include "Compositor.h" - +*/ + +#include + +#include "Compositor.h" @@ -229,4 +230,4 @@ void Compositor::Refresh() isDirty = true; mutex.Unlock(); -} \ No newline at end of file +} diff --git a/src/UI/Compositor.h b/src/UI/Compositor.h index 96abeb1..6561aef 100755 --- a/src/UI/Compositor.h +++ b/src/UI/Compositor.h @@ -20,15 +20,12 @@ #include #include -#include -#include -#include -#include "Egl.h" -#include "QuadBatch.h" +#include "Exception.h" +#include "Image.h" #include "Mutex.h" +#include "QuadBatch.h" #include "Thread.h" -#include "Image.h" diff --git a/src/UI/Egl.cpp b/src/UI/Egl.cpp index ab9a1aa..7222cd1 100755 --- a/src/UI/Egl.cpp +++ b/src/UI/Egl.cpp @@ -12,11 +12,15 @@ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * more details. * -*/ - -#include "Egl.h" - - +*/ + + +#include + +#include "Egl.h" +#include "Exception.h" + + void Egl::CheckError() { diff --git a/src/UI/Egl.h b/src/UI/Egl.h index 9028266..409eec5 100755 --- a/src/UI/Egl.h +++ b/src/UI/Egl.h @@ -16,13 +16,8 @@ #pragma once -#include -#include - #include -#include "Exception.h" - class Egl diff --git a/src/UI/Fbdev/FbdevAmlWindow.h b/src/UI/Fbdev/FbdevAmlWindow.h index 08c5ada..ebb5367 100755 --- a/src/UI/Fbdev/FbdevAmlWindow.h +++ b/src/UI/Fbdev/FbdevAmlWindow.h @@ -16,10 +16,17 @@ #pragma once +#include +#include + +#include +#include +#include #include //mmap -#include #include "AmlWindow.h" +#include "Exception.h" + #ifndef _FBDEV_WINDOW_H_ diff --git a/src/UI/GL.cpp b/src/UI/GL.cpp index 6426455..7dd1b73 100755 --- a/src/UI/GL.cpp +++ b/src/UI/GL.cpp @@ -12,11 +12,13 @@ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * more details. * -*/ - -#include "GL.h" - - +*/ + +#include + +#include "GL.h" + + std::string OpenGLException::GetErrorString(int errorCode) { diff --git a/src/UI/GL.h b/src/UI/GL.h index c846342..cc801bd 100755 --- a/src/UI/GL.h +++ b/src/UI/GL.h @@ -16,13 +16,13 @@ #pragma once -#include #include +#include #include -#include "Exception.h" #include "Egl.h" +#include "Exception.h" diff --git a/src/UI/InputDevice.cpp b/src/UI/InputDevice.cpp index 7bc6bc3..78b6425 100755 --- a/src/UI/InputDevice.cpp +++ b/src/UI/InputDevice.cpp @@ -14,6 +14,13 @@ * */ +#include +#include + +#include +#include + +#include "Exception.h" #include "InputDevice.h" diff --git a/src/UI/InputDevice.h b/src/UI/InputDevice.h index e31fca4..a993af4 100755 --- a/src/UI/InputDevice.h +++ b/src/UI/InputDevice.h @@ -16,18 +16,11 @@ #pragma once -#include "Exception.h" - -#include +#include #include #include -#include -#include -#include -#include -#include -#include -#include + +#include diff --git a/src/UI/Matrix4.cpp b/src/UI/Matrix4.cpp index 411f347..1e56b94 100755 --- a/src/UI/Matrix4.cpp +++ b/src/UI/Matrix4.cpp @@ -14,10 +14,11 @@ * */ -#include "Matrix4.h" +#include +#include "Matrix4.h" #include "Exception.h" -#include + const Matrix4 Matrix4::Identity = Matrix4( diff --git a/src/UI/Osd.h b/src/UI/Osd.h index 4cf8a50..16c6ab8 100755 --- a/src/UI/Osd.h +++ b/src/UI/Osd.h @@ -16,16 +16,10 @@ #pragma once - -#include -#include - -#include "Egl.h" -#include "QuadBatch.h" -#include "Texture2D.h" #include "Compositor.h" + class Osd { //EGLDisplay eglDisplay; diff --git a/src/UI/QuadBatch.h b/src/UI/QuadBatch.h index 03427ea..fa09b3a 100755 --- a/src/UI/QuadBatch.h +++ b/src/UI/QuadBatch.h @@ -16,21 +16,19 @@ #pragma once - -#include -#include #include +#include +#include -#include "GL.h" #include "Vector2.h" #include "Vector3.h" #include "Vector4.h" #include "Texture2D.h" #include "QuadBatchProgram.h" -#include "Matrix4.h" #include "Rectangle.h" + #pragma pack(push, 1) struct PositionColorTexture { diff --git a/src/UI/Shader.h b/src/UI/Shader.h index 2a93df8..05c6d78 100755 --- a/src/UI/Shader.h +++ b/src/UI/Shader.h @@ -16,9 +16,10 @@ #pragma once +#include + #include "GL.h" -#include enum class ShaderTypeEnum diff --git a/src/main.cpp b/src/main.cpp index ac589f8..f8cb9ec 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -14,29 +14,16 @@ * */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include -extern "C" -{ -#include -#include -} +#include +#include -#include "InputDevice.h" #include "MediaPlayer.h" +#include "InputDevice.h" +#include "Osd.h" +#include "Compositor.h" #ifdef X11 #include "X11Window.h" @@ -44,17 +31,6 @@ extern "C" #include "FbdevAmlWindow.h" #endif -#include -#include -#include -#include -#include - -#include -#include - -#include "Osd.h" -#include "Compositor.h" bool isRunning = true; From 5f7189b3b428186314e9e39b3cabbc12f25bb21f Mon Sep 17 00:00:00 2001 From: Omni Flux Date: Sun, 11 Dec 2016 18:45:25 -0700 Subject: [PATCH 2/3] Clean up include statements in X11 files --- src/UI/X11/X11Window.cpp | 5 +++-- src/UI/X11/X11Window.h | 14 +------------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/UI/X11/X11Window.cpp b/src/UI/X11/X11Window.cpp index 12d50ac..9183d51 100755 --- a/src/UI/X11/X11Window.cpp +++ b/src/UI/X11/X11Window.cpp @@ -14,10 +14,11 @@ * */ -#include "X11Window.h" - #include "Egl.h" +#include "Exception.h" #include "GL.h" +#include "X11Window.h" + //void X11AmlWindow::IntializeEgl() diff --git a/src/UI/X11/X11Window.h b/src/UI/X11/X11Window.h index c6578bf..3f5c44d 100755 --- a/src/UI/X11/X11Window.h +++ b/src/UI/X11/X11Window.h @@ -16,24 +16,12 @@ #pragma once -#include -#include -#include -#include -#include - -#include -#include - -#include -#include - #include -#include "Exception.h" #include "AmlWindow.h" + // from include/linux/amlogic/amports/amstream.h //#define _A_M 'S' //#define AMSTREAM_IOC_SET_VIDEO_AXIS _IOW((_A_M), 0x4c, int) From 4da31eeec908b1aca3a0350e87732558dbea3d97 Mon Sep 17 00:00:00 2001 From: Omni Flux Date: Sun, 11 Dec 2016 21:30:11 -0700 Subject: [PATCH 3/3] Add missing include statements --- src/Media/AlsaAudioSink.cpp | 3 +++ src/Media/AmlCodec.cpp | 3 +++ src/Media/AmlVideoSink.h | 1 + src/Media/AudioCodec.cpp | 3 +++ src/Media/Element.cpp | 3 +++ src/Media/Element.h | 4 ++++ src/Media/InPin.cpp | 5 ++++- src/Media/InPin.h | 2 ++ src/Media/MediaPlayer.cpp | 2 ++ src/Media/MediaPlayer.h | 1 + src/Media/MediaSourceElement.cpp | 3 +++ src/Media/MediaSourceElement.h | 1 + src/Media/OutPin.cpp | 6 ++++-- src/Media/SubtitleCodecElement.cpp | 5 +++++ src/Media/SubtitleCodecElement.h | 3 +++ src/Media/Timer.h | 6 +++--- src/UI/Egl.cpp | 2 +- src/UI/Fbdev/FbdevAmlWindow.h | 2 ++ src/UI/InputDevice.cpp | 2 ++ src/UI/Shader.cpp | 2 ++ src/UI/X11/X11Window.cpp | 2 ++ src/main.cpp | 7 +++++++ 22 files changed, 61 insertions(+), 7 deletions(-) diff --git a/src/Media/AlsaAudioSink.cpp b/src/Media/AlsaAudioSink.cpp index 040fca6..28d2fa8 100755 --- a/src/Media/AlsaAudioSink.cpp +++ b/src/Media/AlsaAudioSink.cpp @@ -14,6 +14,9 @@ * */ +#include +#include + #include "AlsaAudioSink.h" diff --git a/src/Media/AmlCodec.cpp b/src/Media/AmlCodec.cpp index 64671a3..011cd02 100755 --- a/src/Media/AmlCodec.cpp +++ b/src/Media/AmlCodec.cpp @@ -14,6 +14,9 @@ * */ +#include +#include + #include #include diff --git a/src/Media/AmlVideoSink.h b/src/Media/AmlVideoSink.h index f20a366..0842352 100755 --- a/src/Media/AmlVideoSink.h +++ b/src/Media/AmlVideoSink.h @@ -16,6 +16,7 @@ #pragma once +#include #include #include "Codec.h" diff --git a/src/Media/AudioCodec.cpp b/src/Media/AudioCodec.cpp index 8a0b44d..61a3d0c 100755 --- a/src/Media/AudioCodec.cpp +++ b/src/Media/AudioCodec.cpp @@ -14,6 +14,9 @@ * */ +#include +#include + #include "AudioCodec.h" diff --git a/src/Media/Element.cpp b/src/Media/Element.cpp index 3901dbf..67789bb 100755 --- a/src/Media/Element.cpp +++ b/src/Media/Element.cpp @@ -14,6 +14,9 @@ * */ +#include +#include + #include #include "Element.h" diff --git a/src/Media/Element.h b/src/Media/Element.h index de873e2..9057484 100755 --- a/src/Media/Element.h +++ b/src/Media/Element.h @@ -16,6 +16,10 @@ #pragma once +#include +#include +#include + #include #include "InPin.h" diff --git a/src/Media/InPin.cpp b/src/Media/InPin.cpp index e627e3a..5793eca 100755 --- a/src/Media/InPin.cpp +++ b/src/Media/InPin.cpp @@ -14,9 +14,12 @@ * */ +#include +#include + +#include "Element.h" #include "InPin.h" #include "OutPin.h" -#include "Element.h" void InPin::WorkThread() { diff --git a/src/Media/InPin.h b/src/Media/InPin.h index 1a8d3c6..64e8c90 100755 --- a/src/Media/InPin.h +++ b/src/Media/InPin.h @@ -16,6 +16,8 @@ #pragma once +#include + #include "Event.h" #include "EventArgs.h" #include "LockedQueue.h" diff --git a/src/Media/MediaPlayer.cpp b/src/Media/MediaPlayer.cpp index 9f5b271..fd81c37 100755 --- a/src/Media/MediaPlayer.cpp +++ b/src/Media/MediaPlayer.cpp @@ -14,6 +14,8 @@ * */ +#include + #include "MediaPlayer.h" diff --git a/src/Media/MediaPlayer.h b/src/Media/MediaPlayer.h index dbb9a53..b908174 100755 --- a/src/Media/MediaPlayer.h +++ b/src/Media/MediaPlayer.h @@ -16,6 +16,7 @@ #pragma once +#include #include #include "Compositor.h" diff --git a/src/Media/MediaSourceElement.cpp b/src/Media/MediaSourceElement.cpp index d72be81..a6d5665 100755 --- a/src/Media/MediaSourceElement.cpp +++ b/src/Media/MediaSourceElement.cpp @@ -14,9 +14,12 @@ * */ +#include + #include "MediaSourceElement.h" + void MediaSourceElement::outPin_BufferReturned(void* sender, const EventArgs& args) { //printf("MediaSourceElement: outPin_BufferReturned entered.\n"); diff --git a/src/Media/MediaSourceElement.h b/src/Media/MediaSourceElement.h index 513ae25..bf39b52 100755 --- a/src/Media/MediaSourceElement.h +++ b/src/Media/MediaSourceElement.h @@ -18,6 +18,7 @@ #include #include +#include extern "C" { diff --git a/src/Media/OutPin.cpp b/src/Media/OutPin.cpp index e980e3e..e7c8990 100755 --- a/src/Media/OutPin.cpp +++ b/src/Media/OutPin.cpp @@ -14,10 +14,12 @@ * */ -#include "OutPin.h" +#include +#include -#include "InPin.h" #include "Element.h" +#include "InPin.h" +#include "OutPin.h" void OutPin::WorkThread() diff --git a/src/Media/SubtitleCodecElement.cpp b/src/Media/SubtitleCodecElement.cpp index 33338d6..beb075f 100755 --- a/src/Media/SubtitleCodecElement.cpp +++ b/src/Media/SubtitleCodecElement.cpp @@ -14,9 +14,14 @@ * */ +#include +#include +#include + #include "SubtitleCodecElement.h" + void SubtitleDecoderElement::static_msg_callback(int level, const char* fmt, va_list va, void *data) { //SubtitleDecoderElement* this_ = (SubtitleDecoderElement*)data; diff --git a/src/Media/SubtitleCodecElement.h b/src/Media/SubtitleCodecElement.h index 73eb676..171d4e3 100755 --- a/src/Media/SubtitleCodecElement.h +++ b/src/Media/SubtitleCodecElement.h @@ -16,6 +16,9 @@ #pragma once +#include +#include + #include extern "C" diff --git a/src/Media/Timer.h b/src/Media/Timer.h index 2b4b591..ac3472b 100755 --- a/src/Media/Timer.h +++ b/src/Media/Timer.h @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include diff --git a/src/UI/Egl.cpp b/src/UI/Egl.cpp index 7222cd1..4c3be71 100755 --- a/src/UI/Egl.cpp +++ b/src/UI/Egl.cpp @@ -14,7 +14,7 @@ * */ - +#include #include #include "Egl.h" diff --git a/src/UI/Fbdev/FbdevAmlWindow.h b/src/UI/Fbdev/FbdevAmlWindow.h index ebb5367..6534eb2 100755 --- a/src/UI/Fbdev/FbdevAmlWindow.h +++ b/src/UI/Fbdev/FbdevAmlWindow.h @@ -16,6 +16,8 @@ #pragma once +#include + #include #include diff --git a/src/UI/InputDevice.cpp b/src/UI/InputDevice.cpp index 78b6425..4b0decf 100755 --- a/src/UI/InputDevice.cpp +++ b/src/UI/InputDevice.cpp @@ -14,6 +14,8 @@ * */ +#include + #include #include diff --git a/src/UI/Shader.cpp b/src/UI/Shader.cpp index ac81418..4de802e 100755 --- a/src/UI/Shader.cpp +++ b/src/UI/Shader.cpp @@ -14,6 +14,8 @@ * */ +#include + #include "Shader.h" diff --git a/src/UI/X11/X11Window.cpp b/src/UI/X11/X11Window.cpp index 9183d51..2b2a793 100755 --- a/src/UI/X11/X11Window.cpp +++ b/src/UI/X11/X11Window.cpp @@ -14,6 +14,8 @@ * */ +#include + #include "Egl.h" #include "Exception.h" #include "GL.h" diff --git a/src/main.cpp b/src/main.cpp index f8cb9ec..df1f732 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -14,8 +14,15 @@ * */ +#include +#include +#include +#include +#include + #include #include +#include #include #include