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>
pull/1/head
Slávek Banko 4 years ago
parent 7090ff34ea
commit 4ca91724d7
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -1,12 +1,14 @@
// Copyright 2005 Max Howell (max.howell@methylblue.com) // Copyright 2005 Max Howell (max.howell@methylblue.com)
// See COPYING file for licensing information // See COPYING file for licensing information
#include "actions.h" #include <tqtoolbutton.h>
#include "../debug.h" #include "../debug.h"
#include "../mxcl.library.h" #include "../mxcl.library.h"
#include <tqtoolbutton.h> #include "actions.h"
#include "xineEngine.h" #include "xineEngine.h"
namespace Codeine namespace Codeine
{ {
PlayAction::PlayAction( TQObject *receiver, const char *slot, TDEActionCollection *ac ) PlayAction::PlayAction( TQObject *receiver, const char *slot, TDEActionCollection *ac )

@ -1,14 +1,11 @@
// (C) 2005 Max Howell (max.howell@methylblue.com) // (C) 2005 Max Howell (max.howell@methylblue.com)
// See COPYING file for licensing information // See COPYING file for licensing information
#include "../debug.h"
#include <tdefiledialog.h> #include <tdefiledialog.h>
#include <kpreviewwidgetbase.h> #include <kpreviewwidgetbase.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <kstatusbar.h> #include <kstatusbar.h>
#include <kstdguiitem.h> #include <kstdguiitem.h>
#include "mainWindow.h"
#include "../mxcl.library.h"
#include <tqdialog.h> #include <tqdialog.h>
#include <tqhbox.h> #include <tqhbox.h>
#include <tqlabel.h> #include <tqlabel.h>
@ -16,9 +13,12 @@
#include <tqlayout.h> #include <tqlayout.h>
#include <tqpainter.h> #include <tqpainter.h>
#include <tqstringlist.h> #include <tqstringlist.h>
#include "../debug.h"
#include "../mxcl.library.h"
#include "mainWindow.h"
#include "theStream.h" #include "theStream.h"
#include "xineEngine.h" #include "xineEngine.h"
#include <xine.h>
namespace Codeine { namespace Codeine {

@ -4,6 +4,7 @@
#include <tqpopupmenu.h> #include <tqpopupmenu.h>
#include <xine.h> #include <xine.h>
TQString i18n( const char *text ); TQString i18n( const char *text );

@ -5,13 +5,7 @@
#include "config.h" #include "config.h"
#endif #endif
#include "actions.h"
#include "analyzer.h"
#include "codeineConfig.h"
#include <cstdlib> #include <cstdlib>
#include "../debug.h"
#include "extern.h" //dialog creation function definitions
#include "fullScreenAction.h"
#include <tdeapplication.h> #include <tdeapplication.h>
#include <tdecmdlineargs.h> #include <tdecmdlineargs.h>
#include <kcursor.h> #include <kcursor.h>
@ -23,21 +17,29 @@
#include <tdetoolbar.h> #include <tdetoolbar.h>
#include <kurldrag.h> #include <kurldrag.h>
#include <twin.h> #include <twin.h>
#include "mainWindow.h"
#include "playDialog.h" //::play()
#include "playlistFile.h"
#include "../mxcl.library.h"
#include <tqcstring.h> #include <tqcstring.h>
#include <tqdesktopwidget.h> #include <tqdesktopwidget.h>
#include <tqevent.h> //::stateChanged() #include <tqevent.h> //::stateChanged()
#include <tqlayout.h> //ctor #include <tqlayout.h> //ctor
#include <tqpopupmenu.h> //because XMLGUI is poorly designed #include <tqpopupmenu.h> //because XMLGUI is poorly designed
#include <tqobjectlist.h> #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 "slider.h"
#include "theStream.h" #include "theStream.h"
#include "volumeAction.h" #include "volumeAction.h"
#include "xineEngine.h" #include "xineEngine.h"
#ifndef NO_XTEST_EXTENSION #ifndef NO_XTEST_EXTENSION
extern "C" extern "C"
{ {

@ -2,11 +2,12 @@
// See COPYING file for licensing information // See COPYING file for licensing information
#include <kurl.h> #include <kurl.h>
#include "../mxcl.library.h" #include "../mxcl.library.h"
#include "theStream.h" #include "theStream.h"
#include <xine.h>
#include "xineEngine.h" #include "xineEngine.h"
namespace Codeine namespace Codeine
{ {
#define e VideoWindow::s_instance #define e VideoWindow::s_instance

@ -2,14 +2,15 @@
// See COPYING file for licensing information // See COPYING file for licensing information
#include <twin.h> #include <twin.h>
#include "../mxcl.library.h"
#include <tqlabel.h> #include <tqlabel.h>
#include <tqlayout.h> #include <tqlayout.h>
#include <tqslider.h> #include <tqslider.h>
#include "../mxcl.library.h"
#include "videoSettings.h" #include "videoSettings.h"
#include <xine.h>
#include "xineEngine.h" #include "xineEngine.h"
extern "C" extern "C"
{ {
// #include <X11/Xlib.h> is just dangerous! Here, there is a macro for Below that conflicts // #include <X11/Xlib.h> is just dangerous! Here, there is a macro for Below that conflicts

@ -3,22 +3,23 @@
#define CODEINE_DEBUG_PREFIX "VideoWindow" #define CODEINE_DEBUG_PREFIX "VideoWindow"
#include "actions.h"
#include <cmath> //std::log10 #include <cmath> //std::log10
#include <cstdlib> #include <cstdlib>
#include "../debug.h"
#include <tdeapplication.h> //::makeStandardCaption #include <tdeapplication.h> //::makeStandardCaption
#include <tdeconfig.h> #include <tdeconfig.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <tdepopupmenu.h> #include <tdepopupmenu.h>
#include <twin.h> #include <twin.h>
#include "../mxcl.library.h"
#include <tqcursor.h> #include <tqcursor.h>
#include <tqevent.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 "slider.h"
#include "theStream.h" #include "theStream.h"
#include <X11/Xlib.h>
#include <xine.h>
#include "xineEngine.h" #include "xineEngine.h"

@ -1,7 +1,6 @@
// (C) 2005 Max Howell (max.howell@methylblue.com) // (C) 2005 Max Howell (max.howell@methylblue.com)
// See COPYING file for licensing information // See COPYING file for licensing information
#include "../debug.h"
#include <tdeapplication.h> // XineConfigDialog::ctor -> to get the iconloader #include <tdeapplication.h> // XineConfigDialog::ctor -> to get the iconloader
#include <kcombobox.h> #include <kcombobox.h>
#include <kiconloader.h> // XineConfigDialog::ctor #include <kiconloader.h> // XineConfigDialog::ctor
@ -17,8 +16,11 @@
#include <tqtooltip.h> #include <tqtooltip.h>
#include <tqvbox.h> #include <tqvbox.h>
#include <xine.h> #include <xine.h>
#include "../debug.h"
#include "xineConfig.h" #include "xineConfig.h"
TQString i18n(const char *text); TQString i18n(const char *text);

@ -3,23 +3,24 @@
#define CODEINE_DEBUG_PREFIX "engine" #define CODEINE_DEBUG_PREFIX "engine"
#include "actions.h" //::seek() FIXME unfortunate
#include <cmath> //the fade out #include <cmath> //the fade out
#include "codeineConfig.h"
#include "../debug.h"
#include <limits> #include <limits>
#include <tdelocale.h> #include <tdelocale.h>
#include "../mxcl.library.h"
#include <tqapplication.h> //::sendEvent() #include <tqapplication.h> //::sendEvent()
#include <tqdatetime.h> //record() #include <tqdatetime.h> //record()
#include <tqdir.h> //::exists() #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 "slider.h"
#include "theStream.h" #include "theStream.h"
#include <xine.h>
#include "xineEngine.h" #include "xineEngine.h"
#include "xineScope.h" #include "xineScope.h"
#include <unistd.h>
#include <cstdlib>
#define XINE_SAFE_MODE 1 #define XINE_SAFE_MODE 1

@ -10,6 +10,8 @@
#include <kurl.h> #include <kurl.h>
#include <stdint.h> #include <stdint.h>
#include <vector> #include <vector>
#include <xine.h>
typedef struct xine_s xine_t; typedef struct xine_s xine_t;
typedef struct xine_stream_s xine_stream_t; typedef struct xine_stream_s xine_stream_t;
@ -83,9 +85,7 @@ namespace Codeine
void channelsChanged( const TQStringList& ); void channelsChanged( const TQStringList& );
private: private:
#ifdef HAVE_XINE_H
static void xineEventListener( void*, const xine_event_t* ); static void xineEventListener( void*, const xine_event_t* );
#endif
uint posTimeLength( PosTimeLength ) const; uint posTimeLength( PosTimeLength ) const;
void showErrorMessage(); void showErrorMessage();

@ -3,14 +3,16 @@
#define CODEINE_DEBUG_PREFIX "videoWindow" #define CODEINE_DEBUG_PREFIX "videoWindow"
#include <cstdlib> #include <cstdlib>
#include "../debug.h"
#include <tqapplication.h> //sendEvent() #include <tqapplication.h> //sendEvent()
#include <tqvariant.h>
#include <tqcursor.h> #include <tqcursor.h>
#include <tqevent.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 <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 { namespace Codeine {

@ -8,6 +8,8 @@
#include <tqtimer.h> #include <tqtimer.h>
#include <tqwidget.h> #include <tqwidget.h>
#include <kurl.h> #include <kurl.h>
#include <xine.h>
typedef struct xine_s xine_t; typedef struct xine_s xine_t;
typedef struct xine_stream_s xine_stream_t; typedef struct xine_stream_s xine_stream_t;
@ -46,9 +48,7 @@ namespace Codeine
private: private:
/// @see xineEngine.cpp /// @see xineEngine.cpp
#ifdef HAVE_XINE_H
static void xineEventListener( void*, const xine_event_t* ); static void xineEventListener( void*, const xine_event_t* );
#endif
void showErrorMessage(); //TODO don't use this, just show delayed message void showErrorMessage(); //TODO don't use this, just show delayed message

@ -3,14 +3,14 @@
#define CODEINE_DEBUG_PREFIX "engine" #define CODEINE_DEBUG_PREFIX "engine"
#include "../debug.h"
#include <tdeglobalsettings.h> #include <tdeglobalsettings.h>
#include <tdelocale.h> #include <tdelocale.h>
#include "../mxcl.library.h"
#include <tqapplication.h> //::sendEvent() #include <tqapplication.h> //::sendEvent()
#include <tqdatetime.h> //::play() #include <tqdatetime.h> //::play()
#include <tqdir.h> //TQDir::homeDir() #include <tqdir.h> //TQDir::homeDir()
#include <xine.h>
#include "../debug.h"
#include "../mxcl.library.h"
#include "videoWindow.h" #include "videoWindow.h"

Loading…
Cancel
Save