summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/app/actions.cpp6
-rw-r--r--src/app/captureFrame.cpp8
-rw-r--r--src/app/insertAspectRatioMenuItems.cpp1
-rw-r--r--src/app/mainWindow.cpp22
-rw-r--r--src/app/theStream.cpp3
-rw-r--r--src/app/videoSettings.cpp5
-rw-r--r--src/app/videoWindow.cpp11
-rw-r--r--src/app/xineConfig.cpp4
-rw-r--r--src/app/xineEngine.cpp15
-rw-r--r--src/app/xineEngine.h4
-rw-r--r--src/part/videoWindow.cpp8
-rw-r--r--src/part/videoWindow.h4
-rw-r--r--src/part/xineEngine.cpp6
13 files changed, 55 insertions, 42 deletions
diff --git a/src/app/actions.cpp b/src/app/actions.cpp
index 7447320..65e1f39 100644
--- a/src/app/actions.cpp
+++ b/src/app/actions.cpp
@@ -1,12 +1,14 @@
// Copyright 2005 Max Howell ([email protected])
// See COPYING file for licensing information
-#include "actions.h"
+#include <tqtoolbutton.h>
+
#include "../debug.h"
#include "../mxcl.library.h"
-#include <tqtoolbutton.h>
+#include "actions.h"
#include "xineEngine.h"
+
namespace Codeine
{
PlayAction::PlayAction( TQObject *receiver, const char *slot, TDEActionCollection *ac )
diff --git a/src/app/captureFrame.cpp b/src/app/captureFrame.cpp
index 1ef8a4f..827a292 100644
--- a/src/app/captureFrame.cpp
+++ b/src/app/captureFrame.cpp
@@ -1,14 +1,11 @@
// (C) 2005 Max Howell ([email protected])
// See COPYING file for licensing information
-#include "../debug.h"
#include <tdefiledialog.h>
#include <kpreviewwidgetbase.h>
#include <kpushbutton.h>
#include <kstatusbar.h>
#include <kstdguiitem.h>
-#include "mainWindow.h"
-#include "../mxcl.library.h"
#include <tqdialog.h>
#include <tqhbox.h>
#include <tqlabel.h>
@@ -16,9 +13,12 @@
#include <tqlayout.h>
#include <tqpainter.h>
#include <tqstringlist.h>
+
+#include "../debug.h"
+#include "../mxcl.library.h"
+#include "mainWindow.h"
#include "theStream.h"
#include "xineEngine.h"
-#include <xine.h>
namespace Codeine {
diff --git a/src/app/insertAspectRatioMenuItems.cpp b/src/app/insertAspectRatioMenuItems.cpp
index 81ad0b3..d2baafc 100644
--- a/src/app/insertAspectRatioMenuItems.cpp
+++ b/src/app/insertAspectRatioMenuItems.cpp
@@ -4,6 +4,7 @@
#include <tqpopupmenu.h>
#include <xine.h>
+
TQString i18n( const char *text );
diff --git a/src/app/mainWindow.cpp b/src/app/mainWindow.cpp
index b31806b..af41a4f 100644
--- a/src/app/mainWindow.cpp
+++ b/src/app/mainWindow.cpp
@@ -5,13 +5,7 @@
#include "config.h"
#endif
-#include "actions.h"
-#include "analyzer.h"
-#include "codeineConfig.h"
#include <cstdlib>
-#include "../debug.h"
-#include "extern.h" //dialog creation function definitions
-#include "fullScreenAction.h"
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <kcursor.h>
@@ -23,21 +17,29 @@
#include <tdetoolbar.h>
#include <kurldrag.h>
#include <twin.h>
-#include "mainWindow.h"
-#include "playDialog.h" //::play()
-#include "playlistFile.h"
-#include "../mxcl.library.h"
#include <tqcstring.h>
#include <tqdesktopwidget.h>
#include <tqevent.h> //::stateChanged()
#include <tqlayout.h> //ctor
#include <tqpopupmenu.h> //because XMLGUI is poorly designed
#include <tqobjectlist.h>
+
+#include "../debug.h"
+#include "../mxcl.library.h"
+#include "actions.h"
+#include "analyzer.h"
+#include "codeineConfig.h"
+#include "extern.h" //dialog creation function definitions
+#include "fullScreenAction.h"
+#include "mainWindow.h"
+#include "playDialog.h" //::play()
+#include "playlistFile.h"
#include "slider.h"
#include "theStream.h"
#include "volumeAction.h"
#include "xineEngine.h"
+
#ifndef NO_XTEST_EXTENSION
extern "C"
{
diff --git a/src/app/theStream.cpp b/src/app/theStream.cpp
index fbb35ac..3f7e35a 100644
--- a/src/app/theStream.cpp
+++ b/src/app/theStream.cpp
@@ -2,11 +2,12 @@
// See COPYING file for licensing information
#include <kurl.h>
+
#include "../mxcl.library.h"
#include "theStream.h"
-#include <xine.h>
#include "xineEngine.h"
+
namespace Codeine
{
#define e VideoWindow::s_instance
diff --git a/src/app/videoSettings.cpp b/src/app/videoSettings.cpp
index cf759c2..3a45c5a 100644
--- a/src/app/videoSettings.cpp
+++ b/src/app/videoSettings.cpp
@@ -2,14 +2,15 @@
// See COPYING file for licensing information
#include <twin.h>
-#include "../mxcl.library.h"
#include <tqlabel.h>
#include <tqlayout.h>
#include <tqslider.h>
+
+#include "../mxcl.library.h"
#include "videoSettings.h"
-#include <xine.h>
#include "xineEngine.h"
+
extern "C"
{
// #include <X11/Xlib.h> is just dangerous! Here, there is a macro for Below that conflicts
diff --git a/src/app/videoWindow.cpp b/src/app/videoWindow.cpp
index 2ecf65a..0f2d540 100644
--- a/src/app/videoWindow.cpp
+++ b/src/app/videoWindow.cpp
@@ -3,22 +3,23 @@
#define CODEINE_DEBUG_PREFIX "VideoWindow"
-#include "actions.h"
#include <cmath> //std::log10
#include <cstdlib>
-#include "../debug.h"
#include <tdeapplication.h> //::makeStandardCaption
#include <tdeconfig.h>
#include <kiconloader.h>
#include <tdepopupmenu.h>
#include <twin.h>
-#include "../mxcl.library.h"
#include <tqcursor.h>
#include <tqevent.h>
+#include <tqslider.h>
+#include <X11/Xlib.h>
+
+#include "../debug.h"
+#include "../mxcl.library.h"
+#include "actions.h"
#include "slider.h"
#include "theStream.h"
-#include <X11/Xlib.h>
-#include <xine.h>
#include "xineEngine.h"
diff --git a/src/app/xineConfig.cpp b/src/app/xineConfig.cpp
index 7be1c76..9ad6b56 100644
--- a/src/app/xineConfig.cpp
+++ b/src/app/xineConfig.cpp
@@ -1,7 +1,6 @@
// (C) 2005 Max Howell ([email protected])
// See COPYING file for licensing information
-#include "../debug.h"
#include <tdeapplication.h> // XineConfigDialog::ctor -> to get the iconloader
#include <kcombobox.h>
#include <kiconloader.h> // XineConfigDialog::ctor
@@ -17,8 +16,11 @@
#include <tqtooltip.h>
#include <tqvbox.h>
#include <xine.h>
+
+#include "../debug.h"
#include "xineConfig.h"
+
TQString i18n(const char *text);
diff --git a/src/app/xineEngine.cpp b/src/app/xineEngine.cpp
index d89d300..3409a20 100644
--- a/src/app/xineEngine.cpp
+++ b/src/app/xineEngine.cpp
@@ -3,23 +3,24 @@
#define CODEINE_DEBUG_PREFIX "engine"
-#include "actions.h" //::seek() FIXME unfortunate
#include <cmath> //the fade out
-#include "codeineConfig.h"
-#include "../debug.h"
#include <limits>
#include <tdelocale.h>
-#include "../mxcl.library.h"
#include <tqapplication.h> //::sendEvent()
#include <tqdatetime.h> //record()
#include <tqdir.h> //::exists()
+#include <unistd.h>
+#include <cstdlib>
+
+#include "../debug.h"
+#include "../mxcl.library.h"
+#include "actions.h" //::seek() FIXME unfortunate
+#include "codeineConfig.h"
#include "slider.h"
#include "theStream.h"
-#include <xine.h>
#include "xineEngine.h"
#include "xineScope.h"
-#include <unistd.h>
-#include <cstdlib>
+
#define XINE_SAFE_MODE 1
diff --git a/src/app/xineEngine.h b/src/app/xineEngine.h
index 57017ce..bc2d389 100644
--- a/src/app/xineEngine.h
+++ b/src/app/xineEngine.h
@@ -10,6 +10,8 @@
#include <kurl.h>
#include <stdint.h>
#include <vector>
+#include <xine.h>
+
typedef struct xine_s xine_t;
typedef struct xine_stream_s xine_stream_t;
@@ -83,9 +85,7 @@ namespace Codeine
void channelsChanged( const TQStringList& );
private:
- #ifdef HAVE_XINE_H
static void xineEventListener( void*, const xine_event_t* );
- #endif
uint posTimeLength( PosTimeLength ) const;
void showErrorMessage();
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"
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-19 18:07:59 +0000