From 8446b57d05d8d42c8aa1d9ccfb11a9370bac5b78 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Fri, 8 Feb 2008 13:18:29 +0000 Subject: include path changes git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@234 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Output/alsa/alsa.pro | 8 +------- src/plugins/Output/alsa/outputalsa.cpp | 8 ++++---- src/plugins/Output/alsa/outputalsa.h | 10 ++++------ src/plugins/Output/alsa/outputalsafactory.h | 6 +++--- src/plugins/Output/alsa/settingsdialog.h | 1 - src/plugins/Output/jack/jack.pro | 2 +- src/plugins/Output/jack/outputjack.cpp | 6 +++--- src/plugins/Output/jack/outputjack.h | 2 +- src/plugins/Output/jack/outputjackfactory.h | 4 ++-- src/plugins/Output/oss/oss.pro | 8 ++++---- src/plugins/Output/oss/outputoss.cpp | 6 +++--- src/plugins/Output/oss/outputoss.h | 2 +- src/plugins/Output/oss/outputossfactory.h | 4 ++-- 13 files changed, 29 insertions(+), 38 deletions(-) (limited to 'src/plugins/Output') diff --git a/src/plugins/Output/alsa/alsa.pro b/src/plugins/Output/alsa/alsa.pro index 465fabe4a..853621e18 100644 --- a/src/plugins/Output/alsa/alsa.pro +++ b/src/plugins/Output/alsa/alsa.pro @@ -1,8 +1,3 @@ -# ???? ?????? ? KDevelop ?????????? qmake. -# ------------------------------------------- -# ?????????? ???????????? ???????? ???????? ???????: ./Plugins/Output/alsa -# ???? - ??????????: - include(../../plugins.pri) HEADERS += outputalsa.h \ @@ -14,9 +9,8 @@ SOURCES += outputalsa.cpp \ TARGET=$$PLUGINS_PREFIX/Output/alsa QMAKE_CLEAN =$$PLUGINS_PREFIX/Output/libalsa.so - -INCLUDEPATH += ../../../qmmp +INCLUDEPATH += ../../../ QMAKE_LIBDIR += ../../../../lib CONFIG += release \ diff --git a/src/plugins/Output/alsa/outputalsa.cpp b/src/plugins/Output/alsa/outputalsa.cpp index 66c031bbb..1ad2a2ace 100644 --- a/src/plugins/Output/alsa/outputalsa.cpp +++ b/src/plugins/Output/alsa/outputalsa.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006 by Ilya Kotov * + * Copyright (C) 2006-2008 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -29,10 +29,10 @@ #include #include +#include +#include +#include #include "outputalsa.h" -#include "constants.h" -#include "buffer.h" -#include "visual.h" OutputALSA::OutputALSA(QObject * parent, bool useVolume) : Output(parent), m_inited(FALSE), m_pause(FALSE), m_play(FALSE), diff --git a/src/plugins/Output/alsa/outputalsa.h b/src/plugins/Output/alsa/outputalsa.h index f3dd222fe..11b70c356 100644 --- a/src/plugins/Output/alsa/outputalsa.h +++ b/src/plugins/Output/alsa/outputalsa.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006 by Ilya Kotov * + * Copyright (C) 2006-2008 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -23,15 +23,13 @@ class OutputALSA; -#include + #include extern "C" { #include } -#if defined( Q_OS_WIN32 ) -#include -#include "constants.h" -#endif + +#include class OutputALSA : public Output diff --git a/src/plugins/Output/alsa/outputalsafactory.h b/src/plugins/Output/alsa/outputalsafactory.h index afaa18358..4375f4916 100644 --- a/src/plugins/Output/alsa/outputalsafactory.h +++ b/src/plugins/Output/alsa/outputalsafactory.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007 by Ilya Kotov * + * Copyright (C) 2007-2008 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include class OutputALSAFactory : public QObject, diff --git a/src/plugins/Output/alsa/settingsdialog.h b/src/plugins/Output/alsa/settingsdialog.h index 467b25a03..b6410747e 100644 --- a/src/plugins/Output/alsa/settingsdialog.h +++ b/src/plugins/Output/alsa/settingsdialog.h @@ -25,7 +25,6 @@ extern "C"{ #include } -//#include #include "ui_settingsdialog.h" diff --git a/src/plugins/Output/jack/jack.pro b/src/plugins/Output/jack/jack.pro index a943a5b3b..d66bd6db6 100644 --- a/src/plugins/Output/jack/jack.pro +++ b/src/plugins/Output/jack/jack.pro @@ -12,7 +12,7 @@ TARGET=$$PLUGINS_PREFIX/Output/jack QMAKE_CLEAN =$$PLUGINS_PREFIX/Output/libjack.so -INCLUDEPATH += ../../../qmmp +INCLUDEPATH += ../../../ QMAKE_LIBDIR += ../../../../lib CONFIG += release \ warn_on \ diff --git a/src/plugins/Output/jack/outputjack.cpp b/src/plugins/Output/jack/outputjack.cpp index c8d3ebe86..2f8753af6 100644 --- a/src/plugins/Output/jack/outputjack.cpp +++ b/src/plugins/Output/jack/outputjack.cpp @@ -5,9 +5,9 @@ #include #include "outputjack.h" -#include "constants.h" -#include "buffer.h" -#include "visual.h" +#include +#include +#include #include #include diff --git a/src/plugins/Output/jack/outputjack.h b/src/plugins/Output/jack/outputjack.h index e01ced315..825c41f66 100644 --- a/src/plugins/Output/jack/outputjack.h +++ b/src/plugins/Output/jack/outputjack.h @@ -3,7 +3,7 @@ class OutputJACK; -#include +#include #include extern "C" { diff --git a/src/plugins/Output/jack/outputjackfactory.h b/src/plugins/Output/jack/outputjackfactory.h index cc27990f1..f3bb10476 100644 --- a/src/plugins/Output/jack/outputjackfactory.h +++ b/src/plugins/Output/jack/outputjackfactory.h @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include class OutputJACKFactory : public QObject, diff --git a/src/plugins/Output/oss/oss.pro b/src/plugins/Output/oss/oss.pro index e401f14b0..d273d730e 100644 --- a/src/plugins/Output/oss/oss.pro +++ b/src/plugins/Output/oss/oss.pro @@ -3,8 +3,8 @@ FORMS += settingsdialog.ui HEADERS += outputossfactory.h \ outputoss.h \ - settingsdialog.h - + settingsdialog.h + SOURCES += outputossfactory.cpp \ outputoss.cpp \ @@ -14,12 +14,12 @@ TARGET=$$PLUGINS_PREFIX/Output/oss QMAKE_CLEAN =$$PLUGINS_PREFIX/Output/liboss.so -INCLUDEPATH += ../../../qmmp +INCLUDEPATH += ../../../ QMAKE_LIBDIR += ../../../../lib CONFIG += release \ warn_on \ thread \ -plugin +plugin TEMPLATE = lib LIBS += -lqmmp diff --git a/src/plugins/Output/oss/outputoss.cpp b/src/plugins/Output/oss/outputoss.cpp index 9c52ac777..bf702705b 100644 --- a/src/plugins/Output/oss/outputoss.cpp +++ b/src/plugins/Output/oss/outputoss.cpp @@ -22,9 +22,9 @@ #include #include "outputoss.h" -#include "constants.h" -#include "buffer.h" -#include "visual.h" +#include +#include +#include #include #include diff --git a/src/plugins/Output/oss/outputoss.h b/src/plugins/Output/oss/outputoss.h index a2f260057..90a443ea6 100644 --- a/src/plugins/Output/oss/outputoss.h +++ b/src/plugins/Output/oss/outputoss.h @@ -25,7 +25,7 @@ class OutputOSS; -#include +#include #include class OutputOSS : public Output diff --git a/src/plugins/Output/oss/outputossfactory.h b/src/plugins/Output/oss/outputossfactory.h index 03166bb94..9ef168282 100644 --- a/src/plugins/Output/oss/outputossfactory.h +++ b/src/plugins/Output/oss/outputossfactory.h @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include class OutputOSSFactory : public QObject, -- cgit v1.2.3-13-gbd6f