diff options
48 files changed, 143 insertions, 1181 deletions
@@ -9,8 +9,8 @@ OBJECTS_DIR=./.build/obj #Comment/uncomment this if you want to change plugins list -#CONFIG += JACK_PLUGIN -#CONFIG += FLAC_PLUGIN -#CONFIG += MUSEPACK_PLUGIN -#CONFIG += FFMPEG_PLUGIN -#CONFIG += OSS_PLUGIN
\ No newline at end of file +CONFIG += JACK_PLUGIN +CONFIG += FLAC_PLUGIN +CONFIG += MUSEPACK_PLUGIN +CONFIG += FFMPEG_PLUGIN +CONFIG += OSS_PLUGIN
\ No newline at end of file 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 \ diff --git a/src/plugins/Misc/CommandLineOptions/IncDecVolumeOption/Makefile b/src/plugins/Misc/CommandLineOptions/IncDecVolumeOption/Makefile deleted file mode 100644 index 0ac10a77d..000000000 --- a/src/plugins/Misc/CommandLineOptions/IncDecVolumeOption/Makefile +++ /dev/null @@ -1,301 +0,0 @@ -############################################################################# -# Makefile for building: libIncDecVolumeOption.so -# Generated by qmake (2.01a) (Qt 4.3.0) on: Thu Feb 7 01:34:34 2008 -# Project: IncDecVolumeOption.pro -# Template: lib -# Command: /usr/local/Trolltech/Qt-4.3.0/bin/qmake -unix -o Makefile IncDecVolumeOption.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 -Wall -W -D_REENTRANT -fPIC $(DEFINES) -CXXFLAGS = -pipe -O2 -Wall -W -D_REENTRANT -fPIC $(DEFINES) -INCPATH = -I/usr/local/Trolltech/Qt-4.3.0/mkspecs/linux-g++ -I. -I/usr/local/Trolltech/Qt-4.3.0/include/QtCore -I/usr/local/Trolltech/Qt-4.3.0/include/QtCore -I/usr/local/Trolltech/Qt-4.3.0/include/QtGui -I/usr/local/Trolltech/Qt-4.3.0/include/QtGui -I/usr/local/Trolltech/Qt-4.3.0/include -I../../../../ui -I../../../../qmmp -I../../../.. -I.build/moc -I./.build/ui/ -LINK = g++ -LFLAGS = -Wl,-rpath,/usr/local/Trolltech/Qt-4.3.0/lib -shared -LIBS = $(SUBLIBS) -L/usr/local/Trolltech/Qt-4.3.0/lib -lQtGui -L/usr/local/Trolltech/Qt-4.3.0/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 -lrt -lglib-2.0 -ldl -lpthread -AR = ar cqs -RANLIB = -QMAKE = /usr/local/Trolltech/Qt-4.3.0/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 = incdecvolumeoption.cpp \ - ../../../../qmmp/soundcore.cpp \ - ../../../../ui/mainwindow.cpp .build/moc/moc_incdecvolumeoption.cpp \ - .build/moc/moc_mainwindow.cpp \ - .build/moc/moc_soundcore.cpp -OBJECTS = .build/obj/incdecvolumeoption.o \ - .build/obj/soundcore.o \ - .build/obj/mainwindow.o \ - .build/obj/moc_incdecvolumeoption.o \ - .build/obj/moc_mainwindow.o \ - .build/obj/moc_soundcore.o -DIST = /usr/local/Trolltech/Qt-4.3.0/mkspecs/common/g++.conf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/common/unix.conf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/common/linux.conf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/qconfig.pri \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt_functions.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt_config.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/exclusive_builds.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/default_pre.prf \ - /rest/qmmp/qmmp/qmmp.pri \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/release.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/default_post.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/warn_on.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/unix/thread.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/moc.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/resources.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/uic.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/yacc.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/lex.prf \ - IncDecVolumeOption.pro -QMAKE_TARGET = IncDecVolumeOption -DESTDIR = ../ -TARGET = libIncDecVolumeOption.so -TARGETD = libIncDecVolumeOption.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 ../$(TARGET) - -../$(TARGET): $(OBJECTS) $(SUBLIBS) $(OBJCOMP) - @$(CHK_DIR_EXISTS) ../ || $(MKDIR) ../ - -$(DEL_FILE) $(TARGET) - $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS) $(OBJCOMP) - -$(MOVE) $(TARGET) ../ - - - -Makefile: IncDecVolumeOption.pro /usr/local/Trolltech/Qt-4.3.0/mkspecs/linux-g++/qmake.conf /usr/local/Trolltech/Qt-4.3.0/mkspecs/common/g++.conf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/common/unix.conf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/common/linux.conf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/qconfig.pri \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt_functions.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt_config.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/exclusive_builds.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/default_pre.prf \ - /rest/qmmp/qmmp/qmmp.pri \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/release.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/default_post.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/warn_on.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/unix/thread.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/moc.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/resources.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/uic.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/yacc.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/lex.prf \ - /usr/local/Trolltech/Qt-4.3.0/lib/libQtGui.prl \ - /usr/local/Trolltech/Qt-4.3.0/lib/libQtCore.prl - $(QMAKE) -unix -o Makefile IncDecVolumeOption.pro -/usr/local/Trolltech/Qt-4.3.0/mkspecs/common/g++.conf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/common/unix.conf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/common/linux.conf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/qconfig.pri: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt_functions.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt_config.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/exclusive_builds.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/default_pre.prf: -/rest/qmmp/qmmp/qmmp.pri: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/release.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/default_post.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/warn_on.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/unix/thread.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/moc.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/resources.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/uic.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/yacc.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/lex.prf: -/usr/local/Trolltech/Qt-4.3.0/lib/libQtGui.prl: -/usr/local/Trolltech/Qt-4.3.0/lib/libQtCore.prl: -qmake: FORCE - @$(QMAKE) -unix -o Makefile IncDecVolumeOption.pro - -dist: - @$(CHK_DIR_EXISTS) .build/obj/IncDecVolumeOption1.0.0 || $(MKDIR) .build/obj/IncDecVolumeOption1.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) .build/obj/IncDecVolumeOption1.0.0/ && $(COPY_FILE) --parents incdecvolumeoption.h ../../../../ui/mainwindow.h ../../../../qmmp/soundcore.h .build/obj/IncDecVolumeOption1.0.0/ && $(COPY_FILE) --parents incdecvolumeoption.cpp ../../../../qmmp/soundcore.cpp ../../../../ui/mainwindow.cpp .build/obj/IncDecVolumeOption1.0.0/ && (cd `dirname .build/obj/IncDecVolumeOption1.0.0` && $(TAR) IncDecVolumeOption1.0.0.tar IncDecVolumeOption1.0.0 && $(COMPRESS) IncDecVolumeOption1.0.0.tar) && $(MOVE) `dirname .build/obj/IncDecVolumeOption1.0.0`/IncDecVolumeOption1.0.0.tar.gz . && $(DEL_FILE) -r .build/obj/IncDecVolumeOption1.0.0 - - -clean:compiler_clean - -$(DEL_FILE) $(OBJECTS) - -$(DEL_FILE) ../libincdecvolumeoption.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_incdecvolumeoption.cpp .build/moc/moc_mainwindow.cpp .build/moc/moc_soundcore.cpp -compiler_moc_header_clean: - -$(DEL_FILE) .build/moc/moc_incdecvolumeoption.cpp .build/moc/moc_mainwindow.cpp .build/moc/moc_soundcore.cpp -.build/moc/moc_incdecvolumeoption.cpp: incdecvolumeoption.h - /usr/local/Trolltech/Qt-4.3.0/bin/moc $(DEFINES) $(INCPATH) incdecvolumeoption.h -o .build/moc/moc_incdecvolumeoption.cpp - -.build/moc/moc_mainwindow.cpp: ../../../../qmmp/output.h \ - ../../../../qmmp/visual.h \ - ../../../../qmmp/outputfactory.h \ - ../../../../qmmp/visualfactory.h \ - ../../../../qmmp/recycler.h \ - ../../../../qmmp/decoder.h \ - ../../../../qmmp/filetag.h \ - ../../../../ui/display.h \ - ../../../../ui/pixmapwidget.h \ - ../../../../ui/mediafile.h \ - ../../../../qmmp/decoderfactory.h \ - ../../../../ui/titlebar.h \ - ../../../../ui/playlist.h \ - ../../../../ui/mainwindow.h \ - ../../../../ui/mainwindow.h - /usr/local/Trolltech/Qt-4.3.0/bin/moc $(DEFINES) $(INCPATH) ../../../../ui/mainwindow.h -o .build/moc/moc_mainwindow.cpp - -.build/moc/moc_soundcore.cpp: ../../../../qmmp/decoder.h \ - ../../../../qmmp/filetag.h \ - ../../../../qmmp/output.h \ - ../../../../qmmp/visual.h \ - ../../../../qmmp/outputfactory.h \ - ../../../../qmmp/visualfactory.h \ - ../../../../qmmp/recycler.h \ - ../../../../qmmp/soundcore.h - /usr/local/Trolltech/Qt-4.3.0/bin/moc $(DEFINES) $(INCPATH) ../../../../qmmp/soundcore.h -o .build/moc/moc_soundcore.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: -compiler_uic_clean: -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 - -####### Compile - -.build/obj/incdecvolumeoption.o: incdecvolumeoption.cpp incdecvolumeoption.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .build/obj/incdecvolumeoption.o incdecvolumeoption.cpp - -.build/obj/soundcore.o: ../../../../qmmp/soundcore.cpp ../../../../qmmp/decoderfactory.h \ - ../../../../qmmp/constants.h \ - ../../../../qmmp/config.h \ - ../../../../qmmp/streamreader.h \ - ../../../../qmmp/effect.h \ - ../../../../qmmp/soundcore.h \ - ../../../../qmmp/decoder.h \ - ../../../../qmmp/filetag.h \ - ../../../../qmmp/output.h \ - ../../../../qmmp/visual.h \ - ../../../../qmmp/outputfactory.h \ - ../../../../qmmp/visualfactory.h \ - ../../../../qmmp/recycler.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .build/obj/soundcore.o ../../../../qmmp/soundcore.cpp - -.build/obj/mainwindow.o: ../../../../ui/mainwindow.cpp ../../../../ui/textscroller.h \ - ../../../../ui/mainwindow.h \ - ../../../../qmmp/output.h \ - ../../../../qmmp/visual.h \ - ../../../../qmmp/outputfactory.h \ - ../../../../qmmp/visualfactory.h \ - ../../../../qmmp/recycler.h \ - ../../../../qmmp/decoder.h \ - ../../../../qmmp/filetag.h \ - ../../../../ui/display.h \ - ../../../../ui/pixmapwidget.h \ - ../../../../ui/mediafile.h \ - ../../../../qmmp/decoderfactory.h \ - ../../../../ui/titlebar.h \ - ../../../../ui/playlist.h \ - ../../../../qmmp/constants.h \ - ../../../../qmmp/config.h \ - ../../../../ui/fileloader.h \ - ../../../../ui/skin.h \ - ../../../../ui/playlistmodel.h \ - ../../../../ui/configdialog.h \ - ../../../../ui/dock.h \ - ../../../../ui/eqwidget.h \ - ../../../../ui/mainvisual.h \ - ../../../../ui/logscale.h \ - ../../../../ui/playlistformat.h \ - ../../../../ui/jumptotrackdialog.h \ - ../../../../ui/aboutdialog.h \ - ../../../../ui/filedialog.h \ - ../../../../ui/listwidget.h \ - ../../../../ui/visualmenu.h \ - ../../../../ui/commandlineoption.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .build/obj/mainwindow.o ../../../../ui/mainwindow.cpp - -.build/obj/moc_incdecvolumeoption.o: .build/moc/moc_incdecvolumeoption.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .build/obj/moc_incdecvolumeoption.o .build/moc/moc_incdecvolumeoption.cpp - -.build/obj/moc_mainwindow.o: .build/moc/moc_mainwindow.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .build/obj/moc_mainwindow.o .build/moc/moc_mainwindow.cpp - -.build/obj/moc_soundcore.o: .build/moc/moc_soundcore.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .build/obj/moc_soundcore.o .build/moc/moc_soundcore.cpp - -####### Install - -install: FORCE - -uninstall: FORCE - -FORCE: - diff --git a/src/plugins/Misc/FileDialogs/Makefile b/src/plugins/Misc/FileDialogs/Makefile deleted file mode 100644 index 5e0580ccf..000000000 --- a/src/plugins/Misc/FileDialogs/Makefile +++ /dev/null @@ -1,134 +0,0 @@ -############################################################################# -# Makefile for building: FileDialogs -# Generated by qmake (2.01a) (Qt 4.2.3) on: Tue Jul 24 19:08:22 2007 -# Project: FileDialogs.pro -# Template: subdirs -# Command: /usr/local/Trolltech/Qt-4.2.3/bin/qmake -unix -o Makefile FileDialogs.pro -############################################################################# - -first: make_default -MAKEFILE = Makefile -QMAKE = /usr/local/Trolltech/Qt-4.2.3/bin/qmake -DEL_FILE = rm -f -CHK_DIR_EXISTS= test -d -MKDIR = mkdir -p -COPY = cp -f -COPY_FILE = $(COPY) -COPY_DIR = $(COPY) -r -INSTALL_FILE = install -m 644 -p -INSTALL_PROGRAM = install -m 755 -p -INSTALL_DIR = $(COPY_DIR) -DEL_FILE = rm -f -SYMLINK = ln -sf -DEL_DIR = rmdir -MOVE = mv -f -CHK_DIR_EXISTS= test -d -MKDIR = mkdir -p -SUBTARGETS = \ - sub-Qt3FileDialog \ - sub-QmmpFileDialog - -Qt3FileDialog/$(MAKEFILE): - @$(CHK_DIR_EXISTS) Qt3FileDialog/ || $(MKDIR) Qt3FileDialog/ - cd Qt3FileDialog && $(QMAKE) Qt3FileDialog.pro -unix -o $(MAKEFILE) -sub-Qt3FileDialog-qmake_all: FORCE - @$(CHK_DIR_EXISTS) Qt3FileDialog/ || $(MKDIR) Qt3FileDialog/ - cd Qt3FileDialog && $(QMAKE) Qt3FileDialog.pro -unix -o $(MAKEFILE) -sub-Qt3FileDialog: Qt3FileDialog/$(MAKEFILE) FORCE - cd Qt3FileDialog && $(MAKE) -f $(MAKEFILE) -sub-Qt3FileDialog-make_default: Qt3FileDialog/$(MAKEFILE) FORCE - cd Qt3FileDialog && $(MAKE) -f $(MAKEFILE) -sub-Qt3FileDialog-make_first: Qt3FileDialog/$(MAKEFILE) FORCE - cd Qt3FileDialog && $(MAKE) -f $(MAKEFILE) first -sub-Qt3FileDialog-all: Qt3FileDialog/$(MAKEFILE) FORCE - cd Qt3FileDialog && $(MAKE) -f $(MAKEFILE) all -sub-Qt3FileDialog-clean: Qt3FileDialog/$(MAKEFILE) FORCE - cd Qt3FileDialog && $(MAKE) -f $(MAKEFILE) clean -sub-Qt3FileDialog-distclean: Qt3FileDialog/$(MAKEFILE) FORCE - cd Qt3FileDialog && $(MAKE) -f $(MAKEFILE) distclean -sub-Qt3FileDialog-install_subtargets: Qt3FileDialog/$(MAKEFILE) FORCE - cd Qt3FileDialog && $(MAKE) -f $(MAKEFILE) install -sub-Qt3FileDialog-uninstall_subtargets: Qt3FileDialog/$(MAKEFILE) FORCE - cd Qt3FileDialog && $(MAKE) -f $(MAKEFILE) uninstall -QmmpFileDialog/$(MAKEFILE): - @$(CHK_DIR_EXISTS) QmmpFileDialog/ || $(MKDIR) QmmpFileDialog/ - cd QmmpFileDialog && $(QMAKE) QmmpFileDialog.pro -unix -o $(MAKEFILE) -sub-QmmpFileDialog-qmake_all: FORCE - @$(CHK_DIR_EXISTS) QmmpFileDialog/ || $(MKDIR) QmmpFileDialog/ - cd QmmpFileDialog && $(QMAKE) QmmpFileDialog.pro -unix -o $(MAKEFILE) -sub-QmmpFileDialog: QmmpFileDialog/$(MAKEFILE) FORCE - cd QmmpFileDialog && $(MAKE) -f $(MAKEFILE) -sub-QmmpFileDialog-make_default: QmmpFileDialog/$(MAKEFILE) FORCE - cd QmmpFileDialog && $(MAKE) -f $(MAKEFILE) -sub-QmmpFileDialog-make_first: QmmpFileDialog/$(MAKEFILE) FORCE - cd QmmpFileDialog && $(MAKE) -f $(MAKEFILE) first -sub-QmmpFileDialog-all: QmmpFileDialog/$(MAKEFILE) FORCE - cd QmmpFileDialog && $(MAKE) -f $(MAKEFILE) all -sub-QmmpFileDialog-clean: QmmpFileDialog/$(MAKEFILE) FORCE - cd QmmpFileDialog && $(MAKE) -f $(MAKEFILE) clean -sub-QmmpFileDialog-distclean: QmmpFileDialog/$(MAKEFILE) FORCE - cd QmmpFileDialog && $(MAKE) -f $(MAKEFILE) distclean -sub-QmmpFileDialog-install_subtargets: QmmpFileDialog/$(MAKEFILE) FORCE - cd QmmpFileDialog && $(MAKE) -f $(MAKEFILE) install -sub-QmmpFileDialog-uninstall_subtargets: QmmpFileDialog/$(MAKEFILE) FORCE - cd QmmpFileDialog && $(MAKE) -f $(MAKEFILE) uninstall - -Makefile: FileDialogs.pro /usr/local/Trolltech/Qt-4.2.3/mkspecs/linux-g++/qmake.conf /usr/local/Trolltech/Qt-4.2.3/mkspecs/common/unix.conf \ - /usr/local/Trolltech/Qt-4.2.3/mkspecs/common/g++.conf \ - /usr/local/Trolltech/Qt-4.2.3/mkspecs/common/linux.conf \ - /usr/local/Trolltech/Qt-4.2.3/mkspecs/qconfig.pri \ - /usr/local/Trolltech/Qt-4.2.3/mkspecs/features/qt_functions.prf \ - /usr/local/Trolltech/Qt-4.2.3/mkspecs/features/qt_config.prf \ - /usr/local/Trolltech/Qt-4.2.3/mkspecs/features/exclusive_builds.prf \ - /usr/local/Trolltech/Qt-4.2.3/mkspecs/features/default_pre.prf \ - /usr/local/Trolltech/Qt-4.2.3/mkspecs/features/release.prf \ - /usr/local/Trolltech/Qt-4.2.3/mkspecs/features/default_post.prf \ - /usr/local/Trolltech/Qt-4.2.3/mkspecs/features/warn_on.prf \ - /usr/local/Trolltech/Qt-4.2.3/mkspecs/features/qt.prf \ - /usr/local/Trolltech/Qt-4.2.3/mkspecs/features/unix/thread.prf \ - /usr/local/Trolltech/Qt-4.2.3/mkspecs/features/moc.prf \ - /usr/local/Trolltech/Qt-4.2.3/mkspecs/features/resources.prf \ - /usr/local/Trolltech/Qt-4.2.3/mkspecs/features/uic.prf - $(QMAKE) -unix -o Makefile FileDialogs.pro -/usr/local/Trolltech/Qt-4.2.3/mkspecs/common/unix.conf: -/usr/local/Trolltech/Qt-4.2.3/mkspecs/common/g++.conf: -/usr/local/Trolltech/Qt-4.2.3/mkspecs/common/linux.conf: -/usr/local/Trolltech/Qt-4.2.3/mkspecs/qconfig.pri: -/usr/local/Trolltech/Qt-4.2.3/mkspecs/features/qt_functions.prf: -/usr/local/Trolltech/Qt-4.2.3/mkspecs/features/qt_config.prf: -/usr/local/Trolltech/Qt-4.2.3/mkspecs/features/exclusive_builds.prf: -/usr/local/Trolltech/Qt-4.2.3/mkspecs/features/default_pre.prf: -/usr/local/Trolltech/Qt-4.2.3/mkspecs/features/release.prf: -/usr/local/Trolltech/Qt-4.2.3/mkspecs/features/default_post.prf: -/usr/local/Trolltech/Qt-4.2.3/mkspecs/features/warn_on.prf: -/usr/local/Trolltech/Qt-4.2.3/mkspecs/features/qt.prf: -/usr/local/Trolltech/Qt-4.2.3/mkspecs/features/unix/thread.prf: -/usr/local/Trolltech/Qt-4.2.3/mkspecs/features/moc.prf: -/usr/local/Trolltech/Qt-4.2.3/mkspecs/features/resources.prf: -/usr/local/Trolltech/Qt-4.2.3/mkspecs/features/uic.prf: -qmake: qmake_all FORCE - @$(QMAKE) -unix -o Makefile FileDialogs.pro - -qmake_all: sub-Qt3FileDialog-qmake_all sub-QmmpFileDialog-qmake_all FORCE - -make_default: sub-Qt3FileDialog-make_default sub-QmmpFileDialog-make_default FORCE -make_first: sub-Qt3FileDialog-make_first sub-QmmpFileDialog-make_first FORCE -all: sub-Qt3FileDialog-all sub-QmmpFileDialog-all FORCE -clean: sub-Qt3FileDialog-clean sub-QmmpFileDialog-clean FORCE -distclean: sub-Qt3FileDialog-distclean sub-QmmpFileDialog-distclean FORCE - -$(DEL_FILE) Makefile -install_subtargets: sub-Qt3FileDialog-install_subtargets sub-QmmpFileDialog-install_subtargets FORCE -uninstall_subtargets: sub-Qt3FileDialog-uninstall_subtargets sub-QmmpFileDialog-uninstall_subtargets FORCE - -/usr/local/Trolltech/Qt-4.2.3/bin/moc: - (cd $(QTDIR)/src/tools/moc && $(MAKE)) - -mocclean: compiler_moc_header_clean compiler_moc_source_clean - -mocables: compiler_moc_header_make_all compiler_moc_source_make_all -install: install_subtargets FORCE - -uninstall: uninstall_subtargets FORCE - -FORCE: - diff --git a/src/plugins/Misc/PlaylistFormats/CSVPlaylistFormat/Makefile b/src/plugins/Misc/PlaylistFormats/CSVPlaylistFormat/Makefile deleted file mode 100644 index 5afa50b01..000000000 --- a/src/plugins/Misc/PlaylistFormats/CSVPlaylistFormat/Makefile +++ /dev/null @@ -1,213 +0,0 @@ -############################################################################# -# Makefile for building: libCSVPlaylistFormat.so -# Generated by qmake (2.01a) (Qt 4.3.0) on: Mon Dec 24 01:59:02 2007 -# Project: CSVPlaylistFormat.pro -# Template: lib -# Command: /usr/local/Trolltech/Qt-4.3.0/bin/qmake -unix -o Makefile CSVPlaylistFormat.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 -Wall -W -D_REENTRANT -fPIC $(DEFINES) -CXXFLAGS = -pipe -O2 -Wall -W -D_REENTRANT -fPIC $(DEFINES) -INCPATH = -I/usr/local/Trolltech/Qt-4.3.0/mkspecs/linux-g++ -I. -I/usr/local/Trolltech/Qt-4.3.0/include/QtCore -I/usr/local/Trolltech/Qt-4.3.0/include/QtCore -I/usr/local/Trolltech/Qt-4.3.0/include/QtGui -I/usr/local/Trolltech/Qt-4.3.0/include/QtGui -I/usr/local/Trolltech/Qt-4.3.0/include -I../../../qmmp/src -I../../../qmmp/lib -I. -I. -LINK = g++ -LFLAGS = -Wl,-rpath,/usr/local/Trolltech/Qt-4.3.0/lib -shared -LIBS = $(SUBLIBS) -L/usr/local/Trolltech/Qt-4.3.0/lib -lQtGui -L/usr/local/Trolltech/Qt-4.3.0/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 -lrt -lglib-2.0 -ldl -lpthread -AR = ar cqs -RANLIB = -QMAKE = /usr/local/Trolltech/Qt-4.3.0/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 = ./ - -####### Files - -SOURCES = csvplaylistformat.cpp \ - ../../../qmmp/src/mediafile.cpp moc_csvplaylistformat.cpp -OBJECTS = csvplaylistformat.o \ - mediafile.o \ - moc_csvplaylistformat.o -DIST = /usr/local/Trolltech/Qt-4.3.0/mkspecs/common/g++.conf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/common/unix.conf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/common/linux.conf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/qconfig.pri \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt_functions.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt_config.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/exclusive_builds.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/default_pre.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/release.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/default_post.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/warn_on.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/unix/thread.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/moc.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/resources.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/uic.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/yacc.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/lex.prf \ - CSVPlaylistFormat.pro -QMAKE_TARGET = CSVPlaylistFormat -DESTDIR = ../ -TARGET = libCSVPlaylistFormat.so -TARGETD = libCSVPlaylistFormat.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 ../$(TARGET) - -../$(TARGET): $(OBJECTS) $(SUBLIBS) $(OBJCOMP) - @$(CHK_DIR_EXISTS) ../ || $(MKDIR) ../ - -$(DEL_FILE) $(TARGET) - $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS) $(OBJCOMP) - -$(MOVE) $(TARGET) ../ - - - -Makefile: CSVPlaylistFormat.pro /usr/local/Trolltech/Qt-4.3.0/mkspecs/linux-g++/qmake.conf /usr/local/Trolltech/Qt-4.3.0/mkspecs/common/g++.conf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/common/unix.conf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/common/linux.conf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/qconfig.pri \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt_functions.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt_config.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/exclusive_builds.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/default_pre.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/release.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/default_post.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/warn_on.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/unix/thread.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/moc.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/resources.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/uic.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/yacc.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/lex.prf \ - /usr/local/Trolltech/Qt-4.3.0/lib/libQtGui.prl \ - /usr/local/Trolltech/Qt-4.3.0/lib/libQtCore.prl - $(QMAKE) -unix -o Makefile CSVPlaylistFormat.pro -/usr/local/Trolltech/Qt-4.3.0/mkspecs/common/g++.conf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/common/unix.conf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/common/linux.conf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/qconfig.pri: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt_functions.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt_config.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/exclusive_builds.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/default_pre.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/release.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/default_post.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/warn_on.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/unix/thread.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/moc.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/resources.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/uic.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/yacc.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/lex.prf: -/usr/local/Trolltech/Qt-4.3.0/lib/libQtGui.prl: -/usr/local/Trolltech/Qt-4.3.0/lib/libQtCore.prl: -qmake: FORCE - @$(QMAKE) -unix -o Makefile CSVPlaylistFormat.pro - -dist: - @$(CHK_DIR_EXISTS) .tmp/CSVPlaylistFormat1.0.0 || $(MKDIR) .tmp/CSVPlaylistFormat1.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/CSVPlaylistFormat1.0.0/ && $(COPY_FILE) --parents csvplaylistformat.h .tmp/CSVPlaylistFormat1.0.0/ && $(COPY_FILE) --parents csvplaylistformat.cpp ../../../qmmp/src/mediafile.cpp .tmp/CSVPlaylistFormat1.0.0/ && (cd `dirname .tmp/CSVPlaylistFormat1.0.0` && $(TAR) CSVPlaylistFormat1.0.0.tar CSVPlaylistFormat1.0.0 && $(COMPRESS) CSVPlaylistFormat1.0.0.tar) && $(MOVE) `dirname .tmp/CSVPlaylistFormat1.0.0`/CSVPlaylistFormat1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/CSVPlaylistFormat1.0.0 - - -clean:compiler_clean - -$(DEL_FILE) $(OBJECTS) - -$(DEL_FILE) ../libcsvplaylistformat.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: moc_csvplaylistformat.cpp -compiler_moc_header_clean: - -$(DEL_FILE) moc_csvplaylistformat.cpp -moc_csvplaylistformat.cpp: csvplaylistformat.h - /usr/local/Trolltech/Qt-4.3.0/bin/moc $(DEFINES) $(INCPATH) csvplaylistformat.h -o moc_csvplaylistformat.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: -compiler_uic_clean: -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 - -####### Compile - -csvplaylistformat.o: csvplaylistformat.cpp csvplaylistformat.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o csvplaylistformat.o csvplaylistformat.cpp - -mediafile.o: ../../../qmmp/src/mediafile.cpp ../../../qmmp/src/mediafile.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mediafile.o ../../../qmmp/src/mediafile.cpp - -moc_csvplaylistformat.o: moc_csvplaylistformat.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_csvplaylistformat.o moc_csvplaylistformat.cpp - -####### Install - -install: FORCE - -uninstall: FORCE - -FORCE: - diff --git a/src/plugins/Misc/PlaylistFormats/Makefile b/src/plugins/Misc/PlaylistFormats/Makefile deleted file mode 100644 index cbf632042..000000000 --- a/src/plugins/Misc/PlaylistFormats/Makefile +++ /dev/null @@ -1,112 +0,0 @@ -############################################################################# -# Makefile for building: PlaylistFormats -# Generated by qmake (2.01a) (Qt 4.3.0) on: Mon Dec 24 01:59:00 2007 -# Project: PlaylistFormats.pro -# Template: subdirs -# Command: /usr/local/Trolltech/Qt-4.3.0/bin/qmake -unix -o Makefile PlaylistFormats.pro -############################################################################# - -first: make_default -MAKEFILE = Makefile -QMAKE = /usr/local/Trolltech/Qt-4.3.0/bin/qmake -DEL_FILE = rm -f -CHK_DIR_EXISTS= test -d -MKDIR = mkdir -p -COPY = cp -f -COPY_FILE = $(COPY) -COPY_DIR = $(COPY) -r -INSTALL_FILE = install -m 644 -p -INSTALL_PROGRAM = install -m 755 -p -INSTALL_DIR = $(COPY_DIR) -DEL_FILE = rm -f -SYMLINK = ln -sf -DEL_DIR = rmdir -MOVE = mv -f -CHK_DIR_EXISTS= test -d -MKDIR = mkdir -p -SUBTARGETS = \ - sub-CSVPlaylistFormat - -CSVPlaylistFormat//$(MAKEFILE): - @$(CHK_DIR_EXISTS) CSVPlaylistFormat/ || $(MKDIR) CSVPlaylistFormat/ - cd CSVPlaylistFormat/ && $(QMAKE) CSVPlaylistFormat.pro -unix -o $(MAKEFILE) -sub-CSVPlaylistFormat-qmake_all: FORCE - @$(CHK_DIR_EXISTS) CSVPlaylistFormat/ || $(MKDIR) CSVPlaylistFormat/ - cd CSVPlaylistFormat/ && $(QMAKE) CSVPlaylistFormat.pro -unix -o $(MAKEFILE) -sub-CSVPlaylistFormat: CSVPlaylistFormat//$(MAKEFILE) FORCE - cd CSVPlaylistFormat/ && $(MAKE) -f $(MAKEFILE) -sub-CSVPlaylistFormat-make_default: CSVPlaylistFormat//$(MAKEFILE) FORCE - cd CSVPlaylistFormat/ && $(MAKE) -f $(MAKEFILE) -sub-CSVPlaylistFormat-make_first: CSVPlaylistFormat//$(MAKEFILE) FORCE - cd CSVPlaylistFormat/ && $(MAKE) -f $(MAKEFILE) first -sub-CSVPlaylistFormat-all: CSVPlaylistFormat//$(MAKEFILE) FORCE - cd CSVPlaylistFormat/ && $(MAKE) -f $(MAKEFILE) all -sub-CSVPlaylistFormat-clean: CSVPlaylistFormat//$(MAKEFILE) FORCE - cd CSVPlaylistFormat/ && $(MAKE) -f $(MAKEFILE) clean -sub-CSVPlaylistFormat-distclean: CSVPlaylistFormat//$(MAKEFILE) FORCE - cd CSVPlaylistFormat/ && $(MAKE) -f $(MAKEFILE) distclean -sub-CSVPlaylistFormat-install_subtargets: CSVPlaylistFormat//$(MAKEFILE) FORCE - cd CSVPlaylistFormat/ && $(MAKE) -f $(MAKEFILE) install -sub-CSVPlaylistFormat-uninstall_subtargets: CSVPlaylistFormat//$(MAKEFILE) FORCE - cd CSVPlaylistFormat/ && $(MAKE) -f $(MAKEFILE) uninstall - -Makefile: PlaylistFormats.pro /usr/local/Trolltech/Qt-4.3.0/mkspecs/linux-g++/qmake.conf /usr/local/Trolltech/Qt-4.3.0/mkspecs/common/g++.conf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/common/unix.conf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/common/linux.conf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/qconfig.pri \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt_functions.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt_config.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/exclusive_builds.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/default_pre.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/release.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/default_post.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/warn_on.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/unix/thread.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/moc.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/resources.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/uic.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/yacc.prf \ - /usr/local/Trolltech/Qt-4.3.0/mkspecs/features/lex.prf - $(QMAKE) -unix -o Makefile PlaylistFormats.pro -/usr/local/Trolltech/Qt-4.3.0/mkspecs/common/g++.conf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/common/unix.conf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/common/linux.conf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/qconfig.pri: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt_functions.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt_config.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/exclusive_builds.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/default_pre.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/release.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/default_post.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/warn_on.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/qt.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/unix/thread.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/moc.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/resources.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/uic.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/yacc.prf: -/usr/local/Trolltech/Qt-4.3.0/mkspecs/features/lex.prf: -qmake: qmake_all FORCE - @$(QMAKE) -unix -o Makefile PlaylistFormats.pro - -qmake_all: sub-CSVPlaylistFormat-qmake_all FORCE - -make_default: sub-CSVPlaylistFormat-make_default FORCE -make_first: sub-CSVPlaylistFormat-make_first FORCE -all: sub-CSVPlaylistFormat-all FORCE -clean: sub-CSVPlaylistFormat-clean FORCE -distclean: sub-CSVPlaylistFormat-distclean FORCE - -$(DEL_FILE) Makefile -install_subtargets: sub-CSVPlaylistFormat-install_subtargets FORCE -uninstall_subtargets: sub-CSVPlaylistFormat-uninstall_subtargets FORCE - -mocclean: compiler_moc_header_clean compiler_moc_source_clean - -mocables: compiler_moc_header_make_all compiler_moc_source_make_all -install: install_subtargets FORCE - -uninstall: uninstall_subtargets FORCE - -FORCE: - 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" 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 <QSettings> #include "outputjack.h" -#include "constants.h" -#include "buffer.h" -#include "visual.h" +#include <qmmp/constants.h> +#include <qmmp/buffer.h> +#include <qmmp/visual.h> #include <stdio.h> #include <string.h> 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 <output.h> +#include <qmmp/output.h> #include <QObject> 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 <QIODevice> #include <QWidget> -#include <output.h> -#include <outputfactory.h> +#include <qmmp/output.h> +#include <qmmp/outputfactory.h> 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 <QApplication> #include "outputoss.h" -#include "constants.h" -#include "buffer.h" -#include "visual.h" +#include <qmmp/constants.h> +#include <qmmp/buffer.h> +#include <qmmp/visual.h> #include <stdio.h> #include <string.h> 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 <output.h> +#include <qmmp/output.h> #include <QObject> 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 <QIODevice> #include <QWidget> -#include <output.h> -#include <outputfactory.h> +#include <qmmp/output.h> +#include <qmmp/outputfactory.h> class OutputOSSFactory : public QObject, diff --git a/src/plugins/Visual/analyzer/analyzer.cpp b/src/plugins/Visual/analyzer/analyzer.cpp index efcb8b7d7..c47ee71de 100644 --- a/src/plugins/Visual/analyzer/analyzer.cpp +++ b/src/plugins/Visual/analyzer/analyzer.cpp @@ -23,13 +23,12 @@ #include <QMenu> #include <QActionGroup> -#include <buffer.h> -#include <constants.h> -#include <output.h> +#include <qmmp/buffer.h> +#include <qmmp/constants.h> +#include <qmmp/output.h> #include <math.h> #include <stdlib.h> -//#include "skin.h" #include "fft.h" #include "inlines.h" #include "analyzer.h" diff --git a/src/plugins/Visual/analyzer/analyzer.h b/src/plugins/Visual/analyzer/analyzer.h index ab08d3af0..2a4c70397 100644 --- a/src/plugins/Visual/analyzer/analyzer.h +++ b/src/plugins/Visual/analyzer/analyzer.h @@ -22,8 +22,8 @@ #include <QWidget> #include <QResizeEvent> -#include <visual.h> -#include <constants.h> +#include <qmmp/visual.h> +#include <qmmp/constants.h> #include <QDir> class QSettings; diff --git a/src/plugins/Visual/analyzer/analyzer.pro b/src/plugins/Visual/analyzer/analyzer.pro index 05d95a1ff..a2711f17c 100644 --- a/src/plugins/Visual/analyzer/analyzer.pro +++ b/src/plugins/Visual/analyzer/analyzer.pro @@ -4,19 +4,19 @@ TARGET=$$PLUGINS_PREFIX/Visual/analyzer QMAKE_CLEAN =$$PLUGINS_PREFIX/Visual/libanalyzer.so -#FORMS += detailsdialog.ui +FORMS += settingsdialog.ui HEADERS += analyzer.h \ - fft.h \ - visualanalyzerfactory.h \ - inlines.h \ - colorwidget.h \ - settingsdialog.h -SOURCES += analyzer.cpp \ - fft.c \ - visualanalyzerfactory.cpp \ - colorwidget.cpp \ - settingsdialog.cpp -INCLUDEPATH += ../../../qmmp + fft.h \ + visualanalyzerfactory.h \ + inlines.h \ + colorwidget.h \ + settingsdialog.h + SOURCES += analyzer.cpp \ + fft.c \ + visualanalyzerfactory.cpp \ + colorwidget.cpp \ + settingsdialog.cpp +INCLUDEPATH += ../../../ CONFIG += release \ warn_on \ plugin @@ -31,5 +31,5 @@ isEmpty(LIB_DIR){ } target.path = $$LIB_DIR/qmmp/Visual INSTALLS += target -FORMS += settingsdialog.ui + diff --git a/src/plugins/Visual/analyzer/visualanalyzerfactory.h b/src/plugins/Visual/analyzer/visualanalyzerfactory.h index 54f52bfe2..6f8619125 100644 --- a/src/plugins/Visual/analyzer/visualanalyzerfactory.h +++ b/src/plugins/Visual/analyzer/visualanalyzerfactory.h @@ -23,8 +23,8 @@ #include <QObject> -#include <visualfactory.h> -#include <visual.h> +#include <qmmp/visualfactory.h> +#include <qmmp/visual.h> /** @author Ilya Kotov <forkotov02@hotmail.ru> |