include path changes

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@234 90c681e8-e032-0410-971d-27865f9a5e38

26 files changed, 89 insertions, 357 deletions

diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
index 095f818e7..274e05160 100644
--- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
+++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
@@ -21,10 +21,10 @@
 #include <QObject>
 #include <QFile>
 
-#include "constants.h"
-#include "buffer.h"
-#include "output.h"
-#include "recycler.h"
+#include <qmmp/constants.h>
+#include <qmmp/buffer.h>
+#include <qmmp/output.h>
+#include <qmmp/recycler.h>
 
 #include "decoder_ffmpeg.h"
 
diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.h b/src/plugins/Input/ffmpeg/decoder_ffmpeg.h
index 956e5f32b..cdcf224b3 100644
--- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.h
+++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.h
@@ -25,7 +25,7 @@ extern "C"{
 #include <ffmpeg/avformat.h>
 #include <ffmpeg/avcodec.h>
 }
-#include "decoder.h"
+#include <qmmp/decoder.h>
 
 class DecoderFFmpeg : public Decoder
 {
diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.h b/src/plugins/Input/ffmpeg/decoderffmpegfactory.h
index 16b6de1dd..6f24fed94 100644
--- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.h
+++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.h
@@ -25,10 +25,10 @@
 #include <QIODevice>
 #include <QWidget>
 
-#include <decoder.h>
-#include <output.h>
-#include <decoderfactory.h>
-#include <filetag.h>
+#include <qmmp/decoder.h>
+#include <qmmp/output.h>
+#include <qmmp/decoderfactory.h>
+#include <qmmp/filetag.h>
 
 
 
diff --git a/src/plugins/Input/ffmpeg/ffmpeg.pro b/src/plugins/Input/ffmpeg/ffmpeg.pro
index 7de7c7d5b..d2e7c2aa6 100644
--- a/src/plugins/Input/ffmpeg/ffmpeg.pro
+++ b/src/plugins/Input/ffmpeg/ffmpeg.pro
@@ -6,16 +6,16 @@ HEADERS += decoderffmpegfactory.h \
            decoder_ffmpeg.h
 SOURCES += detailsdialog.cpp \
            decoder_ffmpeg.cpp \
-	   decoderffmpegfactory.cpp
-	   
-	   
+           decoderffmpegfactory.cpp
+
+
 QMAKE_CLEAN = ../libffmpeg.so
 
 TARGET=$$PLUGINS_PREFIX/Input/ffmpeg
 QMAKE_CLEAN =$$PLUGINS_PREFIX/Input/libffmpeg.so
 
 
-INCLUDEPATH += ../../../qmmp
+INCLUDEPATH += ../../../
 CONFIG += release \
 warn_on \
 plugin \
diff --git a/src/plugins/Input/flac/decoder_flac.cpp b/src/plugins/Input/flac/decoder_flac.cpp
index b2a895bca..6f6b8d734 100644
--- a/src/plugins/Input/flac/decoder_flac.cpp
+++ b/src/plugins/Input/flac/decoder_flac.cpp
@@ -19,10 +19,10 @@
  ***************************************************************************/
 
 
-#include "constants.h"
-#include "buffer.h"
-#include "output.h"
-#include "recycler.h"
+#include <qmmp/constants.h>
+#include <qmmp/buffer.h>
+#include <qmmp/output.h>
+#include <qmmp/recycler.h>
 
 #include <QObject>
 #include <QIODevice>
diff --git a/src/plugins/Input/flac/decoder_flac.h b/src/plugins/Input/flac/decoder_flac.h
index 4c85176ed..277348349 100644
--- a/src/plugins/Input/flac/decoder_flac.h
+++ b/src/plugins/Input/flac/decoder_flac.h
@@ -18,12 +18,10 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef __decoder_flac_h
-#define __decoder_flac_h
+#ifndef DECODER_FLAC_H
+#define DECODER_FLAC_H
 
-class DecoderOgg;
-
-#include "decoder.h"
+#include <qmmp/decoder.h>
 
 #include <FLAC/all.h>
 
diff --git a/src/plugins/Input/flac/decoderflacfactory.h b/src/plugins/Input/flac/decoderflacfactory.h
index 586bc3b33..3e4beb5a8 100644
--- a/src/plugins/Input/flac/decoderflacfactory.h
+++ b/src/plugins/Input/flac/decoderflacfactory.h
@@ -25,10 +25,10 @@
 #include <QIODevice>
 #include <QWidget>
 
-#include <decoder.h>
-#include <output.h>
-#include <decoderfactory.h>
-#include <filetag.h>
+#include <qmmp/decoder.h>
+#include <qmmp/output.h>
+#include <qmmp/decoderfactory.h>
+#include <qmmp/filetag.h>
 
 
 
diff --git a/src/plugins/Input/flac/flac.pro b/src/plugins/Input/flac/flac.pro
index 4ab46c296..864380533 100644
--- a/src/plugins/Input/flac/flac.pro
+++ b/src/plugins/Input/flac/flac.pro
@@ -1,8 +1,3 @@
-# ???? ?????? ? KDevelop ?????????? qmake.
-# ------------------------------------------- 
-# ?????????? ???????????? ???????? ???????? ???????: ./Plugins/Input/flac
-# ???? - ??????????:  
-
 include(../../plugins.pri)
 
 FORMS += detailsdialog.ui 
@@ -12,11 +7,11 @@ HEADERS += decoderflacfactory.h \
 SOURCES += decoder_flac.cpp \
            decoderflacfactory.cpp \
            detailsdialog.cpp
-	   
+
 TARGET=$$PLUGINS_PREFIX/Input/flac
 QMAKE_CLEAN =$$PLUGINS_PREFIX/Input/libflac.so
-   	
-INCLUDEPATH += ../../../qmmp
+
+INCLUDEPATH += ../../../
 CONFIG += release \
 warn_on \
 plugin \
diff --git a/src/plugins/Input/mad/decoder_mad.cpp b/src/plugins/Input/mad/decoder_mad.cpp
index 6b4c2569a..33d027652 100644
--- a/src/plugins/Input/mad/decoder_mad.cpp
+++ b/src/plugins/Input/mad/decoder_mad.cpp
@@ -1,9 +1,9 @@
 #include <QtGui>
 
 #include "decoder_mad.h"
-#include "constants.h"
-#include "buffer.h"
-#include "output.h"
+#include <qmmp/constants.h>
+#include <qmmp/buffer.h>
+#include <qmmp/output.h>
 
 #include <math.h>
 #include <stdio.h>
diff --git a/src/plugins/Input/mad/decoder_mad.h b/src/plugins/Input/mad/decoder_mad.h
index ecbb160cb..313af2e0f 100644
--- a/src/plugins/Input/mad/decoder_mad.h
+++ b/src/plugins/Input/mad/decoder_mad.h
@@ -4,12 +4,12 @@
 // warranty, or liability of any kind.
 //
 
-#ifndef   __decoder_mad_h
-#define   __decoder_mad_h
+#ifndef   DECODER_MAD_H
+#define   DECODER_MAD_H
 
 class DecoderMAD;
 
-#include "decoder.h"
+#include <qmmp/decoder.h>
 #include "decodermadfactory.h"
 
 extern "C" {
diff --git a/src/plugins/Input/mad/decodermadfactory.h b/src/plugins/Input/mad/decodermadfactory.h
index 2c7da8e47..5688adbe9 100644
--- a/src/plugins/Input/mad/decodermadfactory.h
+++ b/src/plugins/Input/mad/decodermadfactory.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  *
@@ -25,9 +25,9 @@
 #include <QIODevice>
 #include <QWidget>
 
-#include <decoder.h>
-#include <output.h>
-#include <decoderfactory.h>
+#include <qmmp/decoder.h>
+#include <qmmp/output.h>
+#include <qmmp/decoderfactory.h>
 
 
 
diff --git a/src/plugins/Input/mad/mad.pro b/src/plugins/Input/mad/mad.pro
index 7a320b370..bc7650531 100644
--- a/src/plugins/Input/mad/mad.pro
+++ b/src/plugins/Input/mad/mad.pro
@@ -20,7 +20,7 @@ SOURCES += decoder_mad.cpp \
 TARGET=$$PLUGINS_PREFIX/Input/mad
 QMAKE_CLEAN =$$PLUGINS_PREFIX/Input/libmad.so
 
-INCLUDEPATH += ../../../qmmp
+INCLUDEPATH += ../../../
 CONFIG += release \
 warn_on \
 plugin \
diff --git a/src/plugins/Input/mpc/Makefile b/src/plugins/Input/mpc/Makefile
deleted file mode 100644
index 7aa3ee7b3..000000000
--- a/src/plugins/Input/mpc/Makefile
+++ /dev/null
@@ -1,254 +0,0 @@
-#############################################################################
-# Makefile for building: libmpc.so
-# Generated by qmake (2.01a) (Qt 4.3.1) on: Thu Feb 7 14:07:02 2008
-# Project:  mpc.pro
-# Template: lib
-# Command: /usr/local/Trolltech/Qt-4.3.1/bin/qmake -unix -o Makefile mpc.pro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC            = gcc
-CXX           = g++
-DEFINES       = -DQT_NO_DEBUG -DQT_PLUGIN -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
-CFLAGS        = -pipe -O2 -I/usr/include/taglib -Wall -W -D_REENTRANT -fPIC $(DEFINES)
-CXXFLAGS      = -pipe -O2 -I/usr/include/taglib -Wall -W -D_REENTRANT -fPIC $(DEFINES)
-INCPATH       = -I/usr/local/Trolltech/Qt-4.3.1/mkspecs/linux-g++ -I. -I/usr/local/Trolltech/Qt-4.3.1/include/QtCore -I/usr/local/Trolltech/Qt-4.3.1/include/QtCore -I/usr/local/Trolltech/Qt-4.3.1/include/QtGui -I/usr/local/Trolltech/Qt-4.3.1/include/QtGui -I/usr/local/Trolltech/Qt-4.3.1/include -I../../../qmmp -I.build/moc -I.build/ui
-LINK          = g++
-LFLAGS        = -Wl,-rpath,/usr/local/Trolltech/Qt-4.3.1/lib -shared
-LIBS          = $(SUBLIBS)  -L../../../../lib -L/usr/local/Trolltech/Qt-4.3.1/lib -lqmmp -L/usr/lib -lmpcdec -I/usr/include -ltag -lQtGui -L/usr/local/Trolltech/Qt-4.3.1/lib -L/usr/X11R6/lib -lpng -lSM -lICE -pthread -pthread -lXi -lXrender -lXrandr -lXfixes -lXcursor -lXinerama -lfreetype -lfontconfig -lXext -lX11 -lQtCore -lz -lm -pthread -lgthread-2.0 -lglib-2.0 -lrt -ldl -lpthread
-AR            = ar cqs
-RANLIB        = 
-QMAKE         = /usr/local/Trolltech/Qt-4.3.1/bin/qmake
-TAR           = tar -cf
-COMPRESS      = gzip -9f
-COPY          = cp -f
-SED           = sed
-COPY_FILE     = $(COPY)
-COPY_DIR      = $(COPY) -r
-INSTALL_FILE  = install -m 644 -p
-INSTALL_DIR   = $(COPY_DIR)
-INSTALL_PROGRAM = install -m 755 -p
-DEL_FILE      = rm -f
-SYMLINK       = ln -sf
-DEL_DIR       = rmdir
-MOVE          = mv -f
-CHK_DIR_EXISTS= test -d
-MKDIR         = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR   = .build/obj/
-
-####### Files
-
-SOURCES       = decoder_mpc.cpp \
-		decodermpcfactory.cpp \
-		detailsdialog.cpp .build/moc/moc_decodermpcfactory.cpp \
-		.build/moc/moc_detailsdialog.cpp
-OBJECTS       = .build/obj/decoder_mpc.o \
-		.build/obj/decodermpcfactory.o \
-		.build/obj/detailsdialog.o \
-		.build/obj/moc_decodermpcfactory.o \
-		.build/obj/moc_detailsdialog.o
-DIST          = /usr/local/Trolltech/Qt-4.3.1/mkspecs/common/g++.conf \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/common/unix.conf \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/common/linux.conf \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/qconfig.pri \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/qt_functions.prf \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/qt_config.prf \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/exclusive_builds.prf \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/default_pre.prf \
-		../../../../qmmp.pri \
-		../../plugins.pri \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/release.prf \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/default_post.prf \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/link_pkgconfig.prf \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/warn_on.prf \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/qt.prf \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/unix/thread.prf \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/moc.prf \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/resources.prf \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/uic.prf \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/yacc.prf \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/lex.prf \
-		mpc.pro
-QMAKE_TARGET  = mpc
-DESTDIR       = ../../../../lib/qmmp/Input/
-TARGET        = libmpc.so
-TARGETD       = libmpc.so
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .o .c .cpp .cc .cxx .C
-
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
-
-.cc.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
-
-.cxx.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
-
-.C.o:
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
-
-####### Build rules
-
-all: Makefile  ../../../../lib/qmmp/Input/$(TARGET)
-
-../../../../lib/qmmp/Input/$(TARGET): .build/ui/ui_detailsdialog.h $(OBJECTS) $(SUBLIBS) $(OBJCOMP)  
-	@$(CHK_DIR_EXISTS) ../../../../lib/qmmp/Input/ || $(MKDIR) ../../../../lib/qmmp/Input/ 
-	-$(DEL_FILE) $(TARGET)
-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS) $(OBJCOMP)
-	-$(MOVE) $(TARGET) ../../../../lib/qmmp/Input/
-
-
-
-Makefile: mpc.pro  /usr/local/Trolltech/Qt-4.3.1/mkspecs/linux-g++/qmake.conf /usr/local/Trolltech/Qt-4.3.1/mkspecs/common/g++.conf \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/common/unix.conf \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/common/linux.conf \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/qconfig.pri \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/qt_functions.prf \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/qt_config.prf \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/exclusive_builds.prf \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/default_pre.prf \
-		../../../../qmmp.pri \
-		../../plugins.pri \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/release.prf \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/default_post.prf \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/link_pkgconfig.prf \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/warn_on.prf \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/qt.prf \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/unix/thread.prf \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/moc.prf \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/resources.prf \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/uic.prf \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/yacc.prf \
-		/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/lex.prf \
-		/usr/local/Trolltech/Qt-4.3.1/lib/libQtGui.prl \
-		/usr/local/Trolltech/Qt-4.3.1/lib/libQtCore.prl
-	$(QMAKE) -unix -o Makefile mpc.pro
-/usr/local/Trolltech/Qt-4.3.1/mkspecs/common/g++.conf:
-/usr/local/Trolltech/Qt-4.3.1/mkspecs/common/unix.conf:
-/usr/local/Trolltech/Qt-4.3.1/mkspecs/common/linux.conf:
-/usr/local/Trolltech/Qt-4.3.1/mkspecs/qconfig.pri:
-/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/qt_functions.prf:
-/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/qt_config.prf:
-/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/exclusive_builds.prf:
-/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/default_pre.prf:
-../../../../qmmp.pri:
-../../plugins.pri:
-/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/release.prf:
-/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/default_post.prf:
-/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/link_pkgconfig.prf:
-/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/warn_on.prf:
-/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/qt.prf:
-/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/unix/thread.prf:
-/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/moc.prf:
-/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/resources.prf:
-/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/uic.prf:
-/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/yacc.prf:
-/usr/local/Trolltech/Qt-4.3.1/mkspecs/features/lex.prf:
-/usr/local/Trolltech/Qt-4.3.1/lib/libQtGui.prl:
-/usr/local/Trolltech/Qt-4.3.1/lib/libQtCore.prl:
-qmake:  FORCE
-	@$(QMAKE) -unix -o Makefile mpc.pro
-
-dist: 
-	@$(CHK_DIR_EXISTS) .build/obj/mpc1.0.0 || $(MKDIR) .build/obj/mpc1.0.0 
-	$(COPY_FILE) --parents $(SOURCES) $(DIST) .build/obj/mpc1.0.0/ && $(COPY_FILE) --parents decodermpcfactory.h decoder_mpc.h detailsdialog.h .build/obj/mpc1.0.0/ && $(COPY_FILE) --parents decoder_mpc.cpp decodermpcfactory.cpp detailsdialog.cpp .build/obj/mpc1.0.0/ && $(COPY_FILE) --parents detailsdialog.ui .build/obj/mpc1.0.0/ && (cd `dirname .build/obj/mpc1.0.0` && $(TAR) mpc1.0.0.tar mpc1.0.0 && $(COMPRESS) mpc1.0.0.tar) && $(MOVE) `dirname .build/obj/mpc1.0.0`/mpc1.0.0.tar.gz . && $(DEL_FILE) -r .build/obj/mpc1.0.0
-
-
-clean:compiler_clean 
-	-$(DEL_FILE) $(OBJECTS)
-	-$(DEL_FILE) ../../../../lib/qmmp/Input/libmpc.so
-	-$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
-	-$(DEL_FILE) $(TARGET) 
-	-$(DEL_FILE) Makefile
-
-
-mocclean: compiler_moc_header_clean compiler_moc_source_clean
-
-mocables: compiler_moc_header_make_all compiler_moc_source_make_all
-
-compiler_moc_header_make_all: .build/moc/moc_decodermpcfactory.cpp .build/moc/moc_detailsdialog.cpp
-compiler_moc_header_clean:
-	-$(DEL_FILE) .build/moc/moc_decodermpcfactory.cpp .build/moc/moc_detailsdialog.cpp
-.build/moc/moc_decodermpcfactory.cpp: decodermpcfactory.h
-	/usr/local/Trolltech/Qt-4.3.1/bin/moc $(DEFINES) $(INCPATH) decodermpcfactory.h -o .build/moc/moc_decodermpcfactory.cpp
-
-.build/moc/moc_detailsdialog.cpp: .build/ui/ui_detailsdialog.h \
-		detailsdialog.h
-	/usr/local/Trolltech/Qt-4.3.1/bin/moc $(DEFINES) $(INCPATH) detailsdialog.h -o .build/moc/moc_detailsdialog.cpp
-
-compiler_rcc_make_all:
-compiler_rcc_clean:
-compiler_image_collection_make_all: qmake_image_collection.cpp
-compiler_image_collection_clean:
-	-$(DEL_FILE) qmake_image_collection.cpp
-compiler_moc_source_make_all:
-compiler_moc_source_clean:
-compiler_uic_make_all: .build/ui/ui_detailsdialog.h
-compiler_uic_clean:
-	-$(DEL_FILE) .build/ui/ui_detailsdialog.h
-.build/ui/ui_detailsdialog.h: detailsdialog.ui
-	/usr/local/Trolltech/Qt-4.3.1/bin/uic detailsdialog.ui -o .build/ui/ui_detailsdialog.h
-
-compiler_yacc_decl_make_all:
-compiler_yacc_decl_clean:
-compiler_yacc_impl_make_all:
-compiler_yacc_impl_clean:
-compiler_lex_make_all:
-compiler_lex_clean:
-compiler_clean: compiler_moc_header_clean compiler_uic_clean 
-
-####### Compile
-
-.build/obj/decoder_mpc.o: decoder_mpc.cpp decoder_mpc.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o .build/obj/decoder_mpc.o decoder_mpc.cpp
-
-.build/obj/decodermpcfactory.o: decodermpcfactory.cpp detailsdialog.h \
-		.build/ui/ui_detailsdialog.h \
-		decoder_mpc.h \
-		decodermpcfactory.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o .build/obj/decodermpcfactory.o decodermpcfactory.cpp
-
-.build/obj/detailsdialog.o: detailsdialog.cpp detailsdialog.h \
-		.build/ui/ui_detailsdialog.h
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o .build/obj/detailsdialog.o detailsdialog.cpp
-
-.build/obj/moc_decodermpcfactory.o: .build/moc/moc_decodermpcfactory.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o .build/obj/moc_decodermpcfactory.o .build/moc/moc_decodermpcfactory.cpp
-
-.build/obj/moc_detailsdialog.o: .build/moc/moc_detailsdialog.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o .build/obj/moc_detailsdialog.o .build/moc/moc_detailsdialog.cpp
-
-####### Install
-
-install_target: first FORCE
-	@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/lib/qmmp/Input/ || $(MKDIR) $(INSTALL_ROOT)/lib/qmmp/Input/ 
-	-$(INSTALL_PROGRAM) "../../../../lib/qmmp/Input/$(TARGET)" "$(INSTALL_ROOT)/lib/qmmp/Input/$(TARGET)"
-	-strip --strip-unneeded "$(INSTALL_ROOT)/lib/qmmp/Input/$(TARGET)"
-
-uninstall_target:  FORCE
-	-$(DEL_FILE) "$(INSTALL_ROOT)/lib/qmmp/Input/$(TARGET)"
-	-$(DEL_DIR) $(INSTALL_ROOT)/lib/qmmp/Input/ 
-
-
-install:  install_target  FORCE
-
-uninstall: uninstall_target   FORCE
-
-FORCE:
-
diff --git a/src/plugins/Input/mpc/decoder_mpc.cpp b/src/plugins/Input/mpc/decoder_mpc.cpp
index 10591a384..a7da95652 100644
--- a/src/plugins/Input/mpc/decoder_mpc.cpp
+++ b/src/plugins/Input/mpc/decoder_mpc.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  *
@@ -22,10 +22,10 @@
 #include <QObject>
 #include <QIODevice>
 
-#include "constants.h"
-#include "buffer.h"
-#include "output.h"
-#include "recycler.h"
+#include <qmmp/constants.h>
+#include <qmmp/buffer.h>
+#include <qmmp/output.h>
+#include <qmmp/recycler.h>
 
 #include "decoder_mpc.h"
 
diff --git a/src/plugins/Input/mpc/decoder_mpc.h b/src/plugins/Input/mpc/decoder_mpc.h
index 3b17b100e..9378d727e 100644
--- a/src/plugins/Input/mpc/decoder_mpc.h
+++ b/src/plugins/Input/mpc/decoder_mpc.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  *
@@ -18,12 +18,12 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef __decoder_mpc_h
-#define __decoder_mpc_h
+#ifndef DECODER_MPC_H
+#define DECODER_MPC_H
 
 #include <mpcdec/mpcdec.h>
 
-#include "decoder.h"
+#include <qmmp/decoder.h>
 
 struct mpc_data
 {
diff --git a/src/plugins/Input/mpc/decodermpcfactory.h b/src/plugins/Input/mpc/decodermpcfactory.h
index 0f8dda55f..7ee6fb3c1 100644
--- a/src/plugins/Input/mpc/decodermpcfactory.h
+++ b/src/plugins/Input/mpc/decodermpcfactory.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  *
@@ -25,10 +25,10 @@
 #include <QIODevice>
 #include <QWidget>
 
-#include <decoder.h>
-#include <output.h>
-#include <decoderfactory.h>
-#include <filetag.h>
+#include <qmmp/decoder.h>
+#include <qmmp/output.h>
+#include <qmmp/decoderfactory.h>
+#include <qmmp/filetag.h>
 
 
 
diff --git a/src/plugins/Input/mpc/mpc.pro b/src/plugins/Input/mpc/mpc.pro
index f1a50683d..dc570ffc5 100644
--- a/src/plugins/Input/mpc/mpc.pro
+++ b/src/plugins/Input/mpc/mpc.pro
@@ -3,16 +3,16 @@ include(../../plugins.pri)
 FORMS += detailsdialog.ui 
 HEADERS += decodermpcfactory.h \
            decoder_mpc.h \
-	   detailsdialog.h
+           detailsdialog.h
 SOURCES += decoder_mpc.cpp \
            decodermpcfactory.cpp \
-	   detailsdialog.cpp
+           detailsdialog.cpp
 
 TARGET=$$PLUGINS_PREFIX/Input/mpc
 QMAKE_CLEAN =$$PLUGINS_PREFIX/Input/libmpc.so
-	   
 
-INCLUDEPATH += ../../../qmmp
+
+INCLUDEPATH += ../../../
 CONFIG += release \
 warn_on \
 plugin \
diff --git a/src/plugins/Input/sndfile/decoder_sndfile.cpp b/src/plugins/Input/sndfile/decoder_sndfile.cpp
index b4baa2ba4..dc7516854 100644
--- a/src/plugins/Input/sndfile/decoder_sndfile.cpp
+++ b/src/plugins/Input/sndfile/decoder_sndfile.cpp
@@ -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  *
@@ -22,12 +22,10 @@
 #include <QFile>
 #include <QFileInfo>
 
-
-
-#include "constants.h"
-#include "buffer.h"
-#include "output.h"
-#include "recycler.h"
+#include <qmmp/constants.h>
+#include <qmmp/buffer.h>
+#include <qmmp/output.h>
+#include <qmmp/recycler.h>
 
 #include "decoder_sndfile.h"
 
diff --git a/src/plugins/Input/sndfile/decoder_sndfile.h b/src/plugins/Input/sndfile/decoder_sndfile.h
index 53bb8fd81..9a66acd3d 100644
--- a/src/plugins/Input/sndfile/decoder_sndfile.h
+++ b/src/plugins/Input/sndfile/decoder_sndfile.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  *
@@ -24,7 +24,7 @@
 extern "C"{
 #include <sndfile.h>
 }
-#include "decoder.h"
+#include <qmmp/decoder.h>
 
 
 class DecoderSndFile : public Decoder
diff --git a/src/plugins/Input/sndfile/decodersndfilefactory.cpp b/src/plugins/Input/sndfile/decodersndfilefactory.cpp
index b918d32fc..37a42f9ff 100644
--- a/src/plugins/Input/sndfile/decodersndfilefactory.cpp
+++ b/src/plugins/Input/sndfile/decodersndfilefactory.cpp
@@ -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  *
diff --git a/src/plugins/Input/sndfile/decodersndfilefactory.h b/src/plugins/Input/sndfile/decodersndfilefactory.h
index 8439594fb..ca1753cac 100644
--- a/src/plugins/Input/sndfile/decodersndfilefactory.h
+++ b/src/plugins/Input/sndfile/decodersndfilefactory.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  *
@@ -25,10 +25,10 @@
 #include <QIODevice>
 #include <QWidget>
 
-#include <decoder.h>
-#include <output.h>
-#include <decoderfactory.h>
-#include <filetag.h>
+#include <qmmp/decoder.h>
+#include <qmmp/output.h>
+#include <qmmp/decoderfactory.h>
+#include <qmmp/filetag.h>
 
 
 
diff --git a/src/plugins/Input/sndfile/sndfile.pro b/src/plugins/Input/sndfile/sndfile.pro
index 701ea58fb..9f601bef7 100644
--- a/src/plugins/Input/sndfile/sndfile.pro
+++ b/src/plugins/Input/sndfile/sndfile.pro
@@ -3,12 +3,12 @@ include(../../plugins.pri)
 HEADERS += decodersndfilefactory.h \
            decoder_sndfile.h 
 SOURCES += decoder_sndfile.cpp \
-	   decodersndfilefactory.cpp
+           decodersndfilefactory.cpp
 
 TARGET=$$PLUGINS_PREFIX/Input/sndfile
 QMAKE_CLEAN =$$PLUGINS_PREFIX/Input/libsndfile.so
-	  
-INCLUDEPATH += ../../../qmmp
+
+INCLUDEPATH += ../../../
 CONFIG += release \
 warn_on \
 plugin \
diff --git a/src/plugins/Input/vorbis/decoder_vorbis.cpp b/src/plugins/Input/vorbis/decoder_vorbis.cpp
index 31fb99c6f..654a22619 100644
--- a/src/plugins/Input/vorbis/decoder_vorbis.cpp
+++ b/src/plugins/Input/vorbis/decoder_vorbis.cpp
@@ -4,17 +4,17 @@
 // warranty, or liability of any kind.
 //
 
-#include "decoder_vorbis.h"
-#include "constants.h"
-#include "buffer.h"
-#include "output.h"
-#include "recycler.h"
-#include "filetag.h"
+
+#include <qmmp/constants.h>
+#include <qmmp/buffer.h>
+#include <qmmp/output.h>
+#include <qmmp/recycler.h>
+#include <qmmp/filetag.h>
 
 #include <QObject>
 #include <QIODevice>
 
-
+#include "decoder_vorbis.h"
 // ic functions for OggVorbis
 
 static size_t oggread (void *buf, size_t size, size_t nmemb, void *src)
diff --git a/src/plugins/Input/vorbis/decoder_vorbis.h b/src/plugins/Input/vorbis/decoder_vorbis.h
index 091d856ff..1d093f7cf 100644
--- a/src/plugins/Input/vorbis/decoder_vorbis.h
+++ b/src/plugins/Input/vorbis/decoder_vorbis.h
@@ -4,10 +4,10 @@
 // warranty, or liability of any kind.
 //
 
-#ifndef __decoder_vorbis_h
-#define __decoder_vorbis_h
+#ifndef DECODER_VORBIS_H
+#define DECODER_VORBIS_H
 
-#include "decoder.h"
+#include <qmmp/decoder.h>
 
 #include <vorbis/vorbisfile.h>
 
diff --git a/src/plugins/Input/vorbis/decodervorbisfactory.h b/src/plugins/Input/vorbis/decodervorbisfactory.h
index 6830fc102..5610faeb2 100644
--- a/src/plugins/Input/vorbis/decodervorbisfactory.h
+++ b/src/plugins/Input/vorbis/decodervorbisfactory.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  *
@@ -25,10 +25,10 @@
 #include <QIODevice>
 #include <QWidget>
 
-#include <decoder.h>
-#include <output.h>
-#include <decoderfactory.h>
-#include <filetag.h>
+#include <qmmp/decoder.h>
+#include <qmmp/output.h>
+#include <qmmp/decoderfactory.h>
+#include <qmmp/filetag.h>
 
 
 
diff --git a/src/plugins/Input/vorbis/vorbis.pro b/src/plugins/Input/vorbis/vorbis.pro
index afd7b6510..36312b72d 100644
--- a/src/plugins/Input/vorbis/vorbis.pro
+++ b/src/plugins/Input/vorbis/vorbis.pro
@@ -1,8 +1,3 @@
-# ???? ?????? ? KDevelop ?????????? qmake.
-# ------------------------------------------- 
-# ?????????? ???????????? ???????? ???????? ???????: ./Plugins/Input/ogg
-# ???? - ??????????:  
-
 include(../../plugins.pri)
 
 FORMS += detailsdialog.ui 
@@ -15,8 +10,8 @@ SOURCES += decoder_vorbis.cpp \
 
 TARGET=$$PLUGINS_PREFIX/Input/vorbis
 QMAKE_CLEAN =$$PLUGINS_PREFIX/Input/libvorbis.so
-	   
-INCLUDEPATH += ../../../qmmp
+
+INCLUDEPATH += ../../../
 CONFIG += release \
 warn_on \
 plugin \