aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Input/vorbis
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2008-02-08 13:18:29 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2008-02-08 13:18:29 +0000
commit8446b57d05d8d42c8aa1d9ccfb11a9370bac5b78 (patch)
tree0ff8cb60d8f62a5da867719eb1f3e10f70655571 /src/plugins/Input/vorbis
parent663888166aea02b082d94eafa844b766eac0f2dd (diff)
downloadqmmp-8446b57d05d8d42c8aa1d9ccfb11a9370bac5b78.tar.gz
qmmp-8446b57d05d8d42c8aa1d9ccfb11a9370bac5b78.tar.bz2
qmmp-8446b57d05d8d42c8aa1d9ccfb11a9370bac5b78.zip
include path changes
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@234 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Input/vorbis')
-rw-r--r--src/plugins/Input/vorbis/decoder_vorbis.cpp14
-rw-r--r--src/plugins/Input/vorbis/decoder_vorbis.h6
-rw-r--r--src/plugins/Input/vorbis/decodervorbisfactory.h10
-rw-r--r--src/plugins/Input/vorbis/vorbis.pro9
4 files changed, 17 insertions, 22 deletions
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 \