summaryrefslogtreecommitdiffstats
path: root/src/part
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2020-06-29 19:14:27 +0200
committerSlávek Banko <slavek.banko@axis.cz>2020-06-29 19:14:27 +0200
commit4ca91724d7700edb009a3037c7020aa033ce14d7 (patch)
tree7bda9d552603888a4805b5c3fec4bdde10947ae7 /src/part
parent7090ff34ea4f78bb5ae8a2b644ed44893996cce6 (diff)
downloadcodeine-4ca91724d7700edb009a3037c7020aa033ce14d7.tar.gz
codeine-4ca91724d7700edb009a3037c7020aa033ce14d7.zip
Drop the use of the HAVE_XINE_H definition.
Add include <xine.h> to the appropriate headers. Clean up the arrangement of include files. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'src/part')
-rw-r--r--src/part/videoWindow.cpp8
-rw-r--r--src/part/videoWindow.h4
-rw-r--r--src/part/xineEngine.cpp6
3 files changed, 10 insertions, 8 deletions
diff --git a/src/part/videoWindow.cpp b/src/part/videoWindow.cpp
index 79d09ae..eb1c859 100644
--- a/src/part/videoWindow.cpp
+++ b/src/part/videoWindow.cpp
@@ -3,14 +3,16 @@
#define CODEINE_DEBUG_PREFIX "videoWindow"
+
#include <cstdlib>
-#include "../debug.h"
#include <tqapplication.h> //sendEvent()
+#include <tqvariant.h>
#include <tqcursor.h>
#include <tqevent.h>
-#include "videoWindow.h"
#include <X11/Xlib.h> //TODO this breaks compile for lots of people due to excessive macro content
-#include <xine.h> //x11_visual_t
+
+#include "../debug.h"
+#include "videoWindow.h"
namespace Codeine {
diff --git a/src/part/videoWindow.h b/src/part/videoWindow.h
index 76d2b6c..f7e5782 100644
--- a/src/part/videoWindow.h
+++ b/src/part/videoWindow.h
@@ -8,6 +8,8 @@
#include <tqtimer.h>
#include <tqwidget.h>
#include <kurl.h>
+#include <xine.h>
+
typedef struct xine_s xine_t;
typedef struct xine_stream_s xine_stream_t;
@@ -46,9 +48,7 @@ namespace Codeine
private:
/// @see xineEngine.cpp
- #ifdef HAVE_XINE_H
static void xineEventListener( void*, const xine_event_t* );
- #endif
void showErrorMessage(); //TODO don't use this, just show delayed message
diff --git a/src/part/xineEngine.cpp b/src/part/xineEngine.cpp
index ac04c4a..96108a7 100644
--- a/src/part/xineEngine.cpp
+++ b/src/part/xineEngine.cpp
@@ -3,14 +3,14 @@
#define CODEINE_DEBUG_PREFIX "engine"
-#include "../debug.h"
#include <tdeglobalsettings.h>
#include <tdelocale.h>
-#include "../mxcl.library.h"
#include <tqapplication.h> //::sendEvent()
#include <tqdatetime.h> //::play()
#include <tqdir.h> //TQDir::homeDir()
-#include <xine.h>
+
+#include "../debug.h"
+#include "../mxcl.library.h"
#include "videoWindow.h"