From 8446b57d05d8d42c8aa1d9ccfb11a9370bac5b78 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
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 -
 5 files changed, 12 insertions(+), 21 deletions(-)

(limited to 'src/plugins/Output/alsa')

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 <string.h>
 #include <iostream>
 
+#include <qmmp/constants.h>
+#include <qmmp/buffer.h>
+#include <qmmp/visual.h>
 #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 <output.h>
+
 #include <QObject>
 extern "C" {
 #include <alsa/asoundlib.h>
 }
-#if defined( Q_OS_WIN32 )
-#include <dsound.h>
-#include "constants.h"
-#endif
+
+#include <qmmp/output.h>
 
 
 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 <QIODevice>
 #include <QWidget>
 
-#include <output.h>
-#include <outputfactory.h>
+#include <qmmp/output.h>
+#include <qmmp/outputfactory.h>
 
 
 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 <alsa/asoundlib.h> 
 }
-//#include <alsa/pcm_plugin.h>
 
 #include "ui_settingsdialog.h"
 
-- 
cgit v1.2.3-13-gbd6f