moved into qmmp dir

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

133 files changed, 17003 insertions, 0 deletions

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
new file mode 100644
index 000000000..3b2fc8df9
--- /dev/null
+++ b/lib/CMakeLists.txt
@@ -0,0 +1,53 @@
+project(libqmmp)
+
+cmake_minimum_required(VERSION 2.4.0)
+
+include(FindQt4)
+find_package(Qt4 REQUIRED) # find and setup Qt4 for this project
+include(${QT_USE_FILE})
+
+# qt lib
+ADD_DEFINITIONS( -Wall )
+ADD_DEFINITIONS(${QT_DEFINITIONS})
+#ADD_DEFINITIONS(-DQT_PLUGIN)
+ADD_DEFINITIONS(-DQT_NO_DEBUG)
+ADD_DEFINITIONS(-DQT_SHARED)
+ADD_DEFINITIONS(-DQT_THREAD)
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+SET(libqmmp_SRCS
+    recycler.cpp
+    decoder.cpp
+    output.cpp
+    equ/iir.c
+    equ/iir_cfs.c
+    equ/iir_fpu.c
+    soundcore.cpp
+)
+
+SET(libqmmp_MOC_HDRS
+  visualization.h
+  recycler.h
+  buffer.h
+  constants.h
+  decoder.h
+  output.h
+  filetag.h
+  outputfactory.h
+  equ/iir_cfs.h
+  equ/iir_fpu.h
+  equ/iir.h
+  decoderfactory.h
+  soundcore.h
+)
+
+QT4_WRAP_CPP(libqmmp_MOC_SRCS ${libqmmp_MOC_HDRS})
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+
+ADD_LIBRARY(qmmp SHARED ${libqmmp_SRCS} ${libqmmp_MOC_SRCS})
+target_link_libraries(qmmp ${QT_LIBRARIES})
+install(TARGETS qmmp LIBRARY DESTINATION lib)
+
diff --git a/lib/buffer.h b/lib/buffer.h
new file mode 100644
index 000000000..b04ea0ed8
--- /dev/null
+++ b/lib/buffer.h
@@ -0,0 +1,37 @@
+// Copyright (c) 2000-2001 Brad Hughes <bhughes@trolltech.com>
+//
+// Use, modification and distribution is allowed without limitation,
+// warranty, or liability of any kind.
+//
+
+#ifndef   __buffer_h
+#define   __buffer_h
+
+#include "constants.h"
+
+class Buffer {
+public:
+    Buffer()
+    {
+	data = new unsigned char[Buffer::size()];
+	nbytes = 0;
+	rate = 0;
+    }
+    ~Buffer()
+    {
+	delete data;
+	data = 0;
+	nbytes = 0;
+	rate = 0;
+    }
+
+    unsigned char *data;
+    unsigned long nbytes;
+    unsigned long rate;
+
+    static unsigned long size() { return globalBlockSize; }
+};
+
+
+#endif // __buffer_h
+
diff --git a/lib/constants.h b/lib/constants.h
new file mode 100644
index 000000000..468dc08c1
--- /dev/null
+++ b/lib/constants.h
@@ -0,0 +1,30 @@
+// Copyright (c) 2000-2001 Brad Hughes <bhughes@trolltech.com>
+//
+// Use, modification and distribution is allowed without limitation,
+// warranty, or liability of any kind.
+//
+
+#ifndef __constants_h
+#define __constants_h
+
+#define VERSION "MQ3 Release Fourteen"
+
+#if defined(Q_OS_UNIX)
+//#  include "../config.h"
+#  ifndef INSTALLDIR
+#    define INSTALLDIR "/usr/local"
+#  endif
+#elif defined( Q_OS_WIN32 )
+#  define INSTALLDIR "c:/depot/mq3/main"
+#endif
+
+const unsigned int historySize      = 100;
+const unsigned int globalBlockSize  = 2 * 1024;    //2*1024
+const unsigned int globalBufferSize = globalBlockSize * 32;
+const unsigned int groupOpenTimeout = 750;
+
+#if defined( Q_OS_WIN32 )
+#define BUFFERBLOCKS 16
+#endif
+
+#endif // __constants_h
diff --git a/lib/decoder.cpp b/lib/decoder.cpp
new file mode 100644
index 000000000..b77b780b4
--- /dev/null
+++ b/lib/decoder.cpp
@@ -0,0 +1,270 @@
+// Copyright (c) 2000-2001 Brad Hughes <bhughes@trolltech.com>
+//
+// Use, modification and distribution is allowed without limitation,
+// warranty, or liability of any kind.
+//
+#include <QtGui>
+#include <QObject>
+#include <QStringList>
+#include <QApplication>
+#include <QSettings>
+
+
+#include "constants.h"
+#include "buffer.h"
+#include "output.h"
+#include "visualization.h"
+#include "decoderfactory.h"
+extern "C"{
+#include "equ/iir.h" 
+}
+#include "decoder.h"
+
+
+Decoder::Decoder(QObject *parent, DecoderFactory *d, QIODevice *i, Output *o)
+        : QThread(parent), fctry(d), in(i), out(o), blksize(0),m_eqInited(FALSE),
+        m_useEQ(FALSE)
+{
+    out->recycler()->clear();
+    int b[] = {0,0,0,0,0,0,0,0,0,0};
+    setEQ(b, 0);
+    qRegisterMetaType<DecoderState>("DecoderState");
+}
+
+Decoder::~Decoder()
+{
+    fctry = 0;
+    in = 0;
+    out = 0;
+    blksize = 0;
+}
+
+// static methods
+
+static QList<DecoderFactory*> *factories = 0;
+static QStringList files;
+static QStringList blacklist;
+
+static void checkFactories()
+{
+    QSettings settings ( QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat );
+    blacklist = settings.value("Decoder/disabled_plugins").toStringList ();
+    if (! factories)
+    {
+        files.clear();
+        factories = new QList<DecoderFactory *>;
+
+        QDir pluginsDir (qApp->applicationDirPath());
+        pluginsDir.cdUp();
+        pluginsDir.cd("lib/qmmp/Input");
+        foreach (QString fileName, pluginsDir.entryList(QDir::Files))
+        {
+            QPluginLoader loader(pluginsDir.absoluteFilePath(fileName));
+            QObject *plugin = loader.instance();
+            if (loader.isLoaded())
+            {
+                qDebug("Decoder: plugin loaded - %s", qPrintable(fileName));
+            }
+            DecoderFactory *factory = 0;
+            if (plugin)
+                factory = qobject_cast<DecoderFactory *>(plugin);
+
+            if (factory)
+            {
+                factories->append(factory);
+                files << pluginsDir.absoluteFilePath(fileName);
+            }
+        }
+        //remove physically deleted plugins from blacklist
+        QStringList names;
+        foreach (QString filePath, files)
+        {
+            names.append(filePath.section('/',-1));
+        }
+        int i = 0;
+        while (i < blacklist.size())
+        {
+            if (!names.contains(blacklist.at(i)))
+                blacklist.removeAt(i);
+            else
+                i++;
+        }
+        settings.setValue("Decoder/disabled_plugins",blacklist);
+    }
+}
+
+
+QStringList Decoder::all()
+{
+    checkFactories();
+
+    QStringList l;
+    DecoderFactory *fact;
+    foreach(fact, *factories)
+    {
+        l << fact->description();
+    }
+    return l;
+}
+
+QStringList Decoder::decoderFiles()
+{
+    checkFactories();
+    return files;
+}
+
+
+bool Decoder::supports(const QString &source)
+{
+    checkFactories();
+
+    for (int i=0; i<factories->size(); ++i)
+    {
+        if (factories->at(i)->supports(source) &&
+                !blacklist.contains(files.at(i).section('/',-1)))
+        {
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+Decoder *Decoder::create(QObject *parent, const QString &source,
+                         QIODevice *input,
+                         Output *output)
+{
+    Decoder *decoder = 0;
+
+    DecoderFactory *fact = Decoder::findFactory(source);
+    if (fact)
+    {
+        decoder = fact->create(parent, input, output);
+    }
+    return decoder;
+}
+
+DecoderFactory *Decoder::findFactory(const QString& source)
+{
+    checkFactories();
+
+    for (int i=0; i<factories->size(); ++i)
+    {
+        if (factories->at(i)->supports(source) &&
+                !blacklist.contains(files.at(i).section('/',-1)))
+        {
+            return factories->at(i);
+        }
+    }
+    qDebug("Decoder: unable to find factory");
+    return 0;
+}
+
+FileTag *Decoder::createTag(const QString& source)
+{
+    DecoderFactory *fact = Decoder::findFactory(source);
+    if (fact)
+    {
+        return fact->createTag(source);
+    }
+    return 0;
+}
+
+QString Decoder::filter()
+{
+    QString allflt(tr("All Supported Bitstreams ("));
+    QString flt;
+
+    checkFactories();
+    DecoderFactory *fact;
+    for (int i = 0; i<factories->size(); ++i)
+    {
+        if (!blacklist.contains(files.at(i).section('/',-1)))
+        {
+            fact = (*factories)[i];
+            allflt +=fact->filter().toLower() +" ";
+            flt += fact->description() + " (" + fact->filter().toLower() + ")";
+            flt += ";;";
+        }
+    }
+    if (!flt.isEmpty ())
+        flt = flt.left(flt.size ()-2);
+
+    allflt += ");;";
+
+    return allflt + flt;
+}
+
+QStringList Decoder::nameFilters()
+{
+    checkFactories();
+    QStringList filters;
+    for (int i=0; i<factories->size(); ++i)
+    {
+        if (!blacklist.contains(files.at(i).section('/',-1)))
+            filters << factories->at(i)->filter().split(" ", QString::SkipEmptyParts);
+    }
+    return filters;
+}
+
+QList<DecoderFactory*> *Decoder::decoderFactories()
+{
+    checkFactories();
+    return factories;
+}
+
+void Decoder::dispatch(const DecoderState &st)
+{
+    emit stateChanged(st);
+}
+
+void Decoder::dispatch(DecoderState::Type st)
+{
+    emit stateChanged(DecoderState(st));
+}
+
+void Decoder::error(const QString &e)
+{
+    emit stateChanged(DecoderState(e));
+}
+
+ulong Decoder::produceSound(char *data, ulong output_bytes, ulong bitrate, int nch)
+{
+    ulong sz = output_bytes < blksize ? output_bytes : blksize;
+    Buffer *b = output()->recycler()->get();
+
+    if (!m_eqInited)
+    {
+        init_iir();
+        m_eqInited = TRUE;
+    }
+    if (m_useEQ)
+    {
+        iir((void*) data,sz,nch);
+    }
+    memcpy(b->data, data, sz);
+
+    if (sz != blksize)
+        memset(b->data + sz, 0, blksize - sz);
+
+    b->nbytes = blksize;
+    b->rate = bitrate;
+
+    output()->recycler()->add();
+
+    output_bytes -= sz;
+    memmove(data, data + sz, output_bytes);
+    return sz;
+}
+
+void Decoder::setEQ(int bands[10], int preamp)
+{
+    set_preamp(0, 1.0 + 0.0932471 *preamp + 0.00279033 * preamp * preamp);
+    set_preamp(1, 1.0 + 0.0932471 *preamp + 0.00279033 * preamp * preamp);
+    for (int i=0; i<10; ++i)
+    {
+        int value = bands[i];
+        set_gain(i,0, 0.03*value+0.000999999*value*value);
+        set_gain(i,1, 0.03*value+0.000999999*value*value);
+    }
+}
+
diff --git a/lib/decoder.h b/lib/decoder.h
new file mode 100644
index 000000000..c7b099067
--- /dev/null
+++ b/lib/decoder.h
@@ -0,0 +1,158 @@
+// Copyright (c) 2000-2001 Brad Hughes <bhughes@trolltech.com>
+//
+// Use, modification and distribution is allowed without limitation,
+// warranty, or liability of any kind.
+//
+
+#ifndef   DECODER_H
+#define   DECODER_H
+
+#include <QThread>
+#include <QList>
+#include <QMutex>
+#include <QWaitCondition>
+#include <QObject>
+
+
+#include "fileinfo.h"
+#include "filetag.h"
+
+class QObject;
+class QIODevice;
+
+class Decoder;
+class DecoderFactory;
+class Buffer;
+class Recycler;
+class Output;
+class Visualization;
+
+
+
+class DecoderState
+{
+public:
+    enum Type { Decoding, Stopped, Finished, Error };
+
+    DecoderState(Type t)
+            : m_type(t), m_error_msg(0)
+    {}
+
+    DecoderState(const QString &e)
+            : m_type(Error)
+    {
+        m_error_msg = new QString(e);
+    }
+
+    DecoderState()
+            : m_type(Stopped), m_error_msg(0)
+    {}
+
+    ~DecoderState()
+    {
+        if (m_error_msg)
+           delete m_error_msg;
+    }
+
+    const QString *errorMessage() const
+    {
+        return m_error_msg;
+    }
+    const Type &type() const
+    {
+        return m_type;
+    }
+
+private:
+    Type m_type;
+    const QString *m_error_msg;
+};
+
+
+
+class Decoder : public QThread
+{
+Q_OBJECT
+public:
+    Decoder(QObject *parent, DecoderFactory *d, 
+               QIODevice *i, Output *o);
+    virtual ~Decoder();
+
+    // Standard Decoder API
+    virtual bool initialize() = 0;
+    virtual double lengthInSeconds() = 0;
+    virtual void seek(double) = 0;
+    virtual void stop() = 0;
+
+    DecoderFactory *factory() const
+    {
+        return fctry;
+    }
+
+    QIODevice *input()
+    {
+        return in;
+    }
+    Output *output()
+    {
+        return out;
+    }
+
+    QMutex *mutex()
+    {
+        return &mtx;
+    }
+    QWaitCondition *cond()
+    {
+        return &cnd;
+    }
+
+    void setBlockSize(unsigned int sz)
+    {
+        blksize = sz;
+    }
+
+    unsigned int blockSize() const
+    {
+        return blksize;
+    }
+    ulong produceSound(char *data, ulong output_bytes, ulong bitrate, int nch);
+    void setEQ(int bands[10], int preamp);
+    void setEQEnabled(bool on) { m_useEQ = on; };
+
+    // static methods
+    static QStringList all();
+    static bool supports(const QString &);
+    //static void registerFactory(DecoderFactory *);
+    static Decoder *create(QObject *, const QString &, QIODevice *, Output *);
+    static DecoderFactory *findFactory(const QString&);
+    static FileTag *createTag(const QString&);
+    static QString filter();
+    static QStringList nameFilters();
+    static QList<DecoderFactory*> *decoderFactories();
+    static QStringList decoderFiles();
+
+signals:
+    void stateChanged(const DecoderState&);
+
+protected:
+    void dispatch(DecoderState::Type);
+    void dispatch(const DecoderState&);
+    void error(const QString&);
+
+private:
+    DecoderFactory *fctry;
+
+    QList<QObject*> listeners;
+    QIODevice *in;
+    Output *out;
+
+    QMutex mtx;
+    QWaitCondition cnd;
+
+    uint blksize;
+    bool m_eqInited;
+    bool m_useEQ;
+};
+
+#endif // DECODER_H
diff --git a/lib/decoderfactory.h b/lib/decoderfactory.h
new file mode 100644
index 000000000..9fd5b55cd
--- /dev/null
+++ b/lib/decoderfactory.h
@@ -0,0 +1,52 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#ifndef DECODERFACTORY_H
+#define DECODERFACTORY_H
+
+class QObject;
+class QString;
+class QIODevice;
+class QWidget;
+class QTranslator;
+
+class Decoder;
+class Output;
+class FileTag;
+
+class DecoderFactory
+{
+public:
+    virtual ~DecoderFactory() {}
+    virtual bool supports(const QString &source) const = 0;
+    virtual const QString &name() const = 0;
+    virtual const QString &filter() const = 0;
+    virtual const QString &description() const = 0; //i.e. file description
+    virtual Decoder *create(QObject *, QIODevice *, Output *) = 0; 
+    virtual FileTag *createTag(const QString &source) = 0;
+    virtual void showDetails(QWidget *parent, const QString &path) = 0;
+    virtual void showSettings(QWidget *parent) = 0;
+    virtual void showAbout(QWidget *parent) = 0;
+    virtual QTranslator *createTranslator(QObject *parent) = 0;
+};
+
+Q_DECLARE_INTERFACE(DecoderFactory, "DecoderFactory/1.0");
+
+#endif
diff --git a/lib/equ/iir.c b/lib/equ/iir.c
new file mode 100644
index 000000000..9d826b86c
--- /dev/null
+++ b/lib/equ/iir.c
@@ -0,0 +1,85 @@
+/*
+ *   PCM time-domain equalizer
+ *
+ *   Copyright (C) 2002-2005  Felipe Rivera <liebremx at users sourceforge net>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *   $Id: iir.c,v 1.15 2005/10/17 01:57:59 liebremx Exp $
+ */
+
+#include <math.h>
+#include "iir.h"
+
+/* Coefficients */
+sIIRCoefficients *iir_cf;
+
+/* Volume gain 
+ * values should be between 0.0 and 1.0 
+ * Use the preamp from XMMS for now
+ * */
+float preamp[EQ_CHANNELS];
+
+#ifdef BENCHMARK
+#include "benchmark.h"
+double timex = 0.0;
+int count = 0;
+unsigned int blength = 0;
+#endif
+
+/* 
+ * Global vars
+ */
+int rate;
+int band_count;
+
+void set_preamp(int chn, float val)
+{
+  preamp[chn] = val;
+}
+
+/* Init the filters */
+void init_iir()
+{
+  calc_coeffs();
+#if 0
+  band_count = cfg.band_num;
+#endif
+
+  band_count = 10;
+
+  rate = 44100;
+
+  iir_cf = get_coeffs(&band_count, rate);
+  clean_history();
+}
+
+#ifdef ARCH_X86
+/* Round function provided by Frank Klemm which saves around 100K
+ * CPU cycles in my PIII for each call to the IIR function with 4K samples
+ */
+__inline__ int round_trick(float floatvalue_to_round)
+{
+  float   floattmp ;
+  int     rounded_value ;
+
+  floattmp      = (int) 0x00FD8000L + (floatvalue_to_round);
+  rounded_value = *(int*)(&floattmp) - (int)0x4B7D8000L;
+
+  if ( rounded_value != (short) rounded_value )
+    rounded_value = ( rounded_value >> 31 ) ^ 0x7FFF;
+  return rounded_value;
+}
+#endif
diff --git a/lib/equ/iir.h b/lib/equ/iir.h
new file mode 100644
index 000000000..e7ea5ef1a
--- /dev/null
+++ b/lib/equ/iir.h
@@ -0,0 +1,84 @@
+/*
+ *   PCM time-domain equalizer
+ *
+ *   Copyright (C) 2002-2005  Felipe Rivera <liebremx at users.sourceforge.net>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *   $Id: iir.h,v 1.12 2005/10/17 01:57:59 liebremx Exp $
+ */
+#ifndef IIR_H
+#define IIR_H
+
+//#include <glib.h>
+//#include "main.h"
+#include "iir_cfs.h"
+
+/*
+ * Flush-to-zero to avoid flooding the CPU with underflow exceptions 
+ */
+#ifdef SSE_MATH
+#define FTZ 0x8000
+#define FTZ_ON { \
+    unsigned int mxcsr; \
+  __asm__  __volatile__ ("stmxcsr %0" : "=m" (*&mxcsr)); \
+  mxcsr |= FTZ; \
+  __asm__  __volatile__ ("ldmxcsr %0" : : "m" (*&mxcsr)); \
+}
+#define FTZ_OFF { \
+    unsigned int mxcsr; \
+  __asm__  __volatile__ ("stmxcsr %0" : "=m" (*&mxcsr)); \
+  mxcsr &= ~FTZ; \
+  __asm__  __volatile__ ("ldmxcsr %0" : : "m" (*&mxcsr)); \
+}
+#else
+#define FTZ_ON
+#define FTZ_OFF
+#endif
+
+/*
+ * Function prototypes
+ */
+void init_iir();
+void clean_history();
+void set_gain(int index, int chn, float val);
+void set_preamp(int chn, float val);
+
+
+ int iir(void * d, int length, int nch);
+
+#ifdef ARCH_X86
+__inline__ int round_trick(float floatvalue_to_round);
+#endif
+#ifdef ARCH_PPC
+__inline__ int round_ppc(float x);
+#endif
+
+#define EQ_CHANNELS 2
+#define EQ_MAX_BANDS 10
+
+extern float preamp[EQ_CHANNELS];
+extern sIIRCoefficients *iir_cf;
+extern int rate;
+extern int band_count;
+
+#ifdef BENCHMARK
+extern double timex;
+extern int count;
+extern unsigned int blength;
+#endif
+
+#endif /* #define IIR_H */
+
diff --git a/lib/equ/iir_cfs.c b/lib/equ/iir_cfs.c
new file mode 100644
index 000000000..f8e6f88a6
--- /dev/null
+++ b/lib/equ/iir_cfs.c
@@ -0,0 +1,237 @@
+/*
+ *   Copyright (C) 2002-2005  Felipe Rivera <liebremx at users.sourceforge.net>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *
+ *   Coefficient stuff
+ *
+ *   $Id: iir_cfs.c,v 1.1 2005/10/17 01:57:59 liebremx Exp $
+ */
+
+#include "iir_cfs.h"
+#include <stdio.h>
+#include <math.h>
+
+/*************************** 
+ * IIR filter coefficients *
+ ***************************/ 
+static sIIRCoefficients iir_cf10_11k_11025[10] __attribute__((aligned));
+static sIIRCoefficients iir_cf10_22k_22050[10] __attribute__((aligned));
+static sIIRCoefficients iir_cforiginal10_44100[10] __attribute__((aligned));
+static sIIRCoefficients iir_cforiginal10_48000[10] __attribute__((aligned));
+static sIIRCoefficients iir_cf10_44100[10] __attribute__((aligned));
+static sIIRCoefficients iir_cf10_48000[10] __attribute__((aligned));
+static sIIRCoefficients iir_cf15_44100[15] __attribute__((aligned));
+static sIIRCoefficients iir_cf15_48000[15] __attribute__((aligned));
+static sIIRCoefficients iir_cf25_44100[25] __attribute__((aligned));
+static sIIRCoefficients iir_cf25_48000[25] __attribute__((aligned));
+static sIIRCoefficients iir_cf31_44100[31] __attribute__((aligned));
+static sIIRCoefficients iir_cf31_48000[31] __attribute__((aligned));
+
+/****************************************************************** 
+ * Definitions and data structures to calculate the coefficients
+ ******************************************************************/
+static const double band_f011k[] =
+{ 31, 62, 125, 250, 500, 1000, 2000, 3000, 4000, 5500 
+};
+static const double band_f022k[] =
+{ 31, 62, 125, 250, 500, 1000, 2000, 4000, 8000, 11000 
+};
+static const double band_f010[] =
+{ 31, 62, 125, 250, 500, 1000, 2000, 4000, 8000, 16000 
+};
+static const double band_original_f010[] =
+{ 60, 170, 310, 600, 1000, 3000, 6000, 12000, 14000, 16000 
+};
+static const double band_f015[] =
+{ 25,40,63,100,160,250,400,630,1000,1600,2500,4000,6300,10000,16000
+};
+static const double band_f025[] =
+{ 20,31.5,40,50,80,100,125,160,250,315,400,500,800,
+  1000,1250,1600,2500,3150,4000,5000,8000,10000,12500,16000,20000
+};
+static const double band_f031[] =
+{ 20,25,31.5,40,50,63,80,100,125,160,200,250,315,400,500,630,800,
+  1000,1250,1600,2000,2500,3150,4000,5000,6300,8000,10000,12500,16000,20000
+};
+
+#define GAIN_F0 1.0
+#define GAIN_F1 GAIN_F0 / M_SQRT2
+
+#define SAMPLING_FREQ 44100.0
+#define TETA(f) (2*M_PI*(double)f/bands[n].sfreq)
+#define TWOPOWER(value) (value * value)
+
+#define BETA2(tf0, tf) \
+(TWOPOWER(GAIN_F1)*TWOPOWER(cos(tf0)) \
+ - 2.0 * TWOPOWER(GAIN_F1) * cos(tf) * cos(tf0) \
+ + TWOPOWER(GAIN_F1) \
+ - TWOPOWER(GAIN_F0) * TWOPOWER(sin(tf)))
+#define BETA1(tf0, tf) \
+    (2.0 * TWOPOWER(GAIN_F1) * TWOPOWER(cos(tf)) \
+     + TWOPOWER(GAIN_F1) * TWOPOWER(cos(tf0)) \
+     - 2.0 * TWOPOWER(GAIN_F1) * cos(tf) * cos(tf0) \
+     - TWOPOWER(GAIN_F1) + TWOPOWER(GAIN_F0) * TWOPOWER(sin(tf)))
+#define BETA0(tf0, tf) \
+    (0.25 * TWOPOWER(GAIN_F1) * TWOPOWER(cos(tf0)) \
+     - 0.5 * TWOPOWER(GAIN_F1) * cos(tf) * cos(tf0) \
+     + 0.25 * TWOPOWER(GAIN_F1) \
+     - 0.25 * TWOPOWER(GAIN_F0) * TWOPOWER(sin(tf)))
+
+#define GAMMA(beta, tf0) ((0.5 + beta) * cos(tf0))
+#define ALPHA(beta) ((0.5 - beta)/2.0)
+
+struct {
+    sIIRCoefficients *coeffs;
+    const double *cfs;
+    double octave;
+    int band_count;
+    double sfreq;
+} bands[] = {
+  { iir_cf10_11k_11025,     band_f011k,         1.0,     10, 11025.0 },
+  { iir_cf10_22k_22050,     band_f022k,         1.0,     10, 22050.0 },
+  { iir_cforiginal10_44100, band_original_f010, 1.0,     10, 44100.0 },
+  { iir_cforiginal10_48000, band_original_f010, 1.0,     10, 48000.0 },
+  { iir_cf10_44100,         band_f010,          1.0,     10, 44100.0 },
+  { iir_cf10_48000,         band_f010,          1.0,     10, 48000.0 },
+  { iir_cf15_44100,         band_f015,          2.0/3.0, 15, 44100.0 },
+  { iir_cf15_48000,         band_f015,          2.0/3.0, 15, 48000.0 },
+  { iir_cf25_44100,         band_f025,          1.0/3.0, 25, 44100.0 },
+  { iir_cf25_48000,         band_f025,          1.0/3.0, 25, 48000.0 },
+  { iir_cf31_44100,         band_f031,          1.0/3.0, 31, 44100.0 },
+  { iir_cf31_48000,         band_f031,          1.0/3.0, 31, 48000.0 },
+  { 0, 0, 0, 0, 0 }
+};
+
+/*************
+ * Functions *
+ *************/
+
+/* Get the coeffs for a given number of bands and sampling frequency */
+sIIRCoefficients* get_coeffs(int *bands, int sfreq)
+{
+  sIIRCoefficients *iir_cf = 0;
+  switch(sfreq)
+  {
+    case 11025: iir_cf = iir_cf10_11k_11025;
+                *bands = 10;
+                break;
+    case 22050: iir_cf = iir_cf10_22k_22050;
+                *bands = 10;
+                break;
+    case 48000: 
+                switch(*bands)
+                {
+                  case 31: iir_cf = iir_cf31_48000; break;
+                  case 25: iir_cf = iir_cf25_48000; break;
+                  case 15: iir_cf = iir_cf15_48000; break;
+                  default:
+                           /*iir_cf = use_xmms_original_freqs ? 
+                             iir_cforiginal10_48000 :
+                             iir_cf10_48000;*/
+                             iir_cf = iir_cforiginal10_48000;
+                           break;
+                }
+                break;
+    default:
+                switch(*bands)
+                {
+                  case 31: iir_cf = iir_cf31_44100; break;
+                  case 25: iir_cf = iir_cf25_44100; break;
+                  case 15: iir_cf = iir_cf15_44100; break;
+                  default:
+                           /*iir_cf = use_xmms_original_freqs ? 
+                             iir_cforiginal10_44100 :
+                             iir_cf10_44100;*/
+                             iir_cf = iir_cforiginal10_44100;
+                           break;
+                }
+                break;
+  }
+  return iir_cf;
+}
+
+/* Get the freqs at both sides of F0. These will be cut at -3dB */
+static void find_f1_and_f2(double f0, double octave_percent, double *f1, double *f2)
+{
+    double octave_factor = pow(2.0, octave_percent/2.0);
+    *f1 = f0/octave_factor;
+    *f2 = f0*octave_factor;
+}
+
+/* Find the quadratic root
+ * Always return the smallest root */
+static int find_root(double a, double b, double c, double *x0) {
+  double k = c-((b*b)/(4.*a));
+  double h = -(b/(2.*a));
+  double x1 = 0.;
+  if (-(k/a) < 0.)
+    return -1; 
+  *x0 = h - sqrt(-(k/a));
+  x1 = h + sqrt(-(k/a));
+  if (x1 < *x0)
+    *x0 = x1;
+  return 0;
+}
+
+/* Calculate all the coefficients as specified in the bands[] array */
+void calc_coeffs()
+{
+  int i, n;
+  double f1, f2;
+  double x0;
+
+  n = 0;
+  for (; bands[n].cfs; n++) {
+    double *freqs = (double *)bands[n].cfs;
+    for (i=0; i<bands[n].band_count; i++)
+    {
+
+      /* Find -3dB frequencies for the center freq */
+      find_f1_and_f2(freqs[i], bands[n].octave, &f1, &f2);
+      /* Find Beta */
+      if ( find_root(
+            BETA2(TETA(freqs[i]), TETA(f1)), 
+            BETA1(TETA(freqs[i]), TETA(f1)), 
+            BETA0(TETA(freqs[i]), TETA(f1)), 
+            &x0) == 0)
+      {
+        /* Got a solution, now calculate the rest of the factors */
+        /* Take the smallest root always (find_root returns the smallest one)
+         *
+         * NOTE: The IIR equation is
+         *	y[n] = 2 * (alpha*(x[n]-x[n-2]) + gamma*y[n-1] - beta*y[n-2])
+         *  Now the 2 factor has been distributed in the coefficients
+         */
+        /* Now store the coefficients */
+        bands[n].coeffs[i].beta = 2.0 * x0;
+        bands[n].coeffs[i].alpha = 2.0 * ALPHA(x0);
+        bands[n].coeffs[i].gamma = 2.0 * GAMMA(x0, TETA(freqs[i]));
+#ifdef DEBUG
+        printf("Freq[%d]: %f. Beta: %.10e Alpha: %.10e Gamma %.10e\n",
+            i, freqs[i], bands[n].coeffs[i].beta,
+            bands[n].coeffs[i].alpha, bands[n].coeffs[i].gamma);
+#endif
+      } else {
+        /* Shouldn't happen */
+        bands[n].coeffs[i].beta = 0.;
+        bands[n].coeffs[i].alpha = 0.;
+        bands[n].coeffs[i].gamma = 0.;
+        printf("  **** Where are the roots?\n");
+      }
+    }// for i
+  }//for n
+}
diff --git a/lib/equ/iir_cfs.h b/lib/equ/iir_cfs.h
new file mode 100644
index 000000000..c4cc4a0fd
--- /dev/null
+++ b/lib/equ/iir_cfs.h
@@ -0,0 +1,39 @@
+/*
+ *   PCM time-domain equalizer
+ *
+ *   Copyright (C) 2002-2005  Felipe Rivera <liebremx at users.sourceforge.net>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *   $Id: iir_cfs.h,v 1.1 2005/10/17 01:57:59 liebremx Exp $
+ */
+#ifndef IIR_CFS_H
+#define IIR_CFS_H
+
+//#include <glib.h>
+
+/* Coefficients entry */
+typedef struct 
+{
+    float beta;
+    float alpha; 
+    float gamma;
+    float dummy; // Word alignment
+}sIIRCoefficients;
+
+sIIRCoefficients* get_coeffs(int *bands, int sfreq); //, bool use_xmms_original_freqs);
+void calc_coeffs();
+
+#endif
diff --git a/lib/equ/iir_fpu.c b/lib/equ/iir_fpu.c
new file mode 100644
index 000000000..ae0051fdf
--- /dev/null
+++ b/lib/equ/iir_fpu.c
@@ -0,0 +1,210 @@
+/*
+ *   PCM time-domain equalizer
+ *
+ *   Copyright (C) 2002-2005  Felipe Rivera <liebremx at users sourceforge net>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *   $Id: iir_fpu.c,v 1.3 2005/11/13 20:02:58 lisanet Exp $
+ */
+
+#include <strings.h>
+#include <stdlib.h>
+//#include <glib.h>
+#include "iir.h"
+#include "iir_fpu.h"
+
+static sXYData data_history[EQ_MAX_BANDS][EQ_CHANNELS] __attribute__((aligned));
+static sXYData data_history2[EQ_MAX_BANDS][EQ_CHANNELS] __attribute__((aligned));
+float gain[EQ_MAX_BANDS][EQ_CHANNELS] __attribute__((aligned));
+/* random noise */
+sample_t dither[256];
+int di;
+
+void set_gain(int index, int chn, float val)
+{
+  gain[index][chn] = val;
+}
+
+void clean_history()
+{
+  int n;
+  /* Zero the history arrays */
+  bzero(data_history, sizeof(sXYData) * EQ_MAX_BANDS * EQ_CHANNELS);
+  bzero(data_history2, sizeof(sXYData) * EQ_MAX_BANDS * EQ_CHANNELS);
+  /* this is only needed if we use fpu code and there's no other place for
+  the moment to init the dither array*/
+  for (n = 0; n < 256; n++) {
+      dither[n] = (rand() % 4) - 2;
+  }
+  di = 0;
+}
+
+__inline__ int iir(void * d, int length, int nch)
+{
+/*  FTZ_ON; */
+  short *data = (short *) d;
+  /* Indexes for the history arrays
+   * These have to be kept between calls to this function
+   * hence they are static */
+  static int i = 2, j = 1, k = 0;	
+
+  int index, band, channel;
+  int tempgint, halflength;
+  sample_t out[EQ_CHANNELS], pcm[EQ_CHANNELS];
+
+#if 0
+  /* Load the correct filter table according to the sampling rate if needed */
+  if (srate != rate)
+  {
+    band_count = eqcfg.band_num;
+    rate = srate;
+    iir_cf = get_coeffs(&band_count, rate, eqcfg.use_xmms_original_freqs);
+    clean_history();
+  }
+#endif
+
+#ifdef BENCHMARK
+  start_counter();
+#endif /* BENCHMARK */
+
+  /**
+   * IIR filter equation is
+   * y[n] = 2 * (alpha*(x[n]-x[n-2]) + gamma*y[n-1] - beta*y[n-2])
+   *
+   * NOTE: The 2 factor was introduced in the coefficients to save
+   * 			a multiplication
+   *
+   * This algorithm cascades two filters to get nice filtering
+   * at the expense of extra CPU cycles
+   */
+  /* 16bit, 2 bytes per sample, so divide by two the length of
+   * the buffer (length is in bytes)
+   */
+  halflength = (length >> 1);
+  for (index = 0; index < halflength; index+=nch)
+  {
+    /* For each channel */
+    for (channel = 0; channel < nch; channel++)
+    {
+      pcm[channel] = data[index+channel] * 4;
+      /* Preamp gain */
+      pcm[channel] *= (preamp[channel] / 2);
+      
+      /* add random noise */
+      pcm[channel] += dither[di];
+
+      out[channel] = 0.0;
+      /* For each band */
+      for (band = 0; band < band_count; band++)
+      {
+        /* Store Xi(n) */
+        data_history[band][channel].x[i] = pcm[channel];
+        /* Calculate and store Yi(n) */
+        data_history[band][channel].y[i] = 
+          (
+           /* 		= alpha * [x(n)-x(n-2)] */
+           iir_cf[band].alpha * ( data_history[band][channel].x[i]
+             -  data_history[band][channel].x[k])
+           /* 		+ gamma * y(n-1) */
+           + iir_cf[band].gamma * data_history[band][channel].y[j]
+           /* 		- beta * y(n-2) */
+           - iir_cf[band].beta * data_history[band][channel].y[k]
+          );
+        /* 
+         * The multiplication by 2.0 was 'moved' into the coefficients to save
+         * CPU cycles here */
+        /* Apply the gain  */
+        out[channel] += data_history[band][channel].y[i]*gain[band][channel]; /* * 2.0; */
+      } /* For each band */
+
+      //if (cfg.eq_extra_filtering)
+      {
+        /* Filter the sample again */
+        for (band = 0; band < band_count; band++)
+        {
+          /* Store Xi(n) */
+          data_history2[band][channel].x[i] = out[channel];
+          /* Calculate and store Yi(n) */
+          data_history2[band][channel].y[i] = 
+            (
+             /* y(n) = alpha * [x(n)-x(n-2)] */
+             iir_cf[band].alpha * (data_history2[band][channel].x[i]
+               -  data_history2[band][channel].x[k])
+             /* 	    + gamma * y(n-1) */
+             + iir_cf[band].gamma * data_history2[band][channel].y[j]
+             /* 		- beta * y(n-2) */
+             - iir_cf[band].beta * data_history2[band][channel].y[k]
+            );
+          /* Apply the gain */
+          out[channel] +=  data_history2[band][channel].y[i]*gain[band][channel];
+        } /* For each band */
+      }
+
+      /* Volume stuff
+         Scale down original PCM sample and add it to the filters 
+         output. This substitutes the multiplication by 0.25
+         Go back to use the floating point multiplication before the
+         conversion to give more dynamic range
+         */
+      out[channel] += pcm[channel]*0.25;
+      
+      /* remove random noise */
+      out[channel] -= dither[di]*0.25;
+
+      /* Round and convert to integer */
+#ifdef ARCH_PPC
+      tempgint = round_ppc(out[channel]);
+#else
+#ifdef ARCH_X86
+      tempgint = round_trick(out[channel]);
+#else
+      tempgint = (int)out[channel];
+#endif
+#endif
+
+      /* Limit the output */
+      if (tempgint < -32768)
+        data[index+channel] = -32768;
+      else if (tempgint > 32767)
+        data[index+channel] = 32767;
+      else 
+        data[index+channel] = tempgint;
+    } /* For each channel */
+    
+    /* Wrap around the indexes */
+    i = (i+1)%3;
+    j = (j+1)%3;
+    k = (k+1)%3;
+    /* random noise index */
+    di = (di + 1) % 256;
+
+  }/* For each pair of samples */
+
+#ifdef BENCHMARK
+  timex += get_counter();
+  blength += length;
+  if (count++ == 1024)
+  {
+    printf("FLOATING POINT: %f %d\n",timex/1024.0, blength/1024);
+    blength = 0;
+    timex = 0.;
+    count = 0;
+  }
+#endif /* BENCHMARK */
+
+/*  FTZ_OFF; */
+  return length;
+}
diff --git a/lib/equ/iir_fpu.h b/lib/equ/iir_fpu.h
new file mode 100644
index 000000000..990eebf97
--- /dev/null
+++ b/lib/equ/iir_fpu.h
@@ -0,0 +1,39 @@
+/*
+ *   PCM time-domain equalizer
+ *
+ *   Copyright (C) 2002-2005  Felipe Rivera <liebremx at users.sourceforge.net>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *   $Id: iir_fpu.h,v 1.2 2005/11/01 15:59:20 lisanet Exp $$
+ */
+#ifndef IIR_FPU_H
+#define IIR_FPU_H
+
+#define sample_t double
+
+/*
+ * Normal FPU implementation data structures
+ */
+/* Coefficient history for the IIR filter */
+typedef struct
+{
+    sample_t x[3]; /* x[n], x[n-1], x[n-2] */
+    sample_t y[3]; /* y[n], y[n-1], y[n-2] */
+    sample_t dummy1; // Word alignment
+    sample_t dummy2;
+}sXYData;
+
+#endif
diff --git a/lib/fileinfo.cpp b/lib/fileinfo.cpp
new file mode 100644
index 000000000..fb4b051ec
--- /dev/null
+++ b/lib/fileinfo.cpp
@@ -0,0 +1,48 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by for_kotov                                       *
+ *   for_kotov@mail.ru                                                     *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#include "fileinfo.h"
+
+FileInfo::FileInfo(const QString &path, const QString &name, const int &time)
+{
+    m_path = path;
+    m_name = name;
+    m_length = time;
+}
+
+
+FileInfo::~FileInfo()
+{
+   //qDebug("FileInfo deleted");
+}
+
+const QString FileInfo::path()
+{
+    return m_path;
+}
+
+const QString FileInfo::name()
+{
+    return m_name;
+}
+
+const int FileInfo::length()
+{
+    return m_length;
+}
diff --git a/lib/fileinfo.h b/lib/fileinfo.h
new file mode 100644
index 000000000..3135b5584
--- /dev/null
+++ b/lib/fileinfo.h
@@ -0,0 +1,48 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by for_kotov                                       *
+ *   for_kotov@mail.ru                                                     *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef FILEINFO_H
+#define FILEINFO_H
+
+#include <QString>
+/**
+	@author for_kotov <for_kotov@mail.ru>
+*/
+
+
+class FileInfo
+{
+public:
+    FileInfo() {};
+    FileInfo(const QString &path, const QString &name, const int &time);
+
+    ~FileInfo();
+    //FileInfo operator=(const FileInfo &other);
+    
+    const QString path();
+    const QString name();
+    const int length();
+
+private:
+    QString m_path, m_name;
+    int m_length;
+
+};
+
+#endif
diff --git a/lib/filetag.h b/lib/filetag.h
new file mode 100644
index 000000000..80383c2ab
--- /dev/null
+++ b/lib/filetag.h
@@ -0,0 +1,44 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                       *
+ *   forkotov02@hotmail.ru                                                     *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef FILETAG_H
+#define FILETAG_H
+
+
+#include <QString>
+
+class FileTag
+{
+public:
+    FileTag() {};
+
+    virtual ~FileTag() {};
+    virtual QString title () = 0;
+    virtual QString artist () = 0;
+    virtual QString album () = 0;
+    virtual QString comment () = 0 ;
+    virtual QString genre () = 0;
+    virtual uint year () = 0;
+    virtual uint track () = 0;
+    virtual uint length () = 0;
+    virtual bool isEmpty () = 0;
+
+};
+
+#endif
diff --git a/lib/iir.c b/lib/iir.c
new file mode 100644
index 000000000..317fce8e4
--- /dev/null
+++ b/lib/iir.c
@@ -0,0 +1,85 @@
+/*
+ *   PCM time-domain equalizer
+ *
+ *   Copyright (C) 2002-2005  Felipe Rivera <liebremx at users sourceforge net>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *   $Id: iir.c,v 1.15 2005/10/17 01:57:59 liebremx Exp $
+ */
+
+#include <math.h>
+#include "iir.h"
+
+/* Coefficients */
+sIIRCoefficients *iir_cf;
+
+/* Volume gain 
+ * values should be between 0.0 and 1.0 
+ * Use the preamp from XMMS for now
+ * */
+float preamp[EQ_CHANNELS];
+
+#ifdef BENCHMARK
+#include "benchmark.h"
+double timex = 0.0;
+int count = 0;
+unsigned int blength = 0;
+#endif
+
+/* 
+ * Global vars
+ */
+int rate;
+int band_count;
+
+void set_preamp(int chn, float val)
+{
+  preamp[chn] = val;
+}
+
+/* Init the filters */
+void init_iir()
+{
+  calc_coeffs();
+#if 0
+  band_count = cfg.band_num;
+#endif
+
+  band_count = 10;
+
+  rate = 44100;
+
+  iir_cf = get_coeffs(&band_count, rate, TRUE);
+  clean_history();
+}
+
+#ifdef ARCH_X86
+/* Round function provided by Frank Klemm which saves around 100K
+ * CPU cycles in my PIII for each call to the IIR function with 4K samples
+ */
+__inline__ int round_trick(float floatvalue_to_round)
+{
+  float   floattmp ;
+  int     rounded_value ;
+
+  floattmp      = (int) 0x00FD8000L + (floatvalue_to_round);
+  rounded_value = *(int*)(&floattmp) - (int)0x4B7D8000L;
+
+  if ( rounded_value != (short) rounded_value )
+    rounded_value = ( rounded_value >> 31 ) ^ 0x7FFF;
+  return rounded_value;
+}
+#endif
diff --git a/lib/iir.h b/lib/iir.h
new file mode 100644
index 000000000..de6fa04e5
--- /dev/null
+++ b/lib/iir.h
@@ -0,0 +1,84 @@
+/*
+ *   PCM time-domain equalizer
+ *
+ *   Copyright (C) 2002-2005  Felipe Rivera <liebremx at users.sourceforge.net>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *   $Id: iir.h,v 1.12 2005/10/17 01:57:59 liebremx Exp $
+ */
+#ifndef IIR_H
+#define IIR_H
+
+//#include <glib.h>
+//#include "main.h"
+#include "iir_cfs.h"
+
+/*
+ * Flush-to-zero to avoid flooding the CPU with underflow exceptions 
+ */
+#ifdef SSE_MATH
+#define FTZ 0x8000
+#define FTZ_ON { \
+    unsigned int mxcsr; \
+  __asm__  __volatile__ ("stmxcsr %0" : "=m" (*&mxcsr)); \
+  mxcsr |= FTZ; \
+  __asm__  __volatile__ ("ldmxcsr %0" : : "m" (*&mxcsr)); \
+}
+#define FTZ_OFF { \
+    unsigned int mxcsr; \
+  __asm__  __volatile__ ("stmxcsr %0" : "=m" (*&mxcsr)); \
+  mxcsr &= ~FTZ; \
+  __asm__  __volatile__ ("ldmxcsr %0" : : "m" (*&mxcsr)); \
+}
+#else
+#define FTZ_ON
+#define FTZ_OFF
+#endif
+
+/*
+ * Function prototypes
+ */
+void init_iir();
+void clean_history();
+void set_gain(int index, int chn, float val);
+void set_preamp(int chn, float val);
+
+
+__inline__ int iir(void *d, int length, int nch);
+
+#ifdef ARCH_X86
+__inline__ int round_trick(float floatvalue_to_round);
+#endif
+#ifdef ARCH_PPC
+__inline__ int round_ppc(float x);
+#endif
+
+#define EQ_CHANNELS 2
+#define EQ_MAX_BANDS 10
+
+extern float preamp[EQ_CHANNELS];
+extern sIIRCoefficients *iir_cf;
+extern int rate;
+extern int band_count;
+
+#ifdef BENCHMARK
+extern double timex;
+extern int count;
+extern unsigned int blength;
+#endif
+
+#endif /* #define IIR_H */
+
diff --git a/lib/iir_cfs.c b/lib/iir_cfs.c
new file mode 100644
index 000000000..88ecbadc6
--- /dev/null
+++ b/lib/iir_cfs.c
@@ -0,0 +1,235 @@
+/*
+ *   Copyright (C) 2002-2005  Felipe Rivera <liebremx at users.sourceforge.net>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *
+ *   Coefficient stuff
+ *
+ *   $Id: iir_cfs.c,v 1.1 2005/10/17 01:57:59 liebremx Exp $
+ */
+
+#include "iir_cfs.h"
+#include <stdio.h>
+#include <math.h>
+
+/*************************** 
+ * IIR filter coefficients *
+ ***************************/ 
+static sIIRCoefficients iir_cf10_11k_11025[10] __attribute__((aligned));
+static sIIRCoefficients iir_cf10_22k_22050[10] __attribute__((aligned));
+static sIIRCoefficients iir_cforiginal10_44100[10] __attribute__((aligned));
+static sIIRCoefficients iir_cforiginal10_48000[10] __attribute__((aligned));
+static sIIRCoefficients iir_cf10_44100[10] __attribute__((aligned));
+static sIIRCoefficients iir_cf10_48000[10] __attribute__((aligned));
+static sIIRCoefficients iir_cf15_44100[15] __attribute__((aligned));
+static sIIRCoefficients iir_cf15_48000[15] __attribute__((aligned));
+static sIIRCoefficients iir_cf25_44100[25] __attribute__((aligned));
+static sIIRCoefficients iir_cf25_48000[25] __attribute__((aligned));
+static sIIRCoefficients iir_cf31_44100[31] __attribute__((aligned));
+static sIIRCoefficients iir_cf31_48000[31] __attribute__((aligned));
+
+/****************************************************************** 
+ * Definitions and data structures to calculate the coefficients
+ ******************************************************************/
+static const double band_f011k[] =
+{ 31, 62, 125, 250, 500, 1000, 2000, 3000, 4000, 5500 
+};
+static const double band_f022k[] =
+{ 31, 62, 125, 250, 500, 1000, 2000, 4000, 8000, 11000 
+};
+static const double band_f010[] =
+{ 31, 62, 125, 250, 500, 1000, 2000, 4000, 8000, 16000 
+};
+static const double band_original_f010[] =
+{ 60, 170, 310, 600, 1000, 3000, 6000, 12000, 14000, 16000 
+};
+static const double band_f015[] =
+{ 25,40,63,100,160,250,400,630,1000,1600,2500,4000,6300,10000,16000
+};
+static const double band_f025[] =
+{ 20,31.5,40,50,80,100,125,160,250,315,400,500,800,
+  1000,1250,1600,2500,3150,4000,5000,8000,10000,12500,16000,20000
+};
+static const double band_f031[] =
+{ 20,25,31.5,40,50,63,80,100,125,160,200,250,315,400,500,630,800,
+  1000,1250,1600,2000,2500,3150,4000,5000,6300,8000,10000,12500,16000,20000
+};
+
+#define GAIN_F0 1.0
+#define GAIN_F1 GAIN_F0 / M_SQRT2
+
+#define SAMPLING_FREQ 44100.0
+#define TETA(f) (2*M_PI*(double)f/bands[n].sfreq)
+#define TWOPOWER(value) (value * value)
+
+#define BETA2(tf0, tf) \
+(TWOPOWER(GAIN_F1)*TWOPOWER(cos(tf0)) \
+ - 2.0 * TWOPOWER(GAIN_F1) * cos(tf) * cos(tf0) \
+ + TWOPOWER(GAIN_F1) \
+ - TWOPOWER(GAIN_F0) * TWOPOWER(sin(tf)))
+#define BETA1(tf0, tf) \
+    (2.0 * TWOPOWER(GAIN_F1) * TWOPOWER(cos(tf)) \
+     + TWOPOWER(GAIN_F1) * TWOPOWER(cos(tf0)) \
+     - 2.0 * TWOPOWER(GAIN_F1) * cos(tf) * cos(tf0) \
+     - TWOPOWER(GAIN_F1) + TWOPOWER(GAIN_F0) * TWOPOWER(sin(tf)))
+#define BETA0(tf0, tf) \
+    (0.25 * TWOPOWER(GAIN_F1) * TWOPOWER(cos(tf0)) \
+     - 0.5 * TWOPOWER(GAIN_F1) * cos(tf) * cos(tf0) \
+     + 0.25 * TWOPOWER(GAIN_F1) \
+     - 0.25 * TWOPOWER(GAIN_F0) * TWOPOWER(sin(tf)))
+
+#define GAMMA(beta, tf0) ((0.5 + beta) * cos(tf0))
+#define ALPHA(beta) ((0.5 - beta)/2.0)
+
+struct {
+    sIIRCoefficients *coeffs;
+    const double *cfs;
+    double octave;
+    int band_count;
+    double sfreq;
+} bands[] = {
+  { iir_cf10_11k_11025,     band_f011k,         1.0,     10, 11025.0 },
+  { iir_cf10_22k_22050,     band_f022k,         1.0,     10, 22050.0 },
+  { iir_cforiginal10_44100, band_original_f010, 1.0,     10, 44100.0 },
+  { iir_cforiginal10_48000, band_original_f010, 1.0,     10, 48000.0 },
+  { iir_cf10_44100,         band_f010,          1.0,     10, 44100.0 },
+  { iir_cf10_48000,         band_f010,          1.0,     10, 48000.0 },
+  { iir_cf15_44100,         band_f015,          2.0/3.0, 15, 44100.0 },
+  { iir_cf15_48000,         band_f015,          2.0/3.0, 15, 48000.0 },
+  { iir_cf25_44100,         band_f025,          1.0/3.0, 25, 44100.0 },
+  { iir_cf25_48000,         band_f025,          1.0/3.0, 25, 48000.0 },
+  { iir_cf31_44100,         band_f031,          1.0/3.0, 31, 44100.0 },
+  { iir_cf31_48000,         band_f031,          1.0/3.0, 31, 48000.0 },
+  { 0, 0, 0, 0, 0 }
+};
+
+/*************
+ * Functions *
+ *************/
+
+/* Get the coeffs for a given number of bands and sampling frequency */
+sIIRCoefficients* get_coeffs(gint *bands, gint sfreq, gboolean use_xmms_original_freqs)
+{
+  sIIRCoefficients *iir_cf = 0;
+  switch(sfreq)
+  {
+    case 11025: iir_cf = iir_cf10_11k_11025;
+                *bands = 10;
+                break;
+    case 22050: iir_cf = iir_cf10_22k_22050;
+                *bands = 10;
+                break;
+    case 48000: 
+                switch(*bands)
+                {
+                  case 31: iir_cf = iir_cf31_48000; break;
+                  case 25: iir_cf = iir_cf25_48000; break;
+                  case 15: iir_cf = iir_cf15_48000; break;
+                  default:
+                           iir_cf = use_xmms_original_freqs ? 
+                             iir_cforiginal10_48000 :
+                             iir_cf10_48000;
+                           break;
+                }
+                break;
+    default:
+                switch(*bands)
+                {
+                  case 31: iir_cf = iir_cf31_44100; break;
+                  case 25: iir_cf = iir_cf25_44100; break;
+                  case 15: iir_cf = iir_cf15_44100; break;
+                  default:
+                           iir_cf = use_xmms_original_freqs ? 
+                             iir_cforiginal10_44100 :
+                             iir_cf10_44100;
+                           break;
+                }
+                break;
+  }
+  return iir_cf;
+}
+
+/* Get the freqs at both sides of F0. These will be cut at -3dB */
+static void find_f1_and_f2(double f0, double octave_percent, double *f1, double *f2)
+{
+    double octave_factor = pow(2.0, octave_percent/2.0);
+    *f1 = f0/octave_factor;
+    *f2 = f0*octave_factor;
+}
+
+/* Find the quadratic root
+ * Always return the smallest root */
+static int find_root(double a, double b, double c, double *x0) {
+  double k = c-((b*b)/(4.*a));
+  double h = -(b/(2.*a));
+  double x1 = 0.;
+  if (-(k/a) < 0.)
+    return -1; 
+  *x0 = h - sqrt(-(k/a));
+  x1 = h + sqrt(-(k/a));
+  if (x1 < *x0)
+    *x0 = x1;
+  return 0;
+}
+
+/* Calculate all the coefficients as specified in the bands[] array */
+void calc_coeffs()
+{
+  int i, n;
+  double f1, f2;
+  double x0;
+
+  n = 0;
+  for (; bands[n].cfs; n++) {
+    double *freqs = (double *)bands[n].cfs;
+    for (i=0; i<bands[n].band_count; i++)
+    {
+
+      /* Find -3dB frequencies for the center freq */
+      find_f1_and_f2(freqs[i], bands[n].octave, &f1, &f2);
+      /* Find Beta */
+      if ( find_root(
+            BETA2(TETA(freqs[i]), TETA(f1)), 
+            BETA1(TETA(freqs[i]), TETA(f1)), 
+            BETA0(TETA(freqs[i]), TETA(f1)), 
+            &x0) == 0)
+      {
+        /* Got a solution, now calculate the rest of the factors */
+        /* Take the smallest root always (find_root returns the smallest one)
+         *
+         * NOTE: The IIR equation is
+         *	y[n] = 2 * (alpha*(x[n]-x[n-2]) + gamma*y[n-1] - beta*y[n-2])
+         *  Now the 2 factor has been distributed in the coefficients
+         */
+        /* Now store the coefficients */
+        bands[n].coeffs[i].beta = 2.0 * x0;
+        bands[n].coeffs[i].alpha = 2.0 * ALPHA(x0);
+        bands[n].coeffs[i].gamma = 2.0 * GAMMA(x0, TETA(freqs[i]));
+#ifdef DEBUG
+        printf("Freq[%d]: %f. Beta: %.10e Alpha: %.10e Gamma %.10e\n",
+            i, freqs[i], bands[n].coeffs[i].beta,
+            bands[n].coeffs[i].alpha, bands[n].coeffs[i].gamma);
+#endif
+      } else {
+        /* Shouldn't happen */
+        bands[n].coeffs[i].beta = 0.;
+        bands[n].coeffs[i].alpha = 0.;
+        bands[n].coeffs[i].gamma = 0.;
+        printf("  **** Where are the roots?\n");
+      }
+    }// for i
+  }//for n
+}
diff --git a/lib/iir_cfs.h b/lib/iir_cfs.h
new file mode 100644
index 000000000..c5885283b
--- /dev/null
+++ b/lib/iir_cfs.h
@@ -0,0 +1,41 @@
+/*
+ *   PCM time-domain equalizer
+ *
+ *   Copyright (C) 2002-2005  Felipe Rivera <liebremx at users.sourceforge.net>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *   $Id: iir_cfs.h,v 1.1 2005/10/17 01:57:59 liebremx Exp $
+ */
+#ifndef IIR_CFS_H
+#define IIR_CFS_H
+
+#include <math.h>
+//#include <glib.h>
+
+/* Coefficients entry */
+typedef struct 
+{
+    float beta;
+    float alpha; 
+    float gamma;
+    float dummy; // Word alignment
+}sIIRCoefficients;
+
+
+sIIRCoefficients* get_coeffs(int *bands, int sfreq, bool use_xmms_original_freqs);
+void calc_coeffs();
+
+#endif
diff --git a/lib/iir_fpu.c b/lib/iir_fpu.c
new file mode 100644
index 000000000..47c97134d
--- /dev/null
+++ b/lib/iir_fpu.c
@@ -0,0 +1,210 @@
+/*
+ *   PCM time-domain equalizer
+ *
+ *   Copyright (C) 2002-2005  Felipe Rivera <liebremx at users sourceforge net>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *   $Id: iir_fpu.c,v 1.3 2005/11/13 20:02:58 lisanet Exp $
+ */
+
+#include <strings.h>
+#include <stdlib.h>
+#include <glib.h>
+#include "iir.h"
+#include "iir_fpu.h"
+
+static sXYData data_history[EQ_MAX_BANDS][EQ_CHANNELS] __attribute__((aligned));
+static sXYData data_history2[EQ_MAX_BANDS][EQ_CHANNELS] __attribute__((aligned));
+float gain[EQ_MAX_BANDS][EQ_CHANNELS] __attribute__((aligned));
+/* random noise */
+sample_t dither[256];
+gint di;
+
+void set_gain(gint index, gint chn, float val)
+{
+  gain[index][chn] = val;
+}
+
+void clean_history()
+{
+  gint n;
+  /* Zero the history arrays */
+  bzero(data_history, sizeof(sXYData) * EQ_MAX_BANDS * EQ_CHANNELS);
+  bzero(data_history2, sizeof(sXYData) * EQ_MAX_BANDS * EQ_CHANNELS);
+  /* this is only needed if we use fpu code and there's no other place for
+  the moment to init the dither array*/
+  for (n = 0; n < 256; n++) {
+      dither[n] = (rand() % 4) - 2;
+  }
+  di = 0;
+}
+
+__inline__ int iir(gpointer * d, gint length, gint nch)
+{
+//  FTZ_ON;
+  gint16 *data = (gint16 *) * d;
+  /* Indexes for the history arrays
+   * These have to be kept between calls to this function
+   * hence they are static */
+  static gint i = 2, j = 1, k = 0;	
+
+  gint index, band, channel;
+  gint tempgint, halflength;
+  sample_t out[EQ_CHANNELS], pcm[EQ_CHANNELS];
+
+#if 0
+  // Load the correct filter table according to the sampling rate if needed
+  if (srate != rate)
+  {
+    band_count = eqcfg.band_num;
+    rate = srate;
+    iir_cf = get_coeffs(&band_count, rate, eqcfg.use_xmms_original_freqs);
+    clean_history();
+  }
+#endif
+
+#ifdef BENCHMARK
+  start_counter();
+#endif //BENCHMARK
+
+  /**
+   * IIR filter equation is
+   * y[n] = 2 * (alpha*(x[n]-x[n-2]) + gamma*y[n-1] - beta*y[n-2])
+   *
+   * NOTE: The 2 factor was introduced in the coefficients to save
+   * 			a multiplication
+   *
+   * This algorithm cascades two filters to get nice filtering
+   * at the expense of extra CPU cycles
+   */
+  /* 16bit, 2 bytes per sample, so divide by two the length of
+   * the buffer (length is in bytes)
+   */
+  halflength = (length >> 1);
+  for (index = 0; index < halflength; index+=nch)
+  {
+    /* For each channel */
+    for (channel = 0; channel < nch; channel++)
+    {
+      pcm[channel] = data[index+channel] * 4;
+      /* Preamp gain */
+      pcm[channel] *= preamp[channel];
+      
+      /* add random noise */
+      pcm[channel] += dither[di];
+
+      out[channel] = 0.;
+      /* For each band */
+      for (band = 0; band < band_count; band++)
+      {
+        /* Store Xi(n) */
+        data_history[band][channel].x[i] = pcm[channel];
+        /* Calculate and store Yi(n) */
+        data_history[band][channel].y[i] = 
+          (
+           /* 		= alpha * [x(n)-x(n-2)] */
+           iir_cf[band].alpha * ( data_history[band][channel].x[i]
+             -  data_history[band][channel].x[k])
+           /* 		+ gamma * y(n-1) */
+           + iir_cf[band].gamma * data_history[band][channel].y[j]
+           /* 		- beta * y(n-2) */
+           - iir_cf[band].beta * data_history[band][channel].y[k]
+          );
+        /* 
+         * The multiplication by 2.0 was 'moved' into the coefficients to save
+         * CPU cycles here */
+        /* Apply the gain  */
+        out[channel] +=  data_history[band][channel].y[i]*gain[band][channel]; // * 2.0;
+      } /* For each band */
+
+      if (cfg.eq_extra_filtering)
+      {
+        /* Filter the sample again */
+        for (band = 0; band < band_count; band++)
+        {
+          /* Store Xi(n) */
+          data_history2[band][channel].x[i] = out[channel];
+          /* Calculate and store Yi(n) */
+          data_history2[band][channel].y[i] = 
+            (
+             /* y(n) = alpha * [x(n)-x(n-2)] */
+             iir_cf[band].alpha * (data_history2[band][channel].x[i]
+               -  data_history2[band][channel].x[k])
+             /* 	    + gamma * y(n-1) */
+             + iir_cf[band].gamma * data_history2[band][channel].y[j]
+             /* 		- beta * y(n-2) */
+             - iir_cf[band].beta * data_history2[band][channel].y[k]
+            );
+          /* Apply the gain */
+          out[channel] +=  data_history2[band][channel].y[i]*gain[band][channel];
+        } /* For each band */
+      }
+
+      /* Volume stuff
+         Scale down original PCM sample and add it to the filters 
+         output. This substitutes the multiplication by 0.25
+         Go back to use the floating point multiplication before the
+         conversion to give more dynamic range
+         */
+      out[channel] += pcm[channel]*0.25;
+      
+      /* remove random noise */
+      out[channel] -= dither[di]*0.25;
+
+      /* Round and convert to integer */
+#ifdef ARCH_PPC
+      tempgint = round_ppc(out[channel]);
+#else
+#ifdef ARCH_X86
+      tempgint = round_trick(out[channel]);
+#else
+      tempgint = (int)out[channel];
+#endif
+#endif
+
+      /* Limit the output */
+      if (tempgint < -32768)
+        data[index+channel] = -32768;
+      else if (tempgint > 32767)
+        data[index+channel] = 32767;
+      else 
+        data[index+channel] = tempgint;
+    } /* For each channel */
+    
+    /* Wrap around the indexes */
+    i = (i+1)%3;
+    j = (j+1)%3;
+    k = (k+1)%3;
+    /* random noise index */
+    di = (di + 1) % 256;
+
+  }/* For each pair of samples */
+
+#ifdef BENCHMARK
+  timex += get_counter();
+  blength += length;
+  if (count++ == 1024)
+  {
+    printf("FLOATING POINT: %f %d\n",timex/1024.0, blength/1024);
+    blength = 0;
+    timex = 0.;
+    count = 0;
+  }
+#endif // BENCHMARK
+
+//  FTZ_OFF;
+  return length;
+}
diff --git a/lib/iir_fpu.h b/lib/iir_fpu.h
new file mode 100644
index 000000000..990eebf97
--- /dev/null
+++ b/lib/iir_fpu.h
@@ -0,0 +1,39 @@
+/*
+ *   PCM time-domain equalizer
+ *
+ *   Copyright (C) 2002-2005  Felipe Rivera <liebremx at users.sourceforge.net>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *   $Id: iir_fpu.h,v 1.2 2005/11/01 15:59:20 lisanet Exp $$
+ */
+#ifndef IIR_FPU_H
+#define IIR_FPU_H
+
+#define sample_t double
+
+/*
+ * Normal FPU implementation data structures
+ */
+/* Coefficient history for the IIR filter */
+typedef struct
+{
+    sample_t x[3]; /* x[n], x[n-1], x[n-2] */
+    sample_t y[3]; /* y[n], y[n-1], y[n-2] */
+    sample_t dummy1; // Word alignment
+    sample_t dummy2;
+}sXYData;
+
+#endif
diff --git a/lib/lib.pro b/lib/lib.pro
new file mode 100644
index 000000000..723998b9f
--- /dev/null
+++ b/lib/lib.pro
@@ -0,0 +1,36 @@
+# ???? ?????? ? KDevelop ?????????? qmake.
+# ------------------------------------------- 
+# ?????????? ???????????? ???????? ???????? ???????: ./libs
+# ???? - ??????????:  nnp
+
+HEADERS += recycler.h \
+           buffer.h \
+           constants.h \
+           decoder.h \
+           output.h \
+           filetag.h \
+           outputfactory.h \
+           equ\iir_cfs.h \
+           equ\iir_fpu.h \
+           equ\iir.h \
+           decoderfactory.h \
+           soundcore.h \
+           visualization.h
+SOURCES += recycler.cpp \
+           decoder.cpp \
+           output.cpp \
+           equ\iir.c \
+           equ\iir_cfs.c \
+           equ\iir_fpu.c \
+           soundcore.cpp
+TARGET = qmmp
+CONFIG += release \
+warn_on \
+qt \
+thread
+
+TEMPLATE = lib
+target.path = /lib
+INSTALLS += target
+
+
diff --git a/lib/output.cpp b/lib/output.cpp
new file mode 100644
index 000000000..0d0e4de99
--- /dev/null
+++ b/lib/output.cpp
@@ -0,0 +1,192 @@
+// Copyright (c) 2000-2001 Brad Hughes <bhughes@trolltech.com>
+//
+// Use, modification and distribution is allowed without limitation,
+// warranty, or liability of any kind.
+//
+
+#include <QtGui>
+#include <QObject>
+#include <QStringList>
+#include <QApplication>
+#include <QTimer>
+
+#include "output.h"
+#include "visualization.h"
+
+#include <stdio.h>
+
+// static methods
+
+static QList<OutputFactory*> *factories = 0;
+static QStringList files;
+static QTimer *timer = 0;
+
+static void checkFactories()
+{
+    if ( ! factories )
+    {
+        files.clear();
+        factories = new QList<OutputFactory *>;
+
+        QDir pluginsDir ( qApp->applicationDirPath() );
+        pluginsDir.cdUp();
+        pluginsDir.cd ( "lib/qmmp/Output" );
+        foreach ( QString fileName, pluginsDir.entryList ( QDir::Files ) )
+        {
+            QPluginLoader loader ( pluginsDir.absoluteFilePath ( fileName ) );
+            QObject *plugin = loader.instance();
+            if ( loader.isLoaded() )
+            {
+                qDebug ( "Output: plugin loaded - %s", qPrintable ( fileName ) );
+            }
+            OutputFactory *factory = 0;
+            if ( plugin )
+                factory = qobject_cast<OutputFactory *> ( plugin );
+
+            if ( factory )
+            {
+                Output::registerFactory ( factory );
+                files << pluginsDir.absoluteFilePath(fileName);
+            }
+        }
+    }
+}
+
+void Output::registerFactory ( OutputFactory *fact )
+{
+    factories->append ( fact );
+}
+
+Output *Output::create ( QObject *parent )
+{
+    Output *output = 0;
+
+    checkFactories();
+    if ( factories->isEmpty () )
+    {
+        qDebug("Output: unable to find output plugins");
+        return output;
+    }
+    QSettings settings ( QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat );
+    QString pluginFileName =
+        settings.value("Output/plugin_file","libalsa.so").toString();
+    int j = 0;
+    for (int i = 0; i < factories->size(); ++i)
+    {
+        if (files.at(i).section('/',-1) == pluginFileName)
+            j = i;
+    }
+    OutputFactory *fact = factories->at ( j );
+    if ( fact )
+    {
+        output = fact->create ( parent );
+    }
+    switch ((int) output->volumeControl())
+    {
+    case Output::Standard:
+        {
+            break;
+        }
+    case Output::Custom:
+        {
+            timer = new QTimer(output);
+            connect(timer, SIGNAL(timeout()), output, SLOT(checkVolume()));
+            timer->start(125);
+            break;
+        }
+    case Output::Disabled:
+        {
+            break;
+        }
+    }
+    return output;
+}
+
+QList<OutputFactory*> *Output::outputFactories()
+{
+    checkFactories();
+    return factories;
+}
+
+QStringList Output::outputFiles()
+{
+    checkFactories();
+    return files;
+}
+
+Output::Output ( QObject* parent, VolumeType vt) : QThread (parent), r (stackSize())
+{
+    qRegisterMetaType<OutputState>("OutputState");
+    m_vol = vt;
+}
+
+
+Output::~Output()
+{}
+
+void Output::error ( const QString &e )
+{
+    emit stateChanged ( OutputState ( e ) );
+}
+
+
+void Output::addVisual ( Visualization *v )
+{
+    if ( visuals.indexOf ( v ) == -1 )
+    {
+        visuals.append ( v );
+    }
+}
+
+
+void Output::removeVisual ( Visualization *v )
+{
+    visuals.removeAll ( v );
+}
+
+void Output::dispatchVisual ( Buffer *buffer, unsigned long written,
+                              int chan, int prec )
+{
+    if ( ! buffer || !visuals.size())
+        return;
+    Visualization *visual = 0;
+    foreach (visual , visuals );
+    {
+        visual->mutex()->lock ();
+        visual->add ( buffer, written, chan, prec );
+        visual->mutex()->unlock();
+    }
+}
+
+
+void Output::prepareVisuals()
+{
+    //Visual *visual = visuals.first();
+    /*while (visual) {
+    visual->mutex()->lock();
+    visual->prepare();
+    visual->mutex()->unlock();
+
+    visual = visuals.next();
+    }*/
+}
+
+void Output::dispatch(OutputState::Type st)
+{
+    emit stateChanged ( OutputState(st) );
+}
+
+void Output::dispatch(long s, unsigned long w, int b, int f, int p, int c)
+{
+    emit stateChanged ( OutputState(s, w, b, f, p, c) );
+}
+
+void Output::dispatch ( const OutputState &st )
+{
+    emit stateChanged ( st );
+}
+
+void Output::dispatchVolume(int L, int R)
+{
+    emit stateChanged ( OutputState(L, R) );
+}
diff --git a/lib/output.h b/lib/output.h
new file mode 100644
index 000000000..c5fa0941a
--- /dev/null
+++ b/lib/output.h
@@ -0,0 +1,156 @@
+
+// Copyright (c) 2000-2001 Brad Hughes <bhughes@trolltech.com>
+//
+// Use, modification and distribution is allowed without limitation,
+// warranty, or liability of any kind.
+//
+
+#ifndef   __output_h
+#define   __output_h
+
+class Output;
+
+#include <QObject>
+#include <QThread>
+#include <QEvent>
+#include <QList>
+#include <QIODevice>
+#include <outputfactory.h>
+
+#include "recycler.h"
+
+class QTimer;
+
+class Visualization;
+
+
+class OutputState
+{
+public:
+
+    enum Type { Playing, Buffering, Info, Paused, Stopped, Volume, Error };
+
+    OutputState()
+            : m_type(Stopped),  m_error_msg(0), m_elasped_seconds(0),
+              m_written_bytes(0), m_brate(0), m_freq(0), m_prec(0), m_chan(0),
+              m_left(0), m_right(0)
+    {}
+
+    OutputState(Type t)
+            : m_type(t),  m_error_msg(0), m_elasped_seconds(0),
+              m_written_bytes(0), m_brate(0), m_freq(0), m_prec(0), m_chan(0),
+              m_left(0), m_right(0)
+    {}
+    OutputState(long s, unsigned long w, int b, int f, int p, int c)
+            : m_type(Info), m_error_msg(0), m_elasped_seconds(s),
+              m_written_bytes(w), m_brate(b), m_freq(f), m_prec(p), m_chan(c),
+              m_left(0), m_right(0)
+    {}
+    OutputState(int L, int R)
+            : m_type(Volume), m_error_msg(0), m_elasped_seconds(0),
+              m_written_bytes(0), m_brate(0), m_freq(0), m_prec(0), m_chan(0),
+              m_left(L), m_right(R)
+    {}
+    OutputState(const QString &e)
+            : m_type(Error), m_elasped_seconds(0), m_written_bytes(0),
+              m_brate(0), m_freq(0), m_prec(0), m_chan(0),
+              m_left(0), m_right(0)
+    {
+         m_error_msg = new QString(e);
+    }
+    ~OutputState()
+    {
+       if (m_error_msg)
+           delete m_error_msg;
+    }
+
+    const QString *errorMessage() const { return m_error_msg; }
+
+    const long &elapsedSeconds() const { return m_elasped_seconds; }
+    const unsigned long &writtenBytes() const { return m_written_bytes; }
+    const int &bitrate() const { return m_brate; }
+    const int &frequency() const { return m_freq; }
+    const int &precision() const { return m_prec; }
+    const int &channels() const { return m_chan; }
+    const Type &type() const { return m_type; }
+    const int leftVolume() const { return m_left; }
+    const int rightVolume() const { return m_right; }
+
+private:
+    Type m_type;
+    QString *m_error_msg;
+    long m_elasped_seconds;
+    unsigned long m_written_bytes;
+    int m_brate, m_freq, m_prec, m_chan;
+    int m_left, m_right;    //volume
+};
+
+
+
+
+class Output : public QThread
+{
+    Q_OBJECT
+public:
+
+    enum VolumeType { Standard, Custom, Disabled };
+
+    Output(QObject * parent = 0, VolumeType vt = Standard);
+    ~Output();
+
+    Recycler *recycler()
+    {
+        return &r;
+    }
+
+    void addVisual(Visualization *);
+    void removeVisual(Visualization *);
+
+    QMutex *mutex()
+    {
+        return &mtx;
+    }
+
+    VolumeType volumeControl(){return m_vol; };
+
+    // abstract
+    virtual bool isInitialized() const = 0;
+    virtual bool initialize() = 0;
+    virtual void uninitialize() = 0;
+    virtual void configure(long, int, int, int) = 0;
+    virtual void pause() = 0;
+    virtual void stop() = 0;
+    virtual long written() = 0;
+    virtual long latency() = 0;
+    virtual void seek(long) = 0;
+    virtual void setVolume(int, int) {};
+
+    static void registerFactory(OutputFactory *);
+    static Output *create(QObject *);
+    static QList<OutputFactory*> *outputFactories();
+    static QStringList outputFiles();
+
+public slots:
+    virtual void checkVolume() {};
+
+signals:
+    void stateChanged(const OutputState&);
+
+protected:
+    void dispatch(OutputState::Type);
+    void dispatch(long s, unsigned long w, int b, int f, int p, int c);
+    void dispatch(const OutputState&);
+    void dispatchVolume(int L, int R);
+    void error(const QString &e);
+    void dispatchVisual(Buffer *, unsigned long, int, int);
+    void prepareVisuals();
+
+private:
+    QMutex mtx;
+    Recycler r;
+    QList<Visualization *> visuals;
+    VolumeType m_vol;
+};
+
+
+#endif // __output_h
diff --git a/lib/outputfactory.h b/lib/outputfactory.h
new file mode 100644
index 000000000..a398cf2b5
--- /dev/null
+++ b/lib/outputfactory.h
@@ -0,0 +1,46 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                       *
+ *   forkotov02@hotmail.ru                                                     *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#ifndef OUTPUTFACTORY_H
+#define OUTPUTFACTORY_H
+
+class QObject;
+class QString;
+class QIODevice;
+class QWidget;
+class QTranslator;
+
+class Decoder;
+class Output;
+
+class OutputFactory
+{
+public:
+    virtual ~OutputFactory() {} 
+    virtual const QString &name() const = 0;
+    virtual Output *create(QObject *) = 0;
+    virtual void showSettings(QWidget *parent) = 0;
+    virtual void showAbout(QWidget *parent) = 0;
+    virtual QTranslator *createTranslator(QObject *parent) = 0;
+};
+
+Q_DECLARE_INTERFACE(OutputFactory, "OutputFactory/1.0")
+
+#endif
diff --git a/lib/qmmp/CMakeLists.txt b/lib/qmmp/CMakeLists.txt
new file mode 100644
index 000000000..26ad9b3ef
--- /dev/null
+++ b/lib/qmmp/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_subdirectory(Input)
+add_subdirectory(Output)
+
diff --git a/lib/qmmp/Input/CMakeLists.txt b/lib/qmmp/Input/CMakeLists.txt
new file mode 100644
index 000000000..31a303d86
--- /dev/null
+++ b/lib/qmmp/Input/CMakeLists.txt
@@ -0,0 +1,41 @@
+
+SET(USE_MAD    TRUE CACHE BOOL "enable/disable mad plugin")
+SET(USE_FLAC   TRUE CACHE BOOL "enable/disable flac plugin")
+SET(USE_VORBIS TRUE CACHE BOOL "enable/disable ogg vorbis plugin")
+SET(USE_FFMPEG TRUE CACHE BOOL "enable/disable ffmpeg plugin")
+SET(USE_MPC    TRUE CACHE BOOL "enable/disable mpc plugin")
+
+IF(USE_MAD)
+MESSAGE( STATUS "MAD ON")
+add_subdirectory(mad)
+ELSE(USE_MAD)
+MESSAGE( STATUS "MAD OFF")
+ENDIF(USE_MAD)
+
+IF(USE_FLAC)
+MESSAGE( STATUS "FLAC ON")
+add_subdirectory(flac)
+ELSE(USE_FLAC)
+MESSAGE( STATUS "FLAC OFF")
+ENDIF(USE_FLAC)
+
+IF(USE_VORBIS)
+MESSAGE( STATUS "VORBIS ON")
+add_subdirectory(vorbis)
+ELSE(USE_VORBIS)
+MESSAGE( STATUS "VORBIS OFF")
+ENDIF(USE_VORBIS)
+
+IF(USE_FFMPEG)
+MESSAGE( STATUS "FFMPEG ON")
+add_subdirectory(ffmpeg)
+ELSE(USE_FFMPEG)
+MESSAGE( STATUS "FFMPEG OFF")
+ENDIF(USE_FFMPEG)
+
+IF(USE_MPC)
+MESSAGE( STATUS "MPC ON")
+add_subdirectory(mpc)
+ELSE(USE_MPC)
+MESSAGE( STATUS "MPC OFF")
+ENDIF(USE_MPC)
diff --git a/lib/qmmp/Input/Input.pro b/lib/qmmp/Input/Input.pro
new file mode 100644
index 000000000..794407c76
--- /dev/null
+++ b/lib/qmmp/Input/Input.pro
@@ -0,0 +1,26 @@
+include(../../../qmmp.pri)
+
+SUBDIRS += vorbis mad
+TEMPLATE = subdirs
+
+contains(CONFIG, MUSEPACK_PLUGIN){
+    SUBDIRS += mpc
+    message(***************************)
+    message(* Musepack plugin enabled *)
+    message(***************************)
+}
+
+contains(CONFIG, FLAC_PLUGIN){
+    SUBDIRS += flac
+    message(***********************)
+    message(* FLAC plugin enabled *)
+    message(***********************)
+}
+
+contains(CONFIG, FFMPEG_PLUGIN){
+   SUBDIRS += ffmpeg
+   message(*************************)
+   message(* FFMPEG plugin enabled *)
+   message(*************************)
+}
+
diff --git a/lib/qmmp/Input/ffmpeg/CMakeLists.txt b/lib/qmmp/Input/ffmpeg/CMakeLists.txt
new file mode 100644
index 000000000..bd0481a39
--- /dev/null
+++ b/lib/qmmp/Input/ffmpeg/CMakeLists.txt
@@ -0,0 +1,96 @@
+project(libffmpeg)
+
+cmake_minimum_required(VERSION 2.4.0)
+
+
+INCLUDE(UsePkgConfig)
+INCLUDE(FindQt4)
+
+find_package(Qt4 REQUIRED) # find and setup Qt4 for this project
+include(${QT_USE_FILE})
+
+# qt plugin
+ADD_DEFINITIONS( -Wall )
+ADD_DEFINITIONS(${QT_DEFINITIONS})
+ADD_DEFINITIONS(-DQT_PLUGIN)
+ADD_DEFINITIONS(-DQT_NO_DEBUG)
+ADD_DEFINITIONS(-DQT_SHARED)
+ADD_DEFINITIONS(-DQT_THREAD)
+# fixes ffmpeg defines
+ADD_DEFINITIONS(-D__STDC_CONSTANT_MACROS)
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+SET(QT_INCLUDES
+  ${QT_INCLUDES}
+  ${CMAKE_CURRENT_BINARY_DIR}/../../../
+)
+
+# libqmmp
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
+
+# libffmpeg and taglib
+PKGCONFIG(libavcodec LIBAVCODEC_INCLUDE_DIR LIBAVCODEC_LINK_DIR LIBAVCODEC_LINK_FLAGS LIBAVCODEC_CFLAGS)
+PKGCONFIG(libavformat LIBAVFORMAT_INCLUDE_DIR LIBAVFORMAT_LINK_DIR LIBAVFORMAT_LINK_FLAGS LIBAVFORMAT_CFLAGS)
+PKGCONFIG(taglib TAGLIB_INCLUDE_DIR TAGLIB_LINK_DIR TAGLIB_LINK_FLAGS TAGLIB_CFLAGS)
+
+IF(NOT LIBAVCODEC_LINK_FLAGS)
+  SET(LIBAVCODEC_LINK_FLAGS -lavcodec)
+ENDIF(NOT LIBAVCODEC_LINK_FLAGS)
+
+IF(NOT LIBAVFORMAT_LINK_FLAGS)
+  SET(LIBAVFORMAT_LINK_FLAGS -lavformat)
+ENDIF(NOT LIBAVFORMAT_LINK_FLAGS)
+
+IF(NOT TAGLIB_LINK_FLAGS)
+  SET(TAGLIB_LINK_FLAGS -ltag)
+  SET(TAGLIB_INCLUDE_DIR /usr/include/taglib)
+  SET(TAGLIB_CFLAGS -I/usr/include/taglib)
+ENDIF(NOT TAGLIB_LINK_FLAGS)
+
+include_directories(${FLAC_INCLUDE_DIR} ${TAGLIB_INCLUDE_DIR})
+link_directories(${FLAC_LINK_DIR} ${TAGLIB_LINK_DIR})
+
+ADD_DEFINITIONS(${LIBAVCODEC_CFLAGS})
+ADD_DEFINITIONS(${LIBAVFORMAT_CFLAGS})
+ADD_DEFINITIONS(${TAGLIB_CFLAGS})
+
+
+SET(libffmpeg_SRCS
+  decoder_ffmpeg.cpp
+  decoderffmpegfactory.cpp
+  detailsdialog.cpp
+  tag.cpp
+)
+
+SET(libffmpeg_MOC_HDRS
+  tag.h
+  decoderffmpegfactory.h
+  decoder_ffmpeg.h
+  detailsdialog.h
+)
+
+SET(libffmpeg_RCCS translations/translations.qrc)
+
+QT4_ADD_RESOURCES(libffmpeg_RCC_SRCS ${libffmpeg_RCCS})
+
+QT4_WRAP_CPP(libffmpeg_MOC_SRCS ${libffmpeg_MOC_HDRS})
+
+# user interface
+
+
+SET(libffmpeg_UIS
+    detailsdialog.ui
+)
+
+QT4_WRAP_UI(libffmpeg_UIS_H ${libffmpeg_UIS})
+# Don't forget to include output directory, otherwise
+# the UI file won't be wrapped!
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+ADD_LIBRARY(ffmpeg SHARED ${libffmpeg_SRCS} ${libffmpeg_MOC_SRCS} ${libffmpeg_UIS_H}
+  ${libffmpeg_RCC_SRCS})
+target_link_libraries(ffmpeg ${QT_LIBRARIES} -lqmmp ${LIBAVCODEC_LINK_FLAGS} ${LIBAVFORMAT_LINK_FLAGS} ${TAGLIB_LINK_FLAGS} ${TAGLIB_CFLAGS})
+install(TARGETS ffmpeg DESTINATION lib/qmmp/Input)
+
diff --git a/lib/qmmp/Input/ffmpeg/decoder_ffmpeg.cpp b/lib/qmmp/Input/ffmpeg/decoder_ffmpeg.cpp
new file mode 100644
index 000000000..832a6c11a
--- /dev/null
+++ b/lib/qmmp/Input/ffmpeg/decoder_ffmpeg.cpp
@@ -0,0 +1,346 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#include <QObject>
+#include <QFile>
+
+#include "constants.h"
+#include "buffer.h"
+#include "output.h"
+#include "recycler.h"
+
+#include "decoder_ffmpeg.h"
+
+// Decoder class
+
+DecoderFFmpeg::DecoderFFmpeg(QObject *parent, DecoderFactory *d, QIODevice *i, Output *o)
+        : Decoder(parent, d, i, o)
+{
+    inited = FALSE;
+    user_stop = FALSE;
+    stat = 0;
+    output_buf = 0;
+    output_bytes = 0;
+    output_at = 0;
+    bks = 0;
+    done = FALSE;
+    finish = FALSE;
+    len = 0;
+    freq = 0;
+    bitrate = 0;
+    seekTime = -1.0;
+    totalTime = 0.0;
+    chan = 0;
+    output_size = 0;
+    ic = 0;
+    wma_outbuf = 0;
+
+
+
+
+}
+
+
+DecoderFFmpeg::~DecoderFFmpeg()
+{
+    deinit();
+    if (wma_outbuf)
+    {
+        delete [] wma_outbuf;
+        wma_outbuf = 0;
+    }
+    if (output_buf)
+        delete [] output_buf;
+    output_buf = 0;
+
+    if(ic)
+        av_close_input_file(ic);
+}
+
+
+void DecoderFFmpeg::stop()
+{
+    user_stop = TRUE;
+}
+
+
+void DecoderFFmpeg::flush(bool final)
+{
+    ulong min = final ? 0 : bks;
+
+    while ((! done && ! finish) && output_bytes > min)
+    {
+        output()->recycler()->mutex()->lock ();
+
+        while ((! done && ! finish) && output()->recycler()->full())
+        {
+            mutex()->unlock();
+
+            output()->recycler()->cond()->wait(output()->recycler()->mutex());
+
+            mutex()->lock ();
+            done = user_stop;
+        }
+
+        if (user_stop || finish)
+        {
+            inited = FALSE;
+            done = TRUE;
+        }
+        else
+        {
+            output_bytes -= produceSound(output_buf, output_bytes, bitrate, chan);
+            output_size += bks;
+            output_at = output_bytes;
+        }
+
+        if (output()->recycler()->full())
+        {
+            output()->recycler()->cond()->wakeOne();
+        }
+
+        output()->recycler()->mutex()->unlock();
+    }
+}
+
+
+bool DecoderFFmpeg::initialize()
+{
+    bks = blockSize();
+    inited = user_stop = done = finish = FALSE;
+    len = freq = bitrate = 0;
+    stat = chan = 0;
+    output_size = 0;
+    seekTime = -1.0;
+    totalTime = 0.0;
+
+
+    if (! input())
+    {
+        error("DecoderFFmpeg: cannot initialize.  No input.");
+
+        return FALSE;
+    }
+
+    if (! output_buf)
+        output_buf = new char[globalBufferSize];
+    output_at = 0;
+    output_bytes = 0;
+
+    if (! input())
+    {
+        error("DecoderFFmpeg: cannot initialize.  No input.");
+
+        return FALSE;
+    }
+
+    if (! output_buf)
+        output_buf = new char[globalBufferSize];
+    output_at = 0;
+    output_bytes = 0;
+
+    QString filename = qobject_cast<QFile*>(input())->fileName ();
+    avcodec_init();
+    avcodec_register_all();
+    av_register_all();
+
+    AVCodec *codec;
+    if (av_open_input_file(&ic, filename.toLocal8Bit(), NULL,0, NULL) < 0)
+    {
+        qDebug("DecoderFFmpeg: cannot open input file");
+        return FALSE;
+    }
+    for (wma_idx = 0; wma_idx < ic->nb_streams; wma_idx++)
+    {
+        c = ic->streams[wma_idx]->codec;
+        if (c->codec_type == CODEC_TYPE_AUDIO) break;
+    }
+
+    av_find_stream_info(ic);
+
+    codec = avcodec_find_decoder(c->codec_id);
+
+    if (!codec) return FALSE;
+    if (avcodec_open(c, codec) < 0)
+        return FALSE;
+
+    totalTime = ic->duration/AV_TIME_BASE;
+
+    if (output())
+        output()->configure(c->sample_rate, c->channels, 16, c->bit_rate);
+
+    bitrate = c->bit_rate;
+    chan = c->channels;
+    wma_outbuf = new uint8_t[AVCODEC_MAX_AUDIO_FRAME_SIZE*sizeof(int16_t)];
+    inited = TRUE;
+    qDebug("DecoderFFmpeg: initialize succes");
+    return TRUE;
+}
+
+
+double DecoderFFmpeg::lengthInSeconds()
+{
+    if (! inited)
+        return 0;
+
+    return totalTime;
+}
+
+
+void DecoderFFmpeg::seek(double pos)
+{
+    seekTime = pos;
+}
+
+
+void DecoderFFmpeg::deinit()
+{
+    //FLAC__stream_decoder_finish (data()->decoder);
+    inited = user_stop = done = finish = FALSE;
+    len = freq = bitrate = 0;
+    stat = chan = 0;
+    output_size = 0;
+}
+
+void DecoderFFmpeg::run()
+{
+//     mpc_uint32_t vbrAcc = 0;
+//     mpc_uint32_t vbrUpd = 0;
+    uint8_t *inbuf_ptr;
+    int out_size, size, len;
+    AVPacket pkt;
+
+    mutex()->lock ();
+
+    if (! inited)
+    {
+        mutex()->unlock();
+
+        return;
+    }
+    stat = DecoderState::Decoding;
+    mutex()->unlock();
+    {
+        dispatch(DecoderState ((DecoderState::Type) stat));
+    }
+
+    while (! done && ! finish)
+    {
+        mutex()->lock ();
+        // decode
+
+        if (seekTime >= 0.0)
+        {
+            int64_t timestamp;
+            timestamp = int64_t(seekTime)*AV_TIME_BASE;
+            if (ic->start_time != AV_NOPTS_VALUE)
+                timestamp += ic->start_time;
+            av_seek_frame(ic, -1, timestamp, AVSEEK_FLAG_ANY);
+            seekTime = -1.0;
+        }
+
+        int l = 0;
+        len = 0;
+        if (av_read_frame(ic, &pkt) < 0)
+        {
+            finish = TRUE;
+            goto end;
+        }
+        size = pkt.size;
+        inbuf_ptr = pkt.data;
+
+        len = 0;
+        out_size = 0;
+        while (size > 0)
+        {
+            //mutex()->lock();
+            l = avcodec_decode_audio(c, (int16_t *)(wma_outbuf), &out_size, inbuf_ptr, size);
+
+            ffmpeg_out(out_size);
+            size -= l;
+            inbuf_ptr += l;
+            if (pkt.data) av_free_packet(&pkt);
+            len = out_size;
+        }
+        bitrate = c->bit_rate/1024;
+end:
+        if (len == 0 || finish)
+        {
+            flush(TRUE);
+
+            if (output())
+            {
+                output()->recycler()->mutex()->lock ();
+                // end of stream
+                while (! output()->recycler()->empty() && ! user_stop)
+                {
+                    output()->recycler()->cond()->wakeOne();
+                    mutex()->unlock();
+                    output()->recycler()->cond()->wait(output()->recycler()->mutex());
+                    mutex()->lock ();
+                }
+                output()->recycler()->mutex()->unlock();
+            }
+
+            done = TRUE;
+            if (! user_stop)
+            {
+                finish = TRUE;
+            }
+        }
+
+        mutex()->unlock();
+
+    }
+
+    mutex()->lock ();
+
+    if (finish)
+        stat = DecoderState::Finished;
+    else if (user_stop)
+        stat = DecoderState::Stopped;
+
+    mutex()->unlock();
+
+    {
+        dispatch(DecoderState ((DecoderState::Type) stat));
+    }
+
+    deinit();
+}
+
+void DecoderFFmpeg::ffmpeg_out(int size)
+{
+    if (size == 0)
+        return;
+    int at = 0;
+    int to_copy = 0;
+    while (size > 0)
+    {
+        to_copy = qMin(int(globalBufferSize - output_at), int(size) );
+        memmove ( (char *) (output_buf + output_at), wma_outbuf + at, to_copy);
+        at += to_copy;
+        size -= to_copy;
+        output_at += to_copy;
+        output_bytes += to_copy;
+        if (output())
+            flush();
+    }
+}
diff --git a/lib/qmmp/Input/ffmpeg/decoder_ffmpeg.h b/lib/qmmp/Input/ffmpeg/decoder_ffmpeg.h
new file mode 100644
index 000000000..86a415a8d
--- /dev/null
+++ b/lib/qmmp/Input/ffmpeg/decoder_ffmpeg.h
@@ -0,0 +1,78 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#ifndef __decoder_ffmeg_h
+#define __decoder_ffmeg_h
+
+extern "C"{
+#include <ffmpeg/avformat.h>
+#include <ffmpeg/avcodec.h>
+}
+#include "decoder.h"
+
+class DecoderFFmpeg : public Decoder
+{
+public:
+    DecoderFFmpeg(QObject *, DecoderFactory *, QIODevice *, Output *);
+    virtual ~DecoderFFmpeg();
+
+    // Standard Decoder API
+    bool initialize();
+    double lengthInSeconds();
+    void seek(double);
+    void stop();
+
+    // Equalizer
+    bool isEQSupported() const { return FALSE; }
+    void setEQEnabled(bool) { ; }
+    void setEQGain(int) { ; }
+    void setEQBands(int[10]) { ; }
+
+
+private:
+    // thread run function
+    void run();
+    // helper functions
+    void flush(bool = FALSE);
+    void deinit();
+    void ffmpeg_out(int size);
+
+    bool inited, user_stop;
+    int stat;
+
+    // output buffer
+    char *output_buf;
+    ulong output_bytes, output_at;
+
+    AVFormatContext *ic;
+    AVCodecContext *c;
+    int wma_st_buff, wma_idx, wma_idx2;
+    uint8_t *wma_outbuf;
+
+    unsigned int bks;
+    bool done, finish;
+    long len, freq, bitrate;
+    int chan;
+    unsigned long output_size;
+    double totalTime, seekTime;
+};
+
+
+#endif // __decoder_mpc_h
diff --git a/lib/qmmp/Input/ffmpeg/decoderffmpegfactory.cpp b/lib/qmmp/Input/ffmpeg/decoderffmpegfactory.cpp
new file mode 100644
index 000000000..0f4d4ed2b
--- /dev/null
+++ b/lib/qmmp/Input/ffmpeg/decoderffmpegfactory.cpp
@@ -0,0 +1,75 @@
+#include <QtGui>
+
+#include "detailsdialog.h"
+#include "decoder_ffmpeg.h"
+#include "tag.h"
+#include "decoderffmpegfactory.h"
+
+
+// DecoderFFmpegFactory
+
+bool DecoderFFmpegFactory::supports(const QString &source) const
+{
+    
+    return (source.right(4).toLower() == ".wma");
+}
+
+const QString &DecoderFFmpegFactory::name() const
+{
+    static QString name (tr("FFmpeg Plugin"));
+    return name;
+}
+
+
+const QString &DecoderFFmpegFactory::filter() const
+{
+    static QString filter("*.wma");
+    return filter;
+}
+
+
+const QString &DecoderFFmpegFactory::description() const
+{
+    static QString desc(tr("WMA Files"));
+    return desc;
+}
+
+
+Decoder *DecoderFFmpegFactory::create(QObject *parent, QIODevice *input,
+                                   Output *output)
+{
+    return new DecoderFFmpeg(parent, this, input, output);
+}
+
+FileTag *DecoderFFmpegFactory::createTag(const QString &source)
+{
+    FileTag *tag = new Tag(source);
+    return tag;
+}
+
+void DecoderFFmpegFactory::showDetails(QWidget *parent, const QString &path)
+{
+    DetailsDialog *d = new DetailsDialog(parent, path);
+    d -> show();
+}
+
+void DecoderFFmpegFactory::showSettings(QWidget *)
+{}
+
+void DecoderFFmpegFactory::showAbout(QWidget *parent)
+{
+    QMessageBox::about (parent, tr("About FFmpeg Audio Plugin"),
+                        tr("Qmmp FFmpeg Audio Plugin")+"\n"+
+                        tr("Suppored formats: WMA")+"\n"+
+                        tr("Writen by: Ilya Kotov <forkotov02@hotmail.ru>"));
+}
+
+QTranslator *DecoderFFmpegFactory::createTranslator(QObject *parent)
+{
+    QTranslator *translator = new QTranslator(parent);
+    QString locale = QLocale::system().name();
+    translator->load(QString(":/ffmpeg_plugin_") + locale);
+    return translator;
+}
+
+Q_EXPORT_PLUGIN(DecoderFFmpegFactory)
diff --git a/lib/qmmp/Input/ffmpeg/decoderffmpegfactory.h b/lib/qmmp/Input/ffmpeg/decoderffmpegfactory.h
new file mode 100644
index 000000000..6eeef53cd
--- /dev/null
+++ b/lib/qmmp/Input/ffmpeg/decoderffmpegfactory.h
@@ -0,0 +1,55 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef DECODERFFMPEGFACTORY_H
+#define DECODERFFMPEGFACTORY_H
+
+#include <QObject>
+#include <QString>
+#include <QIODevice>
+#include <QWidget>
+
+#include <decoder.h>
+#include <output.h>
+#include <decoderfactory.h>
+#include <filetag.h>
+
+
+
+
+class DecoderFFmpegFactory : public QObject,
+                          DecoderFactory
+{
+Q_OBJECT
+Q_INTERFACES(DecoderFactory);
+
+public:
+    bool supports(const QString &source) const;
+    const QString &name() const;
+    const QString &filter() const;
+    const QString &description() const;
+    Decoder *create(QObject *, QIODevice *, Output *);
+    FileTag *createTag(const QString &source);
+    void showDetails(QWidget *parent, const QString &path);
+    void showSettings(QWidget *parent);
+    void showAbout(QWidget *parent);
+    QTranslator *createTranslator(QObject *parent);
+};
+
+#endif
diff --git a/lib/qmmp/Input/ffmpeg/detailsdialog.cpp b/lib/qmmp/Input/ffmpeg/detailsdialog.cpp
new file mode 100644
index 000000000..a4551872b
--- /dev/null
+++ b/lib/qmmp/Input/ffmpeg/detailsdialog.cpp
@@ -0,0 +1,103 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+extern "C"
+{
+#include <ffmpeg/avformat.h>
+#include <ffmpeg/avcodec.h>
+}
+
+
+#include "detailsdialog.h"
+
+DetailsDialog::DetailsDialog(QWidget *parent, const QString &path)
+        : QDialog(parent)
+{
+    ui.setupUi(this);
+    setAttribute(Qt::WA_DeleteOnClose);
+    m_path = path;
+    setWindowTitle (path.section('/',-1));
+    path.section('/',-1);
+
+    ui.pathLineEdit->setText(m_path);
+    loadInfo();
+
+}
+
+
+DetailsDialog::~DetailsDialog()
+{}
+
+void DetailsDialog::loadInfo()
+{
+    AVFormatContext *in;
+    avcodec_init();
+    avcodec_register_all();
+    av_register_all();
+    if (av_open_input_file(&in, m_path.toLocal8Bit(), NULL,0, NULL) < 0)
+        return;
+    av_find_stream_info(in);
+    QString string = QString::fromUtf8(in->title).trimmed();
+    ui.titleLineEdit->setText(string);
+    string = QString::fromUtf8(in->author).trimmed();
+    ui.artistLineEdit->setText(string);
+    string = QString::fromUtf8(in->album).trimmed();
+    ui.albumLineEdit->setText(string);
+    string = QString::fromUtf8(in->comment).trimmed();
+    ui.commentLineEdit->setText(string);
+    string = QString("%1").arg(in->year);
+    ui.yearLineEdit->setText(string);
+    string = QString("%1").arg(in->track);
+    ui.trackLineEdit->setText(string);
+    string = QString::fromUtf8(in->genre).trimmed();
+    ui.genreLineEdit->setText(string);
+
+    QString text;
+    text = QString("%1").arg(int(in->duration/AV_TIME_BASE)/60);
+    text +=":"+QString("%1").arg(int(in->duration/AV_TIME_BASE)%60,2,10,QChar('0'));
+    ui.lengthLabel->setText(text);
+
+
+    text = QString("%1").arg(in->file_size/1024)+" "+tr("KB");
+    ui.fileSizeLabel->setText(text);
+    text = QString("%1").arg(in->bit_rate/1000);
+    ui.bitrateLabel->setText(text+" "+tr("kbps"));
+
+    AVCodecContext *c = 0;
+    int wma_idx;
+
+    for (wma_idx = 0; wma_idx < in->nb_streams; wma_idx++)
+    {
+        c = in->streams[wma_idx]->codec;
+        if (c->codec_type == CODEC_TYPE_AUDIO) break;
+    }
+
+    if (c)
+    {
+        text = QString("%1").arg(c->sample_rate);
+        ui.sampleRateLabel->setText(text+" "+tr("Hz"));
+        text = QString("%1").arg(c->channels);
+        ui.channelsLabel->setText(text);
+    }
+
+    av_close_input_file(in);
+}
+
+
diff --git a/lib/qmmp/Input/ffmpeg/detailsdialog.h b/lib/qmmp/Input/ffmpeg/detailsdialog.h
new file mode 100644
index 000000000..258a1bd21
--- /dev/null
+++ b/lib/qmmp/Input/ffmpeg/detailsdialog.h
@@ -0,0 +1,45 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                       *
+ *   forkotov02@hotmail.ru                                                     *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef DETAILSDIALOG_H
+#define DETAILSDIALOG_H
+
+#include <QDialog>
+
+#include "ui_detailsdialog.h"
+
+/**
+	@author Ilya Kotov <forkotov02@hotmail.ru>
+*/
+class DetailsDialog : public QDialog
+{
+Q_OBJECT
+public:
+    DetailsDialog(QWidget *parent = 0, const QString &path = 0);
+
+    ~DetailsDialog();
+
+private:
+    void loadInfo();
+    Ui::DetailsDialog ui;
+    QString m_path;
+
+};
+
+#endif
diff --git a/lib/qmmp/Input/ffmpeg/detailsdialog.ui b/lib/qmmp/Input/ffmpeg/detailsdialog.ui
new file mode 100644
index 000000000..70ed57052
--- /dev/null
+++ b/lib/qmmp/Input/ffmpeg/detailsdialog.ui
@@ -0,0 +1,332 @@
+<ui version="4.0" >
+ <class>DetailsDialog</class>
+ <widget class="QDialog" name="DetailsDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>449</width>
+    <height>375</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Details</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item rowspan="2" row="1" column="0" colspan="2" >
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="minimumSize" >
+      <size>
+       <width>175</width>
+       <height>16</height>
+      </size>
+     </property>
+     <property name="title" >
+      <string>ASF Info</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="4" column="1" >
+       <widget class="QLabel" name="bitrateLabel" >
+        <property name="text" >
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" >
+       <widget class="QLabel" name="channelsLabel" >
+        <property name="layoutDirection" >
+         <enum>Qt::LeftToRight</enum>
+        </property>
+        <property name="text" >
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" >
+       <widget class="QLabel" name="label_2" >
+        <property name="text" >
+         <string>Bitrate:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="label_5" >
+        <property name="text" >
+         <string>File size:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="label_10" >
+        <property name="layoutDirection" >
+         <enum>Qt::LeftToRight</enum>
+        </property>
+        <property name="text" >
+         <string>Channels:</string>
+        </property>
+        <property name="textFormat" >
+         <enum>Qt::PlainText</enum>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QLabel" name="sampleRateLabel" >
+        <property name="text" >
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="label_3" >
+        <property name="text" >
+         <string>Sample rate:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QLabel" name="lengthLabel" >
+        <property name="text" >
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label" >
+        <property name="text" >
+         <string>Length:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <widget class="QLabel" name="fileSizeLabel" >
+        <property name="text" >
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>74</width>
+          <height>151</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="2" colspan="2" >
+    <widget class="QGroupBox" name="groupBox_2" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>5</hsizetype>
+       <vsizetype>5</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title" >
+      <string>WMA Tag</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>8</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="6" column="1" colspan="2" >
+       <widget class="QPushButton" name="pushButton" >
+        <property name="enabled" >
+         <bool>false</bool>
+        </property>
+        <property name="text" >
+         <string>Save</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="3" >
+       <widget class="QLineEdit" name="trackLineEdit" />
+      </item>
+      <item row="4" column="2" >
+       <widget class="QLabel" name="label_26" >
+        <property name="text" >
+         <string>Track number:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1" >
+       <widget class="QLineEdit" name="yearLineEdit" />
+      </item>
+      <item row="4" column="0" >
+       <widget class="QLabel" name="label_25" >
+        <property name="text" >
+         <string>Year:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" >
+       <widget class="QLabel" name="label_27" >
+        <property name="text" >
+         <string>Genre:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="label_24" >
+        <property name="text" >
+         <string>Comment:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="label_23" >
+        <property name="text" >
+         <string>Album:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="label_22" >
+        <property name="text" >
+         <string>Artist:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label_21" >
+        <property name="text" >
+         <string>Title:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" colspan="3" >
+       <widget class="QLineEdit" name="titleLineEdit" />
+      </item>
+      <item row="1" column="1" colspan="3" >
+       <widget class="QLineEdit" name="artistLineEdit" />
+      </item>
+      <item row="2" column="1" colspan="3" >
+       <widget class="QLineEdit" name="albumLineEdit" />
+      </item>
+      <item row="3" column="1" colspan="3" >
+       <widget class="QLineEdit" name="commentLineEdit" />
+      </item>
+      <item row="5" column="1" colspan="2" >
+       <widget class="QLineEdit" name="genreLineEdit" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="2" column="2" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>111</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="3" >
+    <widget class="QPushButton" name="pushButton_3" >
+     <property name="text" >
+      <string>Close</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" >
+    <widget class="QLabel" name="label_28" >
+     <property name="text" >
+      <string>File path:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" colspan="3" >
+    <widget class="QLineEdit" name="pathLineEdit" >
+     <property name="readOnly" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>pushButton_3</sender>
+   <signal>clicked()</signal>
+   <receiver>DetailsDialog</receiver>
+   <slot>close()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>623</x>
+     <y>353</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>539</x>
+     <y>352</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/lib/qmmp/Input/ffmpeg/ffmpeg.pro b/lib/qmmp/Input/ffmpeg/ffmpeg.pro
new file mode 100644
index 000000000..e10985311
--- /dev/null
+++ b/lib/qmmp/Input/ffmpeg/ffmpeg.pro
@@ -0,0 +1,25 @@
+FORMS += detailsdialog.ui 
+HEADERS += decoderffmpegfactory.h \
+           tag.h \
+	   detailsdialog.h \
+           decoder_ffmpeg.h
+SOURCES += tag.cpp \
+	   detailsdialog.cpp \
+           decoder_ffmpeg.cpp \
+	   decoderffmpegfactory.cpp
+DESTDIR = ../
+QMAKE_CLEAN = ../libffmpeg.so
+INCLUDEPATH += ../../../
+CONFIG += release \
+warn_on \
+plugin \
+link_pkgconfig
+TEMPLATE = lib
+QMAKE_LIBDIR += ../../../
+LIBS += -lqmmp -L/usr/lib -I/usr/include
+DEFINES += __STDC_CONSTANT_MACROS
+PKGCONFIG += libavcodec libavformat
+#TRANSLATIONS = translations/ffmpeg_plugin_ru.ts
+#RESOURCES = translations/translations.qrc
+target.path = /lib/qmmp/Input
+INSTALLS += target
diff --git a/lib/qmmp/Input/ffmpeg/tag.cpp b/lib/qmmp/Input/ffmpeg/tag.cpp
new file mode 100644
index 000000000..7a642de87
--- /dev/null
+++ b/lib/qmmp/Input/ffmpeg/tag.cpp
@@ -0,0 +1,98 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#include "tag.h"
+
+Tag::Tag(const QString &source)
+        : FileTag()
+{
+    m_length = 0;
+    m_year = 0;
+    m_track = 0;
+    m_empty = TRUE;
+
+    avcodec_init();
+    avcodec_register_all();
+    av_register_all();
+
+    if (av_open_input_file(&m_in, source.toLocal8Bit(), NULL,0, NULL) < 0)
+        return;
+    av_find_stream_info(m_in);
+    m_album = QString::fromUtf8(m_in->album).trimmed();
+    m_artist = QString::fromUtf8(m_in->author).trimmed();
+    m_comment = QString::fromUtf8(m_in->comment).trimmed();
+    m_genre = QString::fromUtf8(m_in->genre).trimmed();
+    m_title = QString::fromUtf8(m_in->title).trimmed();
+    m_year = m_in->year;
+    m_track = m_in->track;
+    m_length = int(m_in->duration/AV_TIME_BASE);
+    m_empty = FALSE;
+
+    av_close_input_file(m_in);
+}
+
+
+Tag::~Tag()
+{}
+
+
+bool Tag::isEmpty()
+{
+    return m_empty;
+}
+
+QString Tag::album()
+{
+    return m_album;
+}
+
+QString Tag::artist()
+{
+    return m_artist;
+}
+
+QString Tag::comment()
+{
+    return m_comment;
+}
+
+QString Tag::genre()
+{
+    return m_genre;
+}
+
+QString Tag::title()
+{
+    return m_title;
+}
+
+uint Tag::length()
+{
+    return m_length;
+}
+
+uint Tag::track()
+{
+    return m_track;
+}
+
+uint Tag::year()
+{
+    return m_year;
+}
diff --git a/lib/qmmp/Input/ffmpeg/tag.h b/lib/qmmp/Input/ffmpeg/tag.h
new file mode 100644
index 000000000..df55ae24e
--- /dev/null
+++ b/lib/qmmp/Input/ffmpeg/tag.h
@@ -0,0 +1,64 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef XIPHCOMMENT_H
+#define XIPHCOMMENT_H
+
+extern "C"{
+#include <ffmpeg/avformat.h>
+#include <ffmpeg/avcodec.h>
+}
+
+#include <filetag.h>
+
+/**
+	@author Ilya Kotov <forkotov02@hotmail.ru>
+*/
+class Tag : public FileTag
+{
+public:
+    Tag(const QString &source);
+
+    ~Tag();
+
+    virtual QString album();
+    virtual QString artist();
+    virtual QString comment();
+    virtual QString genre();
+    virtual QString title();
+    virtual uint length();
+    virtual uint track();
+    virtual uint year();
+    virtual bool isEmpty();
+
+private:
+    //TagLib::Tag *m_tag;
+    AVFormatContext *m_in;
+    QString m_album;
+    QString m_artist;
+    QString m_comment;
+    QString m_genre;
+    QString m_title;
+    uint m_length;
+    uint m_year;
+    uint m_track;
+    bool m_empty;
+};
+
+#endif
diff --git a/lib/qmmp/Input/ffmpeg/translations/ffmpeg_plugin_ru.qm b/lib/qmmp/Input/ffmpeg/translations/ffmpeg_plugin_ru.qm
new file mode 100644
index 000000000..68ceb6f8b
--- /dev/null
+++ b/lib/qmmp/Input/ffmpeg/translations/ffmpeg_plugin_ru.qm
diff --git a/lib/qmmp/Input/ffmpeg/translations/ffmpeg_plugin_ru.ts b/lib/qmmp/Input/ffmpeg/translations/ffmpeg_plugin_ru.ts
new file mode 100644
index 000000000..e782e411c
--- /dev/null
+++ b/lib/qmmp/Input/ffmpeg/translations/ffmpeg_plugin_ru.ts
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS><TS version="1.1" language="pl">
+<context>
+    <name>DecoderFFmpegFactory</name>
+    <message>
+        <location filename="../decoderffmegfactory.cpp" line="19"/>
+        <source>FFmpeg Plugin</source>
+        <translation>Модуль FFmpeg</translation>
+    </message>
+    <message>
+        <location filename="../decoderffmegfactory.cpp" line="33"/>
+        <source>WMA Files</source>
+        <translation>Файлы WMA</translation>
+    </message>
+    <message>
+        <location filename="../decoderffmegfactory.cpp" line="61"/>
+        <source>About FFmpeg Audio Plugin</source>
+        <translation>Об аудио-модуле FFmpeg</translation>
+    </message>
+    <message>
+        <location filename="../decoderffmegfactory.cpp" line="62"/>
+        <source>Qmmp FFmpeg Audio Plugin</source>
+        <translation>Аудио-модуль FFmpeg для Qmmp</translation>
+    </message>
+    <message>
+        <location filename="../decoderffmegfactory.cpp" line="63"/>
+        <source>Suppored formats: WMA</source>
+        <translation>Поддерживаемые форматы: WMA</translation>
+    </message>
+    <message>
+        <location filename="../decoderffmegfactory.cpp" line="64"/>
+        <source>Writen by: Ilya Kotov &lt;forkotov02@hotmail.ru&gt;</source>
+        <translation>Разработчик: Илья Котов &lt;forkotov02@hotmail.ru&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>DetailsDialog</name>
+    <message>
+        <location filename="../detailsdialog.cpp" line="78"/>
+        <source>KB</source>
+        <translation>Кб</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.cpp" line="95"/>
+        <source>Hz</source>
+        <translation>Гц</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="31"/>
+        <source>ASF Info</source>
+        <translation>Информация ASF</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="130"/>
+        <source>-</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="60"/>
+        <source>Bitrate:</source>
+        <translation>Битовая частота:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="70"/>
+        <source>File size:</source>
+        <translation>Размер файла:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="83"/>
+        <source>Channels:</source>
+        <translation>Каналов:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="103"/>
+        <source>Sample rate:</source>
+        <translation>Дискретизация:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="120"/>
+        <source>Length:</source>
+        <translation>Длительность:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="161"/>
+        <source>WMA Tag</source>
+        <translation>WMA-тег</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="176"/>
+        <source>Save</source>
+        <translation>Сохранить</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="186"/>
+        <source>Track number:</source>
+        <translation>Номер трека:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="199"/>
+        <source>Year:</source>
+        <translation>Год:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="209"/>
+        <source>Genre:</source>
+        <translation>Жанр:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="219"/>
+        <source>Comment:</source>
+        <translation>Комментарий:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="229"/>
+        <source>Album:</source>
+        <translation>Альбом:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="239"/>
+        <source>Artist:</source>
+        <translation>Исполнитель:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="249"/>
+        <source>Title:</source>
+        <translation>Название:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="290"/>
+        <source>Close</source>
+        <translation>Закрыть</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="297"/>
+        <source>File path:</source>
+        <translation>Путь к файлу:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.cpp" line="81"/>
+        <source>kbps</source>
+        <translation>Кб/с</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="13"/>
+        <source>Details</source>
+        <translation>Информация</translation>
+    </message>
+</context>
+</TS>
diff --git a/lib/qmmp/Input/ffmpeg/translations/translations.qrc b/lib/qmmp/Input/ffmpeg/translations/translations.qrc
new file mode 100644
index 000000000..5e15f321d
--- /dev/null
+++ b/lib/qmmp/Input/ffmpeg/translations/translations.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+  <qresource>
+    <file>ffmpeg_plugin_ru.qm</file>
+  </qresource>
+</RCC>
diff --git a/lib/qmmp/Input/flac/CMakeLists.txt b/lib/qmmp/Input/flac/CMakeLists.txt
new file mode 100644
index 000000000..1efc7bb43
--- /dev/null
+++ b/lib/qmmp/Input/flac/CMakeLists.txt
@@ -0,0 +1,88 @@
+project(libflac)
+
+cmake_minimum_required(VERSION 2.4.0)
+
+
+INCLUDE(UsePkgConfig)
+INCLUDE(FindQt4)
+
+find_package(Qt4 REQUIRED) # find and setup Qt4 for this project
+include(${QT_USE_FILE})
+
+# qt plugin
+ADD_DEFINITIONS( -Wall )
+ADD_DEFINITIONS(${QT_DEFINITIONS})
+ADD_DEFINITIONS(-DQT_PLUGIN)
+ADD_DEFINITIONS(-DQT_NO_DEBUG)
+ADD_DEFINITIONS(-DQT_SHARED)
+ADD_DEFINITIONS(-DQT_THREAD)
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+SET(QT_INCLUDES
+  ${QT_INCLUDES}
+  ${CMAKE_CURRENT_BINARY_DIR}/../../../
+)
+
+# libqmmp
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
+
+# libflac and taglib
+PKGCONFIG(flac FLAC_INCLUDE_DIR FLAC_LINK_DIR FLAC_LINK_FLAGS FLAC_CFLAGS)
+PKGCONFIG(taglib TAGLIB_INCLUDE_DIR TAGLIB_LINK_DIR TAGLIB_LINK_FLAGS TAGLIB_CFLAGS)
+
+IF(NOT FLAC_LINK_FLAGS)
+  SET(FLAC_LINK_FLAGS -lFLAC)
+ENDIF(NOT FLAC_LINK_FLAGS)
+
+IF(NOT TAGLIB_LINK_FLAGS)
+  SET(TAGLIB_LINK_FLAGS -ltag)
+  SET(TAGLIB_INCLUDE_DIR /usr/include/taglib)
+  SET(TAGLIB_CFLAGS -I/usr/include/taglib)
+ENDIF(NOT TAGLIB_LINK_FLAGS)
+
+include_directories(${FLAC_INCLUDE_DIR} ${TAGLIB_INCLUDE_DIR})
+link_directories(${FLAC_LINK_DIR} ${TAGLIB_LINK_DIR})
+
+ADD_DEFINITIONS(${FLAC_CFLAGS})
+ADD_DEFINITIONS(${TAGLIB_CFLAGS})
+
+
+SET(libflac_SRCS
+  decoder_flac.cpp
+  decoderflacfactory.cpp
+  detailsdialog.cpp
+  tag.cpp
+)
+
+SET(libflac_MOC_HDRS
+  tag.h
+  decoderflacfactory.h
+  decoder_flac.h
+  detailsdialog.h
+)
+
+SET(libflac_RCCS translations/translations.qrc)
+
+QT4_ADD_RESOURCES(libflac_RCC_SRCS ${libflac_RCCS})
+
+QT4_WRAP_CPP(libflac_MOC_SRCS ${libflac_MOC_HDRS})
+
+# user interface
+
+
+SET(libflac_UIS
+    detailsdialog.ui
+)
+
+QT4_WRAP_UI(libflac_UIS_H ${libflac_UIS})
+# Don't forget to include output directory, otherwise
+# the UI file won't be wrapped!
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+ADD_LIBRARY(flac SHARED ${libflac_SRCS} ${libflac_MOC_SRCS} ${libflac_UIS_H}
+  ${libflac_RCC_SRCS})
+target_link_libraries(flac ${QT_LIBRARIES} -lqmmp ${FLAC_LINK_FLAGS} ${FLAC_CFLAGS} ${TAGLIB_LINK_FLAGS} ${TAGLIB_CFLAGS})
+install(TARGETS flac DESTINATION lib/qmmp/Input)
+
diff --git a/lib/qmmp/Input/flac/decoder_flac.cpp b/lib/qmmp/Input/flac/decoder_flac.cpp
new file mode 100644
index 000000000..d4f3d6304
--- /dev/null
+++ b/lib/qmmp/Input/flac/decoder_flac.cpp
@@ -0,0 +1,567 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+
+#include "constants.h"
+#include "buffer.h"
+#include "output.h"
+#include "recycler.h"
+
+#include <qobject.h>
+#include <qiodevice.h>
+#include <FLAC/all.h>
+#include "decoder_flac.h"
+
+
+
+static size_t pack_pcm_signed (FLAC__byte *data,
+                               const FLAC__int32 * const input[],
+                               unsigned wide_samples,
+                               unsigned channels, unsigned bps)
+{
+    FLAC__byte * const start = data;
+    FLAC__int32 sample;
+    const FLAC__int32 *input_;
+    unsigned samples, channel;
+    unsigned bytes_per_sample;
+    unsigned incr;
+
+    if (bps == 24)
+        bps = 32; /* we encode to 32-bit words */
+    bytes_per_sample = bps / 8;
+    incr = bytes_per_sample * channels;
+
+    for (channel = 0; channel < channels; channel++)
+    {
+        samples = wide_samples;
+        data = start + bytes_per_sample * channel;
+        input_ = input[channel];
+
+        while (samples--)
+        {
+            sample = *input_++;
+
+            switch (bps)
+            {
+            case 8:
+                data[0] = sample;
+                break;
+            case 16:
+                data[1] = (FLAC__byte)(sample >> 8);
+                data[0] = (FLAC__byte)sample;
+                break;
+            case 32:
+                data[3] = (FLAC__byte)(sample >> 16);
+                data[2] = (FLAC__byte)(sample >> 8);
+                data[1] = (FLAC__byte)sample;
+                data[0] = 0;
+                break;
+            }
+
+            data += incr;
+        }
+    }
+
+    return wide_samples * channels * bytes_per_sample;
+}
+
+static int flac_decode (void *void_data, char *buf, int buf_len) /*,
+      struct sound_params *sound_params)*/
+{
+    //struct flac_data *data = (struct flac_data *)void_data;
+    DecoderFLAC *dflac = (DecoderFLAC *) void_data;
+    unsigned to_copy;
+    int bytes_per_sample;
+    FLAC__uint64 decode_position;
+
+    bytes_per_sample = dflac->data()->bits_per_sample / 8;
+
+    /*switch (bytes_per_sample) {
+      case 1:
+         sound_params->fmt = SFMT_S8;
+         break;
+      case 2:
+         sound_params->fmt = SFMT_S16 | SFMT_LE;
+         break;
+      case 3:
+         sound_params->fmt = SFMT_S32 | SFMT_LE;
+         break;
+    }
+
+    sound_params->rate = data->sample_rate;
+    sound_params->channels = data->channels;*/
+
+    //decoder_error_clear (&data->error);
+
+    if (!dflac->data()->sample_buffer_fill)
+    {
+
+        if (FLAC__stream_decoder_get_state(dflac->data()->decoder)
+                == FLAC__STREAM_DECODER_END_OF_STREAM)
+        {
+            return 0;
+        }
+
+        if (!FLAC__stream_decoder_process_single(
+                    dflac->data()->decoder))
+        {
+            return 0;
+        }
+
+        /* Count the bitrate */
+        if (!FLAC__stream_decoder_get_decode_position(
+                    dflac->data()->decoder, &decode_position))
+            decode_position = 0;
+        if (decode_position > dflac->data()->last_decode_position)
+        {
+            int bytes_per_sec = bytes_per_sample * dflac->data()->sample_rate
+                                * dflac->data()->channels;
+
+            dflac->data()->bitrate = int(((float)decode_position -
+                                          dflac->data()->last_decode_position) * 8.0 *
+                                          bytes_per_sec /
+                                          dflac->data()->sample_buffer_fill / 1000);
+        }
+
+        dflac->data()->last_decode_position = decode_position;
+    }
+
+    to_copy = qMin((unsigned)buf_len, dflac->data()->sample_buffer_fill);
+    memcpy (buf, dflac->data()->sample_buffer, to_copy);
+    memmove (dflac->data()->sample_buffer,
+             dflac->data()->sample_buffer + to_copy,
+             dflac->data()->sample_buffer_fill - to_copy);
+    dflac->data()->sample_buffer_fill -= to_copy;
+    return to_copy;
+}
+
+
+static FLAC__StreamDecoderReadStatus
+flac_callback_read (const FLAC__StreamDecoder *, FLAC__byte buffer[],
+                    size_t *bytes, void *client_data)
+{
+    DecoderFLAC *dflac = (DecoderFLAC *) client_data;
+    qint64 res;
+
+    res = dflac->input()->read((char *)buffer, *bytes);
+
+    if (res > 0)
+    {
+        *bytes = res;
+        return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
+    }
+    if (res == 0)
+    {
+        *bytes = res;
+        return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
+    }
+
+    return FLAC__STREAM_DECODER_READ_STATUS_ABORT;
+
+}
+
+static FLAC__StreamDecoderWriteStatus
+flac_callback_write (const FLAC__StreamDecoder *, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
+{
+    DecoderFLAC *dflac = (DecoderFLAC *) client_data;
+    const unsigned wide_samples = frame->header.blocksize;
+
+    if (dflac->data()->abort)
+        return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
+
+
+    dflac->data()->sample_buffer_fill = pack_pcm_signed (
+                                            dflac->data()->sample_buffer,
+                                            buffer, wide_samples,
+                                            dflac->data()->channels,
+                                            dflac->data()->bits_per_sample);
+
+    return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
+}
+
+static FLAC__StreamDecoderTellStatus
+flac_callback_tell (const FLAC__StreamDecoder *, FLAC__uint64 *offset, void *client_data)
+{
+    DecoderFLAC *dflac = (DecoderFLAC *) client_data;
+    *offset = dflac->input()->pos ();
+    return FLAC__STREAM_DECODER_TELL_STATUS_OK;
+}
+
+static FLAC__StreamDecoderSeekStatus
+flac_callback_seek (const FLAC__StreamDecoder *, FLAC__uint64 offset, void *client_data)
+{
+    DecoderFLAC *dflac = (DecoderFLAC *) client_data;
+
+    return dflac->input()->seek(offset)
+           ? FLAC__STREAM_DECODER_SEEK_STATUS_OK
+           : FLAC__STREAM_DECODER_SEEK_STATUS_ERROR;
+}
+
+static FLAC__StreamDecoderLengthStatus
+flac_callback_length (const FLAC__StreamDecoder *, FLAC__uint64 *stream_length, void *client_data)
+{
+    DecoderFLAC *dflac = (DecoderFLAC *) client_data;
+    *stream_length = dflac->input()->size();
+    return FLAC__STREAM_DECODER_LENGTH_STATUS_OK;
+}
+
+static void
+flac_callback_metadata (const FLAC__StreamDecoder *, const FLAC__StreamMetadata *metadata, void *client_data)
+{
+    DecoderFLAC *dflac = (DecoderFLAC *) client_data;
+
+    if (metadata->type == FLAC__METADATA_TYPE_STREAMINFO)
+    {
+        qDebug ("DecoderFLAC: getting metadata info");
+
+        dflac->data()->total_samples =
+            (unsigned)(metadata->data.stream_info.total_samples
+                       & 0xffffffff);
+        dflac->data()->bits_per_sample =
+            metadata->data.stream_info.bits_per_sample;
+        dflac->data()->channels = metadata->data.stream_info.channels;
+        dflac->data()->sample_rate = metadata->data.stream_info.sample_rate;
+        dflac->data()->length = dflac->data()->total_samples / dflac->data()->sample_rate;
+    }
+}
+
+static FLAC__bool
+flac_callback_eof (const FLAC__StreamDecoder *, void *)
+{
+    return FALSE;
+}
+
+static void
+flac_callback_error (const FLAC__StreamDecoder *, FLAC__StreamDecoderErrorStatus status, void *client_data)
+{}
+
+// Decoder class
+
+DecoderFLAC::DecoderFLAC(QObject *parent, DecoderFactory *d, QIODevice *i, Output *o)
+        : Decoder(parent, d, i, o)
+{
+    inited = FALSE;
+    user_stop = FALSE;
+    stat = 0;
+    output_buf = 0;
+    output_bytes = 0;
+    output_at = 0;
+    bks = 0;
+    done = FALSE;
+    finish = FALSE;
+    len = 0;
+    freq = 0;
+    bitrate = 0;
+    seekTime = -1.0;
+    totalTime = 0.0;
+    chan = 0;
+    output_size = 0;
+    m_data = 0;
+
+
+
+
+}
+
+
+DecoderFLAC::~DecoderFLAC()
+{
+    deinit();
+    if (data())
+    {
+        if (data()->decoder)
+            FLAC__stream_decoder_delete (data()->decoder);
+        delete data();
+        m_data = 0;
+    }
+
+    if (output_buf)
+        delete [] output_buf;
+    output_buf = 0;
+}
+
+
+void DecoderFLAC::stop()
+{
+    user_stop = TRUE;
+}
+
+
+void DecoderFLAC::flush(bool final)
+{
+    //qDebug("DecoderFLAC: flush()");
+    ulong min = final ? 0 : bks;
+
+    while ((! done && ! finish) && output_bytes > min)
+    {
+        output()->recycler()->mutex()->lock();
+
+        while ((! done && ! finish) && output()->recycler()->full())
+        {
+            mutex()->unlock();
+
+            output()->recycler()->cond()->wait(output()->recycler()->mutex());
+
+            mutex()->lock();
+            done = user_stop;
+        }
+
+        if (user_stop || finish)
+        {
+            inited = FALSE;
+            done = TRUE;
+        }
+        else
+        {
+            output_bytes -= produceSound(output_buf, output_bytes, bitrate, chan);
+            output_size += bks;
+            output_at = output_bytes;
+        }
+
+        if (output()->recycler()->full())
+        {
+            output()->recycler()->cond()->wakeOne();
+        }
+
+        output()->recycler()->mutex()->unlock();
+    }
+}
+
+
+bool DecoderFLAC::initialize()
+{
+    bks = blockSize();
+    inited = user_stop = done = finish = FALSE;
+    len = freq = bitrate = 0;
+    stat = chan = 0;
+    output_size = 0;
+    seekTime = -1.0;
+    totalTime = 0.0;
+
+
+    if (! input())
+    {
+        error("DecoderFLAC: cannot initialize.  No input.");
+
+        return FALSE;
+    }
+
+    if (! output_buf)
+        output_buf = new char[globalBufferSize];
+    output_at = 0;
+    output_bytes = 0;
+
+    if (! input()->isOpen())
+    {
+        if (! input()->open(QIODevice::ReadOnly))
+        {
+
+            return FALSE;
+        }
+    }
+
+
+    if (! input())
+    {
+        error("DecoderFLAC: cannot initialize.  No input.");
+
+        return FALSE;
+    }
+
+    if (! output_buf)
+        output_buf = new char[globalBufferSize];
+    output_at = 0;
+    output_bytes = 0;
+
+    if (! input()->isOpen())
+    {
+        if (! input()->open(QIODevice::ReadOnly))
+        {
+            return FALSE;
+        }
+    }
+    if (!m_data)
+    {
+        m_data = new flac_data;
+        m_data->decoder = NULL;
+    }
+
+    m_data->bitrate = -1;
+    m_data->abort = 0;
+    m_data->sample_buffer_fill = 0;
+    m_data->last_decode_position = 0;
+    if (!m_data->decoder)
+    {
+        qDebug("DecoderFLAC: creating FLAC__StreamDecoder");
+        m_data->decoder = FLAC__stream_decoder_new ();
+    }
+    qDebug("DecoderFLAC: setting callbacks");
+    if (FLAC__stream_decoder_init_stream(
+                m_data->decoder,
+                flac_callback_read,
+                flac_callback_seek,
+                flac_callback_tell,
+                flac_callback_length,
+                flac_callback_eof,
+                flac_callback_write,
+                flac_callback_metadata,
+                flac_callback_error,
+                this) != FLAC__STREAM_DECODER_INIT_STATUS_OK)
+    {
+        data()->ok = 0;
+        return FALSE;
+    }
+
+    if (!FLAC__stream_decoder_process_until_end_of_metadata(
+                data()->decoder))
+    {
+        data()->ok = 0;
+        return FALSE;
+    }
+    chan = data()->channels;
+    if (output())
+        output()->configure(data()->sample_rate, data()->channels, 16, bitrate);
+    totalTime = data()->length;
+
+    inited = TRUE;
+    qDebug("DecoderFLAC: initialize succes");
+    return TRUE;
+}
+
+
+double DecoderFLAC::lengthInSeconds()
+{
+    if (! inited)
+        return 0;
+
+    return totalTime;
+}
+
+
+void DecoderFLAC::seek(double pos)
+{
+    seekTime = pos;
+}
+
+
+void DecoderFLAC::deinit()
+{
+    FLAC__stream_decoder_finish (data()->decoder);
+    inited = user_stop = done = finish = FALSE;
+    len = freq = bitrate = 0;
+    stat = chan = 0;
+    output_size = 0;
+}
+
+void DecoderFLAC::run()
+{
+    mutex()->lock ();
+
+    if (! inited)
+    {
+        mutex()->unlock();
+
+        return;
+    }
+    stat = DecoderState::Decoding;
+    mutex()->unlock();
+    {
+        dispatch(DecoderState ((DecoderState::Type) stat));
+    }
+
+    while (! done && ! finish)
+    {
+        mutex()->lock ();
+        // decode
+
+        if (seekTime >= 0.0)
+        {
+            FLAC__uint64 target_sample;
+
+            target_sample = (FLAC__uint64)((seekTime/(double)data()->length) *
+                                           (double)data()->total_samples);
+
+            FLAC__stream_decoder_seek_absolute(data()->decoder,
+                                               target_sample);
+            seekTime = -1.0;
+        }
+        len = flac_decode (this, (char *) (output_buf + output_at), bks);
+
+        if (len > 0)
+        {
+            bitrate = data()->bitrate;
+            output_at += len;
+            output_bytes += len;
+
+            if (output())
+                flush();
+
+        }
+        else if (len == 0)
+        {
+            flush(TRUE);
+
+            if (output())
+            {
+                output()->recycler()->mutex()->lock ();
+                // end of stream
+                while (! output()->recycler()->empty() && ! user_stop)
+                {
+                    output()->recycler()->cond()->wakeOne();
+                    mutex()->unlock();
+                    output()->recycler()->cond()->wait(output()->recycler()->mutex());
+                    mutex()->lock ();
+                }
+                output()->recycler()->mutex()->unlock();
+            }
+
+            done = TRUE;
+            if (! user_stop)
+            {
+                finish = TRUE;
+            }
+        }
+        else
+        {
+            // error in read
+            error("DecoderFLAC: Error while decoding stream, File appears to be "
+                  "corrupted");
+
+            finish = TRUE;
+        }
+
+        mutex()->unlock();
+    }
+
+    mutex()->lock ();
+
+    if (finish)
+        stat = DecoderState::Finished;
+    else if (user_stop)
+        stat = DecoderState::Stopped;
+
+    mutex()->unlock();
+
+    {
+        dispatch(DecoderState ((DecoderState::Type) stat));
+    }
+
+    deinit();
+}
diff --git a/lib/qmmp/Input/flac/decoder_flac.h b/lib/qmmp/Input/flac/decoder_flac.h
new file mode 100644
index 000000000..4c85176ed
--- /dev/null
+++ b/lib/qmmp/Input/flac/decoder_flac.h
@@ -0,0 +1,124 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#ifndef __decoder_flac_h
+#define __decoder_flac_h
+
+class DecoderOgg;
+
+#include "decoder.h"
+
+#include <FLAC/all.h>
+
+#define MAX_SUPPORTED_CHANNELS      2
+
+#define SAMPLES_PER_WRITE     512
+#define SAMPLE_BUFFER_SIZE ((FLAC__MAX_BLOCK_SIZE + SAMPLES_PER_WRITE) * MAX_SUPPORTED_CHANNELS * (32/8))
+
+struct flac_data
+{
+    //FLAC__SeekableStreamDecoder *decoder;
+    FLAC__StreamDecoder *decoder;
+    struct io_stream *stream;
+    int bitrate;
+    int abort; /* abort playing (due to an error) */
+
+    unsigned length;
+    unsigned total_samples;
+
+    FLAC__byte sample_buffer[SAMPLE_BUFFER_SIZE];
+    unsigned sample_buffer_fill;
+
+    /* sound parameters */
+    unsigned bits_per_sample;
+    unsigned sample_rate;
+    unsigned channels;
+
+    FLAC__uint64 last_decode_position;
+
+    int ok; /* was this stream successfully opened? */
+    //struct decoder_error error;
+};
+
+class DecoderFLAC : public Decoder
+{
+public:
+    DecoderFLAC(QObject *, DecoderFactory *, QIODevice *, Output *);
+    virtual ~DecoderFLAC();
+
+    // Standard Decoder API
+    bool initialize();
+    double lengthInSeconds();
+    void seek(double);
+    void stop();
+
+    // Equalizer
+    bool isEQSupported() const
+    {
+        return FALSE;
+    }
+    void setEQEnabled(bool)
+    {
+        ;
+    }
+    void setEQGain(int)
+    {
+        ;
+    }
+    void setEQBands(int[10])
+    {
+        ;
+    }
+
+    struct flac_data *data()
+    {
+        return m_data;
+    }
+
+
+private:
+    // thread run function
+    void run();
+    struct flac_data *m_data;
+    // helper functions
+    void flush(bool = FALSE);
+    void deinit();
+
+    bool inited, user_stop;
+    int stat;
+
+    // output buffer
+    char *output_buf;
+    ulong output_bytes, output_at;
+
+    // FLAC Decoder
+    //FLAC__SeekableStreamDecoder *m_flacDecoder;
+    FLAC__StreamDecoder *m_flacDecoder;
+
+    unsigned int bks;
+    bool done, finish;
+    long len, freq, bitrate;
+    int chan;
+    unsigned long output_size;
+    double totalTime, seekTime;
+};
+
+
+#endif // __decoder_flac_h
diff --git a/lib/qmmp/Input/flac/decoderflacfactory.cpp b/lib/qmmp/Input/flac/decoderflacfactory.cpp
new file mode 100644
index 000000000..e8214924e
--- /dev/null
+++ b/lib/qmmp/Input/flac/decoderflacfactory.cpp
@@ -0,0 +1,76 @@
+#include <QtGui>
+#include <taglib/tag.h>
+#include <taglib/fileref.h>
+
+#include "detailsdialog.h"
+#include "decoder_flac.h"
+#include "tag.h"
+#include "decoderflacfactory.h"
+
+
+// DecoderFLACFactory
+
+bool DecoderFLACFactory::supports(const QString &source) const
+{
+
+    return (source.right(5).toLower() == ".flac");
+}
+
+const QString &DecoderFLACFactory::name() const
+{
+    static QString name (tr("FLAC Plugin"));
+    return name;
+}
+
+
+const QString &DecoderFLACFactory::filter() const
+{
+    static QString filter("*.flac");
+    return filter;
+}
+
+
+const QString &DecoderFLACFactory::description() const
+{
+    static QString desc(tr("FLAC Files"));
+    return desc;
+}
+
+
+Decoder *DecoderFLACFactory::create(QObject *parent, QIODevice *input,
+                                    Output *output)
+{
+    return new DecoderFLAC(parent, this, input, output);
+}
+
+FileTag *DecoderFLACFactory::createTag(const QString &source)
+{
+    FileTag *tag = new Tag(source);
+    return tag;
+}
+
+void DecoderFLACFactory::showDetails(QWidget *parent, const QString &path)
+{
+    DetailsDialog *d = new DetailsDialog(parent, path);
+    d -> show();
+}
+
+void DecoderFLACFactory::showSettings(QWidget *)
+{}
+
+void DecoderFLACFactory::showAbout(QWidget *parent)
+{
+    QMessageBox::about (parent, tr("About FLAC Audio Plugin"),
+                        tr("Qmmp FLAC Audio Plugin")+"\n"+
+                        tr("Writen by: Ilya Kotov <forkotov02@hotmail.ru>"));
+}
+
+QTranslator *DecoderFLACFactory::createTranslator(QObject *parent)
+{
+    QTranslator *translator = new QTranslator(parent);
+    QString locale = QLocale::system().name();
+    translator->load(QString(":/flac_plugin_") + locale);
+    return translator;
+}
+
+Q_EXPORT_PLUGIN(DecoderFLACFactory)
diff --git a/lib/qmmp/Input/flac/decoderflacfactory.h b/lib/qmmp/Input/flac/decoderflacfactory.h
new file mode 100644
index 000000000..ea5d62068
--- /dev/null
+++ b/lib/qmmp/Input/flac/decoderflacfactory.h
@@ -0,0 +1,55 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef DECODERFLACFACTORY_H
+#define DECODERFLACFACTORY_H
+
+#include <QObject>
+#include <QString>
+#include <QIODevice>
+#include <QWidget>
+
+#include <decoder.h>
+#include <output.h>
+#include <decoderfactory.h>
+#include <filetag.h>
+
+
+
+
+class DecoderFLACFactory : public QObject,
+                          DecoderFactory
+{
+Q_OBJECT
+Q_INTERFACES(DecoderFactory);
+
+public:
+    bool supports(const QString &source) const;
+    const QString &name() const;
+    const QString &filter() const;
+    const QString &description() const;
+    Decoder *create(QObject *, QIODevice *, Output *);
+    FileTag *createTag(const QString &source);
+    void showDetails(QWidget *parent, const QString &path);
+    void showSettings(QWidget *parent);
+    void showAbout(QWidget *parent);
+    QTranslator *createTranslator(QObject *parent);
+};
+
+#endif
diff --git a/lib/qmmp/Input/flac/decoderflacfactory_interface.h b/lib/qmmp/Input/flac/decoderflacfactory_interface.h
new file mode 100644
index 000000000..357b6a948
--- /dev/null
+++ b/lib/qmmp/Input/flac/decoderflacfactory_interface.h
@@ -0,0 +1,17 @@
+#ifndef __DECODERFLACFACTORY_INTERFACE_H
+#define __DECODERFLACFACTORY_INTERFACE_H
+
+class DecoderFLACFactoryInterface
+{
+public:
+    DecoderFLACFactoryInterface() {}
+    virtual ~DecoderFLACFactoryInterface() {}
+
+
+private:
+    DecoderFLACFactoryInterface( const DecoderFLACFactoryInterface& source );
+    void operator = ( const DecoderFLACFactoryInterface& source );
+};
+
+
+#endif // __DECODERFLACFACTORY_INTERFACE_H
diff --git a/lib/qmmp/Input/flac/detailsdialog.cpp b/lib/qmmp/Input/flac/detailsdialog.cpp
new file mode 100644
index 000000000..3834e7ba9
--- /dev/null
+++ b/lib/qmmp/Input/flac/detailsdialog.cpp
@@ -0,0 +1,94 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#include <taglib/tag.h>
+#include <taglib/fileref.h>
+#include <taglib/flacfile.h>
+
+#include "detailsdialog.h"
+
+DetailsDialog::DetailsDialog(QWidget *parent, const QString &path)
+        : QDialog(parent)
+{
+    ui.setupUi(this);
+    setAttribute(Qt::WA_DeleteOnClose);
+    m_path = path;
+    setWindowTitle (path.section('/',-1));
+    path.section('/',-1);
+    ui.pathLineEdit->setText(m_path);
+    loadFLACInfo();
+    loadTag();
+
+}
+
+
+DetailsDialog::~DetailsDialog()
+{}
+
+void DetailsDialog::loadFLACInfo()
+{
+    TagLib::FLAC::File f (m_path.toLocal8Bit());
+    //l.label
+    //ui. f.audioProperties()->level();
+    QString text;
+    text = QString("%1").arg(f.audioProperties()->length()/60);
+    text +=":"+QString("%1").arg(f.audioProperties()->length()%60,2,10,QChar('0'));
+    ui.lengthLabel->setText(text);
+    text = QString("%1").arg(f.audioProperties()->sampleRate());
+    ui.sampleRateLabel->setText(text+" "+tr("Hz"));
+    text = QString("%1").arg(f.audioProperties()->channels());
+    ui.channelsLabel->setText(text);
+    text = QString("%1").arg(f.audioProperties()->bitrate());
+    ui.bitrateLabel->setText(text+" "+tr("kbps"));
+    text = QString("%1").arg(f.audioProperties()->sampleWidth());
+    ui.sampleWidthLabel->setText(text+" "+tr("bits"));
+    text = QString("%1 "+tr("KB")).arg(f.length()/1024);
+    ui.fileSizeLabel->setText(text);
+
+}
+
+void DetailsDialog::loadTag()
+{
+    TagLib::FileRef f (m_path.toLocal8Bit());
+
+    if (f.tag())
+    {   //TODO: load codec name from config
+
+        TagLib::String title = f.tag()->title();
+        TagLib::String artist = f.tag()->artist();
+        TagLib::String album = f.tag()->album();
+        TagLib::String comment = f.tag()->comment();
+        TagLib::String genre = f.tag()->genre();
+        QString string = QString::fromUtf8(title.toCString(TRUE)).trimmed();
+        ui.titleLineEdit->setText(string);
+        string = QString::fromUtf8(artist.toCString(TRUE)).trimmed();
+        ui.artistLineEdit->setText(string);
+        string = QString::fromUtf8(album.toCString(TRUE)).trimmed();
+        ui.albumLineEdit->setText(string);
+        string = QString::fromUtf8(comment.toCString(TRUE)).trimmed();
+        ui.commentLineEdit->setText(string);
+        string = QString("%1").arg(f.tag()->year());
+        ui.yearLineEdit->setText(string);
+        string = QString("%1").arg(f.tag()->track());
+        ui.trackLineEdit->setText(string);
+        string = QString::fromUtf8(genre.toCString(TRUE)).trimmed();
+        ui.genreLineEdit->setText(string);
+    }
+}
+
diff --git a/lib/qmmp/Input/flac/detailsdialog.h b/lib/qmmp/Input/flac/detailsdialog.h
new file mode 100644
index 000000000..5e5e57ad6
--- /dev/null
+++ b/lib/qmmp/Input/flac/detailsdialog.h
@@ -0,0 +1,46 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                       *
+ *   forkotov02@hotmail.ru                                                     *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef DETAILSDIALOG_H
+#define DETAILSDIALOG_H
+
+#include <QDialog>
+
+#include "ui_detailsdialog.h"
+
+/**
+	@author Ilya Kotov <forkotov02@hotmail.ru>
+*/
+class DetailsDialog : public QDialog
+{
+Q_OBJECT
+public:
+    DetailsDialog(QWidget *parent = 0, const QString &path = 0);
+
+    ~DetailsDialog();
+
+private:
+    void loadFLACInfo();
+    void loadTag();  
+    Ui::DetailsDialog ui;
+    QString m_path;
+
+};
+
+#endif
diff --git a/lib/qmmp/Input/flac/detailsdialog.ui b/lib/qmmp/Input/flac/detailsdialog.ui
new file mode 100644
index 000000000..6968c78be
--- /dev/null
+++ b/lib/qmmp/Input/flac/detailsdialog.ui
@@ -0,0 +1,349 @@
+<ui version="4.0" >
+ <class>DetailsDialog</class>
+ <widget class="QDialog" name="DetailsDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>449</width>
+    <height>375</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Details</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>8</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item rowspan="2" row="1" column="0" colspan="2" >
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="minimumSize" >
+      <size>
+       <width>175</width>
+       <height>16</height>
+      </size>
+     </property>
+     <property name="title" >
+      <string>FLAC Info</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>8</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="6" column="0" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>74</width>
+          <height>151</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="2" column="1" colspan="2" >
+       <widget class="QLabel" name="fileSizeLabel" >
+        <property name="text" >
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label" >
+        <property name="text" >
+         <string>Length:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" colspan="2" >
+       <widget class="QLabel" name="lengthLabel" >
+        <property name="text" >
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="label_3" >
+        <property name="text" >
+         <string>Sample rate:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" colspan="2" >
+       <widget class="QLabel" name="sampleRateLabel" >
+        <property name="text" >
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="label_10" >
+        <property name="layoutDirection" >
+         <enum>Qt::LeftToRight</enum>
+        </property>
+        <property name="text" >
+         <string>Channels:</string>
+        </property>
+        <property name="textFormat" >
+         <enum>Qt::PlainText</enum>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="label_5" >
+        <property name="text" >
+         <string>File size:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" >
+       <widget class="QLabel" name="label_2" >
+        <property name="text" >
+         <string>Bitrate:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" colspan="2" >
+       <widget class="QLabel" name="channelsLabel" >
+        <property name="layoutDirection" >
+         <enum>Qt::LeftToRight</enum>
+        </property>
+        <property name="text" >
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1" colspan="2" >
+       <widget class="QLabel" name="bitrateLabel" >
+        <property name="text" >
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" >
+       <widget class="QLabel" name="label_4" >
+        <property name="text" >
+         <string>Sample width:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="1" colspan="2" >
+       <widget class="QLabel" name="sampleWidthLabel" >
+        <property name="text" >
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="0" column="1" colspan="3" >
+    <widget class="QLineEdit" name="pathLineEdit" >
+     <property name="readOnly" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" >
+    <widget class="QLabel" name="label_28" >
+     <property name="text" >
+      <string>File path:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="3" >
+    <widget class="QPushButton" name="pushButton_3" >
+     <property name="text" >
+      <string>Close</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="2" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>111</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="2" colspan="2" >
+    <widget class="QGroupBox" name="groupBox_2" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>5</hsizetype>
+       <vsizetype>5</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title" >
+      <string>FLAC Tag</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>8</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="6" column="1" colspan="2" >
+       <widget class="QPushButton" name="pushButton" >
+        <property name="enabled" >
+         <bool>false</bool>
+        </property>
+        <property name="text" >
+         <string>Save</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="3" >
+       <widget class="QLineEdit" name="trackLineEdit" />
+      </item>
+      <item row="4" column="2" >
+       <widget class="QLabel" name="label_26" >
+        <property name="text" >
+         <string>Track number:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1" >
+       <widget class="QLineEdit" name="yearLineEdit" />
+      </item>
+      <item row="4" column="0" >
+       <widget class="QLabel" name="label_25" >
+        <property name="text" >
+         <string>Year:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" >
+       <widget class="QLabel" name="label_27" >
+        <property name="text" >
+         <string>Genre:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="label_24" >
+        <property name="text" >
+         <string>Comment:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="label_23" >
+        <property name="text" >
+         <string>Album:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="label_22" >
+        <property name="text" >
+         <string>Artist:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label_21" >
+        <property name="text" >
+         <string>Title:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" colspan="3" >
+       <widget class="QLineEdit" name="titleLineEdit" />
+      </item>
+      <item row="1" column="1" colspan="3" >
+       <widget class="QLineEdit" name="artistLineEdit" />
+      </item>
+      <item row="2" column="1" colspan="3" >
+       <widget class="QLineEdit" name="albumLineEdit" />
+      </item>
+      <item row="3" column="1" colspan="3" >
+       <widget class="QLineEdit" name="commentLineEdit" />
+      </item>
+      <item row="5" column="1" colspan="2" >
+       <widget class="QLineEdit" name="genreLineEdit" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>pushButton_3</sender>
+   <signal>clicked()</signal>
+   <receiver>DetailsDialog</receiver>
+   <slot>close()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>623</x>
+     <y>353</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>539</x>
+     <y>352</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/lib/qmmp/Input/flac/flac.pro b/lib/qmmp/Input/flac/flac.pro
new file mode 100644
index 000000000..ec81ffd10
--- /dev/null
+++ b/lib/qmmp/Input/flac/flac.pro
@@ -0,0 +1,30 @@
+# ???? ?????? ? KDevelop ?????????? qmake.
+# ------------------------------------------- 
+# ?????????? ???????????? ???????? ???????? ???????: ./Plugins/Input/flac
+# ???? - ??????????:  
+
+FORMS += detailsdialog.ui 
+HEADERS += tag.h \
+	   decoderflacfactory.h \
+           decoder_flac.h \
+           detailsdialog.h 
+SOURCES += decoder_flac.cpp \
+           decoderflacfactory.cpp \
+           detailsdialog.cpp \
+           tag.cpp 
+DESTDIR = ../
+QMAKE_CLEAN += ../libflac.so
+INCLUDEPATH += ../../../
+CONFIG += release \
+warn_on \
+plugin \
+link_pkgconfig
+TEMPLATE = lib
+QMAKE_LIBDIR += ../../../
+LIBS += -lqmmp -L/usr/lib -I/usr/include
+PKGCONFIG += taglib flac
+#TRANSLATIONS = translations/flac_plugin_ru.ts
+#RESOURCES = translations/translations.qrc
+target.path = /lib/qmmp/Input
+INSTALLS += target
+
diff --git a/lib/qmmp/Input/flac/tag.cpp b/lib/qmmp/Input/flac/tag.cpp
new file mode 100644
index 000000000..71feb9051
--- /dev/null
+++ b/lib/qmmp/Input/flac/tag.cpp
@@ -0,0 +1,97 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#include "tag.h"
+
+Tag::Tag(const QString &source)
+        : FileTag()
+{
+    m_length = 0;
+    m_year = 0;
+    m_track = 0;
+    m_empty = TRUE;
+    TagLib::FileRef fileRef(source.toLocal8Bit ());
+
+    m_tag = fileRef.tag();
+    if(m_tag && !m_tag->isEmpty())
+    {
+        m_album = QString::fromUtf8(m_tag->album().toCString(TRUE)).trimmed();
+        m_artist = QString::fromUtf8(m_tag->artist().toCString(TRUE)).trimmed();
+        m_comment = QString::fromUtf8(m_tag->comment().toCString(TRUE)).trimmed();
+        m_genre = QString::fromUtf8(m_tag->genre().toCString(TRUE)).trimmed();
+        m_title = QString::fromUtf8(m_tag->title().toCString(TRUE)).trimmed();
+        m_year = 0;
+        m_track = 0;
+        if(fileRef.audioProperties())
+            m_length = fileRef.audioProperties()->length();
+        m_empty = FALSE;
+    }
+    else
+        m_tag = 0;
+}
+
+
+Tag::~Tag()
+{}
+
+
+bool Tag::isEmpty()
+{
+    return m_empty;
+}
+
+QString Tag::album()
+{
+    return m_album;
+}
+
+QString Tag::artist()
+{
+    return m_artist;
+}
+
+QString Tag::comment()
+{
+    return m_comment;
+}
+
+QString Tag::genre()
+{
+    return m_genre;
+}
+
+QString Tag::title()
+{
+    return m_title;
+}
+
+uint Tag::length()
+{
+    return m_length;
+}
+
+uint Tag::track()
+{
+    return m_track; 
+}
+
+uint Tag::year()
+{
+    return m_year;
+}
diff --git a/lib/qmmp/Input/flac/tag.h b/lib/qmmp/Input/flac/tag.h
new file mode 100644
index 000000000..514f64d2a
--- /dev/null
+++ b/lib/qmmp/Input/flac/tag.h
@@ -0,0 +1,61 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                       *
+ *   forkotov02@hotmail.ru                                                     *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef TAG_H
+#define TAG_H
+
+#include <taglib/tag.h>
+#include <taglib/fileref.h>
+
+#include <filetag.h>
+
+/**
+	@author Ilya Kotov <forkotov02@hotmail.ru>
+*/
+class Tag : public FileTag
+{
+public:
+    Tag(const QString &source);
+
+    ~Tag();
+
+    virtual QString album();
+    virtual QString artist();
+    virtual QString comment();
+    virtual QString genre();
+    virtual QString title();
+    virtual uint length();
+    virtual uint track();
+    virtual uint year();
+    virtual bool isEmpty();
+
+private:
+    TagLib::Tag *m_tag;
+    QString m_album;
+    QString m_artist;
+    QString m_comment;
+    QString m_genre;
+    QString m_title;
+    uint m_length;
+    uint m_year;
+    uint m_track;
+    bool m_empty;
+};
+
+#endif
diff --git a/lib/qmmp/Input/flac/translations/flac_plugin_ru.qm b/lib/qmmp/Input/flac/translations/flac_plugin_ru.qm
new file mode 100644
index 000000000..c90963cf0
--- /dev/null
+++ b/lib/qmmp/Input/flac/translations/flac_plugin_ru.qm
diff --git a/lib/qmmp/Input/flac/translations/flac_plugin_ru.ts b/lib/qmmp/Input/flac/translations/flac_plugin_ru.ts
new file mode 100644
index 000000000..8e70ef53d
--- /dev/null
+++ b/lib/qmmp/Input/flac/translations/flac_plugin_ru.ts
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS><TS version="1.1" language="pl">
+<context>
+    <name>DecoderFLACFactory</name>
+    <message>
+        <location filename="../decoderflacfactory.cpp" line="21"/>
+        <source>FLAC Plugin</source>
+        <translation>Модуль FLAC</translation>
+    </message>
+    <message>
+        <location filename="../decoderflacfactory.cpp" line="35"/>
+        <source>FLAC Files</source>
+        <translation>Файлы FLAC</translation>
+    </message>
+    <message>
+        <location filename="../decoderflacfactory.cpp" line="63"/>
+        <source>About FLAC Audio Plugin</source>
+        <translation>Об аудио-модуле FLAC</translation>
+    </message>
+    <message>
+        <location filename="../decoderflacfactory.cpp" line="64"/>
+        <source>Qmmp FLAC Audio Plugin</source>
+        <translation>Аудио-модуль FLAC для Qmmp</translation>
+    </message>
+    <message>
+        <location filename="../decoderflacfactory.cpp" line="65"/>
+        <source>Writen by: Ilya Kotov &lt;forkotov02@hotmail.ru&gt;</source>
+        <translation>Разработчик: Илья Котов &lt;forkotov02@hotmail.ru&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>DetailsDialog</name>
+    <message>
+        <location filename="../detailsdialog.cpp" line="54"/>
+        <source>Hz</source>
+        <translation>Гц</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.cpp" line="60"/>
+        <source>bits</source>
+        <translation>бит</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="31"/>
+        <source>FLAC Info</source>
+        <translation>Информация FLAC</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="160"/>
+        <source>-</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="63"/>
+        <source>Length:</source>
+        <translation>Длительность:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="80"/>
+        <source>Sample rate:</source>
+        <translation>Частота сэмплов:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="100"/>
+        <source>Channels:</source>
+        <translation>Каналов:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="113"/>
+        <source>File size:</source>
+        <translation>Размер файла:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="123"/>
+        <source>Bitrate:</source>
+        <translation>Битовая частота:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="150"/>
+        <source>Sample width:</source>
+        <translation>Ширина кадра:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="177"/>
+        <source>File path:</source>
+        <translation>Путь к файлу:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="187"/>
+        <source>Close</source>
+        <translation>Закрыть</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="215"/>
+        <source>FLAC Tag</source>
+        <translation>FLAC-тег</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="230"/>
+        <source>Save</source>
+        <translation>Сохранить</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="240"/>
+        <source>Track number:</source>
+        <translation>Номер трека:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="253"/>
+        <source>Year:</source>
+        <translation>Год:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="263"/>
+        <source>Genre:</source>
+        <translation>Жанр:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="273"/>
+        <source>Comment:</source>
+        <translation>Комментарий:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="283"/>
+        <source>Album:</source>
+        <translation>Алюбом:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="293"/>
+        <source>Artist:</source>
+        <translation>Исполнитель:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="303"/>
+        <source>Title:</source>
+        <translation>Название:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.cpp" line="58"/>
+        <source>kbps</source>
+        <translation>Кб/с</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.cpp" line="61"/>
+        <source>KB</source>
+        <translation>Кб</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="13"/>
+        <source>Details</source>
+        <translation>Информация</translation>
+    </message>
+</context>
+</TS>
diff --git a/lib/qmmp/Input/flac/translations/translations.qrc b/lib/qmmp/Input/flac/translations/translations.qrc
new file mode 100644
index 000000000..cd630dfce
--- /dev/null
+++ b/lib/qmmp/Input/flac/translations/translations.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+  <qresource>
+    <file>flac_plugin_ru.qm</file>
+  </qresource>
+</RCC>
diff --git a/lib/qmmp/Input/mad/CMakeLists.txt b/lib/qmmp/Input/mad/CMakeLists.txt
new file mode 100644
index 000000000..7b280dff7
--- /dev/null
+++ b/lib/qmmp/Input/mad/CMakeLists.txt
@@ -0,0 +1,92 @@
+project(libmad)
+
+cmake_minimum_required(VERSION 2.4.0)
+
+
+INCLUDE(UsePkgConfig)
+INCLUDE(FindQt4)
+
+find_package(Qt4 REQUIRED) # find and setup Qt4 for this project
+include(${QT_USE_FILE})
+
+# qt plugin
+ADD_DEFINITIONS( -Wall )
+ADD_DEFINITIONS(${QT_DEFINITIONS})
+ADD_DEFINITIONS(-DQT_PLUGIN)
+ADD_DEFINITIONS(-DQT_NO_DEBUG)
+ADD_DEFINITIONS(-DQT_SHARED)
+ADD_DEFINITIONS(-DQT_THREAD)
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+SET(QT_INCLUDES
+  ${QT_INCLUDES}
+  ${CMAKE_CURRENT_BINARY_DIR}/../../../
+)
+
+# libqmmp
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
+
+# libmad and taglib
+PKGCONFIG(mad MAD_INCLUDE_DIR MAD_LINK_DIR MAD_LINK_FLAGS MAD_CFLAGS)
+PKGCONFIG(taglib TAGLIB_INCLUDE_DIR TAGLIB_LINK_DIR TAGLIB_LINK_FLAGS TAGLIB_CFLAGS)
+
+IF(NOT MAD_LINK_FLAGS)
+  MESSAGE("Can not find mad.pc")
+  SET(MAD_LINK_FLAGS -lmad)
+ENDIF(NOT MAD_LINK_FLAGS)
+
+IF(NOT TAGLIB_LINK_FLAGS)
+  SET(TAGLIB_LINK_FLAGS -ltag)
+  SET(TAGLIB_INCLUDE_DIR /usr/include/taglib)
+  SET(TAGLIB_CFLAGS -I/usr/include/taglib)
+ENDIF(NOT TAGLIB_LINK_FLAGS)
+
+include_directories(${MAD_INCLUDE_DIR} ${TAGLIB_INCLUDE_DIR})
+link_directories(${MAD_LINK_DIR} ${TAGLIB_LINK_DIR})
+
+#ADD_DEFINITIONS(${MAD_CFLAGS})
+ADD_DEFINITIONS(${TAGLIB_CFLAGS})
+
+
+SET(libmad_SRCS
+  decoder_mad.cpp
+  decodermadfactory.cpp
+  detailsdialog.cpp
+  id3tag.cpp
+  settingsdialog.cpp
+)
+
+SET(libmad_MOC_HDRS
+  settingsdialog.h
+  id3tag.h
+  decodermadfactory.h
+  decoder_mad.h
+  detailsdialog.h
+)
+
+SET(libmad_RCCS translations/translations.qrc)
+
+QT4_ADD_RESOURCES(libmad_RCC_SRCS ${libmad_RCCS})
+
+QT4_WRAP_CPP(libmad_MOC_SRCS ${libmad_MOC_HDRS})
+
+# user interface
+
+
+SET(libmad_UIS
+    detailsdialog.ui
+    settingsdialog.ui
+)
+
+QT4_WRAP_UI(libmad_UIS_H ${libmad_UIS})
+# Don't forget to include output directory, otherwise
+# the UI file won't be wrapped!
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+ADD_LIBRARY(mad SHARED ${libmad_SRCS} ${libmad_MOC_SRCS} ${libmad_UIS_H}
+  ${libmad_RCC_SRCS})
+
+target_link_libraries(mad ${QT_LIBRARIES} -lqmmp ${MAD_LINK_FLAGS} ${TAGLIB_LINK_FLAGS} ${TAGLIB_CFLAGS})
+install(TARGETS mad DESTINATION lib/qmmp/Input)
diff --git a/lib/qmmp/Input/mad/decoder_mad.cpp b/lib/qmmp/Input/mad/decoder_mad.cpp
new file mode 100644
index 000000000..6bb16daab
--- /dev/null
+++ b/lib/qmmp/Input/mad/decoder_mad.cpp
@@ -0,0 +1,574 @@
+#include <QtGui>
+
+#include "decoder_mad.h"
+#include "constants.h"
+#include "buffer.h"
+#include "output.h"
+
+#include <math.h>
+#include <stdio.h>
+
+# define XING_MAGIC	(('X' << 24) | ('i' << 16) | ('n' << 8) | 'g')
+
+
+DecoderMAD::DecoderMAD(QObject *parent, DecoderFactory *d, QIODevice *i, Output *o)
+        : Decoder(parent, d, i, o)
+{
+    inited = false;
+    user_stop = false;
+    done = false;
+    finish = false;
+    derror = false;
+    eof = false;
+    useeq = false;
+    totalTime = 0.;
+    seekTime = -1.;
+    channels = 0;
+    bks = 0;
+    bitrate = 0;
+    freq = 0;
+    len = 0;
+    input_buf = 0;
+    input_bytes = 0;
+    output_buf = 0;
+    output_bytes = 0;
+    output_at = 0;
+    output_size = 0;
+}
+
+DecoderMAD::~DecoderMAD()
+{
+    wait();
+    deinit();
+    mutex()->lock();
+    if (input_buf)
+    {
+        qDebug("DecoderMAD: deleting input_buf");
+        delete [] input_buf;
+    }
+    input_buf = 0;
+
+    if (output_buf)
+    {
+        qDebug("DecoderMAD: deleting output_buf");
+        delete [] output_buf;
+    }
+    output_buf = 0;
+    mutex()->unlock();
+}
+
+bool DecoderMAD::initialize()
+{
+    bks = blockSize();
+
+    inited = false;
+    user_stop = false;
+    done = false;
+    finish = false;
+    derror = false;
+    eof = false;
+    totalTime = 0.;
+    seekTime = -1.;
+    channels = 0;
+    bitrate = 0;
+    freq = 0;
+    len = 0;
+    input_bytes = 0;
+    output_bytes = 0;
+    output_at = 0;
+    output_size = 0;
+
+    if (! input())
+    {
+        error("DecoderMAD: cannot initialize.  No input.");
+        return FALSE;
+    }
+
+    if (! input_buf)
+        input_buf = new char[globalBufferSize];
+
+    if (! output_buf)
+        output_buf = new char[globalBufferSize];
+
+    if (! input()->isOpen())
+    {
+        if (! input()->open(QIODevice::ReadOnly))
+        {
+            error("DecoderMAD: Failed to open input.  Error " +
+                  QString::number(input()->isOpen()) + ".");
+            return FALSE;
+        }
+    }
+
+    mad_stream_init(&stream);
+    mad_frame_init(&frame);
+    mad_synth_init(&synth);
+
+    if (! findHeader())
+    {
+        qDebug("DecoderMAD: Cannot find a valid MPEG header.");
+        return FALSE;
+    }
+    if (output())
+        output()->configure(freq, channels, 16, bitrate);
+
+    inited = TRUE;
+    return TRUE;
+}
+
+
+void DecoderMAD::deinit()
+{
+    if(!inited)
+        return;
+
+    mad_synth_finish(&synth);
+    mad_frame_finish(&frame);
+    mad_stream_finish(&stream);
+
+    inited = false;
+    user_stop = false;
+    done = false;
+    finish = false;
+    derror = false;
+    eof = false;
+    useeq = false;
+    totalTime = 0.;
+    seekTime = -1.;
+    channels = 0;
+    bks = 0;
+    bitrate = 0;
+    freq = 0;
+    len = 0;
+    input_bytes = 0;
+    output_bytes = 0;
+    output_at = 0;
+    output_size = 0;
+}
+
+bool DecoderMAD::findXingHeader(struct mad_bitptr ptr, unsigned int bitlen)
+{
+    if (bitlen < 64 || mad_bit_read(&ptr, 32) != XING_MAGIC)
+        goto fail;
+
+    xing.flags = mad_bit_read(&ptr, 32);
+    bitlen -= 64;
+
+    if (xing.flags & XING_FRAMES)
+    {
+        if (bitlen < 32)
+            goto fail;
+
+        xing.frames = mad_bit_read(&ptr, 32);
+        bitlen -= 32;
+    }
+
+    if (xing.flags & XING_BYTES)
+    {
+        if (bitlen < 32)
+            goto fail;
+
+        xing.bytes = mad_bit_read(&ptr, 32);
+        bitlen -= 32;
+    }
+
+    if (xing.flags & XING_TOC)
+    {
+        int i;
+
+        if (bitlen < 800)
+            goto fail;
+
+        for (i = 0; i < 100; ++i)
+            xing.toc[i] = mad_bit_read(&ptr, 8);
+
+        bitlen -= 800;
+    }
+
+    if (xing.flags & XING_SCALE)
+    {
+        if (bitlen < 32)
+            goto fail;
+
+        xing.scale = mad_bit_read(&ptr, 32);
+        bitlen -= 32;
+    }
+
+    return true;
+
+fail:
+    xing.flags = 0;
+    xing.frames = 0;
+    xing.bytes = 0;
+    xing.scale = 0;
+    return false;
+}
+
+bool DecoderMAD::findHeader()
+{
+    bool result = false;
+    int count = 0;
+
+    while (1)
+    {
+        if (input_bytes < globalBufferSize)
+        {
+            int bytes = input()->read(input_buf + input_bytes,
+                                      globalBufferSize - input_bytes);
+            if (bytes <= 0)
+            {
+                if (bytes == -1)
+                    result = false;
+                ;
+                break;
+            }
+            input_bytes += bytes;
+        }
+
+        mad_stream_buffer(&stream, (unsigned char *) input_buf, input_bytes);
+
+        bool done = false;
+        while (! done)
+        {
+            if (mad_frame_decode(&frame, &stream) != -1)
+                done = true;
+            else if (!MAD_RECOVERABLE(stream.error))
+                {
+                   qWarning("DecoderMAD: Can't decode frame");
+                   break;
+                }
+
+            count++;
+        }
+
+        findXingHeader(stream.anc_ptr, stream.anc_bitlen);
+        result = done;
+        if ((stream.error != MAD_ERROR_BUFLEN))
+            break;
+
+        input_bytes = &input_buf[input_bytes] - (char *) stream.next_frame;
+        memmove(input_buf, stream.next_frame, input_bytes);
+    }
+
+    if (result && count)
+    {
+        freq = frame.header.samplerate;
+        channels = MAD_NCHANNELS(&frame.header);
+        bitrate = frame.header.bitrate / 1000;
+        calcLength(&frame.header);
+    }
+
+    return result;
+}
+
+void DecoderMAD::calcLength(struct mad_header *header)
+{
+    if (! input() || input()->isSequential())
+        return;
+
+    totalTime = 0.;
+    if (xing.flags & XING_FRAMES)
+    {
+        mad_timer_t timer;
+
+        timer = header->duration;
+        mad_timer_multiply(&timer, xing.frames);
+
+        totalTime = double(mad_timer_count(timer, MAD_UNITS_MILLISECONDS)) / 1000.;
+    }
+    else if (header->bitrate > 0)
+        totalTime = input()->size() * 8 / header->bitrate;
+}
+
+double DecoderMAD::lengthInSeconds()
+{
+    if (! inited)
+        return 0.;
+    return totalTime;
+}
+
+void DecoderMAD::seek(double pos)
+{
+    seekTime = pos;
+}
+
+void DecoderMAD::stop()
+{
+    user_stop = TRUE;
+}
+
+void DecoderMAD::flush(bool final)
+{
+    ulong min = final ? 0 : bks;
+
+    while ((! done && ! finish) && output_bytes > min)
+    {
+        output()->recycler()->mutex()->lock();
+
+        while ((! done && ! finish) && output()->recycler()->full())
+        {
+            mutex()->unlock();
+
+            output()->recycler()->cond()->wait(output()->recycler()->mutex());
+
+            mutex()->lock();
+            done = user_stop;
+        }
+
+        if (user_stop || finish)
+        {
+            inited = FALSE;
+            done = TRUE;
+        }
+        else
+        {
+            output_bytes -= produceSound(output_buf, output_bytes, bitrate, channels);
+            output_size += bks;
+            output_at = output_bytes;
+        }
+
+        if (output()->recycler()->full())
+        {
+            output()->recycler()->cond()->wakeOne();
+        }
+
+        output()->recycler()->mutex()->unlock();
+    }
+}
+
+void DecoderMAD::run()
+{
+    mutex()->lock();
+
+    if (! inited)
+    {
+        mutex()->unlock();
+        return;
+    }
+
+    DecoderState::Type stat = DecoderState::Decoding;
+
+    mutex()->unlock();
+
+    dispatch(stat);
+
+    while (! done && ! finish && ! derror)
+    {
+        mutex()->lock();
+
+        if (seekTime >= 0.0)
+        {
+            long seek_pos = long(seekTime * input()->size() / totalTime);
+            input()->seek(seek_pos);
+            output_size = long(seekTime) * long(freq * channels * 16 / 2);
+            input_bytes = 0;
+            output_at = 0;
+            output_bytes = 0;
+            eof = false;
+        }
+
+        finish = eof;
+
+        if (! eof)
+        {
+            if (stream.next_frame && seekTime == -1.)
+            {
+                input_bytes = &input_buf[input_bytes] - (char *) stream.next_frame;
+                memmove(input_buf, stream.next_frame, input_bytes);
+            }
+
+            if (input_bytes < globalBufferSize)
+            {
+                int len = input()->read((char *) input_buf + input_bytes,
+                                        globalBufferSize - input_bytes);
+
+                if (len == 0)
+                {
+                    eof = true;
+                }
+                else if (len < 0)
+                {
+                    derror = true;
+                    break;
+                }
+
+                input_bytes += len;
+            }
+
+            mad_stream_buffer(&stream, (unsigned char *) input_buf, input_bytes);
+        }
+
+        seekTime = -1.;
+
+        mutex()->unlock();
+
+        // decode
+        while (! done && ! finish && ! derror)
+        {
+            if (mad_frame_decode(&frame, &stream) == -1)
+            {
+                if (stream.error == MAD_ERROR_BUFLEN)
+                    break;
+
+                // error in decoding
+                if (! MAD_RECOVERABLE(stream.error))
+                {
+                    derror = true;
+                    break;
+                }
+                continue;
+            }
+
+            mutex()->lock();
+
+            if (seekTime >= 0.)
+            {
+                mutex()->unlock();
+                break;
+            }
+
+            if (useeq)
+            {
+                unsigned int nch, ch, ns, s, sb;
+
+                nch = MAD_NCHANNELS(&frame.header);
+                ns  = MAD_NSBSAMPLES(&frame.header);
+
+                for (ch = 0; ch < nch; ++ch)
+                    for (s = 0; s < ns; ++s)
+                        for (sb = 0; sb < 32; ++sb)
+                            frame.sbsample[ch][s][sb] =
+                                mad_f_mul(frame.sbsample[ch][s][sb], eqbands[sb]);
+            }
+
+            mad_synth_frame(&synth, &frame);
+            madOutput();
+            mutex()->unlock();
+        }
+    }
+
+    mutex()->lock();
+
+    if (! user_stop && eof)
+    {
+        flush(TRUE);
+
+        if (output())
+        {
+            output()->recycler()->mutex()->lock();
+            // end of stream
+            while (! output()->recycler()->empty() && ! user_stop)
+            {
+                output()->recycler()->cond()->wakeOne();
+                mutex()->unlock();
+                output()->recycler()->cond()->wait(output()->recycler()->mutex());
+                mutex()->lock();
+            }
+            output()->recycler()->mutex()->unlock();
+        }
+
+        done = TRUE;
+        if (! user_stop)
+            finish = TRUE;
+    }
+
+    if (finish)
+        stat = DecoderState::Finished;
+    else if (user_stop)
+        stat = DecoderState::Stopped;
+
+    mutex()->unlock();
+
+    dispatch(stat);
+
+    if (input())
+        input()->close();
+    deinit();
+
+}
+
+static inline signed int scale(mad_fixed_t sample)
+{
+    /* round */
+    sample += (1L << (MAD_F_FRACBITS - 16));
+
+    /* clip */
+    if (sample >= MAD_F_ONE)
+        sample = MAD_F_ONE - 1;
+    else if (sample < -MAD_F_ONE)
+        sample = -MAD_F_ONE;
+
+    /* quantize */
+    return sample >> (MAD_F_FRACBITS + 1 - 16);
+}
+
+static inline signed long fix_sample(unsigned int bits, mad_fixed_t sample)
+{
+    mad_fixed_t quantized, check;
+    // clip
+    quantized = sample;
+    check = (sample >> MAD_F_FRACBITS) + 1;
+    if (check & ~1)
+    {
+        if (sample >= MAD_F_ONE)
+            quantized = MAD_F_ONE - 1;
+        else if (sample < -MAD_F_ONE)
+            quantized = -MAD_F_ONE;
+    }
+    // quantize
+    quantized &= ~((1L << (MAD_F_FRACBITS + 1 - bits)) - 1);
+    // scale
+    return quantized >> (MAD_F_FRACBITS + 1 - bits);
+}
+
+enum mad_flow DecoderMAD::madOutput()
+{
+    unsigned int samples, channels;
+    mad_fixed_t const *left, *right;
+
+    samples = synth.pcm.length;
+    channels = synth.pcm.channels;
+    left = synth.pcm.samples[0];
+    right = synth.pcm.samples[1];
+
+
+    bitrate = frame.header.bitrate / 1000;
+    done = user_stop;
+
+    while (samples-- && !user_stop)
+    {
+        signed int sample;
+
+        if (output_bytes + 4096 > globalBufferSize)
+            flush();
+
+        sample = fix_sample(16, *left++);
+        *(output_buf + output_at++) = ((sample >> 0) & 0xff);
+        *(output_buf + output_at++) = ((sample >> 8) & 0xff);
+        output_bytes += 2;
+
+        if (channels == 2)
+        {
+            sample = fix_sample(16, *right++);
+            *(output_buf + output_at++) = ((sample >> 0) & 0xff);
+            *(output_buf + output_at++) = ((sample >> 8) & 0xff);
+            output_bytes += 2;
+        }
+    }
+
+    if (done || finish)
+    {
+        return MAD_FLOW_STOP;
+    }
+
+    return MAD_FLOW_CONTINUE;
+}
+
+enum mad_flow DecoderMAD::madError(struct mad_stream *stream,
+                                   struct mad_frame *)
+{
+    if (MAD_RECOVERABLE(stream->error))
+        return MAD_FLOW_CONTINUE;
+    qFatal("MADERROR!\n");
+    return MAD_FLOW_STOP;
+}
diff --git a/lib/qmmp/Input/mad/decoder_mad.h b/lib/qmmp/Input/mad/decoder_mad.h
new file mode 100644
index 000000000..ecbb160cb
--- /dev/null
+++ b/lib/qmmp/Input/mad/decoder_mad.h
@@ -0,0 +1,95 @@
+// Copyright (c) 2000-2001 Brad Hughes <bhughes@trolltech.com>
+//
+// Use, modification and distribution is allowed without limitation,
+// warranty, or liability of any kind.
+//
+
+#ifndef   __decoder_mad_h
+#define   __decoder_mad_h
+
+class DecoderMAD;
+
+#include "decoder.h"
+#include "decodermadfactory.h"
+
+extern "C" {
+#include <mad.h>
+}
+
+
+class DecoderMAD : public Decoder
+{
+public:
+    DecoderMAD(QObject *parent = 0, DecoderFactory *d = 0, 
+       QIODevice *i = 0, Output *o = 0);
+    virtual ~DecoderMAD();
+
+    // standard decoder API
+    bool initialize();
+    double lengthInSeconds();
+    void seek(double);
+    void stop();
+
+    // Equalizer
+    //bool isEQSupported() const { return TRUE; }
+    //void setEQEnabled(bool);
+    //void setEQ(const EqPreset &);
+
+    static const int maxDecodeRetries;
+    static const int maxFrameSize;
+    static const int maxFrameCheck;
+    static const int initialFrameSize;
+
+
+private:
+    // thread run function
+    void run();
+
+    enum mad_flow madOutput();
+    enum mad_flow madError(struct mad_stream *, struct mad_frame *);
+
+    // helper functions
+    void flush(bool = FALSE);
+    void deinit();
+    bool findHeader();
+    bool findXingHeader(struct mad_bitptr, unsigned int);
+    void calcLength(struct mad_header *);
+
+    bool inited, user_stop, done, finish, derror, eof, useeq;
+    double totalTime, seekTime;
+    int channels;
+    long bitrate, freq, len;
+    unsigned int bks;
+    mad_fixed_t eqbands[32];
+
+    // file input buffer
+    char *input_buf;
+    unsigned long input_bytes;
+
+    // output buffer
+    char *output_buf;
+    unsigned long output_bytes, output_at, output_size;
+
+    // MAD decoder
+    struct {
+	int flags;
+	unsigned long frames;
+	unsigned long bytes;
+	unsigned char toc[100];
+	long scale;
+    } xing;
+
+    enum {
+	XING_FRAMES = 0x0001,
+	XING_BYTES  = 0x0002,
+	XING_TOC    = 0x0004,
+	XING_SCALE  = 0x0008
+    };
+
+    struct mad_stream stream;
+    struct mad_frame frame;
+    struct mad_synth synth;
+};
+
+
+#endif // __decoder_mad_h
diff --git a/lib/qmmp/Input/mad/decodermadfactory.cpp b/lib/qmmp/Input/mad/decodermadfactory.cpp
new file mode 100644
index 000000000..a511dc995
--- /dev/null
+++ b/lib/qmmp/Input/mad/decodermadfactory.cpp
@@ -0,0 +1,87 @@
+#include <QtGui>
+#include <QDialog>
+#include <QMessageBox>
+#include <taglib/tag.h>
+#include <taglib/fileref.h>
+#include <taglib/id3v1tag.h>
+#include <taglib/id3v2tag.h>
+#include <taglib/tfile.h>
+#include <taglib/mpegfile.h>
+
+#include "detailsdialog.h"
+#include "settingsdialog.h"
+#include "decoder_mad.h"
+#include "id3tag.h"
+#include "decodermadfactory.h"
+
+// DecoderMADFactory
+
+bool DecoderMADFactory::supports(const QString &source) const
+{
+    QString ext = source.right(4).toLower();
+    return ext == ".mp1" || ext == ".mp2" || ext == ".mp3";
+}
+
+const QString &DecoderMADFactory::name() const
+{
+    static QString name (tr("MPEG Plugin"));
+    return name;
+}
+
+const QString &DecoderMADFactory::filter() const
+{
+    static QString filter("*.mp1 *.mp2 *.mp3");
+    return filter;
+}
+
+const QString &DecoderMADFactory::description() const
+{
+    static QString desc(tr("MPEG Files"));
+    return desc;
+}
+
+Decoder *DecoderMADFactory::create(QObject *parent, QIODevice *input, Output *output)
+{
+    return new DecoderMAD(parent, this, input, output);
+}
+
+FileTag *DecoderMADFactory::createTag(const QString &source)
+{
+    FileTag *tag = new ID3Tag(source);
+    return tag;
+}
+
+void DecoderMADFactory::showDetails(QWidget *parent, const QString &path)
+{
+    DetailsDialog *d = new DetailsDialog(parent, path);
+    d -> show();
+}
+
+void DecoderMADFactory::showSettings(QWidget *parent)
+{
+    SettingsDialog *s = new SettingsDialog(parent);
+    s -> show();
+}
+
+void DecoderMADFactory::showAbout(QWidget *parent)
+{
+    QMessageBox::about (parent, tr("About MPEG Audio Plugin"),
+                        tr("Qmmp MPEG Audio Plugin")+"\n"+
+                        tr("Compiled against libmad version:")+" "+
+                        QString("%1.%2.%3%4").arg(MAD_VERSION_MAJOR)
+                        .arg(MAD_VERSION_MINOR)
+                        .arg(MAD_VERSION_PATCH).arg(MAD_VERSION_EXTRA)+"\n"+
+                        tr("Writen by: Ilya Kotov <forkotov02@hotmail.ru>")+"\n"+
+                        tr("Source code based on mq3 progect")
+                       );
+}
+
+QTranslator *DecoderMADFactory::createTranslator(QObject *parent)
+{
+    QTranslator *translator = new QTranslator(parent);
+    QString locale = QLocale::system().name();
+    translator->load(QString(":/mad_plugin_") + locale);
+    return translator;
+}
+
+Q_EXPORT_PLUGIN(DecoderMADFactory)
diff --git a/lib/qmmp/Input/mad/decodermadfactory.h b/lib/qmmp/Input/mad/decodermadfactory.h
new file mode 100644
index 000000000..9becdf022
--- /dev/null
+++ b/lib/qmmp/Input/mad/decodermadfactory.h
@@ -0,0 +1,54 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef DECODERMADFACTORY_H
+#define DECODERMADFACTORY_H
+
+#include <QObject>
+#include <QString>
+#include <QIODevice>
+#include <QWidget>
+
+#include <decoder.h>
+#include <output.h>
+#include <decoderfactory.h>
+
+
+
+
+class DecoderMADFactory : public QObject,
+                          DecoderFactory
+{
+Q_OBJECT
+Q_INTERFACES(DecoderFactory);
+
+public:
+    bool supports(const QString &source) const;
+    const QString &name() const;
+    const QString &filter() const; // file extension, ie. ".mp3" or ".ogg"
+    const QString &description() const; // file type, ie. "MPEG Audio Files"
+    Decoder *create(QObject *, QIODevice *, Output *);
+    FileTag *createTag(const QString &source);
+    void showDetails(QWidget *parent, const QString &path);
+    void showSettings(QWidget *parent);
+    void showAbout(QWidget *parent);
+    QTranslator *createTranslator(QObject *parent);
+};
+
+#endif
diff --git a/lib/qmmp/Input/mad/detailsdialog.cpp b/lib/qmmp/Input/mad/detailsdialog.cpp
new file mode 100644
index 000000000..ac47c2456
--- /dev/null
+++ b/lib/qmmp/Input/mad/detailsdialog.cpp
@@ -0,0 +1,168 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#include <QTextCodec>
+#include <QSettings>
+#include <QDir>
+#include <taglib/tag.h>
+#include <taglib/fileref.h>
+#include <taglib/id3v1tag.h>
+#include <taglib/id3v2tag.h>
+#include <taglib/tfile.h>
+#include <taglib/mpegfile.h>
+#include <taglib/mpegheader.h>
+#include <taglib/mpegproperties.h>
+
+#include "detailsdialog.h"
+
+DetailsDialog::DetailsDialog(QWidget *parent, const QString &path)
+        : QDialog(parent)
+{
+    ui.setupUi(this);
+    setAttribute(Qt::WA_DeleteOnClose);
+    m_path = path;
+    setWindowTitle (path.section('/',-1));
+    ui.pathLineEdit->setText(m_path);
+
+    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    settings.beginGroup("MAD");
+    QTextCodec *codec_v1 =
+        QTextCodec::codecForName(settings.value("ID3v1_encoding","" )
+                                 .toByteArray ());
+    QTextCodec *codec_v2 =
+        QTextCodec::codecForName(settings.value("ID3v2_encoding","" )
+                                 .toByteArray ());
+    if (!codec_v1)
+        codec_v1 = QTextCodec::codecForLocale ();
+    if (!codec_v2)
+        codec_v2 = QTextCodec::codecForName ("UTF-8");
+    settings.endGroup();
+
+    loadMPEGInfo();
+    m_codec = codec_v1;
+    loadID3v1Tag();
+    m_codec = codec_v2;
+    loadID3v2Tag();
+}
+
+
+DetailsDialog::~DetailsDialog()
+{}
+
+void DetailsDialog::loadMPEGInfo()
+{
+    TagLib::MPEG::File f (m_path.toLocal8Bit());
+    //l.label
+    //ui. f.audioProperties()->level();
+    QString text;
+    text = QString("%1").arg(f.audioProperties()->layer());
+    ui.levelLabel->setText("MPEG layer "+text); //TODO: add MPEG version
+    text = QString("%1").arg(f.audioProperties()->bitrate());
+    ui.bitRateLabel->setText(text+" "+tr("kbps"));
+    text = QString("%1").arg(f.audioProperties()->sampleRate());
+    ui.sampleRateLabel->setText(text+" "+tr("Hz"));
+    switch (f.audioProperties()->channelMode())
+    {
+    case TagLib::MPEG::Header::Stereo:
+        ui.modeLabel->setText("Stereo");
+        break;
+    case TagLib::MPEG::Header::JointStereo:
+        ui.modeLabel->setText("Joint stereo");
+        break;
+    case TagLib::MPEG::Header::DualChannel:
+        ui.modeLabel->setText("Dual channel");
+        break;
+    case TagLib::MPEG::Header::SingleChannel:
+        ui.modeLabel->setText("Single channel");
+        break;
+    }
+    text = QString("%1 "+tr("KB")).arg(f.length()/1024);
+    ui.fileSizeLabel->setText(text);
+    /*if (f.audioProperties()->protectionEnabled())
+        ui.errProtectionLabel->setText(tr("Yes"));
+    else
+        ui.errProtectionLabel->setText(tr("No"));*/
+    if (f.audioProperties()->isCopyrighted())
+        ui.copyrightLabel->setText(tr("Yes"));
+    else
+        ui.copyrightLabel->setText(tr("No"));
+    if (f.audioProperties()->isOriginal())
+        ui.originalLabel->setText(tr("Yes"));
+    else
+        ui.originalLabel->setText(tr("No"));
+}
+
+void DetailsDialog::loadID3v1Tag()
+{
+    TagLib::MPEG::File f (m_path.toLocal8Bit());
+
+    if (f.ID3v1Tag())
+    {
+        bool utf = m_codec->name().contains("UTF");
+        TagLib::String title = f.ID3v1Tag()->title();
+        TagLib::String artist = f.ID3v1Tag()->artist();
+        TagLib::String album = f.ID3v1Tag()->album();
+        TagLib::String comment = f.ID3v1Tag()->comment();
+        TagLib::String genre = f.ID3v1Tag()->genre();
+        QString string = m_codec->toUnicode(title.toCString(utf)).trimmed();
+        ui.titleLineEdit_v1->setText(string);
+        string = m_codec->toUnicode(artist.toCString(utf)).trimmed();
+        ui.artistLineEdit_v1->setText(string);
+        string = m_codec->toUnicode(album.toCString(utf)).trimmed();
+        ui.albumLineEdit_v1->setText(string);
+        string = m_codec->toUnicode(comment.toCString(utf)).trimmed();
+        ui.commentLineEdit_v1->setText(string);
+        string = QString("%1").arg(f.ID3v1Tag()->year());
+        ui.yearLineEdit_v1->setText(string);
+        string = QString("%1").arg(f.ID3v1Tag()->track());
+        ui.trackLineEdit_v1->setText(string);
+        string = m_codec->toUnicode(genre.toCString(utf)).trimmed();
+        ui.genreLineEdit_v1->setText(string);
+    }
+}
+
+void DetailsDialog::loadID3v2Tag()
+{
+    TagLib::MPEG::File f (m_path.toLocal8Bit());
+
+    if (f.ID3v2Tag())
+    {
+        bool utf = m_codec->name().contains("UTF");
+        TagLib::String title = f.ID3v2Tag()->title();
+        TagLib::String artist = f.ID3v2Tag()->artist();
+        TagLib::String album = f.ID3v2Tag()->album();
+        TagLib::String comment = f.ID3v2Tag()->comment();
+        TagLib::String genre = f.ID3v2Tag()->genre();
+        QString string = m_codec->toUnicode(title.toCString(utf)).trimmed();
+        ui.titleLineEdit_v2->setText(string);
+        string = m_codec->toUnicode(artist.toCString(utf)).trimmed();
+        ui.artistLineEdit_v2->setText(string);
+        string = m_codec->toUnicode(album.toCString(utf)).trimmed();
+        ui.albumLineEdit_v2->setText(string);
+        string = m_codec->toUnicode(comment.toCString(utf)).trimmed();
+        ui.commentLineEdit_v2->setText(string);
+        string = QString("%1").arg(f.ID3v2Tag()->year());
+        ui.yearLineEdit_v2->setText(string);
+        string = QString("%1").arg(f.ID3v2Tag()->track());
+        ui.trackLineEdit_v2->setText(string);
+        string = m_codec->toUnicode(genre.toCString(utf)).trimmed();
+        ui.genreLineEdit_v2->setText(string);
+    }
+}
+
diff --git a/lib/qmmp/Input/mad/detailsdialog.h b/lib/qmmp/Input/mad/detailsdialog.h
new file mode 100644
index 000000000..a790dcc7b
--- /dev/null
+++ b/lib/qmmp/Input/mad/detailsdialog.h
@@ -0,0 +1,51 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef DETAILSDIALOG_H
+#define DETAILSDIALOG_H
+
+#include <QDialog>
+
+#include "ui_detailsdialog.h"
+
+/**
+	@author Ilya Kotov <forkotov02@hotmail.ru>
+*/
+
+class QTextCodec;
+
+class DetailsDialog : public QDialog
+{
+Q_OBJECT
+public:
+    DetailsDialog(QWidget *parent = 0, const QString &path = 0);
+
+    ~DetailsDialog();
+
+private:
+    void loadMPEGInfo();
+    void loadID3v1Tag(); 
+    void loadID3v2Tag(); 
+    Ui::DetailsDialog ui;
+    QString m_path;
+    QTextCodec *m_codec;
+
+};
+
+#endif
diff --git a/lib/qmmp/Input/mad/detailsdialog.ui b/lib/qmmp/Input/mad/detailsdialog.ui
new file mode 100644
index 000000000..b096c1a53
--- /dev/null
+++ b/lib/qmmp/Input/mad/detailsdialog.ui
@@ -0,0 +1,487 @@
+<ui version="4.0" >
+ <class>DetailsDialog</class>
+ <widget class="QDialog" name="DetailsDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>709</width>
+    <height>375</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Details</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item rowspan="2" row="1" column="0" >
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="minimumSize" >
+      <size>
+       <width>200</width>
+       <height>16</height>
+      </size>
+     </property>
+     <property name="title" >
+      <string>MPEG Info</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="7" column="0" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeType" >
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>20</width>
+          <height>85</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="label_5" >
+        <property name="text" >
+         <string>File size:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <widget class="QLabel" name="sampleRateLabel" >
+        <property name="text" >
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="label_3" >
+        <property name="text" >
+         <string>Sample rate:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="label_2" >
+        <property name="text" >
+         <string>Bit rate:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QLabel" name="bitRateLabel" >
+        <property name="text" >
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1" >
+       <widget class="QLabel" name="modeLabel" >
+        <property name="text" >
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" >
+       <widget class="QLabel" name="fileSizeLabel" >
+        <property name="text" >
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label" >
+        <property name="text" >
+         <string>MPEG level:</string>
+        </property>
+        <property name="textFormat" >
+         <enum>Qt::AutoText</enum>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QLabel" name="levelLabel" >
+        <property name="text" >
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" >
+       <widget class="QLabel" name="label_6" >
+        <property name="text" >
+         <string>Mode:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" >
+       <widget class="QLabel" name="label_8" >
+        <property name="text" >
+         <string>Copyright:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="1" >
+       <widget class="QLabel" name="copyrightLabel" >
+        <property name="text" >
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="1" >
+       <widget class="QLabel" name="originalLabel" >
+        <property name="text" >
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="0" >
+       <widget class="QLabel" name="label_9" >
+        <property name="text" >
+         <string>Original:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="1" >
+    <widget class="QGroupBox" name="groupBox_2" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>5</hsizetype>
+       <vsizetype>5</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title" >
+      <string>ID3v1 Tag</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>8</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="6" column="1" colspan="2" >
+       <widget class="QPushButton" name="pushButton" >
+        <property name="enabled" >
+         <bool>false</bool>
+        </property>
+        <property name="text" >
+         <string>Save</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="3" >
+       <widget class="QLineEdit" name="trackLineEdit_v1" />
+      </item>
+      <item row="4" column="2" >
+       <widget class="QLabel" name="label_26" >
+        <property name="text" >
+         <string>Track number:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1" >
+       <widget class="QLineEdit" name="yearLineEdit_v1" />
+      </item>
+      <item row="4" column="0" >
+       <widget class="QLabel" name="label_25" >
+        <property name="text" >
+         <string>Year:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" >
+       <widget class="QLabel" name="label_27" >
+        <property name="text" >
+         <string>Genre:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="label_24" >
+        <property name="text" >
+         <string>Comment:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="label_23" >
+        <property name="text" >
+         <string>Album:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="label_22" >
+        <property name="text" >
+         <string>Artist:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label_21" >
+        <property name="text" >
+         <string>Title:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" colspan="3" >
+       <widget class="QLineEdit" name="titleLineEdit_v1" />
+      </item>
+      <item row="1" column="1" colspan="3" >
+       <widget class="QLineEdit" name="artistLineEdit_v1" />
+      </item>
+      <item row="2" column="1" colspan="3" >
+       <widget class="QLineEdit" name="albumLineEdit_v1" />
+      </item>
+      <item row="3" column="1" colspan="3" >
+       <widget class="QLineEdit" name="commentLineEdit_v1" />
+      </item>
+      <item row="5" column="1" colspan="2" >
+       <widget class="QLineEdit" name="genreLineEdit_v1" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="2" column="2" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>111</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="3" >
+    <widget class="QPushButton" name="pushButton_3" >
+     <property name="text" >
+      <string>Close</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2" colspan="2" >
+    <widget class="QGroupBox" name="groupBox_2_2" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>5</hsizetype>
+       <vsizetype>5</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title" >
+      <string>ID3v2 Tag</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>8</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="4" column="3" >
+       <widget class="QLineEdit" name="trackLineEdit_v2" />
+      </item>
+      <item row="4" column="2" >
+       <widget class="QLabel" name="label_26_3" >
+        <property name="text" >
+         <string>Track number:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1" >
+       <widget class="QLineEdit" name="yearLineEdit_v2" />
+      </item>
+      <item row="4" column="0" >
+       <widget class="QLabel" name="label_25_3" >
+        <property name="text" >
+         <string>Year:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" >
+       <widget class="QLabel" name="label_27_3" >
+        <property name="text" >
+         <string>Genre:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="label_24_3" >
+        <property name="text" >
+         <string>Comment:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="label_23_3" >
+        <property name="text" >
+         <string>Album:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="label_22_3" >
+        <property name="text" >
+         <string>Artist:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label_21_3" >
+        <property name="text" >
+         <string>Title:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" colspan="3" >
+       <widget class="QLineEdit" name="titleLineEdit_v2" />
+      </item>
+      <item row="1" column="1" colspan="3" >
+       <widget class="QLineEdit" name="artistLineEdit_v2" />
+      </item>
+      <item row="2" column="1" colspan="3" >
+       <widget class="QLineEdit" name="albumLineEdit_v2" />
+      </item>
+      <item row="3" column="1" colspan="3" >
+       <widget class="QLineEdit" name="commentLineEdit_v2" />
+      </item>
+      <item row="5" column="1" colspan="2" >
+       <widget class="QLineEdit" name="genreLineEdit_v2" />
+      </item>
+      <item row="6" column="1" colspan="2" >
+       <widget class="QPushButton" name="pushButton_4" >
+        <property name="enabled" >
+         <bool>false</bool>
+        </property>
+        <property name="text" >
+         <string>Save</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="0" column="0" >
+    <widget class="QLabel" name="label_28" >
+     <property name="text" >
+      <string>File path:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" colspan="3" >
+    <widget class="QLineEdit" name="pathLineEdit" >
+     <property name="readOnly" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>pushButton_3</sender>
+   <signal>clicked()</signal>
+   <receiver>DetailsDialog</receiver>
+   <slot>close()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>623</x>
+     <y>353</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>539</x>
+     <y>352</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/lib/qmmp/Input/mad/id3tag.cpp b/lib/qmmp/Input/mad/id3tag.cpp
new file mode 100644
index 000000000..1fddb3958
--- /dev/null
+++ b/lib/qmmp/Input/mad/id3tag.cpp
@@ -0,0 +1,172 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+
+#include <QString>
+#include <QTextCodec>
+#include <QSettings>
+#include <QDir>
+/*#include <filetag.h>
+#include <taglib/tag.h>
+#include <taglib/fileref.h>
+#include <taglib/id3v1tag.h>
+#include <taglib/id3v2tag.h>
+#include <taglib/tfile.h>
+#include <taglib/mpegfile.h>*/
+
+#include "id3tag.h"
+
+ID3Tag::ID3Tag(const QString &source): FileTag(), m_tag(0)
+{
+    m_length = 0;
+    m_year = 0;
+    m_track = 0;
+    m_empty = TRUE;
+    TagLib::MPEG::File fileRef(source.toLocal8Bit ());
+
+    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    settings.beginGroup("MAD");
+    QTextCodec *codec_v1 =
+        QTextCodec::codecForName(settings.value("ID3v1_encoding","" )
+                                 .toByteArray ());
+    QTextCodec *codec_v2 =
+        QTextCodec::codecForName(settings.value("ID3v2_encoding","" )
+                                 .toByteArray ());
+    if(!codec_v1)
+        codec_v1 = QTextCodec::codecForLocale ();
+    if(!codec_v2)
+        codec_v2 = QTextCodec::codecForName ("UTF-8");
+
+    QTextCodec *codec = 0;
+
+    int ver = settings.value("ID3_version", 1).toInt();
+    if (ver == 1 && settings.value("ID3v1_enable", TRUE).toBool() &&
+            fileRef.ID3v1Tag())
+    {
+        m_tag = fileRef.ID3v1Tag();
+        codec = codec_v1;
+        if(m_tag->isEmpty())
+        {
+            m_tag = 0;
+            if (settings.value("ID3v2_enable", TRUE).toBool() &&
+                    fileRef.ID3v2Tag())
+            {
+                if(!fileRef.ID3v2Tag()->isEmpty())
+                {
+                    m_tag = fileRef.ID3v2Tag();
+                    codec = codec_v2;
+                }
+            }
+        }
+    }
+    else
+        ver = 2;
+    if (ver == 2 && settings.value("ID3v2_enable", TRUE).toBool() &&
+            fileRef.ID3v2Tag())
+    {
+        m_tag = fileRef.ID3v2Tag();
+        codec = codec_v2;
+        if(m_tag->isEmpty())
+        {
+            m_tag = 0;
+            if (settings.value("ID3v1_enable", TRUE).toBool() &&
+                    fileRef.ID3v1Tag())
+            {
+                if(fileRef.ID3v1Tag()->isEmpty())
+                {
+                    m_tag = fileRef.ID3v1Tag();
+                    codec = codec_v1;
+                }
+            }
+        }
+    }
+    settings.endGroup();
+
+    if (m_tag && codec)
+    {
+        bool utf = codec->name ().contains("UTF");
+        TagLib::String album = m_tag->album();
+        TagLib::String artist = m_tag->artist();
+        TagLib::String comment = m_tag->comment();
+        TagLib::String genre = m_tag->genre();
+        TagLib::String title = m_tag->title();
+
+        m_album = codec->toUnicode(album.toCString(utf)).trimmed();
+        m_artist = codec->toUnicode(artist.toCString(utf)).trimmed();
+        m_comment = codec->toUnicode(comment.toCString(utf)).trimmed();
+        m_genre = codec->toUnicode(genre.toCString(utf)).trimmed();
+        m_title = codec->toUnicode(title.toCString(utf)).trimmed();
+        m_year = m_tag->year();
+        m_track = m_tag->track();
+        m_empty = FALSE;
+    }
+    if(fileRef.audioProperties())
+            m_length = fileRef.audioProperties()->length();
+}
+
+
+ID3Tag::~ID3Tag()
+{}
+
+
+uint ID3Tag::length()
+{
+    return m_length;
+}
+
+uint ID3Tag::track()
+{
+    return m_track;
+}
+
+uint ID3Tag::year()
+{
+    return m_year;
+}
+
+QString ID3Tag::album()
+{
+    return m_album;
+}
+
+QString ID3Tag::artist()
+{
+    return m_artist;
+}
+
+QString ID3Tag::comment()
+{
+    return m_comment;
+}
+
+QString ID3Tag::genre()
+{
+    return m_genre;
+}
+
+QString ID3Tag::title()
+{
+    return m_title;
+}
+
+bool ID3Tag::isEmpty ()
+{
+    return m_empty;
+}
diff --git a/lib/qmmp/Input/mad/id3tag.h b/lib/qmmp/Input/mad/id3tag.h
new file mode 100644
index 000000000..bb0a10d35
--- /dev/null
+++ b/lib/qmmp/Input/mad/id3tag.h
@@ -0,0 +1,70 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef ID3TAG_H
+#define ID3TAG_H
+
+#include <QString>
+#include <filetag.h>
+#include <taglib/tag.h>
+#include <taglib/fileref.h>
+#include <taglib/id3v1tag.h>
+#include <taglib/id3v2tag.h>
+#include <taglib/tfile.h>
+#include <taglib/mpegfile.h>
+
+#include <filetag.h>
+
+/**
+	@author Ilya Kotov <forkotov02@hotmail.ru>
+*/
+class QTextCodec;
+
+class ID3Tag : public FileTag
+{
+public:
+    ID3Tag(const QString &source);
+
+    ~ID3Tag();
+
+    uint length();
+    uint track();
+    uint year();
+    QString album();
+    QString artist();
+    QString comment();
+    QString genre();
+    QString title();
+    bool isEmpty ();
+
+private:
+    TagLib::Tag *m_tag;
+    QString m_album;
+    QString m_artist;
+    QString m_comment;
+    QString m_genre;
+    QString m_title;
+    uint m_length;
+    uint m_year;
+    uint m_track;
+    bool m_empty;
+
+};
+
+#endif
diff --git a/lib/qmmp/Input/mad/mad.pro b/lib/qmmp/Input/mad/mad.pro
new file mode 100644
index 000000000..6b52fed93
--- /dev/null
+++ b/lib/qmmp/Input/mad/mad.pro
@@ -0,0 +1,32 @@
+# ???? ?????? ? KDevelop ?????????? qmake.
+# ------------------------------------------- 
+# ?????????? ???????????? ???????? ???????? ???????: ./Plugins/Input/mad
+# ???? - ??????????:  
+
+FORMS += detailsdialog.ui \
+         settingsdialog.ui 
+HEADERS += decodermadfactory.h \
+           decoder_mad.h \
+           detailsdialog.h \
+           settingsdialog.h \
+           id3tag.h 
+SOURCES += decoder_mad.cpp \
+           decodermadfactory.cpp \
+           detailsdialog.cpp \
+           settingsdialog.cpp \
+           id3tag.cpp 
+DESTDIR = ../
+QMAKE_CLEAN += ../libmad.so
+INCLUDEPATH += ../../../
+CONFIG += release \
+warn_on \
+plugin \
+link_pkgconfig
+TEMPLATE = lib
+QMAKE_LIBDIR += ../../../
+LIBS += -lqmmp
+PKGCONFIG += taglib mad
+#TRANSLATIONS = translations/mad_plugin_ru.ts
+#RESOURCES = translations/translations.qrc
+target.path = /lib/qmmp/Input
+INSTALLS += target
diff --git a/lib/qmmp/Input/mad/settingsdialog.cpp b/lib/qmmp/Input/mad/settingsdialog.cpp
new file mode 100644
index 000000000..72a746de6
--- /dev/null
+++ b/lib/qmmp/Input/mad/settingsdialog.cpp
@@ -0,0 +1,113 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#include <QTextCodec>
+#include <QSettings>
+#include <QDir>
+
+#include "settingsdialog.h"
+
+SettingsDialog::SettingsDialog(QWidget *parent)
+        : QDialog(parent)
+{
+    ui.setupUi(this);
+    setAttribute(Qt::WA_DeleteOnClose);
+    findCodecs();
+    foreach (QTextCodec *codec, codecs)
+    {
+        ui.id3v1EncComboBox->addItem(codec->name());
+        ui.id3v2EncComboBox->addItem(codec->name());
+    }
+    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    settings.beginGroup("MAD");
+    int pos = ui.id3v1EncComboBox->findText
+        (settings.value("ID3v1_encoding",ui.id3v1EncComboBox->itemText(0)).toString());
+    ui.id3v1EncComboBox->setCurrentIndex(pos);
+    pos = ui.id3v2EncComboBox->findText
+        (settings.value("ID3v2_encoding",ui.id3v2EncComboBox->itemText(0)).toString());
+    ui.id3v2EncComboBox->setCurrentIndex(pos);
+
+    ui.id3v1CheckBox->setChecked(settings.value("ID3v1_enable", TRUE).toBool());
+    ui.id3v2CheckBox->setChecked(settings.value("ID3v2_enable", TRUE).toBool());
+    ui.id3v1EncComboBox->setEnabled(ui.id3v1CheckBox->isChecked());
+    ui.id3v2EncComboBox->setEnabled(ui.id3v2CheckBox->isChecked());
+    ui.defTagComboBox->setCurrentIndex(settings.value("ID3_version", 1).toInt() - 1);
+
+    settings.endGroup();
+    connect(ui.okButton, SIGNAL(clicked()), SLOT(writeSettings()));
+}
+
+
+SettingsDialog::~SettingsDialog()
+{}
+
+void SettingsDialog::writeSettings()
+{
+    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    settings.beginGroup("MAD");
+    if(ui.id3v1EncComboBox->currentIndex() > 0)
+        settings.setValue("ID3v1_encoding", ui.id3v1EncComboBox->currentText());
+    if(ui.id3v2EncComboBox->currentIndex() > 0)
+        settings.setValue("ID3v2_encoding", ui.id3v2EncComboBox->currentText());
+
+    settings.setValue("ID3v1_enable", ui.id3v1CheckBox->isChecked());
+    settings.setValue("ID3v2_enable", ui.id3v2CheckBox->isChecked());
+    settings.setValue("ID3_version", ui.defTagComboBox->currentIndex()+1);
+
+    settings.endGroup();
+    accept();
+}
+
+void SettingsDialog::findCodecs()
+{
+    QMap<QString, QTextCodec *> codecMap;
+    QRegExp iso8859RegExp("ISO[- ]8859-([0-9]+).*");
+
+    foreach (int mib, QTextCodec::availableMibs())
+    {
+        QTextCodec *codec = QTextCodec::codecForMib(mib);
+
+        QString sortKey = codec->name().toUpper();
+        int rank;
+
+        if (sortKey.startsWith("UTF-8"))
+        {
+            rank = 1;
+        }
+        else if (sortKey.startsWith("UTF-16"))
+        {
+            rank = 2;
+        }
+        else if (iso8859RegExp.exactMatch(sortKey))
+        {
+            if (iso8859RegExp.cap(1).size() == 1)
+                rank = 3;
+            else
+                rank = 4;
+        }
+        else
+        {
+            rank = 5;
+        }
+        sortKey.prepend(QChar('0' + rank));
+
+        codecMap.insert(sortKey, codec);
+    }
+    codecs = codecMap.values();
+}
diff --git a/lib/qmmp/Input/mad/settingsdialog.h b/lib/qmmp/Input/mad/settingsdialog.h
new file mode 100644
index 000000000..86a8c8ad5
--- /dev/null
+++ b/lib/qmmp/Input/mad/settingsdialog.h
@@ -0,0 +1,50 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                       *
+ *   forkotov02@hotmail.ru                                                     *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef SETTINGSDIALOG_H
+#define SETTINGSDIALOG_H
+
+#include <QDialog>
+
+
+#include "ui_settingsdialog.h"
+
+/**
+	@author Ilya Kotov <forkotov02@hotmail.ru>
+*/
+class SettingsDialog : public QDialog
+{
+Q_OBJECT
+public:
+    SettingsDialog(QWidget *parent = 0);
+
+    ~SettingsDialog();
+
+private slots:
+    void writeSettings();
+
+private:
+    void findCodecs();
+    
+    Ui::SettingsDialog ui;
+    QList<QTextCodec *> codecs;
+
+};
+
+#endif
diff --git a/lib/qmmp/Input/mad/settingsdialog.ui b/lib/qmmp/Input/mad/settingsdialog.ui
new file mode 100644
index 000000000..634ee920e
--- /dev/null
+++ b/lib/qmmp/Input/mad/settingsdialog.ui
@@ -0,0 +1,278 @@
+<ui version="4.0" >
+ <class>SettingsDialog</class>
+ <widget class="QDialog" name="SettingsDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>333</width>
+    <height>224</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>MPEG Plugin Settings</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>8</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
+      <string>ID3 Tags</string>
+     </property>
+     <layout class="QVBoxLayout" >
+      <property name="margin" >
+       <number>8</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item>
+       <layout class="QHBoxLayout" >
+        <property name="margin" >
+         <number>0</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
+        <item>
+         <widget class="QLabel" name="label_15_2" >
+          <property name="text" >
+           <string>Default tag version:</string>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QComboBox" name="defTagComboBox" >
+          <property name="maximumSize" >
+           <size>
+            <width>67</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <item>
+           <property name="text" >
+            <string>ID3v1</string>
+           </property>
+          </item>
+          <item>
+           <property name="text" >
+            <string>ID3v2</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+        <item>
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" >
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="id3v1CheckBox" >
+        <property name="text" >
+         <string>Enable ID3v1</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="id3v2CheckBox" >
+        <property name="text" >
+         <string>Enable ID3v2</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" >
+        <property name="margin" >
+         <number>0</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
+        <item>
+         <widget class="QLabel" name="label_17_2_2" >
+          <property name="text" >
+           <string>ID3v1 encoding:</string>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QComboBox" name="id3v1EncComboBox" >
+          <item>
+           <property name="text" >
+            <string>Default</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+        <item>
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" >
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" >
+        <property name="margin" >
+         <number>0</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
+        <item>
+         <widget class="QLabel" name="label_18_2_2" >
+          <property name="text" >
+           <string>ID3v2 encoding:</string>
+          </property>
+          <property name="alignment" >
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QComboBox" name="id3v2EncComboBox" >
+          <item>
+           <property name="text" >
+            <string>Default</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+        <item>
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" >
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>131</width>
+         <height>31</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="okButton" >
+       <property name="text" >
+        <string>OK</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cancelButton" >
+       <property name="text" >
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>cancelButton</sender>
+   <signal>clicked()</signal>
+   <receiver>SettingsDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>336</x>
+     <y>210</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>179</x>
+     <y>224</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>id3v2CheckBox</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>id3v2EncComboBox</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>84</x>
+     <y>104</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>165</x>
+     <y>163</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>id3v1CheckBox</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>id3v1EncComboBox</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>95</x>
+     <y>73</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>165</x>
+     <y>133</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/lib/qmmp/Input/mad/translations/mad_plugin_ru.qm b/lib/qmmp/Input/mad/translations/mad_plugin_ru.qm
new file mode 100644
index 000000000..16bea746b
--- /dev/null
+++ b/lib/qmmp/Input/mad/translations/mad_plugin_ru.qm
diff --git a/lib/qmmp/Input/mad/translations/mad_plugin_ru.ts b/lib/qmmp/Input/mad/translations/mad_plugin_ru.ts
new file mode 100644
index 000000000..3d092418f
--- /dev/null
+++ b/lib/qmmp/Input/mad/translations/mad_plugin_ru.ts
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS><TS version="1.1" language="pl">
+<context>
+    <name>DecoderMADFactory</name>
+    <message>
+        <location filename="../decodermadfactory.cpp" line="27"/>
+        <source>MPEG Plugin</source>
+        <translation>Модуль MPEG</translation>
+    </message>
+    <message>
+        <location filename="../decodermadfactory.cpp" line="39"/>
+        <source>MPEG Files</source>
+        <translation>Файлы MPEG</translation>
+    </message>
+    <message>
+        <location filename="../decodermadfactory.cpp" line="68"/>
+        <source>About MPEG Audio Plugin</source>
+        <translation>Об аудио-модуле MPEG</translation>
+    </message>
+    <message>
+        <location filename="../decodermadfactory.cpp" line="69"/>
+        <source>Qmmp MPEG Audio Plugin</source>
+        <translation>Аудио-модуль MPEG для Qmmp</translation>
+    </message>
+    <message>
+        <location filename="../decodermadfactory.cpp" line="70"/>
+        <source>Compiled against libmad version:</source>
+        <translation>Собрано с версией libmad:</translation>
+    </message>
+    <message>
+        <location filename="../decodermadfactory.cpp" line="74"/>
+        <source>Writen by: Ilya Kotov &lt;forkotov02@hotmail.ru&gt;</source>
+        <translation>Разработчик: Илья Котов &lt;forkotov02@hotmail.ru&gt;</translation>
+    </message>
+    <message>
+        <location filename="../decodermadfactory.cpp" line="76"/>
+        <source>Source code based on mq3 progect</source>
+        <translation>Исходный код основан на проекте mq3</translation>
+    </message>
+</context>
+<context>
+    <name>DetailsDialog</name>
+    <message>
+        <location filename="../detailsdialog.cpp" line="79"/>
+        <source>Hz</source>
+        <translation>Гц</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.cpp" line="106"/>
+        <source>Yes</source>
+        <translation>Есть</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.cpp" line="108"/>
+        <source>No</source>
+        <translation>Нет</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="192"/>
+        <source>ID3v1 Tag</source>
+        <translation>ID3v1-тег</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="442"/>
+        <source>Save</source>
+        <translation>Сохранить</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="351"/>
+        <source>Track number:</source>
+        <translation>Номер трека:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="364"/>
+        <source>Year:</source>
+        <translation>Год:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="374"/>
+        <source>Genre:</source>
+        <translation>Жанр:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="384"/>
+        <source>Comment:</source>
+        <translation>Комментарий:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="394"/>
+        <source>Album:</source>
+        <translation>Альбом:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="404"/>
+        <source>Artist:</source>
+        <translation>Исполнитель:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="414"/>
+        <source>Title:</source>
+        <translation>Название:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="321"/>
+        <source>Close</source>
+        <translation>Закрыть</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="336"/>
+        <source>ID3v2 Tag</source>
+        <translation>ID3v2-тег</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="31"/>
+        <source>MPEG Info</source>
+        <translation>Информация MPEG</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="164"/>
+        <source>-</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="171"/>
+        <source>Original:</source>
+        <translation>Оригинальный:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="147"/>
+        <source>Copyright:</source>
+        <translation>Авторские права:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="137"/>
+        <source>Mode:</source>
+        <translation>Режим:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="59"/>
+        <source>File size:</source>
+        <translation>Размер файла:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="76"/>
+        <source>Sample rate:</source>
+        <translation>Дискретизация:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="86"/>
+        <source>Bit rate:</source>
+        <translation>Битовая частота:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="117"/>
+        <source>MPEG level:</source>
+        <translation>Уровень MPEG:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="452"/>
+        <source>File path:</source>
+        <translation>Путь к файлу:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.cpp" line="95"/>
+        <source>KB</source>
+        <translation>Кб</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="13"/>
+        <source>Details</source>
+        <translation>Информация</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.cpp" line="77"/>
+        <source>kbps</source>
+        <translation>Кб/с</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.ui" line="25"/>
+        <source>ID3 Tags</source>
+        <translation>ID3-теги</translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="45"/>
+        <source>Default tag version:</source>
+        <translation>Версия тегов по умолчанию:</translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="62"/>
+        <source>ID3v1</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="67"/>
+        <source>ID3v2</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="90"/>
+        <source>Enable ID3v1</source>
+        <translation>Использовать ID3v1</translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="97"/>
+        <source>Enable ID3v2</source>
+        <translation>Использовать ID3v2</translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="112"/>
+        <source>ID3v1 encoding:</source>
+        <translation>Кодировка ID3v1:</translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="165"/>
+        <source>Default</source>
+        <translation>По-умолчанию</translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="154"/>
+        <source>ID3v2 encoding:</source>
+        <translation>Кодировка ID3v2:</translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="212"/>
+        <source>OK</source>
+        <translation>Применить</translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="219"/>
+        <source>Cancel</source>
+        <translation>Отмена</translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="13"/>
+        <source>MPEG Plugin Settings</source>
+        <translation>Настройка модуля MPEG</translation>
+    </message>
+</context>
+</TS>
diff --git a/lib/qmmp/Input/mad/translations/translations.qrc b/lib/qmmp/Input/mad/translations/translations.qrc
new file mode 100644
index 000000000..34dbabbca
--- /dev/null
+++ b/lib/qmmp/Input/mad/translations/translations.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+  <qresource>
+    <file>mad_plugin_ru.qm</file>
+  </qresource>
+</RCC>
diff --git a/lib/qmmp/Input/mpc/CMakeLists.txt b/lib/qmmp/Input/mpc/CMakeLists.txt
new file mode 100644
index 000000000..30b2af596
--- /dev/null
+++ b/lib/qmmp/Input/mpc/CMakeLists.txt
@@ -0,0 +1,88 @@
+project(libmpc)
+
+cmake_minimum_required(VERSION 2.4.0)
+
+
+INCLUDE(UsePkgConfig)
+INCLUDE(FindQt4)
+
+find_package(Qt4 REQUIRED) # find and setup Qt4 for this project
+include(${QT_USE_FILE})
+
+# qt plugin
+ADD_DEFINITIONS( -Wall )
+ADD_DEFINITIONS(${QT_DEFINITIONS})
+ADD_DEFINITIONS(-DQT_PLUGIN)
+ADD_DEFINITIONS(-DQT_NO_DEBUG)
+ADD_DEFINITIONS(-DQT_SHARED)
+ADD_DEFINITIONS(-DQT_THREAD)
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+SET(QT_INCLUDES
+  ${QT_INCLUDES}
+  ${CMAKE_CURRENT_BINARY_DIR}/../../../
+)
+
+# libqmmp
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
+
+# libmpc and taglib
+PKGCONFIG(taglib TAGLIB_INCLUDE_DIR TAGLIB_LINK_DIR TAGLIB_LINK_FLAGS TAGLIB_CFLAGS)
+
+IF(NOT TAGLIB_LINK_FLAGS)
+  SET(TAGLIB_LINK_FLAGS -ltag)
+  SET(TAGLIB_INCLUDE_DIR /usr/include/taglib)
+  SET(TAGLIB_CFLAGS -I/usr/include/taglib)
+ENDIF(NOT TAGLIB_LINK_FLAGS)
+
+include_directories(${FLAC_INCLUDE_DIR} ${TAGLIB_INCLUDE_DIR})
+link_directories(${FLAC_LINK_DIR} ${TAGLIB_LINK_DIR})
+
+ADD_DEFINITIONS(${TAGLIB_CFLAGS})
+
+
+SET(libmpc_SRCS
+  decoder_mpc.cpp
+  decodermpcfactory.cpp
+  detailsdialog.cpp
+  tag.cpp
+)
+
+SET(libmpc_MOC_HDRS
+  tag.h
+  decodermpcfactory.h
+  decoder_mpc.h
+  detailsdialog.h
+)
+
+SET(libmpc_RCCS translations/translations.qrc)
+
+QT4_ADD_RESOURCES(libmpc_RCC_SRCS ${libmpc_RCCS})
+
+QT4_WRAP_CPP(libmpc_MOC_SRCS ${libmpc_MOC_HDRS})
+
+# user interface
+
+
+SET(libmpc_UIS
+    detailsdialog.ui
+)
+
+QT4_WRAP_UI(libmpc_UIS_H ${libmpc_UIS})
+# Don't forget to include output directory, otherwise
+# the UI file won't be wrapped!
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+ADD_LIBRARY(mpc SHARED ${libmpc_SRCS} ${libmpc_MOC_SRCS} ${libmpc_UIS_H}
+  ${libmpc_RCC_SRCS})
+target_link_libraries(mpc ${QT_LIBRARIES} -lqmmp -lmpcdec ${TAGLIB_LINK_FLAGS} ${TAGLIB_CFLAGS})
+install(TARGETS mpc DESTINATION lib/qmmp/Input)
+
+# clean remaining files
+
+SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES 
+			 "CMakeCache.txt;Makefile;cmake_install.cmake"
+)
+
diff --git a/lib/qmmp/Input/mpc/decoder_mpc.cpp b/lib/qmmp/Input/mpc/decoder_mpc.cpp
new file mode 100644
index 000000000..49a5c0cc4
--- /dev/null
+++ b/lib/qmmp/Input/mpc/decoder_mpc.cpp
@@ -0,0 +1,387 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+
+#include <QObject>
+#include <QIODevice>
+
+#include "constants.h"
+#include "buffer.h"
+#include "output.h"
+#include "recycler.h"
+
+#include "decoder_mpc.h"
+
+// this function used from xmms
+inline static void copyBuffer(MPC_SAMPLE_FORMAT* pInBuf, char* pOutBuf, unsigned pLength)
+{
+    unsigned pSize = 16;
+    int clipMin    = -1 << (pSize - 1);
+    int clipMax    = (1 << (pSize - 1)) - 1;
+    int floatScale =  1 << (pSize - 1);
+    for (unsigned n = 0; n < 2 * pLength; n++)
+    {
+        int val;
+#ifdef MPC_FIXED_POINT
+        val = shiftSigned(pInBuf[n], pSize - MPC_FIXED_POINT_SCALE_SHIFT);
+#else
+        val = (int) (pInBuf[n] * floatScale);
+#endif
+        if (val < clipMin)
+            val = clipMin;
+        else if (val > clipMax)
+            val = clipMax;
+        unsigned shift = 0;
+        do
+        {
+            pOutBuf[n * 2 + (shift / 8)] = (unsigned char) ((val >> shift) & 0xFF);
+            shift += 8;
+        }
+        while (shift < pSize);
+    }
+}
+
+// mpc callbacks
+
+static mpc_int32_t mpc_callback_read (void *data, void *buffer, mpc_int32_t size)
+{
+    DecoderMPC *dmpc = (DecoderMPC *) data;
+    qint64 res;
+
+    res = dmpc->input()->read((char *)buffer, size);
+
+    return res;
+}
+
+static mpc_bool_t mpc_callback_seek (void *data, mpc_int32_t offset)
+{
+    DecoderMPC *dmpc = (DecoderMPC *) data;
+
+    return dmpc->input()->seek(offset); // ? TRUE : FALSE;
+}
+
+static mpc_int32_t mpc_callback_tell (void *data)
+{
+    DecoderMPC *dmpc = (DecoderMPC *) data;
+    return dmpc->input()->pos ();
+}
+
+static mpc_bool_t  mpc_callback_canseek (void *data)
+{
+    DecoderMPC *dmpc = (DecoderMPC *) data;
+    return !dmpc->input()->isSequential () ;
+}
+
+static mpc_int32_t mpc_callback_get_size (void *data)
+{
+    DecoderMPC *dmpc = (DecoderMPC *) data;
+    return dmpc->input()->size();
+}
+
+// Decoder class
+
+DecoderMPC::DecoderMPC(QObject *parent, DecoderFactory *d, QIODevice *i, Output *o)
+        : Decoder(parent, d, i, o)
+{
+    inited = FALSE;
+    user_stop = FALSE;
+    stat = 0;
+    output_buf = 0;
+    output_bytes = 0;
+    output_at = 0;
+    bks = 0;
+    done = FALSE;
+    finish = FALSE;
+    len = 0;
+    freq = 0;
+    bitrate = 0;
+    seekTime = -1.0;
+    totalTime = 0.0;
+    chan = 0;
+    output_size = 0;
+    m_data = 0;
+
+
+
+
+}
+
+
+DecoderMPC::~DecoderMPC()
+{
+    deinit();
+    if(data())
+    {
+        delete data();
+        m_data = 0;
+    }
+    if (output_buf)
+        delete [] output_buf;
+    output_buf = 0;
+}
+
+
+void DecoderMPC::stop()
+{
+    user_stop = TRUE;
+}
+
+
+void DecoderMPC::flush(bool final)
+{
+    ulong min = final ? 0 : bks;
+
+    while ((! done && ! finish) && output_bytes > min)
+    {
+        output()->recycler()->mutex()->lock ();
+
+        while ((! done && ! finish) && output()->recycler()->full())
+        {
+            mutex()->unlock();
+
+            output()->recycler()->cond()->wait(output()->recycler()->mutex());
+
+            mutex()->lock ();
+            done = user_stop;
+        }
+
+        if (user_stop || finish)
+        {
+            inited = FALSE;
+            done = TRUE;
+        }
+        else
+        {
+            output_bytes -= produceSound(output_buf, output_bytes, bitrate, chan);
+            output_size += bks;
+            output_at = output_bytes;
+        }
+
+        if (output()->recycler()->full())
+        {
+            output()->recycler()->cond()->wakeOne();
+        }
+
+        output()->recycler()->mutex()->unlock();
+    }
+}
+
+
+bool DecoderMPC::initialize()
+{
+    bks = blockSize();
+    inited = user_stop = done = finish = FALSE;
+    len = freq = bitrate = 0;
+    stat = chan = 0;
+    output_size = 0;
+    seekTime = -1.0;
+    totalTime = 0.0;
+
+
+    if (! input())
+    {
+        error("DecoderMPC: cannot initialize.  No input.");
+
+        return FALSE;
+    }
+
+    if (! output_buf)
+        output_buf = new char[globalBufferSize];
+    output_at = 0;
+    output_bytes = 0;
+
+    if (! input())
+    {
+        error("DecoderMPC: cannot initialize.  No input.");
+
+        return FALSE;
+    }
+
+    if (! output_buf)
+        output_buf = new char[globalBufferSize];
+    output_at = 0;
+    output_bytes = 0;
+
+    if (! input()->isOpen())
+    {
+        if (! input()->open(QIODevice::ReadOnly))
+        {
+            error("DecoderMPC: cannot open input.");
+            return FALSE;
+        }
+    }
+    if (!m_data)
+    {
+        m_data = new mpc_data;
+    }
+
+    qDebug("DecoderMPC: setting callbacks");
+    m_data->reader.read = mpc_callback_read;
+    m_data->reader.seek = mpc_callback_seek;
+    m_data->reader.tell = mpc_callback_tell;
+    m_data->reader.canseek = mpc_callback_canseek;
+    m_data->reader.get_size = mpc_callback_get_size;
+    m_data->reader.data = this;
+
+    mpc_streaminfo_init (&m_data->info);
+
+    if (mpc_streaminfo_read (&m_data->info, &m_data->reader) != ERROR_CODE_OK)
+        return FALSE;
+    chan = data()->info.channels;
+    if (output())
+        output()->configure(data()->info.sample_freq, chan, 16, data()->info.bitrate);
+
+    mpc_decoder_setup (&data()->decoder, &data()->reader);
+
+    //mpc_decoder_scale_output (&data()->decoder, 3.0);
+
+    if (!mpc_decoder_initialize (&data()->decoder, &data()->info))
+    {
+        error("DecoderMPC: cannot get info.");
+        return FALSE;
+    }
+    totalTime = mpc_streaminfo_get_length(&data()->info);
+    inited = TRUE;
+    qDebug("DecoderMPC: initialize succes");
+    return TRUE;
+}
+
+
+double DecoderMPC::lengthInSeconds()
+{
+    if (! inited)
+        return 0;
+
+    return totalTime;
+}
+
+
+void DecoderMPC::seek(double pos)
+{
+    seekTime = pos;
+}
+
+
+void DecoderMPC::deinit()
+{
+    //FLAC__stream_decoder_finish (data()->decoder);
+    inited = user_stop = done = finish = FALSE;
+    len = freq = bitrate = 0;
+    stat = chan = 0;
+    output_size = 0;
+}
+
+void DecoderMPC::run()
+{
+    mpc_uint32_t vbrAcc = 0;
+    mpc_uint32_t vbrUpd = 0;
+    mutex()->lock ();
+
+    if (! inited)
+    {
+        mutex()->unlock();
+
+        return;
+    }
+    stat = DecoderState::Decoding;
+    mutex()->unlock();
+    {
+        dispatch(DecoderState ((DecoderState::Type) stat));
+    }
+
+    while (! done && ! finish)
+    {
+        mutex()->lock ();
+        // decode
+
+        if (seekTime >= 0.0)
+        {
+            mpc_decoder_seek_seconds(&data()->decoder, seekTime);
+            seekTime = -1.0;
+        }
+        MPC_SAMPLE_FORMAT buffer[MPC_DECODER_BUFFER_LENGTH];
+
+        len = mpc_decoder_decode (&data()->decoder, buffer, &vbrAcc, &vbrUpd);
+
+        copyBuffer(buffer, (char *) (output_buf + output_at), len);
+
+        len = len * 4;
+
+        if (len > 0)
+        {
+            bitrate = vbrUpd * data()->info.sample_freq / 1152;
+            output_at += len;
+            output_bytes += len;
+
+            if (output())
+                flush();
+
+        }
+        else if (len == 0)
+        {
+            flush(TRUE);
+
+            if (output())
+            {
+                output()->recycler()->mutex()->lock ();
+                // end of stream
+                while (! output()->recycler()->empty() && ! user_stop)
+                {
+                    output()->recycler()->cond()->wakeOne();
+                    mutex()->unlock();
+                    output()->recycler()->cond()->wait(output()->recycler()->mutex());
+                    mutex()->lock ();
+                }
+                output()->recycler()->mutex()->unlock();
+            }
+
+            done = TRUE;
+            if (! user_stop)
+            {
+                finish = TRUE;
+            }
+        }
+        else
+        {
+            // error in read
+            error("DecoderMPC: Error while decoding stream, File appears to be "
+                  "corrupted");
+
+            finish = TRUE;
+        }
+
+        mutex()->unlock();
+    }
+
+    mutex()->lock ();
+
+    if (finish)
+        stat = DecoderState::Finished;
+    else if (user_stop)
+        stat = DecoderState::Stopped;
+
+    mutex()->unlock();
+
+    {
+        dispatch(DecoderState ((DecoderState::Type) stat));
+    }
+
+    deinit();
+}
diff --git a/lib/qmmp/Input/mpc/decoder_mpc.h b/lib/qmmp/Input/mpc/decoder_mpc.h
new file mode 100644
index 000000000..3b17b100e
--- /dev/null
+++ b/lib/qmmp/Input/mpc/decoder_mpc.h
@@ -0,0 +1,80 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#ifndef __decoder_mpc_h
+#define __decoder_mpc_h
+
+#include <mpcdec/mpcdec.h>
+
+#include "decoder.h"
+
+struct mpc_data
+{
+    mpc_decoder decoder;
+    mpc_reader reader;
+    mpc_streaminfo info;
+};
+
+class DecoderMPC : public Decoder
+{
+public:
+    DecoderMPC(QObject *, DecoderFactory *, QIODevice *, Output *);
+    virtual ~DecoderMPC();
+
+    // Standard Decoder API
+    bool initialize();
+    double lengthInSeconds();
+    void seek(double);
+    void stop();
+
+    // Equalizer
+    bool isEQSupported() const { return FALSE; }
+    void setEQEnabled(bool) { ; }
+    void setEQGain(int) { ; }
+    void setEQBands(int[10]) { ; }
+
+    struct mpc_data *data() { return m_data; }
+
+
+private:
+    // thread run function
+    void run();
+    struct mpc_data *m_data;
+    // helper functions
+    void flush(bool = FALSE);
+    void deinit();
+
+    bool inited, user_stop;
+    int stat;
+
+    // output buffer
+    char *output_buf;
+    ulong output_bytes, output_at;
+
+    unsigned int bks;
+    bool done, finish;
+    long len, freq, bitrate;
+    int chan;
+    unsigned long output_size;
+    double totalTime, seekTime;
+};
+
+
+#endif // __decoder_mpc_h
diff --git a/lib/qmmp/Input/mpc/decodermpcfactory.cpp b/lib/qmmp/Input/mpc/decodermpcfactory.cpp
new file mode 100644
index 000000000..98b537045
--- /dev/null
+++ b/lib/qmmp/Input/mpc/decodermpcfactory.cpp
@@ -0,0 +1,76 @@
+#include <QtGui>
+#include <taglib/tag.h>
+#include <taglib/fileref.h>
+
+#include "detailsdialog.h"
+#include "decoder_mpc.h"
+#include "tag.h"
+#include "decodermpcfactory.h"
+
+
+// DecoderMPCFactory
+
+bool DecoderMPCFactory::supports(const QString &source) const
+{
+
+    return (source.right(4).toLower() == ".mpc");
+}
+
+const QString &DecoderMPCFactory::name() const
+{
+    static QString name (tr("Musepack Plugin"));
+    return name;
+}
+
+
+const QString &DecoderMPCFactory::filter() const
+{
+    static QString filter("*.mpc");
+    return filter;
+}
+
+
+const QString &DecoderMPCFactory::description() const
+{
+    static QString desc(tr("Musepack Files"));
+    return desc;
+}
+
+
+Decoder *DecoderMPCFactory::create(QObject *parent, QIODevice *input,
+                                   Output *output)
+{
+    return new DecoderMPC(parent, this, input, output);
+}
+
+FileTag *DecoderMPCFactory::createTag(const QString &source)
+{
+    FileTag *tag = new Tag(source);
+    return tag;
+}
+
+void DecoderMPCFactory::showDetails(QWidget *parent, const QString &path)
+{
+    DetailsDialog *d = new DetailsDialog(parent, path);
+    d -> show();
+}
+
+void DecoderMPCFactory::showSettings(QWidget *)
+{}
+
+void DecoderMPCFactory::showAbout(QWidget *parent)
+{
+    QMessageBox::about (parent, tr("About Musepack Audio Plugin"),
+                        tr("Qmmp Musepack Audio Plugin")+"\n"+
+                        tr("Writen by: Ilya Kotov <forkotov02@hotmail.ru>"));
+}
+
+QTranslator *DecoderMPCFactory::createTranslator(QObject *parent)
+{
+    QTranslator *translator = new QTranslator(parent);
+    QString locale = QLocale::system().name();
+    translator->load(QString(":/mpc_plugin_") + locale);
+    return translator;
+}
+
+Q_EXPORT_PLUGIN(DecoderMPCFactory)
diff --git a/lib/qmmp/Input/mpc/decodermpcfactory.h b/lib/qmmp/Input/mpc/decodermpcfactory.h
new file mode 100644
index 000000000..651e76e18
--- /dev/null
+++ b/lib/qmmp/Input/mpc/decodermpcfactory.h
@@ -0,0 +1,55 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef DECODERMPCFACTORY_H
+#define DECODERMPCFACTORY_H
+
+#include <QObject>
+#include <QString>
+#include <QIODevice>
+#include <QWidget>
+
+#include <decoder.h>
+#include <output.h>
+#include <decoderfactory.h>
+#include <filetag.h>
+
+
+
+
+class DecoderMPCFactory : public QObject,
+                          DecoderFactory
+{
+Q_OBJECT
+Q_INTERFACES(DecoderFactory);
+
+public:
+    bool supports(const QString &source) const;
+    const QString &name() const;
+    const QString &filter() const;
+    const QString &description() const;
+    Decoder *create(QObject *, QIODevice *, Output *);
+    FileTag *createTag(const QString &source);
+    void showDetails(QWidget *parent, const QString &path);
+    void showSettings(QWidget *parent);
+    void showAbout(QWidget *parent);
+    QTranslator *createTranslator(QObject *parent);
+};
+
+#endif
diff --git a/lib/qmmp/Input/mpc/detailsdialog.cpp b/lib/qmmp/Input/mpc/detailsdialog.cpp
new file mode 100644
index 000000000..da1b3b83d
--- /dev/null
+++ b/lib/qmmp/Input/mpc/detailsdialog.cpp
@@ -0,0 +1,91 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#include <taglib/tag.h>
+#include <taglib/fileref.h>
+#include <taglib/mpcfile.h>
+
+#include "detailsdialog.h"
+
+DetailsDialog::DetailsDialog(QWidget *parent, const QString &path)
+        : QDialog(parent)
+{
+    ui.setupUi(this);
+    setAttribute(Qt::WA_DeleteOnClose);
+    m_path = path;
+    setWindowTitle (path.section('/',-1));
+    path.section('/',-1);
+    ui.pathLineEdit->setText(m_path);
+    loadMPCInfo();
+    loadTag();
+
+}
+
+
+DetailsDialog::~DetailsDialog()
+{}
+
+void DetailsDialog::loadMPCInfo()
+{
+    TagLib::MPC::File f (m_path.toLocal8Bit());
+    QString text;
+    text = QString("%1").arg(f.audioProperties()->length()/60);
+    text +=":"+QString("%1").arg(f.audioProperties()->length()%60,2,10,QChar('0'));
+    ui.lengthLabel->setText(text);
+    text = QString("%1").arg(f.audioProperties()->sampleRate());
+    ui.sampleRateLabel->setText(text+" "+tr("Hz"));
+    text = QString("%1").arg(f.audioProperties()->channels());
+    ui.channelsLabel->setText(text);
+    text = QString("%1").arg(f.audioProperties()->bitrate());
+    ui.bitrateLabel->setText(text+" "+tr("kbps")); 
+    text = QString("%1").arg(f.audioProperties()->mpcVersion());
+    ui.versionLabel->setText(text);
+    text = QString("%1 "+tr("KB")).arg(f.length()/1024);
+    ui.fileSizeLabel->setText(text);
+}
+
+void DetailsDialog::loadTag()
+{
+    TagLib::FileRef f (m_path.toLocal8Bit());
+
+    if (f.tag())
+    {   //TODO: load codec name from config
+
+        TagLib::String title = f.tag()->title();
+        TagLib::String artist = f.tag()->artist();
+        TagLib::String album = f.tag()->album();
+        TagLib::String comment = f.tag()->comment();
+        TagLib::String genre = f.tag()->genre();
+        QString string = QString::fromUtf8(title.toCString(TRUE)).trimmed();
+        ui.titleLineEdit->setText(string);
+        string = QString::fromUtf8(artist.toCString(TRUE)).trimmed();
+        ui.artistLineEdit->setText(string);
+        string = QString::fromUtf8(album.toCString(TRUE)).trimmed();
+        ui.albumLineEdit->setText(string);
+        string = QString::fromUtf8(comment.toCString(TRUE)).trimmed();
+        ui.commentLineEdit->setText(string);
+        string = QString("%1").arg(f.tag()->year());
+        ui.yearLineEdit->setText(string);
+        string = QString("%1").arg(f.tag()->track());
+        ui.trackLineEdit->setText(string);
+        string = QString::fromUtf8(genre.toCString(TRUE)).trimmed();
+        ui.genreLineEdit->setText(string);
+    }
+}
+
diff --git a/lib/qmmp/Input/mpc/detailsdialog.h b/lib/qmmp/Input/mpc/detailsdialog.h
new file mode 100644
index 000000000..4ff868414
--- /dev/null
+++ b/lib/qmmp/Input/mpc/detailsdialog.h
@@ -0,0 +1,46 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                       *
+ *   forkotov02@hotmail.ru                                                     *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef DETAILSDIALOG_H
+#define DETAILSDIALOG_H
+
+#include <QDialog>
+
+#include "ui_detailsdialog.h"
+
+/**
+	@author Ilya Kotov <forkotov02@hotmail.ru>
+*/
+class DetailsDialog : public QDialog
+{
+Q_OBJECT
+public:
+    DetailsDialog(QWidget *parent = 0, const QString &path = 0);
+
+    ~DetailsDialog();
+
+private:
+    void loadMPCInfo();
+    void loadTag();
+    Ui::DetailsDialog ui;
+    QString m_path;
+
+};
+
+#endif
diff --git a/lib/qmmp/Input/mpc/detailsdialog.ui b/lib/qmmp/Input/mpc/detailsdialog.ui
new file mode 100644
index 000000000..bc8c09c0e
--- /dev/null
+++ b/lib/qmmp/Input/mpc/detailsdialog.ui
@@ -0,0 +1,349 @@
+<ui version="4.0" >
+ <class>DetailsDialog</class>
+ <widget class="QDialog" name="DetailsDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>449</width>
+    <height>375</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Details</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>8</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item rowspan="2" row="1" column="0" colspan="2" >
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="minimumSize" >
+      <size>
+       <width>175</width>
+       <height>16</height>
+      </size>
+     </property>
+     <property name="title" >
+      <string>Musepack Info</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>8</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="6" column="0" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>74</width>
+          <height>151</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="2" column="1" colspan="2" >
+       <widget class="QLabel" name="fileSizeLabel" >
+        <property name="text" >
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label" >
+        <property name="text" >
+         <string>Length:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" colspan="2" >
+       <widget class="QLabel" name="lengthLabel" >
+        <property name="text" >
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="label_3" >
+        <property name="text" >
+         <string>Sample rate:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" colspan="2" >
+       <widget class="QLabel" name="sampleRateLabel" >
+        <property name="text" >
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="label_10" >
+        <property name="layoutDirection" >
+         <enum>Qt::LeftToRight</enum>
+        </property>
+        <property name="text" >
+         <string>Channels:</string>
+        </property>
+        <property name="textFormat" >
+         <enum>Qt::PlainText</enum>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="label_5" >
+        <property name="text" >
+         <string>File size:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" >
+       <widget class="QLabel" name="label_2" >
+        <property name="text" >
+         <string>Bitrate:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" colspan="2" >
+       <widget class="QLabel" name="channelsLabel" >
+        <property name="layoutDirection" >
+         <enum>Qt::LeftToRight</enum>
+        </property>
+        <property name="text" >
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1" colspan="2" >
+       <widget class="QLabel" name="bitrateLabel" >
+        <property name="text" >
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" >
+       <widget class="QLabel" name="label_4" >
+        <property name="text" >
+         <string>Stream version:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="1" colspan="2" >
+       <widget class="QLabel" name="versionLabel" >
+        <property name="text" >
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="0" column="1" colspan="3" >
+    <widget class="QLineEdit" name="pathLineEdit" >
+     <property name="readOnly" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" >
+    <widget class="QLabel" name="label_28" >
+     <property name="text" >
+      <string>File path:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="3" >
+    <widget class="QPushButton" name="pushButton_3" >
+     <property name="text" >
+      <string>Close</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="2" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>111</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="2" colspan="2" >
+    <widget class="QGroupBox" name="groupBox_2" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>5</hsizetype>
+       <vsizetype>5</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title" >
+      <string>Musepack Tag</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>8</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="6" column="1" colspan="2" >
+       <widget class="QPushButton" name="pushButton" >
+        <property name="enabled" >
+         <bool>false</bool>
+        </property>
+        <property name="text" >
+         <string>Save</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="3" >
+       <widget class="QLineEdit" name="trackLineEdit" />
+      </item>
+      <item row="4" column="2" >
+       <widget class="QLabel" name="label_26" >
+        <property name="text" >
+         <string>Track number:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1" >
+       <widget class="QLineEdit" name="yearLineEdit" />
+      </item>
+      <item row="4" column="0" >
+       <widget class="QLabel" name="label_25" >
+        <property name="text" >
+         <string>Year:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" >
+       <widget class="QLabel" name="label_27" >
+        <property name="text" >
+         <string>Genre:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="label_24" >
+        <property name="text" >
+         <string>Comment:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="label_23" >
+        <property name="text" >
+         <string>Album:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="label_22" >
+        <property name="text" >
+         <string>Artist:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label_21" >
+        <property name="text" >
+         <string>Title:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" colspan="3" >
+       <widget class="QLineEdit" name="titleLineEdit" />
+      </item>
+      <item row="1" column="1" colspan="3" >
+       <widget class="QLineEdit" name="artistLineEdit" />
+      </item>
+      <item row="2" column="1" colspan="3" >
+       <widget class="QLineEdit" name="albumLineEdit" />
+      </item>
+      <item row="3" column="1" colspan="3" >
+       <widget class="QLineEdit" name="commentLineEdit" />
+      </item>
+      <item row="5" column="1" colspan="2" >
+       <widget class="QLineEdit" name="genreLineEdit" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>pushButton_3</sender>
+   <signal>clicked()</signal>
+   <receiver>DetailsDialog</receiver>
+   <slot>close()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>623</x>
+     <y>353</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>539</x>
+     <y>352</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/lib/qmmp/Input/mpc/mpc.pro b/lib/qmmp/Input/mpc/mpc.pro
new file mode 100644
index 000000000..d932740da
--- /dev/null
+++ b/lib/qmmp/Input/mpc/mpc.pro
@@ -0,0 +1,24 @@
+FORMS += detailsdialog.ui 
+HEADERS += decodermpcfactory.h \
+           decoder_mpc.h \
+	   tag.h \
+	   detailsdialog.h
+SOURCES += decoder_mpc.cpp \
+           decodermpcfactory.cpp \
+	   tag.cpp \
+	   detailsdialog.cpp
+DESTDIR = ../
+QMAKE_CLEAN += ../libmpc.so
+INCLUDEPATH += ../../../
+CONFIG += release \
+warn_on \
+plugin \
+link_pkgconfig
+TEMPLATE = lib
+QMAKE_LIBDIR += ../../../
+LIBS += -lqmmp -L/usr/lib -lmpcdec -I/usr/include
+PKGCONFIG += taglib 
+#TRANSLATIONS = translations/mpc_plugin_ru.ts
+#RESOURCES = translations/translations.qrc
+target.path = /lib/qmmp/Input
+INSTALLS += target
diff --git a/lib/qmmp/Input/mpc/tag.cpp b/lib/qmmp/Input/mpc/tag.cpp
new file mode 100644
index 000000000..71feb9051
--- /dev/null
+++ b/lib/qmmp/Input/mpc/tag.cpp
@@ -0,0 +1,97 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#include "tag.h"
+
+Tag::Tag(const QString &source)
+        : FileTag()
+{
+    m_length = 0;
+    m_year = 0;
+    m_track = 0;
+    m_empty = TRUE;
+    TagLib::FileRef fileRef(source.toLocal8Bit ());
+
+    m_tag = fileRef.tag();
+    if(m_tag && !m_tag->isEmpty())
+    {
+        m_album = QString::fromUtf8(m_tag->album().toCString(TRUE)).trimmed();
+        m_artist = QString::fromUtf8(m_tag->artist().toCString(TRUE)).trimmed();
+        m_comment = QString::fromUtf8(m_tag->comment().toCString(TRUE)).trimmed();
+        m_genre = QString::fromUtf8(m_tag->genre().toCString(TRUE)).trimmed();
+        m_title = QString::fromUtf8(m_tag->title().toCString(TRUE)).trimmed();
+        m_year = 0;
+        m_track = 0;
+        if(fileRef.audioProperties())
+            m_length = fileRef.audioProperties()->length();
+        m_empty = FALSE;
+    }
+    else
+        m_tag = 0;
+}
+
+
+Tag::~Tag()
+{}
+
+
+bool Tag::isEmpty()
+{
+    return m_empty;
+}
+
+QString Tag::album()
+{
+    return m_album;
+}
+
+QString Tag::artist()
+{
+    return m_artist;
+}
+
+QString Tag::comment()
+{
+    return m_comment;
+}
+
+QString Tag::genre()
+{
+    return m_genre;
+}
+
+QString Tag::title()
+{
+    return m_title;
+}
+
+uint Tag::length()
+{
+    return m_length;
+}
+
+uint Tag::track()
+{
+    return m_track; 
+}
+
+uint Tag::year()
+{
+    return m_year;
+}
diff --git a/lib/qmmp/Input/mpc/tag.h b/lib/qmmp/Input/mpc/tag.h
new file mode 100644
index 000000000..3404575f4
--- /dev/null
+++ b/lib/qmmp/Input/mpc/tag.h
@@ -0,0 +1,61 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef TAG_H
+#define TAG_H
+
+#include <taglib/tag.h>
+#include <taglib/fileref.h>
+
+#include <filetag.h>
+
+/**
+	@author Ilya Kotov <forkotov02@hotmail.ru>
+*/
+class Tag : public FileTag
+{
+public:
+    Tag(const QString &source);
+
+    ~Tag();
+
+    virtual QString album();
+    virtual QString artist();
+    virtual QString comment();
+    virtual QString genre();
+    virtual QString title();
+    virtual uint length();
+    virtual uint track();
+    virtual uint year();
+    virtual bool isEmpty();
+
+private:
+    TagLib::Tag *m_tag;
+    QString m_album;
+    QString m_artist;
+    QString m_comment;
+    QString m_genre;
+    QString m_title;
+    uint m_length;
+    uint m_year;
+    uint m_track;
+    bool m_empty;
+};
+
+#endif
diff --git a/lib/qmmp/Input/mpc/translations/mpc_plugin_ru.qm b/lib/qmmp/Input/mpc/translations/mpc_plugin_ru.qm
new file mode 100644
index 000000000..0eb8c1533
--- /dev/null
+++ b/lib/qmmp/Input/mpc/translations/mpc_plugin_ru.qm
diff --git a/lib/qmmp/Input/mpc/translations/mpc_plugin_ru.ts b/lib/qmmp/Input/mpc/translations/mpc_plugin_ru.ts
new file mode 100644
index 000000000..3c0ec3fe2
--- /dev/null
+++ b/lib/qmmp/Input/mpc/translations/mpc_plugin_ru.ts
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS><TS version="1.1" language="pl">
+<context>
+    <name>DecoderMPCFactory</name>
+    <message>
+        <location filename="../decodermpcfactory.cpp" line="21"/>
+        <source>Musepack Plugin</source>
+        <translation>Модуль Musepack</translation>
+    </message>
+    <message>
+        <location filename="../decodermpcfactory.cpp" line="35"/>
+        <source>Musepack Files</source>
+        <translation>Файлы Musepack</translation>
+    </message>
+    <message>
+        <location filename="../decodermpcfactory.cpp" line="63"/>
+        <source>About Musepack Audio Plugin</source>
+        <translation>Об аудио-модуле Musepack</translation>
+    </message>
+    <message>
+        <location filename="../decodermpcfactory.cpp" line="64"/>
+        <source>Qmmp Musepack Audio Plugin</source>
+        <translation>Аудио-модуль Musepack для Qmmp</translation>
+    </message>
+    <message>
+        <location filename="../decodermpcfactory.cpp" line="65"/>
+        <source>Writen by: Ilya Kotov &lt;forkotov02@hotmail.ru&gt;</source>
+        <translation>Разработчик: Илья Котов &lt;forkotov02@hotmail.ru&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>DetailsDialog</name>
+    <message>
+        <location filename="../detailsdialog.cpp" line="52"/>
+        <source>Hz</source>
+        <translation>Гц</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="31"/>
+        <source>Musepack Info</source>
+        <translation>Информация Musepack</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="160"/>
+        <source>-</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="63"/>
+        <source>Length:</source>
+        <translation>Длительность:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="80"/>
+        <source>Sample rate:</source>
+        <translation>Дискретизация:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="100"/>
+        <source>Channels:</source>
+        <translation>Каналов:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="113"/>
+        <source>File size:</source>
+        <translation>Размер файла:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="123"/>
+        <source>Bitrate:</source>
+        <translation>Битовая частота:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="150"/>
+        <source>Stream version:</source>
+        <translation>Версия потока:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="177"/>
+        <source>File path:</source>
+        <translation>Путь к файлу:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="187"/>
+        <source>Close</source>
+        <translation>Закрыть</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="215"/>
+        <source>Musepack Tag</source>
+        <translation>Musepack-тег</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="230"/>
+        <source>Save</source>
+        <translation>Сохранить</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="240"/>
+        <source>Track number:</source>
+        <translation>Номер трека:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="253"/>
+        <source>Year:</source>
+        <translation>Год:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="263"/>
+        <source>Genre:</source>
+        <translation>Жанр:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="273"/>
+        <source>Comment:</source>
+        <translation>Комментарий:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="283"/>
+        <source>Album:</source>
+        <translation>Альбом:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="293"/>
+        <source>Artist:</source>
+        <translation>Исполнитель:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="303"/>
+        <source>Title:</source>
+        <translation>Название:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="13"/>
+        <source>Details</source>
+        <translation>Информация</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.cpp" line="56"/>
+        <source>kbps</source>
+        <translation>Кб/с</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.cpp" line="59"/>
+        <source>KB</source>
+        <translation>Кб</translation>
+    </message>
+</context>
+</TS>
diff --git a/lib/qmmp/Input/mpc/translations/translations.qrc b/lib/qmmp/Input/mpc/translations/translations.qrc
new file mode 100644
index 000000000..cc88de9ce
--- /dev/null
+++ b/lib/qmmp/Input/mpc/translations/translations.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+  <qresource>
+    <file>mpc_plugin_ru.qm</file>
+  </qresource>
+</RCC>
diff --git a/lib/qmmp/Input/vorbis/CMakeLists.txt b/lib/qmmp/Input/vorbis/CMakeLists.txt
new file mode 100644
index 000000000..48f29e26f
--- /dev/null
+++ b/lib/qmmp/Input/vorbis/CMakeLists.txt
@@ -0,0 +1,98 @@
+project(libvorbis)
+
+cmake_minimum_required(VERSION 2.4.0)
+
+
+INCLUDE(UsePkgConfig)
+INCLUDE(FindQt4)
+
+find_package(Qt4 REQUIRED) # find and setup Qt4 for this project
+include(${QT_USE_FILE})
+
+# qt plugin
+ADD_DEFINITIONS( -Wall )
+ADD_DEFINITIONS(${QT_DEFINITIONS})
+ADD_DEFINITIONS(-DQT_PLUGIN)
+ADD_DEFINITIONS(-DQT_NO_DEBUG)
+ADD_DEFINITIONS(-DQT_SHARED)
+ADD_DEFINITIONS(-DQT_THREAD)
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+SET(QT_INCLUDES
+  ${QT_INCLUDES}
+  ${CMAKE_CURRENT_BINARY_DIR}/../../../
+)
+
+# libqmmp
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
+
+# libvorbis and taglib
+PKGCONFIG(ogg OGG_INCLUDE_DIR OGG_LINK_DIR OGG_LINK_FLAGS OGG_CFLAGS)
+PKGCONFIG(vorbis VORBIS_INCLUDE_DIR VORBIS_LINK_DIR VORBIS_LINK_FLAGS VORBIS_CFLAGS)
+PKGCONFIG(vorbisfile VORBISFILE_INCLUDE_DIR VORBISFILE_LINK_DIR VORBISFILE_LINK_FLAGS VORBISFILE_CFLAGS)
+
+PKGCONFIG(taglib TAGLIB_INCLUDE_DIR TAGLIB_LINK_DIR TAGLIB_LINK_FLAGS TAGLIB_CFLAGS)
+
+IF(NOT OGG_LINK_FLAGS)
+  SET(OGG_LINK_FLAGS -logg)
+ENDIF(NOT OGG_LINK_FLAGS)
+
+IF(NOT VORBIS_LINK_FLAGS)
+  SET(VORBIS_LINK_FLAGS -lvorbis)
+ENDIF(NOT VORBIS_LINK_FLAGS)
+
+IF(NOT VORBISFILE_LINK_FLAGS)
+  SET(VORBISFILE_LINK_FLAGS -lvorbisfile)
+ENDIF(NOT VORBISFILE_LINK_FLAGS)
+
+IF(NOT ${TAGLIB_LINK_FLAGS})
+  SET(TAGLIB_LINK_FLAGS -ltag)
+  SET(TAGLIB_INCLUDE_DIR /usr/include/taglib)
+  SET(TAGLIB_CFLAGS -I/usr/include/taglib)
+ENDIF(NOT ${TAGLIB_LINK_FLAGS})
+
+include_directories(${VORBIS_INCLUDE_DIR} ${TAGLIB_INCLUDE_DIR})
+link_directories(${VORBIS_LINK_DIR} ${TAGLIB_LINK_DIR})
+
+#ADD_DEFINITIONS(${VORBIS_CFLAGS})
+ADD_DEFINITIONS(${TAGLIB_CFLAGS})
+
+
+SET(libvorbis_SRCS
+  decoder_vorbis.cpp
+  decodervorbisfactory.cpp
+  detailsdialog.cpp
+  tag.cpp
+)
+
+SET(libvorbis_MOC_HDRS
+  tag.h
+  decodervorbisfactory.h
+  decoder_vorbis.h
+  detailsdialog.h
+)
+
+SET(libvorbis_RCCS translations/translations.qrc)
+
+QT4_ADD_RESOURCES(libvorbis_RCC_SRCS ${libvorbis_RCCS})
+
+QT4_WRAP_CPP(libvorbis_MOC_SRCS ${libvorbis_MOC_HDRS})
+
+# user interface
+
+
+SET(libvorbis_UIS
+    detailsdialog.ui
+)
+
+QT4_WRAP_UI(libvorbis_UIS_H ${libvorbis_UIS})
+# Don't forget to include output directory, otherwise
+# the UI file won't be wrapped!
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+ADD_LIBRARY(vorbis SHARED ${libvorbis_SRCS} ${libvorbis_MOC_SRCS} ${libvorbis_UIS_H}
+  ${libvorbis_RCC_SRCS})
+target_link_libraries(vorbis ${QT_LIBRARIES} -lqmmp ${VORBIS_LINK_FLAGS} ${VORBISFILE_LINK_FLAGS} ${OGG_LINK_FLAGS} ${TAGLIB_LINK_FLAGS} ${TAGLIB_CFLAGS})
+install(TARGETS vorbis DESTINATION lib/qmmp/Input)
diff --git a/lib/qmmp/Input/vorbis/decoder_vorbis.cpp b/lib/qmmp/Input/vorbis/decoder_vorbis.cpp
new file mode 100644
index 000000000..9555d6e6a
--- /dev/null
+++ b/lib/qmmp/Input/vorbis/decoder_vorbis.cpp
@@ -0,0 +1,368 @@
+// Copyright (c) 2000-2001 Brad Hughes <bhughes@trolltech.com>
+//
+// Use, modification and distribution is allowed without limitation,
+// warranty, or liability of any kind.
+//
+
+#include "decoder_vorbis.h"
+#include "constants.h"
+#include "buffer.h"
+#include "output.h"
+#include "recycler.h"
+
+#include <qobject.h>
+#include <qiodevice.h>
+
+
+// ic functions for OggVorbis
+
+static size_t oggread (void *buf, size_t size, size_t nmemb, void *src)
+{
+    if (! src) return 0;
+
+    DecoderVorbis *dogg = (DecoderVorbis *) src;
+    int len = dogg->input()->read((char *) buf, (size * nmemb));
+    return len / size;
+}
+
+
+static int oggseek(void *src, int64_t offset, int whence)
+{
+    DecoderVorbis *dogg = (DecoderVorbis *) src;
+
+    if ( dogg->input()->isSequential ())
+        return -1;
+
+    long start = 0;
+    switch (whence)
+    {
+    case SEEK_END:
+        start = dogg->input()->size();
+        break;
+
+    case SEEK_CUR:
+        start = dogg->input()->pos();
+        break;
+
+    case SEEK_SET:
+    default:
+        start = 0;
+    }
+
+    if (dogg->input()->seek(start + offset))
+        return 0;
+    return -1;
+}
+
+
+static int oggclose(void *src)
+{
+    DecoderVorbis *dogg = (DecoderVorbis *) src;
+    dogg->input()->close();
+    return 0;
+}
+
+
+static long oggtell(void *src)
+{
+    DecoderVorbis *dogg = (DecoderVorbis *) src;
+    long t = dogg->input()->pos();
+    return t;
+}
+
+
+// Decoder class
+
+DecoderVorbis::DecoderVorbis(QObject *parent, DecoderFactory *d, QIODevice *i, Output *o)
+        : Decoder(parent, d, i, o)
+{
+    inited = FALSE;
+    user_stop = FALSE;
+    stat = 0;
+    output_buf = 0;
+    output_bytes = 0;
+    output_at = 0;
+    bks = 0;
+    done = FALSE;
+    finish = FALSE;
+    len = 0;
+    freq = 0;
+    bitrate = 0;
+    seekTime = -1.0;
+    totalTime = 0.0;
+    chan = 0;
+    output_size = 0;
+}
+
+
+DecoderVorbis::~DecoderVorbis()
+{
+    deinit();
+
+    if (output_buf)
+        delete [] output_buf;
+    output_buf = 0;
+}
+
+
+void DecoderVorbis::stop()
+{
+    user_stop = TRUE;
+}
+
+
+void DecoderVorbis::flush(bool final)
+{
+    ulong min = final ? 0 : bks;
+
+    while ((! done && ! finish) && output_bytes > min)
+    {
+        output()->recycler()->mutex()->lock ();
+
+        while ((! done && ! finish) && output()->recycler()->full())
+        {
+            mutex()->unlock();
+
+            output()->recycler()->cond()->wait(output()->recycler()->mutex());
+
+            mutex()->lock ();
+            done = user_stop;
+        }
+
+        if (user_stop || finish)
+        {
+            inited = FALSE;
+            done = TRUE;
+        }
+        else
+        {
+            /*ulong sz = output_bytes < bks ? output_bytes : bks;
+            Buffer *b = output()->recycler()->get();
+
+            memcpy(b->data, output_buf, sz);
+            if (sz != bks) memset(b->data + sz, 0, bks - sz);
+
+            b->nbytes = bks;
+            b->rate = bitrate;
+            output_size += b->nbytes;
+            output()->recycler()->add();
+
+            output_bytes -= sz;
+            memmove(output_buf, output_buf + sz, output_bytes);*/
+            output_bytes -= produceSound(output_buf, output_bytes, bitrate, chan);
+            output_size += bks;
+            output_at = output_bytes;
+        }
+
+        if (output()->recycler()->full())
+        {
+            output()->recycler()->cond()->wakeOne();
+        }
+
+        output()->recycler()->mutex()->unlock();
+    }
+}
+
+
+bool DecoderVorbis::initialize()
+{
+    bks = blockSize();
+
+    inited = user_stop = done = finish = FALSE;
+    len = freq = bitrate = 0;
+    stat = chan = 0;
+    output_size = 0;
+    seekTime = -1.0;
+    totalTime = 0.0;
+
+    if (! input())
+    {
+        error("DecoderVorbis: cannot initialize.  No input.");
+
+        return FALSE;
+    }
+
+    if (! output_buf)
+        output_buf = new char[globalBufferSize];
+    output_at = 0;
+    output_bytes = 0;
+
+    if (! input()->isOpen())
+    {
+        //if (! input()->open(IO_ReadOnly)) {
+        if (! input()->open(QIODevice::ReadOnly))
+        {
+            //error("DecoderVorbis: Failed to open input. Error " +
+            //  QString::number(input()->status()) + ".");
+            return FALSE;
+        }
+    }
+
+    ov_callbacks oggcb =
+        {
+            oggread,
+            oggseek,
+            oggclose,
+            oggtell
+        };
+    if (ov_open_callbacks(this, &oggfile, NULL, 0, oggcb) < 0)
+    {
+        error("DecoderVorbis: Cannot open stream.");
+
+        return FALSE;
+    }
+
+    freq = 0;
+    bitrate = ov_bitrate(&oggfile, -1) / 1000;
+    chan = 0;
+
+    totalTime = long(ov_time_total(&oggfile, 0));
+    totalTime = totalTime < 0 ? 0 : totalTime;
+
+    vorbis_info *ogginfo = ov_info(&oggfile, -1);
+    if (ogginfo)
+    {
+        freq = ogginfo->rate;
+        chan = ogginfo->channels;
+    }
+
+    if (output())
+        output()->configure(freq, chan, 16, bitrate);
+
+    inited = TRUE;
+    return TRUE;
+}
+
+
+double DecoderVorbis::lengthInSeconds()
+{
+    if (! inited)
+        return 0;
+
+    return totalTime;
+}
+
+
+void DecoderVorbis::seek(double pos)
+{
+    seekTime = pos;
+}
+
+
+void DecoderVorbis::deinit()
+{
+    ov_clear(&oggfile);
+
+    inited = user_stop = done = finish = FALSE;
+    len = freq = bitrate = 0;
+    stat = chan = 0;
+    output_size = 0;
+}
+
+void DecoderVorbis::run()
+{
+    mutex()->lock ();
+
+    if (! inited)
+    {
+        mutex()->unlock();
+
+        return;
+    }
+
+    //stat = DecoderEvent::Decoding;
+    stat = DecoderState::Decoding;
+    mutex()->unlock();
+
+    {
+        //DecoderEvent e((DecoderEvent::Type) stat);
+        //dispatch(e);
+        //DecoderStatus st ((DecoderStatus::Type) stat);
+        dispatch(DecoderState ((DecoderState::Type) stat));
+
+        //emit statusChanged(stat);
+    }
+
+    int section = 0;
+
+    while (! done && ! finish)
+    {
+        mutex()->lock ();
+        // decode
+
+        if (seekTime >= 0.0)
+        {
+            ov_time_seek(&oggfile, double(seekTime));
+            seekTime = -1.0;
+
+            output_size = long(ov_time_tell(&oggfile)) * long(freq * chan * 2);
+        }
+
+        len = ov_read(&oggfile, (char *) (output_buf + output_at), bks, 0, 2, 1,
+                      &section);
+
+        if (len > 0)
+        {
+            bitrate = ov_bitrate_instant(&oggfile) / 1000;
+
+            output_at += len;
+            output_bytes += len;
+
+            if (output())
+                flush();
+        }
+        else if (len == 0)
+        {
+            flush(TRUE);
+
+            if (output())
+            {
+                output()->recycler()->mutex()->lock ();
+                // end of stream
+                while (! output()->recycler()->empty() && ! user_stop)
+                {
+                    output()->recycler()->cond()->wakeOne();
+                    mutex()->unlock();
+                    output()->recycler()->cond()->wait(output()->recycler()->mutex());
+                    mutex()->lock ();
+                }
+                output()->recycler()->mutex()->unlock();
+            }
+
+            done = TRUE;
+            if (! user_stop)
+            {
+                finish = TRUE;
+            }
+        }
+        else
+        {
+            // error in read
+            error("DecoderVorbis: Error while decoding stream, File appears to be "
+                  "corrupted");
+
+            finish = TRUE;
+        }
+
+        mutex()->unlock();
+    }
+
+    mutex()->lock ();
+
+    if (finish)
+        stat = DecoderState::Finished;
+    else if (user_stop)
+        stat = DecoderState::Stopped;
+
+    mutex()->unlock();
+
+    {
+        /*DecoderEvent e((DecoderEvent::Type) stat);
+        dispatch(e);*/
+        //DecoderStatus st ((DecoderStatus::Type) stat);
+        //emit statusChanged(st);
+        dispatch(DecoderState ((DecoderState::Type) stat));
+    }
+
+    deinit();
+}
diff --git a/lib/qmmp/Input/vorbis/decoder_vorbis.h b/lib/qmmp/Input/vorbis/decoder_vorbis.h
new file mode 100644
index 000000000..12a5de118
--- /dev/null
+++ b/lib/qmmp/Input/vorbis/decoder_vorbis.h
@@ -0,0 +1,61 @@
+// Copyright (c) 2000-2001 Brad Hughes <bhughes@trolltech.com>
+//
+// Use, modification and distribution is allowed without limitation,
+// warranty, or liability of any kind.
+//
+
+#ifndef __decoder_vorbis_h
+#define __decoder_vorbis_h
+
+#include "decoder.h"
+
+#include <vorbis/vorbisfile.h>
+
+
+class DecoderVorbis : public Decoder
+{
+public:
+    DecoderVorbis(QObject *, DecoderFactory *, QIODevice *, Output *);
+    virtual ~DecoderVorbis();
+
+    // Standard Decoder API
+    bool initialize();
+    double lengthInSeconds();
+    void seek(double);
+    void stop();
+
+    // Equalizer
+    bool isEQSupported() const { return FALSE; }
+    void setEQEnabled(bool) { ; }
+    void setEQGain(int) { ; }
+    void setEQBands(int[10]) { ; }
+
+
+private:
+    // thread run function
+    void run();
+
+    // helper functions
+    void flush(bool = FALSE);
+    void deinit();
+
+    bool inited, user_stop;
+    int stat;
+
+    // output buffer
+    char *output_buf;
+    ulong output_bytes, output_at;
+
+    // OggVorbis Decoder
+    OggVorbis_File oggfile;
+
+    unsigned int bks;
+    bool done, finish;
+    long len, freq, bitrate;
+    int chan;
+    unsigned long output_size;
+    double totalTime, seekTime;
+};
+
+
+#endif // __decoder_vorbis_h
diff --git a/lib/qmmp/Input/vorbis/decodervorbisfactory.cpp b/lib/qmmp/Input/vorbis/decodervorbisfactory.cpp
new file mode 100644
index 000000000..e4f77b191
--- /dev/null
+++ b/lib/qmmp/Input/vorbis/decodervorbisfactory.cpp
@@ -0,0 +1,79 @@
+#include <QtGui>
+#include <taglib/tag.h>
+#include <taglib/fileref.h>
+
+#include "detailsdialog.h"
+#include "decoder_vorbis.h"
+#include "tag.h"
+#include "decodervorbisfactory.h"
+
+
+// DecoderOggFactory
+
+bool DecoderVorbisFactory::supports(const QString &source) const
+{
+    //TODO: FLAC?
+    return source.right(4).toLower() == ".ogg";
+}
+
+const QString &DecoderVorbisFactory::name() const
+{
+    static QString name (tr("Ogg Vorbis Plugin"));
+    return name;
+}
+
+const QString &DecoderVorbisFactory::filter() const
+{
+    static QString filter("*.ogg");
+    return filter;
+}
+
+
+const QString &DecoderVorbisFactory::description() const
+{
+    static QString desc(tr("Ogg Vorbis Files"));
+    return desc;
+}
+
+Decoder *DecoderVorbisFactory::create(QObject *parent, QIODevice *input,
+                                   Output *output)
+{
+    return new DecoderVorbis(parent, this, input, output);
+}
+
+FileTag *DecoderVorbisFactory::createTag(const QString &source)
+{
+    FileTag *tag = new Tag(source);
+    return tag;
+}
+
+void DecoderVorbisFactory::showDetails(QWidget *parent, const QString &path)
+{
+    DetailsDialog *d = new DetailsDialog(parent, path);
+    d -> show();
+}
+
+void DecoderVorbisFactory::showSettings(QWidget *)
+{
+    /*SettingsDialog *s = new SettingsDialog(parent);
+    s -> show();*/
+}
+
+void DecoderVorbisFactory::showAbout(QWidget *parent)
+{
+    QMessageBox::about (parent, tr("About Ogg Vorbis Audio Plugin"),
+                        tr("Qmmp Ogg Vorbis Audio Plugin")+"\n"+
+                        tr("Writen by: Ilya Kotov <forkotov02@hotmail.ru>")+"\n"+
+                        tr("Source code based on mq3 progect")
+                       );
+}
+
+QTranslator *DecoderVorbisFactory::createTranslator(QObject *parent)
+{
+    QTranslator *translator = new QTranslator(parent);
+    QString locale = QLocale::system().name();
+    translator->load(QString(":/vorbis_plugin_") + locale);
+    return translator;
+}
+
+Q_EXPORT_PLUGIN(DecoderVorbisFactory)
diff --git a/lib/qmmp/Input/vorbis/decodervorbisfactory.h b/lib/qmmp/Input/vorbis/decodervorbisfactory.h
new file mode 100644
index 000000000..9c411c49d
--- /dev/null
+++ b/lib/qmmp/Input/vorbis/decodervorbisfactory.h
@@ -0,0 +1,55 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef DECODERVORBISFACTORY_H
+#define DECODERVORBISFACTORY_H
+
+#include <QObject>
+#include <QString>
+#include <QIODevice>
+#include <QWidget>
+
+#include <decoder.h>
+#include <output.h>
+#include <decoderfactory.h>
+#include <filetag.h>
+
+
+
+
+class DecoderVorbisFactory : public QObject,
+                          DecoderFactory
+{
+Q_OBJECT
+Q_INTERFACES(DecoderFactory)
+
+public:
+    bool supports(const QString &source) const;
+    const QString &name() const;
+    const QString &filter() const; // file extension, ie. ".mp3" or ".ogg"
+    const QString &description() const; // file type, ie. "MPEG Audio Files"
+    Decoder *create(QObject *, QIODevice *, Output *);
+    FileTag *createTag(const QString &source);
+    void showDetails(QWidget *parent, const QString &path);
+    void showSettings(QWidget *parent);
+    void showAbout(QWidget *parent);
+    QTranslator *createTranslator(QObject *parent);
+};
+
+#endif
diff --git a/lib/qmmp/Input/vorbis/detailsdialog.cpp b/lib/qmmp/Input/vorbis/detailsdialog.cpp
new file mode 100644
index 000000000..9fb4f761c
--- /dev/null
+++ b/lib/qmmp/Input/vorbis/detailsdialog.cpp
@@ -0,0 +1,96 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#include <taglib/tag.h>
+#include <taglib/fileref.h>
+#include <taglib/vorbisfile.h>
+
+#include "detailsdialog.h"
+
+DetailsDialog::DetailsDialog(QWidget *parent, const QString &path)
+        : QDialog(parent)
+{
+    ui.setupUi(this);
+    setAttribute(Qt::WA_DeleteOnClose);
+    m_path = path;
+    setWindowTitle (path.section('/',-1));
+    path.section('/',-1);
+    ui.pathLineEdit->setText(m_path);
+    loadVorbisInfo();
+    loadTag();
+
+}
+
+
+DetailsDialog::~DetailsDialog()
+{}
+
+void DetailsDialog::loadVorbisInfo()
+{
+    TagLib::Ogg::Vorbis::File f (m_path.toLocal8Bit());
+    //l.label
+    //ui. f.audioProperties()->level();
+    QString text;
+    text = QString("%1").arg(f.audioProperties()->length()/60);
+    text +=":"+QString("%1").arg(f.audioProperties()->length()%60,2,10,QChar('0'));
+    ui.lengthLabel->setText(text);
+    text = QString("%1").arg(f.audioProperties()->sampleRate());
+    ui.sampleRateLabel->setText(text+" "+tr("Hz"));
+    text = QString("%1").arg(f.audioProperties()->channels());
+    ui.channelsLabel->setText(text);
+    text = QString("%1").arg(f.audioProperties()->bitrateNominal());
+    ui.nominalLabel->setText(text+" "+tr("kbps"));
+    text = QString("%1").arg(f.audioProperties()->bitrateMaximum());
+    ui.maximumLabel->setText(text+" "+tr("kbps"));
+    text = QString("%1").arg(f.audioProperties()->bitrateMinimum());
+    ui.minimumLabel->setText(text+" "+tr("kbps"));
+    text = QString("%1 "+tr("KB")).arg(f.length()/1024);
+    ui.fileSizeLabel->setText(text);
+
+}
+
+void DetailsDialog::loadTag()
+{
+    TagLib::FileRef f (m_path.toLocal8Bit());
+
+    if (f.tag())
+    {   //TODO: load codec name from config
+
+        TagLib::String title = f.tag()->title();
+        TagLib::String artist = f.tag()->artist();
+        TagLib::String album = f.tag()->album();
+        TagLib::String comment = f.tag()->comment();
+        TagLib::String genre = f.tag()->genre();
+        QString string = QString::fromUtf8(title.toCString(TRUE)).trimmed();
+        ui.titleLineEdit->setText(string);
+        string = QString::fromUtf8(artist.toCString(TRUE)).trimmed();
+        ui.artistLineEdit->setText(string);
+        string = QString::fromUtf8(album.toCString(TRUE)).trimmed();
+        ui.albumLineEdit->setText(string);
+        string = QString::fromUtf8(comment.toCString(TRUE)).trimmed();
+        ui.commentLineEdit->setText(string);
+        string = QString("%1").arg(f.tag()->year());
+        ui.yearLineEdit->setText(string);
+        string = QString("%1").arg(f.tag()->track());
+        ui.trackLineEdit->setText(string);
+        string = QString::fromUtf8(genre.toCString(TRUE)).trimmed();
+        ui.genreLineEdit->setText(string);
+    }
+}
+
diff --git a/lib/qmmp/Input/vorbis/detailsdialog.h b/lib/qmmp/Input/vorbis/detailsdialog.h
new file mode 100644
index 000000000..60dda5e59
--- /dev/null
+++ b/lib/qmmp/Input/vorbis/detailsdialog.h
@@ -0,0 +1,46 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                       *
+ *   forkotov02@hotmail.ru                                                     *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef DETAILSDIALOG_H
+#define DETAILSDIALOG_H
+
+#include <QDialog>
+
+#include "ui_detailsdialog.h"
+
+/**
+	@author Ilya Kotov <forkotov02@hotmail.ru>
+*/
+class DetailsDialog : public QDialog
+{
+Q_OBJECT
+public:
+    DetailsDialog(QWidget *parent = 0, const QString &path = 0);
+
+    ~DetailsDialog();
+
+private:
+    void loadVorbisInfo();
+    void loadTag();  
+    Ui::DetailsDialog ui;
+    QString m_path;
+
+};
+
+#endif
diff --git a/lib/qmmp/Input/vorbis/detailsdialog.ui b/lib/qmmp/Input/vorbis/detailsdialog.ui
new file mode 100644
index 000000000..67bedbc4f
--- /dev/null
+++ b/lib/qmmp/Input/vorbis/detailsdialog.ui
@@ -0,0 +1,384 @@
+<ui version="4.0" >
+ <class>DetailsDialog</class>
+ <widget class="QDialog" name="DetailsDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>536</width>
+    <height>375</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Details</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>8</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item rowspan="2" row="1" column="0" colspan="2" >
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="minimumSize" >
+      <size>
+       <width>220</width>
+       <height>16</height>
+      </size>
+     </property>
+     <property name="title" >
+      <string>Ogg Vorbis Info</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>8</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="2" column="1" >
+       <widget class="QLabel" name="fileSizeLabel" >
+        <property name="text" >
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" >
+       <widget class="QLabel" name="channelsLabel" >
+        <property name="layoutDirection" >
+         <enum>Qt::LeftToRight</enum>
+        </property>
+        <property name="text" >
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label" >
+        <property name="text" >
+         <string>Length:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QLabel" name="lengthLabel" >
+        <property name="text" >
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="label_3" >
+        <property name="text" >
+         <string>Sample rate:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QLabel" name="sampleRateLabel" >
+        <property name="text" >
+         <string>-</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="label_10" >
+        <property name="layoutDirection" >
+         <enum>Qt::LeftToRight</enum>
+        </property>
+        <property name="text" >
+         <string>Channels:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="4" column="0" colspan="2" >
+       <widget class="QGroupBox" name="groupBox_3" >
+        <property name="title" >
+         <string>Bit Rate</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignHCenter</set>
+        </property>
+        <layout class="QGridLayout" >
+         <property name="margin" >
+          <number>8</number>
+         </property>
+         <property name="spacing" >
+          <number>6</number>
+         </property>
+         <item row="1" column="1" >
+          <widget class="QLabel" name="maximumLabel" >
+           <property name="text" >
+            <string>-</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="1" >
+          <widget class="QLabel" name="minimumLabel" >
+           <property name="text" >
+            <string>-</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="0" >
+          <widget class="QLabel" name="label_9" >
+           <property name="layoutDirection" >
+            <enum>Qt::LeftToRight</enum>
+           </property>
+           <property name="text" >
+            <string>Minimum:</string>
+           </property>
+           <property name="alignment" >
+            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1" >
+          <widget class="QLabel" name="nominalLabel" >
+           <property name="text" >
+            <string>-</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0" >
+          <widget class="QLabel" name="label_8" >
+           <property name="text" >
+            <string>Maximum:</string>
+           </property>
+           <property name="alignment" >
+            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="0" >
+          <widget class="QLabel" name="label_7" >
+           <property name="text" >
+            <string>Nominal:</string>
+           </property>
+           <property name="alignment" >
+            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="label_5" >
+        <property name="text" >
+         <string>File size:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="0" column="1" colspan="3" >
+    <widget class="QLineEdit" name="pathLineEdit" >
+     <property name="readOnly" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" >
+    <widget class="QLabel" name="label_28" >
+     <property name="text" >
+      <string>File path:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="3" >
+    <widget class="QPushButton" name="pushButton_3" >
+     <property name="text" >
+      <string>Close</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="2" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>111</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="2" colspan="2" >
+    <widget class="QGroupBox" name="groupBox_2" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>5</hsizetype>
+       <vsizetype>5</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title" >
+      <string>Ogg Vorbis Tag</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>8</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="6" column="1" colspan="2" >
+       <widget class="QPushButton" name="pushButton" >
+        <property name="enabled" >
+         <bool>false</bool>
+        </property>
+        <property name="text" >
+         <string>Save</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="3" >
+       <widget class="QLineEdit" name="trackLineEdit" />
+      </item>
+      <item row="4" column="2" >
+       <widget class="QLabel" name="label_26" >
+        <property name="text" >
+         <string>Track number:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1" >
+       <widget class="QLineEdit" name="yearLineEdit" />
+      </item>
+      <item row="4" column="0" >
+       <widget class="QLabel" name="label_25" >
+        <property name="text" >
+         <string>Year:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" >
+       <widget class="QLabel" name="label_27" >
+        <property name="text" >
+         <string>Genre:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="label_24" >
+        <property name="text" >
+         <string>Comment:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="label_23" >
+        <property name="text" >
+         <string>Album:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="label_22" >
+        <property name="text" >
+         <string>Artist:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label_21" >
+        <property name="text" >
+         <string>Title:</string>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" colspan="3" >
+       <widget class="QLineEdit" name="titleLineEdit" />
+      </item>
+      <item row="1" column="1" colspan="3" >
+       <widget class="QLineEdit" name="artistLineEdit" />
+      </item>
+      <item row="2" column="1" colspan="3" >
+       <widget class="QLineEdit" name="albumLineEdit" />
+      </item>
+      <item row="3" column="1" colspan="3" >
+       <widget class="QLineEdit" name="commentLineEdit" />
+      </item>
+      <item row="5" column="1" colspan="2" >
+       <widget class="QLineEdit" name="genreLineEdit" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>pushButton_3</sender>
+   <signal>clicked()</signal>
+   <receiver>DetailsDialog</receiver>
+   <slot>close()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>623</x>
+     <y>353</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>539</x>
+     <y>352</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/lib/qmmp/Input/vorbis/tag.cpp b/lib/qmmp/Input/vorbis/tag.cpp
new file mode 100644
index 000000000..15964e615
--- /dev/null
+++ b/lib/qmmp/Input/vorbis/tag.cpp
@@ -0,0 +1,97 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#include "tag.h"
+
+Tag::Tag(const QString &source)
+        : FileTag()
+{
+    m_length = 0;
+    m_year = 0;
+    m_track = 0;
+    m_empty = TRUE;
+    TagLib::FileRef fileRef(source.toLocal8Bit ());
+
+    m_tag = fileRef.tag();
+    if(m_tag && !m_tag->isEmpty())
+    {
+        m_album = QString::fromUtf8(m_tag->album().toCString(TRUE)).trimmed();
+        m_artist = QString::fromUtf8(m_tag->artist().toCString(TRUE)).trimmed();
+        m_comment = QString::fromUtf8(m_tag->comment().toCString(TRUE)).trimmed();
+        m_genre = QString::fromUtf8(m_tag->genre().toCString(TRUE)).trimmed();
+        m_title = QString::fromUtf8(m_tag->title().toCString(TRUE)).trimmed();
+        m_year = 0;
+        m_track = 0;
+        if(fileRef.audioProperties())
+            m_length = fileRef.audioProperties()->length();
+        m_empty = FALSE;
+    }
+    else
+        m_tag = 0;
+}
+
+
+Tag::~Tag()
+{}
+
+
+bool Tag::isEmpty()
+{
+    return m_empty;
+}
+
+QString Tag::album()
+{
+    return m_album;
+}
+
+QString Tag::artist()
+{
+    return m_artist;
+}
+
+QString Tag::comment()
+{
+    return m_comment;
+}
+
+QString Tag::genre()
+{
+    return m_genre;
+}
+
+QString Tag::title()
+{
+    return m_title;
+}
+
+uint Tag::length()
+{
+    return m_length;
+}
+
+uint Tag::track()
+{
+    return m_track;
+}
+
+uint Tag::year()
+{
+    return m_year;
+}
diff --git a/lib/qmmp/Input/vorbis/tag.h b/lib/qmmp/Input/vorbis/tag.h
new file mode 100644
index 000000000..ece3b7d2c
--- /dev/null
+++ b/lib/qmmp/Input/vorbis/tag.h
@@ -0,0 +1,61 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef XIPHCOMMENT_H
+#define XIPHCOMMENT_H
+
+#include <taglib/tag.h>
+#include <taglib/fileref.h>
+
+#include <filetag.h>
+
+/**
+	@author Ilya Kotov <forkotov02@hotmail.ru>
+*/
+class Tag : public FileTag
+{
+public:
+    Tag(const QString &source);
+
+    ~Tag();
+
+    virtual QString album();
+    virtual QString artist();
+    virtual QString comment();
+    virtual QString genre();
+    virtual QString title();
+    virtual uint length();
+    virtual uint track();
+    virtual uint year();
+    virtual bool isEmpty();
+
+private:
+    TagLib::Tag *m_tag;
+    QString m_album;
+    QString m_artist;
+    QString m_comment;
+    QString m_genre;
+    QString m_title;
+    uint m_length;
+    uint m_year;
+    uint m_track;
+    bool m_empty;
+};
+
+#endif
diff --git a/lib/qmmp/Input/vorbis/translations/translations.qrc b/lib/qmmp/Input/vorbis/translations/translations.qrc
new file mode 100644
index 000000000..c5cacdfb0
--- /dev/null
+++ b/lib/qmmp/Input/vorbis/translations/translations.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+  <qresource>
+    <file>vorbis_plugin_ru.qm</file>
+  </qresource>
+</RCC>
diff --git a/lib/qmmp/Input/vorbis/translations/vorbis_plugin_ru.qm b/lib/qmmp/Input/vorbis/translations/vorbis_plugin_ru.qm
new file mode 100644
index 000000000..a6a3a77b7
--- /dev/null
+++ b/lib/qmmp/Input/vorbis/translations/vorbis_plugin_ru.qm
diff --git a/lib/qmmp/Input/vorbis/translations/vorbis_plugin_ru.ts b/lib/qmmp/Input/vorbis/translations/vorbis_plugin_ru.ts
new file mode 100644
index 000000000..7824256ea
--- /dev/null
+++ b/lib/qmmp/Input/vorbis/translations/vorbis_plugin_ru.ts
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS><TS version="1.1" language="pl">
+<context>
+    <name>DecoderVorbisFactory</name>
+    <message>
+        <location filename="../decodervorbisfactory.cpp" line="21"/>
+        <source>Ogg Vorbis Plugin</source>
+        <translation>Модуль Ogg Vorbis</translation>
+    </message>
+    <message>
+        <location filename="../decodervorbisfactory.cpp" line="34"/>
+        <source>Ogg Vorbis Files</source>
+        <translation>Файлы Ogg Vorbis</translation>
+    </message>
+    <message>
+        <location filename="../decodervorbisfactory.cpp" line="64"/>
+        <source>About Ogg Vorbis Audio Plugin</source>
+        <translation>Об аудио-модуле Ogg Vorbis</translation>
+    </message>
+    <message>
+        <location filename="../decodervorbisfactory.cpp" line="65"/>
+        <source>Qmmp Ogg Vorbis Audio Plugin</source>
+        <translation>Аудио-модуль Ogg Vorbis для Qmmp</translation>
+    </message>
+    <message>
+        <location filename="../decodervorbisfactory.cpp" line="66"/>
+        <source>Writen by: Ilya Kotov &lt;forkotov02@hotmail.ru&gt;</source>
+        <translation>Разработчик: Илья Котов &lt;forkotov02@hotmail.ru&gt;</translation>
+    </message>
+    <message>
+        <location filename="../decodervorbisfactory.cpp" line="68"/>
+        <source>Source code based on mq3 progect</source>
+        <translation>Исходный код основан на проекте mq3</translation>
+    </message>
+</context>
+<context>
+    <name>DetailsDialog</name>
+    <message>
+        <location filename="../detailsdialog.cpp" line="54"/>
+        <source>Hz</source>
+        <translation>Гц</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="265"/>
+        <source>Save</source>
+        <translation>Сохранить</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="275"/>
+        <source>Track number:</source>
+        <translation>Номер трека:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="288"/>
+        <source>Year:</source>
+        <translation>Год:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="298"/>
+        <source>Genre:</source>
+        <translation>Жанр:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="308"/>
+        <source>Comment:</source>
+        <translation>Комментарий:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="318"/>
+        <source>Album:</source>
+        <translation>Альбом:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="328"/>
+        <source>Artist:</source>
+        <translation>Исполнитель:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="338"/>
+        <source>Title:</source>
+        <translation>Название:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="222"/>
+        <source>Close</source>
+        <translation>Закрыть</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="162"/>
+        <source>-</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="192"/>
+        <source>File size:</source>
+        <translation>Размер файла:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="77"/>
+        <source>Sample rate:</source>
+        <translation>Дискретизация:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="212"/>
+        <source>File path:</source>
+        <translation>Путь к файлу:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="31"/>
+        <source>Ogg Vorbis Info</source>
+        <translation>Информация Ogg Vorbis</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="60"/>
+        <source>Length:</source>
+        <translation>Длительность:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="97"/>
+        <source>Channels:</source>
+        <translation>Каналов:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="120"/>
+        <source>Bit Rate</source>
+        <translation>Битовая частота</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="152"/>
+        <source>Minimum:</source>
+        <translation>Минимальная:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="169"/>
+        <source>Maximum:</source>
+        <translation>Максимальная:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="179"/>
+        <source>Nominal:</source>
+        <translation>Номинальная:</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="250"/>
+        <source>Ogg Vorbis Tag</source>
+        <translation>Оgg Vorbis-тег</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.cpp" line="62"/>
+        <source>kbps</source>
+        <translation>Кб/с</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.cpp" line="63"/>
+        <source>KB</source>
+        <translation>Кб</translation>
+    </message>
+    <message>
+        <location filename="../detailsdialog.ui" line="13"/>
+        <source>Details</source>
+        <translation>Информация</translation>
+    </message>
+</context>
+</TS>
diff --git a/lib/qmmp/Input/vorbis/vorbis.pro b/lib/qmmp/Input/vorbis/vorbis.pro
new file mode 100644
index 000000000..ce3ee72a6
--- /dev/null
+++ b/lib/qmmp/Input/vorbis/vorbis.pro
@@ -0,0 +1,29 @@
+# ???? ?????? ? KDevelop ?????????? qmake.
+# ------------------------------------------- 
+# ?????????? ???????????? ???????? ???????? ???????: ./Plugins/Input/ogg
+# ???? - ??????????:  
+
+FORMS += detailsdialog.ui 
+HEADERS += decodervorbisfactory.h \
+           decoder_vorbis.h \
+           detailsdialog.h \
+           tag.h 
+SOURCES += decoder_vorbis.cpp \
+           decodervorbisfactory.cpp \
+           detailsdialog.cpp \
+           tag.cpp 
+DESTDIR = ../
+QMAKE_CLEAN += ../libvorbis.so
+INCLUDEPATH += ../../../
+CONFIG += release \
+warn_on \
+plugin \
+link_pkgconfig
+TEMPLATE = lib
+QMAKE_LIBDIR += ../../../
+LIBS += -lqmmp -L/usr/lib
+PKGCONFIG += taglib ogg vorbisfile vorbis
+#TRANSLATIONS = translations/vorbis_plugin_ru.ts
+#RESOURCES = translations/translations.qrc
+target.path = /lib/qmmp/Input
+INSTALLS += target
diff --git a/lib/qmmp/Output/CMakeLists.txt b/lib/qmmp/Output/CMakeLists.txt
new file mode 100644
index 000000000..85d236d39
--- /dev/null
+++ b/lib/qmmp/Output/CMakeLists.txt
@@ -0,0 +1,16 @@
+SET(USE_ALSA TRUE CACHE BOOL "enable/disable alsa plugin")
+SET(USE_JACK TRUE CACHE BOOL "enable/disable jack plugin")
+
+IF(USE_ALSA)
+MESSAGE( STATUS "ALSA ON")
+add_subdirectory(alsa)
+ELSE(USE_MAD)
+MESSAGE( STATUS "ALSA OFF")
+ENDIF(USE_ALSA)
+
+IF(USE_JACK)
+MESSAGE( STATUS "JACK ON")
+add_subdirectory(jack)
+ELSE(USE_FLAC)
+MESSAGE( STATUS "JACK OFF")
+ENDIF(USE_JACK)
diff --git a/lib/qmmp/Output/Output.pro b/lib/qmmp/Output/Output.pro
new file mode 100644
index 000000000..727d3ac20
--- /dev/null
+++ b/lib/qmmp/Output/Output.pro
@@ -0,0 +1,18 @@
+# ???? ?????? ? KDevelop ?????????? qmake.
+# ------------------------------------------- 
+# ?????????? ???????????? ???????? ???????? ???????: ./Plugins/Output
+# ???? - ?????? ? ????????????? 
+
+include(../../../qmmp.pri)
+
+CONFIG += release warn_on 
+TEMPLATE = subdirs
+
+SUBDIRS += alsa
+
+contains(CONFIG, JACK_PLUGIN){
+    SUBDIRS += jack
+    message(***********************)
+    message(* JACK plugin enabled *)
+    message(***********************)
+}
diff --git a/lib/qmmp/Output/alsa/CMakeLists.txt b/lib/qmmp/Output/alsa/CMakeLists.txt
new file mode 100644
index 000000000..987c6b5d3
--- /dev/null
+++ b/lib/qmmp/Output/alsa/CMakeLists.txt
@@ -0,0 +1,65 @@
+project(libalsa)
+
+cmake_minimum_required(VERSION 2.4.0)
+
+
+INCLUDE(UsePkgConfig)
+INCLUDE(FindQt4)
+
+find_package(Qt4 REQUIRED) # find and setup Qt4 for this project
+include(${QT_USE_FILE})
+
+# qt plugin
+ADD_DEFINITIONS( -Wall )
+ADD_DEFINITIONS(${QT_DEFINITIONS})
+ADD_DEFINITIONS(-DQT_PLUGIN)
+ADD_DEFINITIONS(-DQT_NO_DEBUG)
+ADD_DEFINITIONS(-DQT_SHARED)
+ADD_DEFINITIONS(-DQT_THREAD)
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+SET(QT_INCLUDES
+  ${QT_INCLUDES}
+  ${CMAKE_CURRENT_BINARY_DIR}/../../../
+)
+
+# libqmmp
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
+
+SET(libalsa_SRCS
+  outputalsa.cpp
+  outputalsafactory.cpp
+  settingsdialog.cpp
+)
+
+SET(libalsa_MOC_HDRS
+  outputalsa.h
+  outputalsafactory.h
+  settingsdialog.h
+)
+
+SET(libalsa_RCCS translations/translations.qrc)
+
+QT4_ADD_RESOURCES(libalsa_RCC_SRCS ${libalsa_RCCS})
+
+QT4_WRAP_CPP(libalsa_MOC_SRCS ${libalsa_MOC_HDRS})
+
+# user interface
+
+
+SET(libalsa_UIS
+    settingsdialog.ui
+)
+
+QT4_WRAP_UI(libalsa_UIS_H ${libalsa_UIS})
+# Don't forget to include output directory, otherwise
+# the UI file won't be wrapped!
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+ADD_LIBRARY(alsa SHARED ${libalsa_SRCS} ${libalsa_MOC_SRCS} ${libalsa_UIS_H}
+  ${libalsa_RCC_SRCS})
+target_link_libraries(alsa ${QT_LIBRARIES} -lqmmp -lasound)
+install(TARGETS alsa DESTINATION lib/qmmp/Output)
+
diff --git a/lib/qmmp/Output/alsa/alsa.pro b/lib/qmmp/Output/alsa/alsa.pro
new file mode 100644
index 000000000..06ef0b6ce
--- /dev/null
+++ b/lib/qmmp/Output/alsa/alsa.pro
@@ -0,0 +1,26 @@
+# ???? ?????? ? KDevelop ?????????? qmake.
+# ------------------------------------------- 
+# ?????????? ???????????? ???????? ???????? ???????: ./Plugins/Output/alsa
+# ???? - ??????????:  
+
+HEADERS += outputalsa.h \
+           outputalsafactory.h  \
+           settingsdialog.h
+SOURCES += outputalsa.cpp \
+           outputalsafactory.cpp  \
+           settingsdialog.cpp
+INCLUDEPATH += ../../../
+QMAKE_LIBDIR += ../../../
+QMAKE_CLEAN = ../libalsa.so
+CONFIG += release \
+warn_on \
+thread \
+plugin 
+DESTDIR = ../
+TEMPLATE = lib
+LIBS += -lqmmp -lasound
+FORMS += settingsdialog.ui
+#TRANSLATIONS = translations/alsa_plugin_ru.ts
+#RESOURCES = translations/translations.qrc
+target.path = /lib/qmmp/Output
+INSTALLS += target
diff --git a/lib/qmmp/Output/alsa/outputalsa.cpp b/lib/qmmp/Output/alsa/outputalsa.cpp
new file mode 100644
index 000000000..4faa53a47
--- /dev/null
+++ b/lib/qmmp/Output/alsa/outputalsa.cpp
@@ -0,0 +1,559 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#include <QObject>
+#include <QApplication>
+#include <QtGlobal>
+#include <QDir>
+#include <QSettings>
+#include <QTimer>
+
+#include <stdio.h>
+#include <string.h>
+#include <iostream>
+
+#include "outputalsa.h"
+#include "constants.h"
+#include "buffer.h"
+#include "visualization.h"
+
+OutputALSA::OutputALSA(QObject * parent)
+        : Output(parent, Output::Custom), m_inited(FALSE), m_pause(FALSE), m_play(FALSE),
+        m_userStop(FALSE), m_totalWritten(0), m_currentSeconds(-1),
+        m_bps(-1), m_frequency(-1), m_channels(-1), m_precision(-1)
+{
+    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    QString dev_name = settings.value("ALSA/device","default").toString();
+    pcm_name = strdup(dev_name.toAscii().data());
+    stream = SND_PCM_STREAM_PLAYBACK;
+    snd_pcm_hw_params_alloca(&hwparams);
+    pcm_handle = 0;
+    //alsa mixer
+    mixer = 0;
+    QString card = settings.value("ALSA/mixer_card","hw:0").toString();
+    QString dev = settings.value("ALSA/mixer_device", "PCM").toString();
+    setupMixer(card, dev);
+}
+
+OutputALSA::~OutputALSA()
+{
+    uninitialize();
+    free (pcm_name);
+    if(mixer)
+        snd_mixer_close(mixer);
+}
+
+void OutputALSA::stop()
+{
+    m_userStop = TRUE;
+}
+
+void OutputALSA::status()
+{
+    long ct = (m_totalWritten - latency()) / m_bps;
+
+    if (ct < 0)
+        ct = 0;
+
+    if (ct > m_currentSeconds)
+    {
+        m_currentSeconds = ct;
+        dispatch(m_currentSeconds, m_totalWritten, m_rate,
+                 m_frequency, m_precision, m_channels);
+    }
+}
+
+long OutputALSA::written()
+{
+    return m_totalWritten;
+}
+
+void OutputALSA::seek(long pos)
+{
+    recycler()->mutex()->lock ();
+    recycler()->clear();
+    recycler()->mutex()->unlock();
+
+    m_totalWritten = (pos * m_bps);
+    m_currentSeconds = -1;
+}
+
+void OutputALSA::configure(long freq, int chan, int prec, int brate)
+{
+    // we need to configure
+    if (freq != m_frequency || chan != m_channels || prec != m_precision)
+    {
+        m_frequency = freq;
+        m_channels = chan;
+        m_precision = prec;
+        m_bps = freq * chan * (prec / 8);
+        snd_pcm_hw_params_alloca(&hwparams);
+        if (snd_pcm_hw_params_any(pcm_handle, hwparams) < 0)
+        {
+            qWarning("OutputALSA: Can not configure this PCM device.");
+            return;
+        }
+
+        uint rate = m_frequency; /* Sample rate */
+        uint exact_rate = m_frequency;   /* Sample rate returned by */
+
+        /* load settings from config */
+        QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+        settings.beginGroup("ALSA");
+        uint buffer_time = settings.value("buffer_time",500).toUInt()*1000;
+        uint period_time = settings.value("period_time",100).toUInt()*1000;
+        settings.endGroup();
+
+        if (snd_pcm_hw_params_set_access(pcm_handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED) < 0)
+        {
+            qWarning("OutputALSA: Error setting access.");
+            return;
+        }
+
+
+        if (snd_pcm_hw_params_set_format(pcm_handle, hwparams, SND_PCM_FORMAT_S16_LE) < 0)
+        {
+            qDebug("OutputALSA: Error setting format.");
+            return;
+        }
+
+
+        exact_rate = rate;// = 11000;
+        qDebug("OutputALSA: frequency=%d, channels=%d, bitrate=%d",
+               rate, chan, brate);
+        if (snd_pcm_hw_params_set_rate_near(pcm_handle, hwparams, &exact_rate, 0) < 0)
+        {
+            qWarning("OutputALSA: Error setting rate.\n");
+            return;
+        }
+        if (rate != exact_rate)
+        {
+            qWarning("OutputALSA: The rate %d Hz is not supported by your hardware.\n==> Using %d Hz instead.", rate, exact_rate);
+        }
+
+        uint c = m_channels;
+        if (snd_pcm_hw_params_set_channels_near(pcm_handle, hwparams, &c) < 0)
+        {
+            qWarning("OutputALSA: Error setting channels.");
+            return;
+        }
+
+        if (snd_pcm_hw_params_set_period_time_near(pcm_handle, hwparams,
+                &period_time ,0) < 0 )
+        {
+            qWarning("OutputALSA: Error setting HW buffer.");
+            return;
+        }
+        if (snd_pcm_hw_params_set_buffer_time_near(pcm_handle, hwparams,
+                &buffer_time ,0) < 0 )
+        {
+            qWarning("Error setting HW buffer.\n");
+            return;
+        }
+        if (snd_pcm_hw_params(pcm_handle, hwparams) < 0)
+        {
+            qWarning("OutputALSA: Error setting HW params.");
+            return;
+        }
+        prepareVisuals();
+    }
+}
+
+void OutputALSA::reset()
+{
+    if (pcm_handle)
+    {
+        snd_pcm_close(pcm_handle);
+        pcm_handle = 0;
+    }
+    if (snd_pcm_open(&pcm_handle, pcm_name, stream, SND_PCM_NONBLOCK) < 0)
+    {
+        qWarning ("OutputALSA: Error opening PCM device %s", pcm_name);
+        return;
+    }
+}
+
+
+void OutputALSA::pause()
+{
+    if (!m_play)
+        return;
+    m_pause = (m_pause) ? FALSE : TRUE;
+    OutputState::Type state = m_pause ? OutputState::Paused: OutputState::Playing;
+    dispatch(state);
+}
+
+bool OutputALSA::initialize()
+{
+    m_inited = m_pause = m_play = m_userStop = FALSE;
+
+    if (!pcm_handle < 0)
+        return FALSE;
+
+    m_currentSeconds = -1;
+    m_totalWritten = 0;
+    if (snd_pcm_open(&pcm_handle, pcm_name, stream, SND_PCM_NONBLOCK) < 0)
+    {
+        qWarning ("OutputALSA: Error opening PCM device %s", pcm_name);
+        return FALSE;
+    }
+
+    m_inited = TRUE;
+    return TRUE;
+}
+
+
+long OutputALSA::latency()
+{
+    long used = 0;
+
+    /*if (! m_pause)
+    {
+        if (ioctl(audio_fd, SNDCTL_DSP_GETODELAY, &used) == -1)
+            used = 0;
+    }*/
+
+    return used;
+}
+
+void OutputALSA::run()
+{
+
+    mutex()->lock ();
+    if (! m_inited)
+    {
+        mutex()->unlock();
+        return;
+    }
+
+    m_play = TRUE;
+
+    mutex()->unlock();
+
+    Buffer *b = 0;
+    bool done = FALSE;
+    unsigned long n = 0;
+    long m = 0;
+    snd_pcm_uframes_t l;
+
+    dispatch(OutputState::Playing);
+
+    while (! done)
+    {
+        mutex()->lock ();
+        recycler()->mutex()->lock ();
+
+        done = m_userStop;
+
+        while (! done && (recycler()->empty() || m_pause))
+        {
+            mutex()->unlock();
+            recycler()->cond()->wakeOne();
+            recycler()->cond()->wait(recycler()->mutex());
+            mutex()->lock ();
+            done = m_userStop;
+            status();
+
+        }
+
+        if (! b)
+        {
+            b = recycler()->next();
+            if (b->rate)
+                m_rate = b->rate;
+        }
+
+        recycler()->cond()->wakeOne();
+        recycler()->mutex()->unlock();
+
+        if (b)
+        {
+
+            l = qMin(int(globalBlockSize*2), int(b->nbytes - n));
+            l = snd_pcm_bytes_to_frames(pcm_handle, l);
+            //l = qMin(aval, int(l));
+            while (l>0)
+            {
+                m = snd_pcm_writei (pcm_handle, b->data+n, l);
+
+                if (m > 0)
+                {
+                    n += snd_pcm_frames_to_bytes(pcm_handle, m);
+                    l -= m;
+                    status();
+                    dispatchVisual(b, m_totalWritten, m_channels, m_precision);
+                }
+                else if (m == -EAGAIN)
+                {
+                    usleep(500);
+                }
+                else if (m == -EPIPE)
+                {
+                    qDebug ("OutputALSA: underrun!");
+                    if ((m = snd_pcm_prepare(pcm_handle)) < 0)
+                    {
+                        qDebug ("OutputALSA: Can't recover after underrun: %s",
+                                snd_strerror(m));
+                        /* TODO: reopen the device */
+                        break;
+                    }
+                }
+                else if (m == -ESTRPIPE)
+                {
+                    qDebug ("OutputALSA: Suspend, trying to resume");
+                    while ((m = snd_pcm_resume(pcm_handle))
+                            == -EAGAIN)
+                        sleep (1);
+                    if (m < 0)
+                    {
+                        qDebug ("OutputALSA: Failed, restarting");
+                        if ((m = snd_pcm_prepare(pcm_handle))
+                                < 0)
+                        {
+                            qDebug ("OutputALSA: Failed to restart device: %s.",
+                                    snd_strerror(m));
+                            break;
+                        }
+                    }
+                }
+                else if (m < 0)
+                {
+                    qDebug ("OutputALSA: Can't play: %s", snd_strerror(m));
+                    break;
+                }
+            }
+            status();
+            // force buffer change
+            m_totalWritten += n;
+            n = b->nbytes;
+            m = 0;
+        }
+        if (n == b->nbytes)
+        {
+            recycler()->mutex()->lock ();
+            recycler()->done();
+            recycler()->mutex()->unlock();
+            b = 0;
+            n = 0;
+        }
+        mutex()->unlock();
+    }
+
+    mutex()->lock ();
+
+    m_play = FALSE;
+
+    dispatch(OutputState::Stopped);
+
+    mutex()->unlock();
+
+}
+
+void OutputALSA::uninitialize()
+{
+    if (!m_inited)
+        return;
+    m_inited = FALSE;
+    m_pause = FALSE;
+    m_play = FALSE;
+    m_userStop  = FALSE;
+    m_totalWritten = 0;
+    m_currentSeconds = -1;
+    m_bps = -1;
+    m_frequency = -1;
+    m_channels = -1;
+    m_precision = -1;
+    if (pcm_handle)
+    {
+        qDebug("OutputALSA: closing pcm_handle");
+        snd_pcm_close(pcm_handle);
+        pcm_handle = 0;
+    }
+    dispatch(OutputState::Stopped);
+}
+/* ****** MIXER ******* */
+
+int OutputALSA::setupMixer(QString card, QString device)
+{
+    char *name;
+    long int a, b;
+    long alsa_min_vol = 0, alsa_max_vol = 100;
+    int err, index;
+
+    qDebug("OutputALSA: setupMixer()");
+
+    if ((err = getMixer(&mixer, card)) < 0)
+        return err;
+
+    parseMixerName(device.toAscii().data(), &name, &index);
+
+    pcm_element = getMixerElem(mixer, name, index);
+
+    free(name);
+
+    if (!pcm_element)
+    {
+        qWarning("OutputALSA: Failed to find mixer element");
+        return -1;
+    }
+
+    /* This hack was copied from xmms.
+     * Work around a bug in alsa-lib up to 1.0.0rc2 where the
+     * new range don't take effect until the volume is changed.
+     * This hack should be removed once we depend on Alsa 1.0.0.
+     */
+    snd_mixer_selem_get_playback_volume(pcm_element,
+                                        SND_MIXER_SCHN_FRONT_LEFT, &a);
+    snd_mixer_selem_get_playback_volume(pcm_element,
+                                        SND_MIXER_SCHN_FRONT_RIGHT, &b);
+
+    snd_mixer_selem_get_playback_volume_range(pcm_element,
+            &alsa_min_vol, &alsa_max_vol);
+    snd_mixer_selem_set_playback_volume_range(pcm_element, 0, 100);
+
+    if (alsa_max_vol == 0)
+    {
+        pcm_element = NULL;
+        return -1;
+    }
+
+    setVolume(a * 100 / alsa_max_vol, b * 100 / alsa_max_vol);
+
+    qDebug("OutputALSA: setupMixer() succes");
+
+    return 0;
+}
+
+void OutputALSA::parseMixerName(char *str, char **name, int *index)
+{
+    char *end;
+
+    while (isspace(*str))
+        str++;
+
+    if ((end = strchr(str, ',')) != NULL)
+    {
+        *name = strndup(str, end - str);
+        end++;
+        *index = atoi(end);
+    }
+    else
+    {
+        *name = strdup(str);
+        *index = 0;
+    }
+}
+
+snd_mixer_elem_t* OutputALSA::getMixerElem(snd_mixer_t *mixer, char *name, int index)
+{
+    snd_mixer_selem_id_t *selem_id;
+    snd_mixer_elem_t* elem;
+    snd_mixer_selem_id_alloca(&selem_id);
+
+    if (index != -1)
+        snd_mixer_selem_id_set_index(selem_id, index);
+    if (name != NULL)
+        snd_mixer_selem_id_set_name(selem_id, name);
+
+    elem = snd_mixer_find_selem(mixer, selem_id);
+
+    return elem;
+}
+
+void OutputALSA::setVolume(int l, int r)
+{
+
+    if (!pcm_element)
+        return;
+
+    snd_mixer_selem_set_playback_volume(pcm_element,
+                                        SND_MIXER_SCHN_FRONT_LEFT, l);
+    snd_mixer_selem_set_playback_volume(pcm_element,
+                                        SND_MIXER_SCHN_FRONT_RIGHT, r);
+}
+
+int OutputALSA::getMixer(snd_mixer_t **mixer, QString card)
+{
+    char *dev;
+    int err;
+
+
+    dev = strdup(card.toAscii().data());
+
+    if ((err = snd_mixer_open(mixer, 0)) < 0)
+    {
+        qWarning("OutputALSA: Failed to open empty mixer: %s",
+                 snd_strerror(-err));
+        mixer = NULL;
+        return -1;
+    }
+    if ((err = snd_mixer_attach(*mixer, dev)) < 0)
+    {
+        qWarning("OutputALSA: Attaching to mixer %s failed: %s",
+                 dev, snd_strerror(-err));
+        return -1;
+    }
+    if ((err = snd_mixer_selem_register(*mixer, NULL, NULL)) < 0)
+    {
+        qWarning("OutputALSA: Failed to register mixer: %s",
+                 snd_strerror(-err));
+        return -1;
+    }
+    if ((err = snd_mixer_load(*mixer)) < 0)
+    {
+        qWarning("OutputALSA: Failed to load mixer: %s",
+                 snd_strerror(-err));
+        return -1;
+    }
+
+    free(dev);
+
+    return (*mixer != NULL);
+}
+
+void OutputALSA::checkVolume()
+{
+    long ll = 0, lr = 0;
+
+    if (!pcm_element)
+        return;
+
+    snd_mixer_handle_events(mixer);
+
+    snd_mixer_selem_get_playback_volume(pcm_element,
+                                        SND_MIXER_SCHN_FRONT_LEFT,
+                                        &ll);
+    snd_mixer_selem_get_playback_volume(pcm_element,
+                                        SND_MIXER_SCHN_FRONT_RIGHT,
+                                        &lr);
+    //qDebug("%d, %d",ll, lr);
+
+    ll = (ll > 100) ? 100 : ll;
+    lr = (lr > 100) ? 100 : lr;
+    ll = (ll < 0) ? 0 : ll;
+    lr = (lr < 0) ? 0 : lr;
+    if (bl!=ll || br!=lr)
+    {
+        bl = ll;
+        br = lr;
+        dispatchVolume(ll,lr);
+    }
+}
+
diff --git a/lib/qmmp/Output/alsa/outputalsa.h b/lib/qmmp/Output/alsa/outputalsa.h
new file mode 100644
index 000000000..5c872bec9
--- /dev/null
+++ b/lib/qmmp/Output/alsa/outputalsa.h
@@ -0,0 +1,85 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#ifndef   OUTPUTALSA_H
+#define   OUTPUTALSA_H
+
+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
+
+
+class OutputALSA : public Output
+{
+Q_OBJECT
+public:
+    OutputALSA(QObject * parent = 0);
+    ~OutputALSA();
+
+    bool initialize();
+    bool isInitialized() const { return m_inited; }
+    void uninitialize();
+    void configure(long, int, int, int);
+    void stop();
+    void pause();
+    long written();
+    long latency();
+    void seek(long);
+    void setVolume(int l, int r);
+    void checkVolume();
+
+private:
+    // thread run function
+    void run();
+
+    // helper functions
+    void reset();
+    void status();
+
+    bool m_inited, m_pause, m_play, m_userStop;
+    long m_totalWritten, m_currentSeconds, m_bps;
+    int m_rate, m_frequency, m_channels, m_precision;
+    //alsa
+    snd_pcm_t *pcm_handle;
+    snd_pcm_stream_t stream;
+    snd_pcm_hw_params_t *hwparams;
+    char *pcm_name;
+    //alsa
+
+    //alsa mixer
+    int setupMixer(QString card, QString device);
+    void parseMixerName(char *str, char **name, int *index);
+    int getMixer(snd_mixer_t **mixer, QString card);
+    snd_mixer_elem_t* getMixerElem(snd_mixer_t *mixer, char *name, int index);
+    snd_mixer_t *mixer;
+    snd_mixer_elem_t *pcm_element;
+    long bl, br;
+};
+
+
+#endif // OUTPUTALSA_H
diff --git a/lib/qmmp/Output/alsa/outputalsafactory.cpp b/lib/qmmp/Output/alsa/outputalsafactory.cpp
new file mode 100644
index 000000000..25d8c337c
--- /dev/null
+++ b/lib/qmmp/Output/alsa/outputalsafactory.cpp
@@ -0,0 +1,60 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#include <QtGui>
+
+#include "settingsdialog.h"
+#include "outputalsa.h"
+#include "outputalsafactory.h"
+
+
+const QString& OutputALSAFactory::name() const
+{
+   static QString name(tr("ALSA Plugin"));
+   return name;
+}
+
+Output* OutputALSAFactory::create(QObject* parent)
+{
+    return new OutputALSA(parent);
+}
+
+void OutputALSAFactory::showSettings(QWidget* parent)
+{
+   SettingsDialog *s = new SettingsDialog(parent);
+   s -> show();
+}
+
+void OutputALSAFactory::showAbout(QWidget *parent)
+{
+   QMessageBox::about (parent, tr("About ALSA Output Plugin"),
+                        tr("Qmmp ALSA Output Plugin")+"\n"+
+                        tr("Writen by: Ilya Kotov <forkotov02@hotmail.ru>"));
+}
+
+QTranslator *OutputALSAFactory::createTranslator(QObject *parent)
+{
+    QTranslator *translator = new QTranslator(parent);
+    QString locale = QLocale::system().name();
+    translator->load(QString(":/alsa_plugin_") + locale);
+    return translator;
+}
+
+Q_EXPORT_PLUGIN(OutputALSAFactory)
diff --git a/lib/qmmp/Output/alsa/outputalsafactory.h b/lib/qmmp/Output/alsa/outputalsafactory.h
new file mode 100644
index 000000000..24129e2d5
--- /dev/null
+++ b/lib/qmmp/Output/alsa/outputalsafactory.h
@@ -0,0 +1,48 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef OUTPUTALSAFACTORY_H
+#define OUTPUTALSAFACTORY_H
+
+
+#include <QObject>
+#include <QString>
+#include <QIODevice>
+#include <QWidget>
+
+#include <output.h>
+#include <outputfactory.h>
+
+
+class OutputALSAFactory : public QObject,
+                          OutputFactory
+{
+Q_OBJECT
+Q_INTERFACES(OutputFactory);
+
+public:
+    const QString& name() const;
+    Output* create(QObject* parent);
+    void showSettings(QWidget* parent);
+    void showAbout(QWidget *parent);
+    QTranslator *createTranslator(QObject *parent);
+
+};
+
+#endif
diff --git a/lib/qmmp/Output/alsa/settingsdialog.cpp b/lib/qmmp/Output/alsa/settingsdialog.cpp
new file mode 100644
index 000000000..89c6cae84
--- /dev/null
+++ b/lib/qmmp/Output/alsa/settingsdialog.cpp
@@ -0,0 +1,237 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#include <QSettings>
+#include <QDir>
+
+extern "C"
+{
+#include <alsa/asoundlib.h>
+}
+
+#include "settingsdialog.h"
+
+SettingsDialog::SettingsDialog ( QWidget *parent )
+        : QDialog ( parent )
+{
+    ui.setupUi ( this );
+    setAttribute ( Qt::WA_DeleteOnClose );
+    ui.deviceComboBox->setEditable ( TRUE );
+    getCards();
+    connect (ui.deviceComboBox, SIGNAL(activated(int)),SLOT(setText(int)));
+    connect(ui.okButton, SIGNAL(clicked()), SLOT(writeSettings()));
+    connect(ui.mixerCardComboBox, SIGNAL(activated(int)), SLOT(showMixerDevices(int)));
+    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    settings.beginGroup("ALSA");
+    ui.deviceComboBox->setEditText(settings.value("device","default").toString());
+    ui.bufferSpinBox->setValue(settings.value("buffer_time",500).toInt());
+    ui.periodSpinBox->setValue(settings.value("period_time",100).toInt());
+
+    int d = m_cards.indexOf(settings.value("mixer_card","hw:0").toString());
+    if (d >= 0)
+        ui.mixerCardComboBox->setCurrentIndex(d);
+
+    showMixerDevices(ui.mixerCardComboBox->currentIndex ());
+    d = ui.mixerDeviceComboBox->findText(settings.value("mixer_device",
+                                         "PCM").toString());
+
+    if (d >= 0)
+        ui.mixerDeviceComboBox->setCurrentIndex(d);
+
+    settings.endGroup();
+}
+
+
+SettingsDialog::~SettingsDialog()
+{}
+
+void SettingsDialog::getCards()
+{
+    int card = -1, err;
+
+    m_devices.clear();
+    m_devices << "default";
+    ui.deviceComboBox->addItem("Default PCM device (default)");
+
+    if ((err = snd_card_next(&card)) !=0)
+        qWarning("SettingsDialog (ALSA): snd_next_card() failed: %s",
+                 snd_strerror(-err));
+
+    while (card > -1)
+    {
+        getCardDevices(card);
+        m_cards << QString("hw:%1").arg(card);
+        if ((err = snd_card_next(&card)) !=0)
+        {
+            qWarning("SettingsDialog (ALSA): snd_next_card() failed: %s",
+                     snd_strerror(-err));
+            break;
+        }
+    }
+}
+
+void SettingsDialog::getCardDevices(int card)
+{
+    int pcm_device = -1, err;
+    snd_pcm_info_t *pcm_info;
+    snd_ctl_t *ctl;
+    char dev[64], *card_name;
+
+    sprintf(dev, "hw:%i", card);
+
+    if ((err = snd_ctl_open(&ctl, dev, 0)) < 0)
+    {
+        qWarning("SettingsDialog (ALSA): snd_ctl_open() failed: %s",
+                 snd_strerror(-err));
+        return;
+    }
+
+    if ((err = snd_card_get_name(card, &card_name)) != 0)
+    {
+        qWarning("SettingsDialog (ALSA): snd_card_get_name() failed: %s",
+                 snd_strerror(-err));
+        card_name = "Unknown soundcard";
+    }
+    ui.mixerCardComboBox->addItem(QString(card_name));
+
+    snd_pcm_info_alloca(&pcm_info);
+
+    qDebug("SettingsDialog (ALSA): detected sound cards:");
+
+    for (;;)
+    {
+        QString device;
+        if ((err = snd_ctl_pcm_next_device(ctl, &pcm_device)) < 0)
+        {
+            qWarning("SettingsDialog (ALSA): snd_ctl_pcm_next_device() failed: %s",
+                     snd_strerror(-err));
+            pcm_device = -1;
+        }
+        if (pcm_device < 0)
+            break;
+
+        snd_pcm_info_set_device(pcm_info, pcm_device);
+        snd_pcm_info_set_subdevice(pcm_info, 0);
+        snd_pcm_info_set_stream(pcm_info, SND_PCM_STREAM_PLAYBACK);
+
+        if ((err = snd_ctl_pcm_info(ctl, pcm_info)) < 0)
+        {
+            if (err != -ENOENT)
+                qWarning("SettingsDialog (ALSA): get_devices_for_card(): "
+                         "snd_ctl_pcm_info() "
+                         "failed (%d:%d): %s.", card,
+                         pcm_device, snd_strerror(-err));
+        }
+        device = QString("hw:%1,%2").arg(card).arg(pcm_device);
+        m_devices << device;
+        QString str;
+        str =  QString(card_name) + ": "+
+               snd_pcm_info_get_name(pcm_info)+" ("+device+")";
+        qDebug(str.toAscii());
+        ui.deviceComboBox->addItem(str);
+    }
+
+    snd_ctl_close(ctl);
+}
+
+void SettingsDialog::getMixerDevices(QString card)
+{
+    ui.mixerDeviceComboBox->clear();
+    int err;
+    snd_mixer_t *mixer;
+    snd_mixer_elem_t *current;
+
+    if ((err = getMixer(&mixer, card)) < 0)
+        return;
+
+    current = snd_mixer_first_elem(mixer);
+
+    while (current)
+    {
+        const char *sname = snd_mixer_selem_get_name(current);
+        if (snd_mixer_selem_is_active(current) &&
+                snd_mixer_selem_has_playback_volume(current))
+            ui.mixerDeviceComboBox->addItem(QString(sname));
+        current = snd_mixer_elem_next(current);
+    }
+}
+
+void SettingsDialog::setText(int n)
+{
+    ui.deviceComboBox->setEditText(m_devices.at(n));
+}
+
+void SettingsDialog::writeSettings()
+{
+    qDebug("SettingsDialog (ALSA):: writeSettings()");
+    QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
+    settings.beginGroup("ALSA");
+    settings.setValue("device", ui.deviceComboBox->currentText ());
+    settings.setValue("buffer_time",ui.bufferSpinBox->value());
+    settings.setValue("period_time",ui.periodSpinBox->value());
+    QString card = m_cards.at(ui.mixerCardComboBox->currentIndex());
+    settings.setValue("mixer_card", card);
+    settings.setValue("mixer_device", ui.mixerDeviceComboBox->currentText ());
+    settings.endGroup();
+    accept();
+}
+
+int SettingsDialog::getMixer(snd_mixer_t **mixer, QString card)
+{
+    char *dev;
+    int err;
+
+    dev = strdup(QString(card).toAscii().data());
+    if ((err = snd_mixer_open(mixer, 0)) < 0)
+    {
+        qWarning("SettingsDialog (ALSA): alsa_get_mixer(): "
+                 "Failed to open empty mixer: %s", snd_strerror(-err));
+        mixer = NULL;
+        return -1;
+    }
+    if ((err = snd_mixer_attach(*mixer, dev)) < 0)
+    {
+        qWarning("SettingsDialog (ALSA): alsa_get_mixer(): "
+                 "Attaching to mixer %s failed: %s", dev, snd_strerror(-err));
+        return -1;
+    }
+    if ((err = snd_mixer_selem_register(*mixer, NULL, NULL)) < 0)
+    {
+        qWarning("SettingsDialog (ALSA): alsa_get_mixer(): "
+                 "Failed to register mixer: %s", snd_strerror(-err));
+        return -1;
+    }
+    if ((err = snd_mixer_load(*mixer)) < 0)
+    {
+        qWarning("SettingsDialog (ALSA): alsa_get_mixer(): Failed to load mixer: %s",
+                 snd_strerror(-err));
+        return -1;
+    }
+
+    free (dev);
+
+    return (*mixer != NULL);
+}
+
+void SettingsDialog::showMixerDevices(int d)
+{
+    if (0<=d && d<m_cards.size())
+        getMixerDevices(m_cards.at(d));
+}
+
diff --git a/lib/qmmp/Output/alsa/settingsdialog.h b/lib/qmmp/Output/alsa/settingsdialog.h
new file mode 100644
index 000000000..467b25a03
--- /dev/null
+++ b/lib/qmmp/Output/alsa/settingsdialog.h
@@ -0,0 +1,59 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef SETTINGSDIALOG_H
+#define SETTINGSDIALOG_H
+
+#include <QDialog>
+
+extern "C"{
+#include <alsa/asoundlib.h> 
+}
+//#include <alsa/pcm_plugin.h>
+
+#include "ui_settingsdialog.h"
+
+/**
+	@author Ilya Kotov <forkotov02@hotmail.ru>
+*/
+class SettingsDialog : public QDialog
+{
+Q_OBJECT
+public:
+    SettingsDialog(QWidget *parent = 0);
+
+    ~SettingsDialog();
+
+private slots:
+    void setText(int);
+    void writeSettings();
+    void showMixerDevices(int);
+
+private:
+    Ui::SettingsDialog ui;
+    void getCards();
+    void getCardDevices(int card);
+    void getMixerDevices(QString card);
+    int getMixer(snd_mixer_t **mixer, QString card);
+    QStringList m_devices;
+    QList <QString> m_cards;
+
+};
+
+#endif
diff --git a/lib/qmmp/Output/alsa/settingsdialog.ui b/lib/qmmp/Output/alsa/settingsdialog.ui
new file mode 100644
index 000000000..2f9a20753
--- /dev/null
+++ b/lib/qmmp/Output/alsa/settingsdialog.ui
@@ -0,0 +1,261 @@
+<ui version="4.0" >
+ <class>SettingsDialog</class>
+ <widget class="QDialog" name="SettingsDialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>403</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>ALSA Plugin Settings</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" colspan="3" >
+    <widget class="QTabWidget" name="tabWidget" >
+     <property name="currentIndex" >
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="tab" >
+      <attribute name="title" >
+       <string>Device Settings</string>
+      </attribute>
+      <layout class="QVBoxLayout" >
+       <property name="margin" >
+        <number>9</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QGroupBox" name="groupBox" >
+         <property name="title" >
+          <string>Audio device</string>
+         </property>
+         <widget class="QComboBox" name="deviceComboBox" >
+          <property name="geometry" >
+           <rect>
+            <x>11</x>
+            <y>47</y>
+            <width>338</width>
+            <height>22</height>
+           </rect>
+          </property>
+         </widget>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupBox_2" >
+         <property name="title" >
+          <string>Mixer</string>
+         </property>
+         <layout class="QGridLayout" >
+          <property name="margin" >
+           <number>9</number>
+          </property>
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <item row="0" column="1" >
+           <widget class="QComboBox" name="mixerCardComboBox" />
+          </item>
+          <item row="0" column="0" >
+           <widget class="QLabel" name="label_3" >
+            <property name="text" >
+             <string>Mixer card:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0" >
+           <widget class="QLabel" name="label_4" >
+            <property name="text" >
+             <string>Mixer device:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1" >
+           <widget class="QComboBox" name="mixerDeviceComboBox" />
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab_2" >
+      <attribute name="title" >
+       <string>Advanced Settings</string>
+      </attribute>
+      <layout class="QVBoxLayout" >
+       <property name="margin" >
+        <number>9</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QGroupBox" name="groupBox_3" >
+         <property name="title" >
+          <string>Soundcard</string>
+         </property>
+         <layout class="QGridLayout" >
+          <property name="margin" >
+           <number>9</number>
+          </property>
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <item row="2" column="1" >
+           <spacer>
+            <property name="orientation" >
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" >
+             <size>
+              <width>20</width>
+              <height>111</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="0" column="2" >
+           <spacer>
+            <property name="orientation" >
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" >
+             <size>
+              <width>188</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="1" column="1" >
+           <widget class="QSpinBox" name="periodSpinBox" >
+            <property name="maximum" >
+             <number>5000</number>
+            </property>
+            <property name="minimum" >
+             <number>20</number>
+            </property>
+            <property name="value" >
+             <number>100</number>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1" >
+           <widget class="QSpinBox" name="bufferSpinBox" >
+            <property name="maximum" >
+             <number>10000</number>
+            </property>
+            <property name="minimum" >
+             <number>200</number>
+            </property>
+            <property name="value" >
+             <number>500</number>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0" >
+           <widget class="QLabel" name="label" >
+            <property name="text" >
+             <string>Buffer time (ms):</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0" >
+           <widget class="QLabel" name="label_2" >
+            <property name="text" >
+             <string>Period time (ms):</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="2" >
+           <spacer>
+            <property name="orientation" >
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" >
+             <size>
+              <width>188</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>191</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="2" >
+    <widget class="QPushButton" name="cancelButton" >
+     <property name="text" >
+      <string>Cancel</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" >
+    <widget class="QPushButton" name="okButton" >
+     <property name="text" >
+      <string>OK</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>cancelButton</sender>
+   <signal>clicked()</signal>
+   <receiver>SettingsDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>338</x>
+     <y>283</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>164</x>
+     <y>294</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/lib/qmmp/Output/alsa/translations/alsa_plugin_ru.qm b/lib/qmmp/Output/alsa/translations/alsa_plugin_ru.qm
new file mode 100644
index 000000000..78ed38962
--- /dev/null
+++ b/lib/qmmp/Output/alsa/translations/alsa_plugin_ru.qm
diff --git a/lib/qmmp/Output/alsa/translations/alsa_plugin_ru.ts b/lib/qmmp/Output/alsa/translations/alsa_plugin_ru.ts
new file mode 100644
index 000000000..2bfab0f8c
--- /dev/null
+++ b/lib/qmmp/Output/alsa/translations/alsa_plugin_ru.ts
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS><TS version="1.1" language="pl">
+<context>
+    <name>OutputALSAFactory</name>
+    <message>
+        <location filename="../outputalsafactory.cpp" line="30"/>
+        <source>ALSA Plugin</source>
+        <translation>Модуль ALSA</translation>
+    </message>
+    <message>
+        <location filename="../outputalsafactory.cpp" line="47"/>
+        <source>About ALSA Output Plugin</source>
+        <translation>О модуле вывода ALSA</translation>
+    </message>
+    <message>
+        <location filename="../outputalsafactory.cpp" line="48"/>
+        <source>Qmmp ALSA Output Plugin</source>
+        <translation>Модуль вывода ALSA для Qmmp</translation>
+    </message>
+    <message>
+        <location filename="../outputalsafactory.cpp" line="49"/>
+        <source>Writen by: Ilya Kotov &lt;forkotov02@hotmail.ru&gt;</source>
+        <translation>Разработчик: Илья Котов &lt;forkotov02@hotmail.ru&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.ui" line="29"/>
+        <source>Device Settings</source>
+        <translation>Параметры устройства</translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="41"/>
+        <source>Audio device</source>
+        <translation>Аудио устройство</translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="58"/>
+        <source>Mixer</source>
+        <translation>Микшер</translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="73"/>
+        <source>Mixer card:</source>
+        <translation>Карта микшера:</translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="83"/>
+        <source>Mixer device:</source>
+        <translation>Устройство микшера:</translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="100"/>
+        <source>Advanced Settings</source>
+        <translation>Дополнительные настройки</translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="112"/>
+        <source>Soundcard</source>
+        <translation>Звуковая карта</translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="176"/>
+        <source>Buffer time (ms):</source>
+        <translation>Время буферизации (мс):</translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="186"/>
+        <source>Period time (ms):</source>
+        <translation>Время периода (мс):</translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="229"/>
+        <source>Cancel</source>
+        <translation>Отмена</translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="236"/>
+        <source>OK</source>
+        <translation>Применить</translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="13"/>
+        <source>ALSA Plugin Settings</source>
+        <translation>Настройки модуля ALSA</translation>
+    </message>
+</context>
+</TS>
diff --git a/lib/qmmp/Output/alsa/translations/translations.qrc b/lib/qmmp/Output/alsa/translations/translations.qrc
new file mode 100644
index 000000000..beac1cd17
--- /dev/null
+++ b/lib/qmmp/Output/alsa/translations/translations.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+  <qresource>
+    <file>alsa_plugin_ru.qm</file>
+  </qresource>
+</RCC>
diff --git a/lib/qmmp/Output/jack/CMakeLists.txt b/lib/qmmp/Output/jack/CMakeLists.txt
new file mode 100644
index 000000000..a8e9b9d1a
--- /dev/null
+++ b/lib/qmmp/Output/jack/CMakeLists.txt
@@ -0,0 +1,74 @@
+project(libjack)
+
+cmake_minimum_required(VERSION 2.4.0)
+
+
+INCLUDE(UsePkgConfig)
+INCLUDE(FindQt4)
+
+find_package(Qt4 REQUIRED) # find and setup Qt4 for this project
+include(${QT_USE_FILE})
+
+# qt plugin
+ADD_DEFINITIONS( -Wall )
+ADD_DEFINITIONS(${QT_DEFINITIONS})
+ADD_DEFINITIONS(-DQT_PLUGIN)
+ADD_DEFINITIONS(-DQT_NO_DEBUG)
+ADD_DEFINITIONS(-DQT_SHARED)
+ADD_DEFINITIONS(-DQT_THREAD)
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+SET(QT_INCLUDES
+  ${QT_INCLUDES}
+  ${CMAKE_CURRENT_BINARY_DIR}/../../../
+)
+
+# libqmmp
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../)
+
+# libjack and taglib
+PKGCONFIG(jack JACK_INCLUDE_DIR JACK_LINK_DIR JACK_LINK_FLAGS JACK_CFLAGS)
+PKGCONFIG(samplerate SAMPLERATE_INCLUDE_DIR SAMPLERATE_LINK_DIR SAMPLERATE_LINK_FLAGS SAMPLERATE_CFLAGS)
+
+
+IF(NOT JACK_LINK_FLAGS)
+  SET(JACK_LINK_FLAGS -ljack -lrt)
+ENDIF(NOT JACK_LINK_FLAGS)
+
+IF(NOT SAMPLERATE_LINK_FLAGS)
+  SET(SAMPLERATE_LINK_FLAGS -lsamplerate)
+ENDIF(NOT SAMPLERATE_LINK_FLAGS)
+
+include_directories(${JACK_INCLUDE_DIR} ${JACK_INCLUDE_DIR})
+link_directories(${SAMPLERATE_LINK_DIR} ${SAMPLERATE_LINK_DIR})
+
+ADD_DEFINITIONS(${JACK_CFLAGS})
+ADD_DEFINITIONS(${SAMPLERATE_CFLAGS})
+
+
+SET(libjack_SRCS
+  outputjackfactory.cpp
+  outputjack.cpp
+  bio2jack.c
+)
+
+SET(libjack_MOC_HDRS
+  outputjackfactory.h
+  outputjack.h
+  bio2jack.h
+)
+
+SET(libjack_RCCS translations/translations.qrc)
+
+QT4_ADD_RESOURCES(libjack_RCC_SRCS ${libjack_RCCS})
+
+QT4_WRAP_CPP(libjack_MOC_SRCS ${libjack_MOC_HDRS})
+
+
+
+ADD_LIBRARY(jack SHARED ${libjack_SRCS} ${libjack_MOC_SRCS} ${libjack_RCC_SRCS})
+target_link_libraries(jack ${QT_LIBRARIES} -lqmmp ${JACK_LINK_FLAGS} ${SAMPLERATE_LINK_FLAGS})
+install(TARGETS jack DESTINATION lib/qmmp/Output)
+
diff --git a/lib/qmmp/Output/jack/bio2jack.c b/lib/qmmp/Output/jack/bio2jack.c
new file mode 100644
index 000000000..aef7ea9b7
--- /dev/null
+++ b/lib/qmmp/Output/jack/bio2jack.c
@@ -0,0 +1,2635 @@
+/*
+ * Copyright 2003-2006 Chris Morgan <cmorgan@alum.wpi.edu>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+/* NOTE: All functions that take a jack_driver_t* do NOT lock the device, in order to get a */
+/*       jack_driver_t* you must call getDriver() which will pthread_mutex_lock() */
+
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <math.h>
+#include <unistd.h>
+#include <inttypes.h>
+#include <jack/jack.h>
+#include <jack/ringbuffer.h>
+#include <pthread.h>
+#include <sys/time.h>
+#include <samplerate.h>
+
+#include "bio2jack.h"
+
+/* enable/disable TRACING through the JACK_Callback() function */
+/* this can sometimes be too much information */
+#define TRACE_CALLBACK          0
+
+/* set to 1 for verbose output */
+#define VERBOSE_OUTPUT          0
+
+/* set to 1 to enable debug messages */
+#define DEBUG_OUTPUT            0
+
+/* set to 1 to enable tracing */
+#define TRACE_ENABLE            0
+
+/* set to 1 to enable the function timers */
+#define TIMER_ENABLE            0
+
+/* set to 1 to enable tracing of getDriver() and releaseDriver() */
+#define TRACE_getReleaseDevice  0
+
+#define ENABLE_WARNINGS         0
+
+#define DEFAULT_RB_SIZE         4096
+
+#define OUTFILE stderr
+
+#if TIMER_ENABLE
+/* This seemingly construct makes timing arbitrary functions really easy
+   all you have to do is place a 'TIMER("start\n")' at the beginning and
+   a 'TIMER("stop\n")' at the end of any function and this does the rest
+   (naturally you can place any printf-compliant text you like in the argument
+   along with the associated values). */
+static struct timeval timer_now;
+#define TIMER(format,args...) gettimeofday(&timer_now,0); \
+  fprintf(OUTFILE, "%ld.%06ld: %s::%s(%d) "format, timer_now.tv_sec, timer_now.tv_usec, __FILE__, __FUNCTION__, __LINE__, ##args)
+#else
+#define TIMER(...)
+#endif
+
+#if TRACE_ENABLE
+#define TRACE(format,args...) fprintf(OUTFILE, "%s::%s(%d) "format, __FILE__, __FUNCTION__, __LINE__,##args);	\
+         fflush(OUTFILE);
+#else
+#define TRACE(...)
+#endif
+
+#if DEBUG_OUTPUT
+#define DEBUG(format,args...) fprintf(OUTFILE, "%s::%s(%d) "format, __FILE__, __FUNCTION__, __LINE__,##args);	\
+         fflush(OUTFILE);
+#else
+#define DEBUG(...)
+#endif
+
+#if TRACE_CALLBACK
+#define CALLBACK_TRACE(format,args...) fprintf(OUTFILE, "%s::%s(%d) "format, __FILE__, __FUNCTION__, __LINE__,##args);	\
+         fflush(OUTFILE);
+#else
+#define CALLBACK_TRACE(...)
+#endif
+
+#if ENABLE_WARNINGS
+#define WARN(format,args...) fprintf(OUTFILE, "WARN: %s::%s(%d) "format, __FILE__,__FUNCTION__,__LINE__,##args);	\
+         fflush(OUTFILE);
+#else
+#define WARN(...)
+#endif
+
+#define ERR(format,args...) fprintf(OUTFILE, "ERR: %s::%s(%d) "format, __FILE__,__FUNCTION__,__LINE__,##args);	\
+         fflush(OUTFILE);
+
+#define min(a,b)   (((a) < (b)) ? (a) : (b))
+#define max(a,b)   (((a) < (b)) ? (b) : (a))
+
+#define MAX_OUTPUT_PORTS  10
+#define MAX_INPUT_PORTS   10
+
+typedef struct jack_driver_s
+{
+  bool allocated;                       /* whether or not this device has been allocated */
+
+  int deviceID;                         /* id of this device */
+  int clientCtr;                        /* to prevent overlapping client ids */
+  long jack_sample_rate;                /* jack samples(frames) per second */
+
+  long client_sample_rate;              /* client samples(frames) per second */
+  double output_sample_rate_ratio;      /* ratio between jack's output rate & ours */
+  double input_sample_rate_ratio;       /* ratio between our input rate & jack's */
+
+  unsigned long num_input_channels;     /* number of input channels(1 is mono, 2 stereo etc..) */
+  unsigned long num_output_channels;    /* number of output channels(1 is mono, 2 stereo etc..) */
+
+  unsigned long bits_per_channel;       /* number of bits per channel (only 8 & 16 are currently supported) */
+
+  unsigned long bytes_per_output_frame; /* (num_output_channels * bits_per_channel) / 8 */
+  unsigned long bytes_per_input_frame;  /* (num_input_channels * bits_per_channel) / 8 */
+
+  unsigned long bytes_per_jack_output_frame;    /* (num_output_channels * bits_per_channel) / 8 */
+  unsigned long bytes_per_jack_input_frame;     /* (num_input_channels * bits_per_channel) / 8 */
+
+  unsigned long latencyMS;      /* latency in ms between writing and actual audio output of the written data */
+
+  long clientBytesInJack;       /* number of INPUT bytes(from the client of bio2jack) we wrote to jack(not necessary the number of bytes we wrote to jack) */
+  long jack_buffer_size;        /* size of the buffer jack will pass in to the process callback */
+
+  unsigned long callback_buffer1_size;  /* number of bytes in the buffer allocated for processing data in JACK_Callback */
+  char *callback_buffer1;
+  unsigned long callback_buffer2_size;  /* number of bytes in the buffer allocated for processing data in JACK_Callback */
+  char *callback_buffer2;
+
+  unsigned long rw_buffer1_size;        /* number of bytes in the buffer allocated for processing data in JACK_(Read|Write) */
+  char *rw_buffer1;
+
+  struct timeval previousTime;  /* time of last JACK_Callback() write to jack, allows for MS accurate bytes played  */
+
+  unsigned long written_client_bytes;   /* input bytes we wrote to jack, not necessarily actual bytes we wrote to jack due to channel and other conversion */
+  unsigned long played_client_bytes;    /* input bytes that jack has played */
+
+  unsigned long client_bytes;   /* total bytes written by the client of bio2jack via JACK_Write() */
+
+  jack_port_t *output_port[MAX_OUTPUT_PORTS];   /* output ports */
+  jack_port_t *input_port[MAX_OUTPUT_PORTS];    /* input ports */
+
+  jack_client_t *client;        /* pointer to jack client */
+
+  char **jack_port_name;        /* user given strings for the port names, can be NULL */
+  unsigned int jack_port_name_count;    /* the number of port names given */
+
+  unsigned long jack_output_port_flags; /* flags to be passed to jack when opening the output ports */
+  unsigned long jack_input_port_flags;  /* flags to be passed to jack when opening the output ports */
+
+  jack_ringbuffer_t *pPlayPtr;  /* the playback ringbuffer */
+  jack_ringbuffer_t *pRecPtr;   /* the recording ringbuffer */
+
+  SRC_STATE *output_src;        /* SRC object for the output stream */
+  SRC_STATE *input_src;         /* SRC object for the output stream */
+
+  enum status_enum state;       /* one of PLAYING, PAUSED, STOPPED, CLOSED, RESET etc */
+
+  unsigned int volume[MAX_OUTPUT_PORTS];        /* percentage of sample value to preserve, 100 would be no attenuation */
+  enum JACK_VOLUME_TYPE volumeEffectType;       /* linear or dbAttenuation, if dbAttenuation volume is the number of dBs of
+                                                   attenuation to apply, 0 volume being no attenuation, full volume */
+
+  long position_byte_offset;    /* an offset that we will apply to returned position queries to achieve */
+                                /* the position that the user of the driver desires set */
+
+  bool in_use;                  /* true if this device is currently in use */
+
+  pthread_mutex_t mutex;        /* mutex to lock this specific device */
+
+  /* variables used for trying to restart the connection to jack */
+  bool jackd_died;              /* true if jackd has died and we should try to restart it */
+  struct timeval last_reconnect_attempt;
+} jack_driver_t;
+
+
+static char *client_name;       /* the name bio2jack will use when creating a new
+                                   jack client. client_name_%deviceID% will be used */
+
+
+static bool do_sample_rate_conversion;  /* whether the client has requested sample rate conversion,
+                                           default to on for improved compatibility */
+
+/*
+  Which SRC converter function we should use when doing sample rate conversion.
+  Default to the fastest of the 'good quality' set.
+ */
+static int preferred_src_converter = SRC_SINC_FASTEST;
+
+static bool init_done = 0;      /* just to prevent clients from calling JACK_Init twice, that would be very bad */
+
+static enum JACK_PORT_CONNECTION_MODE port_connection_mode = CONNECT_ALL;
+
+/* enable/disable code that allows us to close a device without actually closing the jack device */
+/* this works around the issue where jack doesn't always close devices by the time the close function call returns */
+#define JACK_CLOSE_HACK 1
+
+typedef jack_default_audio_sample_t sample_t;
+typedef jack_nframes_t nframes_t;
+
+/* allocate devices for output */
+/* if you increase this past 10, you might want to update 'out_client_name = ... ' in JACK_OpenDevice */
+#define MAX_OUTDEVICES 10
+static jack_driver_t outDev[MAX_OUTDEVICES];
+
+static pthread_mutex_t device_mutex = PTHREAD_MUTEX_INITIALIZER;        /* this is to lock the entire outDev array
+                                                                           to make managing it in a threaded
+                                                                           environment sane */
+
+#if JACK_CLOSE_HACK
+static void JACK_CloseDevice(jack_driver_t * drv, bool close_client);
+#else
+static void JACK_CloseDevice(jack_driver_t * drv);
+#endif
+
+
+/* Prototypes */
+static int JACK_OpenDevice(jack_driver_t * drv);
+static unsigned long JACK_GetBytesFreeSpaceFromDriver(jack_driver_t * drv);
+static void JACK_ResetFromDriver(jack_driver_t * drv);
+static long JACK_GetPositionFromDriver(jack_driver_t * drv,
+                                       enum pos_enum position, int type);
+static void JACK_CleanupDriver(jack_driver_t * drv);
+
+
+/* Return the difference between two timeval structures in terms of milliseconds */
+long
+TimeValDifference(struct timeval *start, struct timeval *end)
+{
+  double long ms;               /* milliseconds value */
+
+  ms = end->tv_sec - start->tv_sec;     /* compute seconds difference */
+  ms *= (double) 1000;          /* convert to milliseconds */
+
+  ms += (double) (end->tv_usec - start->tv_usec) / (double) 1000;       /* add on microseconds difference */
+
+  return (long) ms;
+}
+
+/* get a device and lock the devices mutex */
+/* */
+/* also attempt to reconnect to jack since this function is called from */
+/* most other bio2jack functions it provides a good point to attempt reconnection */
+/* */
+/* Ok, I know this looks complicated and it kind of is. The point is that when you're
+   trying to trace mutexes it's more important to know *who* called us than just that
+   we were called.  This uses from pre-processor trickery so that the fprintf is actually
+   placed in the function making the getDriver call.  Thus, the __FUNCTION__ and __LINE__
+   macros will actually reference our caller, rather than getDriver.  The reason the 
+   fprintf call is passes as a parameter is because this macro has to still return a
+   jack_driver_t* and we want to log both before *and* after the getDriver call for
+   easier detection of blocked calls.
+ */
+#if TRACE_getReleaseDevice
+#define getDriver(x) _getDriver(x,fprintf(OUTFILE, "%s::%s(%d) getting driver %d\n", __FILE__, __FUNCTION__, __LINE__,x)); TRACE("got driver %d\n",x);
+jack_driver_t *
+_getDriver(int deviceID, int ignored)
+{
+  fflush(OUTFILE);
+#else
+jack_driver_t *
+getDriver(int deviceID)
+{
+#endif
+  jack_driver_t *drv = &outDev[deviceID];
+
+  if(pthread_mutex_lock(&drv->mutex) != 0)
+    ERR("lock returned an error\n");
+
+  /* should we try to restart the jack server? */
+  if(drv->jackd_died && drv->client == 0)
+  {
+    struct timeval now;
+    gettimeofday(&now, 0);
+
+    /* wait 250ms before trying again */
+    if(TimeValDifference(&drv->last_reconnect_attempt, &now) >= 250)
+    {
+      JACK_OpenDevice(drv);
+      drv->last_reconnect_attempt = now;
+    }
+  }
+
+  return drv;
+}
+
+#if TRACE_getReleaseDevice
+#define tryGetDriver(x) _tryGetDriver(x,fprintf(OUTFILE, "%s::%s(%d) trying to get driver %d\n", __FILE__, __FUNCTION__, __LINE__,x)); TRACE("got driver %d\n",x);
+jack_driver_t *
+_tryGetDriver(int deviceID, int ignored)
+{
+  fflush(OUTFILE);
+#else
+jack_driver_t *
+tryGetDriver(int deviceID)
+{
+#endif
+  jack_driver_t *drv = &outDev[deviceID];
+
+  int err;
+  if((err = pthread_mutex_trylock(&drv->mutex)) == 0)
+    return drv;
+
+  if(err == EBUSY)
+  {
+    TRACE("driver %d is busy\n",deviceID);
+    return 0;
+  }
+
+  ERR("lock returned an error\n");
+  return 0;
+}
+
+
+/* release a device's mutex */
+/* */
+/* This macro is similar to the one for getDriver above, only simpler since we only
+   really need to know when the lock was release for the sake of debugging.
+*/
+#if TRACE_getReleaseDevice
+#define releaseDriver(x) TRACE("releasing driver %d\n",x->deviceID); _releaseDriver(x);
+void
+_releaseDriver(jack_driver_t * drv)
+#else
+void
+releaseDriver(jack_driver_t * drv)
+#endif
+{
+  /*
+     #if TRACE_getReleaseDevice
+     TRACE("deviceID == %d\n", drv->deviceID);
+     #endif
+   */
+  if(pthread_mutex_unlock(&drv->mutex) != 0)
+    ERR("lock returned an error\n");
+}
+
+
+/* Return a string corresponding to the input state */
+char *
+DEBUGSTATE(enum status_enum state)
+{
+  if(state == PLAYING)
+    return "PLAYING";
+  else if(state == PAUSED)
+    return "PAUSED";
+  else if(state == STOPPED)
+    return "STOPPED";
+  else if(state == CLOSED)
+    return "CLOSED";
+  else if(state == RESET)
+    return "RESET";
+  else
+    return "unknown state";
+}
+
+
+#define SAMPLE_MAX_16BIT  32767.0f
+#define SAMPLE_MAX_8BIT   255.0f
+
+/* floating point volume routine */
+/* volume should be a value between 0.0 and 1.0 */
+static void
+float_volume_effect(sample_t * buf, unsigned long nsamples, float volume,
+                    int skip)
+{
+  if(volume < 0)
+    volume = 0;
+  if(volume > 1.0)
+    volume = 1.0;
+
+  while(nsamples--)
+  {
+    *buf = (*buf) * volume;
+    buf += skip;
+  }
+}
+
+/* place one channel into a multi-channel stream */
+static inline void
+mux(sample_t * dst, sample_t * src, unsigned long nsamples,
+    unsigned long dst_skip)
+{
+  /* ALERT: signed sign-extension portability !!! */
+  while(nsamples--)
+  {
+    *dst = *src;
+    dst += dst_skip;
+    src++;
+  }
+}
+
+/* pull one channel out of a multi-channel stream */
+static void
+demux(sample_t * dst, sample_t * src, unsigned long nsamples,
+      unsigned long src_skip)
+{
+  /* ALERT: signed sign-extension portability !!! */
+  while(nsamples--)
+  {
+    *dst = *src;
+    dst++;
+    src += src_skip;
+  }
+}
+
+/* convert from 16 bit to floating point */
+static inline void
+sample_move_short_float(sample_t * dst, short *src, unsigned long nsamples)
+{
+  /* ALERT: signed sign-extension portability !!! */
+  unsigned long i;
+  for(i = 0; i < nsamples; i++)
+    dst[i] = (sample_t) (src[i]) / SAMPLE_MAX_16BIT;
+}
+
+/* convert from floating point to 16 bit */
+static inline void
+sample_move_float_short(short *dst, sample_t * src, unsigned long nsamples)
+{
+  /* ALERT: signed sign-extension portability !!! */
+  unsigned long i;
+  for(i = 0; i < nsamples; i++)
+    dst[i] = (short) ((src[i]) * SAMPLE_MAX_16BIT);
+}
+
+/* convert from 8 bit to floating point */
+static inline void
+sample_move_char_float(sample_t * dst, unsigned char *src, unsigned long nsamples)
+{
+  /* ALERT: signed sign-extension portability !!! */
+  unsigned long i;
+  for(i = 0; i < nsamples; i++)
+    dst[i] = (sample_t) (src[i]) / SAMPLE_MAX_8BIT;
+}
+
+/* convert from floating point to 8 bit */
+static inline void
+sample_move_float_char(unsigned char *dst, sample_t * src, unsigned long nsamples)
+{
+  /* ALERT: signed sign-extension portability !!! */
+  unsigned long i;
+  for(i = 0; i < nsamples; i++)
+    dst[i] = (char) ((src[i]) * SAMPLE_MAX_8BIT);
+}
+
+/* fill dst buffer with nsamples worth of silence */
+static inline void
+sample_silence_float(sample_t * dst, unsigned long nsamples)
+{
+  /* ALERT: signed sign-extension portability !!! */
+  while(nsamples--)
+  {
+    *dst = 0;
+    dst++;
+  }
+}
+
+static inline bool
+ensure_buffer_size(char **buffer, unsigned long *cur_size,
+                   unsigned long needed_size)
+{
+  DEBUG("current size = %lu, needed size = %lu\n", *cur_size, needed_size);
+  if(*cur_size >= needed_size)
+    return TRUE;
+  DEBUG("reallocing\n");
+  char *tmp = realloc(*buffer, needed_size);
+  if(tmp)
+  {
+    *cur_size = needed_size;
+    *buffer = tmp;
+    return TRUE;
+  }
+  DEBUG("reallocing failed\n");
+  return FALSE;
+}
+
+/******************************************************************
+ *    JACK_callback
+ *
+ * every time the jack server wants something from us it calls this
+ * function, so we either deliver it some sound to play or deliver it nothing
+ * to play
+ */
+static int
+JACK_callback(nframes_t nframes, void *arg)
+{
+  jack_driver_t *drv = (jack_driver_t *) arg;
+
+  unsigned int i;
+  int src_error = 0;
+
+  TIMER("start\n");
+  gettimeofday(&drv->previousTime, 0);  /* record the current time */
+
+  CALLBACK_TRACE("nframes %ld, sizeof(sample_t) == %d\n", (long) nframes,
+                 sizeof(sample_t));
+
+  if(!drv->client)
+    ERR("client is closed, this is weird...\n");
+
+  sample_t *out_buffer[MAX_OUTPUT_PORTS];
+  /* retrieve the buffers for the output ports */
+  for(i = 0; i < drv->num_output_channels; i++)
+    out_buffer[i] = (sample_t *) jack_port_get_buffer(drv->output_port[i], nframes);
+
+  sample_t *in_buffer[MAX_INPUT_PORTS];
+  /* retrieve the buffers for the input ports */
+  for(i = 0; i < drv->num_input_channels; i++)
+    in_buffer[i] = (sample_t *) jack_port_get_buffer(drv->input_port[i], nframes);
+
+  /* handle playing state */
+  if(drv->state == PLAYING)
+  {
+    /* handle playback data, if any */
+    if(drv->num_output_channels > 0)
+    {
+      unsigned long jackFramesAvailable = nframes;      /* frames we have left to write to jack */
+      unsigned long numFramesToWrite;   /* num frames we are writing */
+      size_t inputBytesAvailable = jack_ringbuffer_read_space(drv->pPlayPtr);
+      unsigned long inputFramesAvailable;       /* frames we have available */
+
+      inputFramesAvailable = inputBytesAvailable / drv->bytes_per_jack_output_frame;
+      size_t jackBytesAvailable = jackFramesAvailable * drv->bytes_per_jack_output_frame;
+
+      long read = 0;
+
+      CALLBACK_TRACE("playing... jackFramesAvailable = %ld inputFramesAvailable = %ld\n",
+         jackFramesAvailable, inputFramesAvailable);
+
+#if JACK_CLOSE_HACK
+      if(drv->in_use == FALSE)
+      {
+        /* output silence if nothing is being outputted */
+        for(i = 0; i < drv->num_output_channels; i++)
+          sample_silence_float(out_buffer[i], nframes);
+
+        return -1;
+      }
+#endif
+
+      /* make sure our buffer is large enough for the data we are writing */
+      /* ie. callback_buffer2_size < (bytes we already wrote + bytes we are going to write in this loop) */
+      if(!ensure_buffer_size
+         (&drv->callback_buffer2, &drv->callback_buffer2_size,
+          jackBytesAvailable))
+      {
+        ERR("allocated %lu bytes, need %lu bytes\n",
+            drv->callback_buffer2_size, (unsigned long)jackBytesAvailable);
+        return -1;
+      }
+
+      /* do sample rate conversion if needed & requested */
+      if(drv->output_src && drv->output_sample_rate_ratio != 1.0)
+      {
+        long bytes_needed_write = nframes * drv->bytes_per_jack_output_frame;
+
+        /* make a very good guess at how many raw bytes we'll need to satisfy jack's request after conversion */
+        long bytes_needed_read = min(inputBytesAvailable,
+                                     (double) (bytes_needed_write +
+                                               drv->
+                                               output_sample_rate_ratio
+                                               *
+                                               drv->
+                                               bytes_per_jack_output_frame)
+                                     / drv->output_sample_rate_ratio);
+        DEBUG("guessing that we need %ld bytes in and %ld out for rate conversion ratio = %f\n",
+           bytes_needed_read, bytes_needed_write,
+           drv->output_sample_rate_ratio);
+
+        if(!ensure_buffer_size(&drv->callback_buffer1,
+                               &drv->callback_buffer1_size,
+                               bytes_needed_read))
+        {
+          ERR("could not realloc callback_buffer2!\n");
+          return 1;
+        }
+        if(!ensure_buffer_size(&drv->callback_buffer2,
+                               &drv->callback_buffer2_size,
+                               bytes_needed_write))
+        {
+          ERR("could not realloc callback_buffer2!\n");
+          return 1;
+        }
+
+        if(jackFramesAvailable && inputBytesAvailable > 0)
+        {
+          /* read in the data, but don't move the read pointer until we know how much SRC used */
+          jack_ringbuffer_peek(drv->pPlayPtr, drv->callback_buffer1,
+                               bytes_needed_read);
+
+          SRC_DATA srcdata;
+          srcdata.data_in = (sample_t *) drv->callback_buffer1;
+          srcdata.input_frames = bytes_needed_read / drv->bytes_per_jack_output_frame;
+          srcdata.src_ratio = drv->output_sample_rate_ratio;
+          srcdata.data_out = (sample_t *) drv->callback_buffer2;
+          srcdata.output_frames = nframes;
+          srcdata.end_of_input = 0;     // it's a stream, it never ends
+          DEBUG("input_frames = %ld, output_frames = %ld\n",
+                srcdata.input_frames, srcdata.output_frames);
+          /* convert the sample rate */
+          src_error = src_process(drv->output_src, &srcdata);
+          DEBUG("used = %ld, generated = %ld, error = %d: %s.\n",
+                srcdata.input_frames_used, srcdata.output_frames_gen,
+                src_error, src_strerror(src_error));
+
+          if(src_error == 0)
+          {
+            /* now we can move the read pointer */
+            jack_ringbuffer_read_advance(drv->pPlayPtr,
+                                         srcdata.
+                                         input_frames_used *
+                                         drv->bytes_per_jack_output_frame);
+            /* add on what we wrote */
+            read = srcdata.input_frames_used * drv->bytes_per_output_frame;
+            jackFramesAvailable -= srcdata.output_frames_gen;   /* take away what was used */
+          }
+        }
+      }
+      else                      /* no resampling needed or requested */
+      {
+        /* read as much data from the buffer as is available */
+        if(jackFramesAvailable && inputBytesAvailable > 0)
+        {
+          /* write as many bytes as we have space remaining, or as much as we have data to write */
+          numFramesToWrite = min(jackFramesAvailable, inputFramesAvailable);
+          jack_ringbuffer_read(drv->pPlayPtr, drv->callback_buffer2,
+                               jackBytesAvailable);
+          /* add on what we wrote */
+          read = numFramesToWrite * drv->bytes_per_output_frame;
+          jackFramesAvailable -= numFramesToWrite;      /* take away what was written */
+        }
+      }
+
+      drv->written_client_bytes += read;
+      drv->played_client_bytes += drv->clientBytesInJack;       /* move forward by the previous bytes we wrote since those must have finished by now */
+      drv->clientBytesInJack = read;    /* record the input bytes we wrote to jack */
+
+      /* see if we still have jackBytesLeft here, if we do that means that we
+         ran out of wave data to play and had a buffer underrun, fill in
+         the rest of the space with zero bytes so at least there is silence */
+      if(jackFramesAvailable)
+      {
+        WARN("buffer underrun of %ld frames\n", jackFramesAvailable);
+        for(i = 0; i < drv->num_output_channels; i++)
+          sample_silence_float(out_buffer[i] +
+                               (nframes - jackFramesAvailable),
+                               jackFramesAvailable);
+      }
+
+      /* if we aren't converting or we are converting and src_error == 0 then we should */
+      /* apply volume and demux */
+      if(!(drv->output_src && drv->output_sample_rate_ratio != 1.0) || (src_error == 0))
+      {
+          /* apply volume */
+          for(i = 0; i < drv->num_output_channels; i++)
+          {
+              if(drv->volumeEffectType == dbAttenuation)
+              {
+                  /* assume the volume setting is dB of attenuation, a volume of 0 */
+                  /* is 0dB attenuation */
+                  float volume = powf(10.0, -((float) drv->volume[i]) / 20.0);
+                  float_volume_effect((sample_t *) drv->callback_buffer2 + i,
+                                      (nframes - jackFramesAvailable), volume, drv->num_output_channels);
+              } else
+              {
+                  float_volume_effect((sample_t *) drv->callback_buffer2 + i, (nframes - jackFramesAvailable),
+                                      ((float) drv->volume[i] / 100.0),
+                                      drv->num_output_channels);
+              }
+          }
+
+          /* demux the stream: we skip over the number of samples we have output channels as the channel data */
+          /* is encoded like chan1,chan2,chan3,chan1,chan2,chan3... */
+          for(i = 0; i < drv->num_output_channels; i++)
+          {
+              demux(out_buffer[i],
+                    (sample_t *) drv->callback_buffer2 + i,
+                    (nframes - jackFramesAvailable), drv->num_output_channels);
+          }
+      }
+    }
+
+    /* handle record data, if any */
+    if(drv->num_input_channels > 0)
+    {
+      long jack_bytes = nframes * drv->bytes_per_jack_input_frame;      /* how many bytes jack is feeding us */
+
+      if(!ensure_buffer_size(&drv->callback_buffer1, &drv->callback_buffer1_size, jack_bytes))
+      {
+        ERR("allocated %lu bytes, need %lu bytes\n",
+            drv->callback_buffer1_size, jack_bytes);
+        return -1;
+      }
+
+      /* mux the invividual channels into one stream */
+      for(i = 0; i < drv->num_input_channels; i++)
+      {
+        mux((sample_t *) drv->callback_buffer1 + i, in_buffer[i],
+            nframes, drv->num_input_channels);
+      }
+
+      /* do sample rate conversion if needed & requested */
+      if(drv->input_src && drv->input_sample_rate_ratio != 1.0)
+      {
+        /* make a very good guess at how many raw bytes we'll need to read all the data jack gave us */
+        long bytes_needed_write = (double) (jack_bytes +
+                                            drv->input_sample_rate_ratio *
+                                            drv->bytes_per_jack_input_frame) *
+          drv->input_sample_rate_ratio;
+        DEBUG("guessing that we need %ld bytes in and %ld out for rate conversion ratio = %f\n",
+              nframes * drv->bytes_per_jack_input_frame,
+              bytes_needed_write, drv->input_sample_rate_ratio);
+
+        if(!ensure_buffer_size(&drv->callback_buffer2,
+                               &drv->callback_buffer2_size,
+                               bytes_needed_write))
+        {
+          ERR("could not realloc callback_buffer2!\n");
+          return 1;
+        }
+
+        SRC_DATA srcdata;
+        srcdata.data_in = (sample_t *) drv->callback_buffer1;
+        srcdata.input_frames = nframes;
+        srcdata.src_ratio = drv->input_sample_rate_ratio;
+        srcdata.data_out = (sample_t *) drv->callback_buffer2;
+        srcdata.output_frames = drv->callback_buffer2_size / drv->bytes_per_jack_input_frame;
+        srcdata.end_of_input = 0;       // it's a stream, it never ends
+        DEBUG("input_frames = %ld, output_frames = %ld\n",
+              srcdata.input_frames, srcdata.output_frames);
+        /* convert the sample rate */
+        src_error = src_process(drv->input_src, &srcdata);
+        DEBUG("used = %ld, generated = %ld, error = %d: %s.\n",
+              srcdata.input_frames_used, srcdata.output_frames_gen,
+              src_error, src_strerror(src_error));
+
+        if(src_error == 0)
+        {
+          long write_space = jack_ringbuffer_write_space(drv->pRecPtr);
+          long bytes_used =  srcdata.output_frames_gen * drv->bytes_per_jack_input_frame;
+          /* if there isn't enough room, make some.  sure this discards data, but when dealing with input sources
+             it seems like it's better to throw away old data than new */
+          if(write_space < bytes_used)
+          {
+            /* the ringbuffer is designed such that only one thread should ever access each pointer.
+               since calling read_advance here will be touching the read pointer which is also accessed
+               by JACK_Read, we need to lock the mutex first for safety */
+            jack_driver_t *d = tryGetDriver(drv->deviceID);
+            if( d )
+            {
+              /* double check the write space after we've gained the lock, just
+                 in case JACK_Read was being called before we gained it */
+              write_space = jack_ringbuffer_write_space(drv->pRecPtr);
+              if(write_space < bytes_used)
+              {
+                /* hey, we warn about underruns, we might as well warn about overruns as well */
+                WARN("buffer overrun of %ld bytes\n", jack_bytes - write_space);
+                jack_ringbuffer_read_advance(drv->pRecPtr, bytes_used - write_space);
+              }
+
+              releaseDriver(drv);
+            }
+          }
+
+          jack_ringbuffer_write(drv->pRecPtr, drv->callback_buffer2,
+                                bytes_used);
+        }
+      }
+      else                      /* no resampling needed */
+      {
+        long write_space = jack_ringbuffer_write_space(drv->pRecPtr);
+        /* if there isn't enough room, make some.  sure this discards data, but when dealing with input sources
+           it seems like it's better to throw away old data than new */
+        if(write_space < jack_bytes)
+        {
+          /* the ringbuffer is designed such that only one thread should ever access each pointer.
+             since calling read_advance here will be touching the read pointer which is also accessed
+             by JACK_Read, we need to lock the mutex first for safety */
+	        jack_driver_t *d = tryGetDriver(drv->deviceID);
+          if( d )
+          {
+            /* double check the write space after we've gained the lock, just
+               in case JACK_Read was being called before we gained it */
+            write_space = jack_ringbuffer_write_space(drv->pRecPtr);
+            if(write_space < jack_bytes)
+            {
+             ERR("buffer overrun of %ld bytes\n", jack_bytes - write_space);
+             jack_ringbuffer_read_advance(drv->pRecPtr, jack_bytes - write_space);
+            }
+	          releaseDriver(drv);
+          }
+        }
+
+        jack_ringbuffer_write(drv->pRecPtr, drv->callback_buffer1,
+                              jack_bytes);
+      }
+    }
+  }
+  else if(drv->state == PAUSED  ||
+          drv->state == STOPPED ||
+          drv->state == CLOSED  || drv->state == RESET)
+  {
+    CALLBACK_TRACE("%s, outputting silence\n", DEBUGSTATE(drv->state));
+
+    /* output silence if nothing is being outputted */
+    for(i = 0; i < drv->num_output_channels; i++)
+      sample_silence_float(out_buffer[i], nframes);
+
+    /* if we were told to reset then zero out some variables */
+    /* and transition to STOPPED */
+    if(drv->state == RESET)
+    {
+      drv->written_client_bytes = 0;
+      drv->played_client_bytes = 0;     /* number of the clients bytes that jack has played */
+
+      drv->client_bytes = 0;    /* bytes that the client wrote to use */
+
+      drv->clientBytesInJack = 0;       /* number of input bytes in jack(not necessary the number of bytes written to jack) */
+
+      drv->position_byte_offset = 0;
+
+      if(drv->pPlayPtr)
+        jack_ringbuffer_reset(drv->pPlayPtr);
+
+      if(drv->pRecPtr)
+        jack_ringbuffer_reset(drv->pRecPtr);
+
+      drv->state = STOPPED;     /* transition to STOPPED */
+    }
+  }
+
+  CALLBACK_TRACE("done\n");
+  TIMER("finish\n");
+
+  return 0;
+}
+
+
+/******************************************************************
+ *             JACK_bufsize
+ *
+ *             Called whenever the jack server changes the the max number
+ *             of frames passed to JACK_callback
+ */
+static int
+JACK_bufsize(nframes_t nframes, void *arg)
+{
+  jack_driver_t *drv = (jack_driver_t *) arg;
+  TRACE("the maximum buffer size is now %lu frames\n", (long) nframes);
+
+  drv->jack_buffer_size = nframes;
+
+  return 0;
+}
+
+/******************************************************************
+ *		JACK_srate
+ */
+int
+JACK_srate(nframes_t nframes, void *arg)
+{
+  jack_driver_t *drv = (jack_driver_t *) arg;
+
+  drv->jack_sample_rate = (long) nframes;
+
+  /* make sure to recalculate the ratios needed for proper sample rate conversion */
+  drv->output_sample_rate_ratio = (double) drv->jack_sample_rate / (double) drv->client_sample_rate;
+  if(drv->output_src) src_set_ratio(drv->output_src, drv->output_sample_rate_ratio);
+
+  drv->input_sample_rate_ratio = (double) drv->client_sample_rate / (double) drv->jack_sample_rate;
+  if(drv->input_src) src_set_ratio(drv->input_src, drv->input_sample_rate_ratio);
+
+  TRACE("the sample rate is now %lu/sec\n", (long) nframes);
+  return 0;
+}
+
+
+/******************************************************************
+ *		JACK_shutdown
+ *
+ * if this is called then jack shut down... handle this appropriately */
+void
+JACK_shutdown(void *arg)
+{
+  jack_driver_t *drv = (jack_driver_t *) arg;
+
+  TRACE("\n");
+
+  getDriver(drv->deviceID);
+
+  drv->client = 0;              /* reset client */
+  drv->jackd_died = TRUE;
+
+  TRACE("jack shutdown, setting client to 0 and jackd_died to true, closing device\n");
+
+#if JACK_CLOSE_HACK
+  JACK_CloseDevice(drv, TRUE);
+#else
+  JACK_CloseDevice(drv);
+#endif
+
+  TRACE("trying to reconnect right now\n");
+  /* lets see if we can't reestablish the connection */
+  if(JACK_OpenDevice(drv) != ERR_SUCCESS)
+  {
+    ERR("unable to reconnect with jack\n");
+  }
+
+  releaseDriver(drv);
+}
+
+
+/******************************************************************
+ *		JACK_Error
+ *
+ * Callback for jack errors
+ */
+static void
+JACK_Error(const char *desc)
+{
+  ERR("%s\n", desc);
+}
+
+
+/******************************************************************
+ *		JACK_OpenDevice
+ *
+ *  RETURNS: ERR_SUCCESS upon success
+ */
+static int
+JACK_OpenDevice(jack_driver_t * drv)
+{
+  const char **ports;
+  char *our_client_name = 0;
+  unsigned int i;
+  int failed = 0;
+
+  TRACE("creating jack client and setting up callbacks\n");
+
+#if JACK_CLOSE_HACK
+  /* see if this device is already open */
+  if(drv->client)
+  {
+    /* if this device is already in use then it is bad for us to be in here */
+    if(drv->in_use)
+      return ERR_OPENING_JACK;
+
+    TRACE("using existing client\n");
+    drv->in_use = TRUE;
+    return ERR_SUCCESS;
+  }
+#endif
+
+  /* set up an error handler */
+  jack_set_error_function(JACK_Error);
+
+
+  /* build the client name */
+  our_client_name = (char *) malloc(snprintf
+                                    (our_client_name, 0, "%s_%d_%d%02d", client_name, getpid(),
+                                     drv->deviceID, drv->clientCtr + 1) + 1);
+  sprintf(our_client_name, "%s_%d_%d%02d", client_name, getpid(),
+          drv->deviceID, drv->clientCtr++);
+
+  /* try to become a client of the JACK server */
+  TRACE("client name '%s'\n", our_client_name);
+  if((drv->client = jack_client_new(our_client_name)) == 0)
+  {
+    /* try once more */
+    TRACE("trying once more to jack_client_new");
+    if((drv->client = jack_client_new(our_client_name)) == 0)
+    {
+      ERR("jack server not running?\n");
+      free(our_client_name);
+      return ERR_OPENING_JACK;
+    }
+  }
+
+  free(our_client_name);
+
+  TRACE("setting up jack callbacks\n");
+
+  /* JACK server to call `JACK_callback()' whenever
+     there is work to be done. */
+  jack_set_process_callback(drv->client, JACK_callback, drv);
+
+  /* setup a buffer size callback */
+  jack_set_buffer_size_callback(drv->client, JACK_bufsize, drv);
+
+  /* tell the JACK server to call `srate()' whenever
+     the sample rate of the system changes. */
+  jack_set_sample_rate_callback(drv->client, JACK_srate, drv);
+
+  /* tell the JACK server to call `jack_shutdown()' if
+     it ever shuts down, either entirely, or if it
+     just decides to stop calling us. */
+  jack_on_shutdown(drv->client, JACK_shutdown, drv);
+
+  /* display the current sample rate. once the client is activated
+     (see below), you should rely on your own sample rate
+     callback (see above) for this value. */
+  drv->jack_sample_rate = jack_get_sample_rate(drv->client);
+  drv->output_sample_rate_ratio = (double) drv->jack_sample_rate / (double) drv->client_sample_rate;
+  drv->input_sample_rate_ratio = (double) drv->client_sample_rate / (double) drv->jack_sample_rate;
+  TRACE("client sample rate: %lu, jack sample rate: %lu, output ratio = %f, input ratio = %f\n",
+        drv->client_sample_rate, drv->jack_sample_rate,
+        drv->output_sample_rate_ratio, drv->input_sample_rate_ratio);
+
+  drv->jack_buffer_size = jack_get_buffer_size(drv->client);
+
+  /* create the output ports */
+  TRACE("creating output ports\n");
+  for(i = 0; i < drv->num_output_channels; i++)
+  {
+    char portname[32];
+    sprintf(portname, "out_%d", i);
+    TRACE("port %d is named '%s'\n", i, portname);
+    /* NOTE: Yes, this is supposed to be JackPortIsOutput since this is an output */
+    /* port FROM bio2jack */
+    drv->output_port[i] = jack_port_register(drv->client, portname,
+                                             JACK_DEFAULT_AUDIO_TYPE,
+                                             JackPortIsOutput, 0);
+  }
+
+  /* create the input ports */
+  TRACE("creating input ports\n");
+  for(i = 0; i < drv->num_input_channels; i++)
+  {
+    char portname[32];
+    sprintf(portname, "in_%d", i);
+    TRACE("port %d is named '%s'\n", i, portname);
+    /* NOTE: Yes, this is supposed to be JackPortIsInput since this is an input */
+    /* port TO bio2jack */
+    drv->input_port[i] = jack_port_register(drv->client, portname,
+                                            JACK_DEFAULT_AUDIO_TYPE,
+                                            JackPortIsInput, 0);
+  }
+
+#if JACK_CLOSE_HACK
+  drv->in_use = TRUE;
+#endif
+
+  /* tell the JACK server that we are ready to roll */
+  TRACE("calling jack_activate()\n");
+  if(jack_activate(drv->client))
+  {
+    ERR("cannot activate client\n");
+    return ERR_OPENING_JACK;
+  }
+
+  /* if we have output channels and the port connection mode isn't CONNECT_NONE */
+  /* then we should connect up some ports */
+  if((drv->num_output_channels > 0) && (port_connection_mode != CONNECT_NONE))
+  {
+    /* determine how we are to acquire output port names */
+    if((drv->jack_port_name_count == 0) || (drv->jack_port_name_count == 1))
+    {
+      if(drv->jack_port_name_count == 0)
+      {
+        TRACE("jack_get_ports() passing in NULL/NULL\n");
+        ports = jack_get_ports(drv->client, NULL, NULL,
+                               drv->jack_output_port_flags);
+      }
+      else
+      {
+        TRACE("jack_get_ports() passing in port of '%s'\n",
+              drv->jack_port_name[0]);
+        ports = jack_get_ports(drv->client, drv->jack_port_name[0], NULL,
+                               drv->jack_output_port_flags);
+      }
+
+      /* display a trace of the output ports we found */
+      unsigned int num_ports = 0;
+      if(ports)
+      {
+        for(i = 0; ports[i]; i++)
+        {
+          TRACE("ports[%d] = '%s'\n", i, ports[i]);
+          num_ports++;
+        }
+      }
+
+      /* ensure that we found enough ports */
+      if(!ports || (i < drv->num_output_channels))
+      {
+        TRACE("ERR: jack_get_ports() failed to find ports with jack port flags of 0x%lX'\n",
+              drv->jack_output_port_flags);
+#if JACK_CLOSE_HACK
+        JACK_CloseDevice(drv, TRUE);
+#else
+        JACK_CloseDevice(drv);
+#endif
+        return ERR_PORT_NOT_FOUND;
+      }
+
+      /* connect a port for each output channel. Note: you can't do this before
+         the client is activated (this may change in the future). */
+      for(i = 0; i < drv->num_output_channels; i++)
+      {
+        TRACE("jack_connect() to port %d('%p')\n", i, drv->output_port[i]);
+        if(jack_connect(drv->client, jack_port_name(drv->output_port[i]), ports[i]))
+        {
+          ERR("cannot connect to output port %d('%s')\n", i, ports[i]);
+          failed = 1;
+        }
+      }
+
+      /* only if we are in CONNECT_ALL mode should we keep connecting ports up beyond */
+      /* the minimum number of ports required for each output channel coming into bio2jack */
+      if(port_connection_mode == CONNECT_ALL)
+      {
+          /* It's much cheaper and easier to let JACK do the processing required to
+             connect 2 channels to 4 or 4 channels to 2 or any other combinations.
+             This effectively eliminates the need for sample_move_d16_d16() */
+          if(drv->num_output_channels < num_ports)
+          {
+              for(i = drv->num_output_channels; ports[i]; i++)
+              {
+                  int n = i % drv->num_output_channels;
+                  TRACE("jack_connect() to port %d('%p')\n", i, drv->output_port[n]);
+                  if(jack_connect(drv->client, jack_port_name(drv->output_port[n]), ports[i]))
+                  {
+                      // non fatal
+                      ERR("cannot connect to output port %d('%s')\n", n, ports[i]);
+                  }
+              }
+          }
+          else if(drv->num_output_channels > num_ports)
+          {
+              for(i = num_ports; i < drv->num_output_channels; i++)
+              {
+                  int n = i % num_ports;
+                  TRACE("jack_connect() to port %d('%p')\n", i, drv->output_port[n]);
+                  if(jack_connect(drv->client, jack_port_name(drv->output_port[i]), ports[n]))
+                  {
+                      // non fatal
+                      ERR("cannot connect to output port %d('%s')\n", i, ports[n]);
+                  }
+              }
+          }
+      }
+
+      free(ports);              /* free the returned array of ports */
+    }
+    else
+    {
+      for(i = 0; i < drv->jack_port_name_count; i++)
+      {
+        TRACE("jack_get_ports() portname %d of '%s\n", i,
+              drv->jack_port_name[i]);
+        ports = jack_get_ports(drv->client, drv->jack_port_name[i], NULL,
+                               drv->jack_output_port_flags);
+
+        if(!ports)
+        {
+          ERR("jack_get_ports() failed to find ports with jack port flags of 0x%lX'\n",
+              drv->jack_output_port_flags);
+          return ERR_PORT_NOT_FOUND;
+        }
+
+        TRACE("ports[%d] = '%s'\n", 0, ports[0]);       /* display a trace of the output port we found */
+
+        /* connect the port */
+        TRACE("jack_connect() to port %d('%p')\n", i, drv->output_port[i]);
+        if(jack_connect(drv->client, jack_port_name(drv->output_port[i]), ports[0]))
+        {
+          ERR("cannot connect to output port %d('%s')\n", 0, ports[0]);
+          failed = 1;
+        }
+        free(ports);            /* free the returned array of ports */
+      }
+    }
+  }                             /* if( drv->num_output_channels > 0 ) */
+
+
+  if(drv->num_input_channels > 0)
+  {
+    /* determine how we are to acquire input port names */
+    if((drv->jack_port_name_count == 0) || (drv->jack_port_name_count == 1))
+    {
+      if(drv->jack_port_name_count == 0)
+      {
+        TRACE("jack_get_ports() passing in NULL/NULL\n");
+        ports = jack_get_ports(drv->client, NULL, NULL, drv->jack_input_port_flags);
+      }
+      else
+      {
+        TRACE("jack_get_ports() passing in port of '%s'\n",
+              drv->jack_port_name[0]);
+        ports = jack_get_ports(drv->client, drv->jack_port_name[0], NULL,
+                               drv->jack_input_port_flags);
+      }
+
+      /* display a trace of the input ports we found */
+      unsigned int num_ports = 0;
+      if(ports)
+      {
+        for(i = 0; ports[i]; i++)
+        {
+          TRACE("ports[%d] = '%s'\n", i, ports[i]);
+          num_ports++;
+        }
+      }
+
+      /* ensure that we found enough ports */
+      if(!ports || (i < drv->num_input_channels))
+      {
+        TRACE("ERR: jack_get_ports() failed to find ports with jack port flags of 0x%lX'\n",
+              drv->jack_input_port_flags);
+#if JACK_CLOSE_HACK
+        JACK_CloseDevice(drv, TRUE);
+#else
+        JACK_CloseDevice(drv);
+#endif
+        return ERR_PORT_NOT_FOUND;
+      }
+
+      /* connect the ports. Note: you can't do this before
+         the client is activated (this may change in the future). */
+      for(i = 0; i < drv->num_input_channels; i++)
+      {
+        TRACE("jack_connect() to port %d('%p')\n", i, drv->input_port[i]);
+        if(jack_connect(drv->client, ports[i], jack_port_name(drv->input_port[i])))
+        {
+          ERR("cannot connect to input port %d('%s')\n", i, ports[i]);
+          failed = 1;
+        }
+      }
+
+      /* It's much cheaper and easier to let JACK do the processing required to
+         connect 2 channels to 4 or 4 channels to 2 or any other combinations.
+         This effectively eliminates the need for sample_move_d16_d16() */
+      if(drv->num_input_channels < num_ports)
+      {
+        for(i = drv->num_input_channels; ports[i]; i++)
+        {
+          int n = i % drv->num_input_channels;
+          TRACE("jack_connect() to port %d('%p')\n", i, drv->input_port[n]);
+          if(jack_connect(drv->client, ports[i], jack_port_name(drv->input_port[n])))
+          {
+            // non fatal
+            ERR("cannot connect to input port %d('%s')\n", n, ports[i]);
+          }
+        }
+      }
+      else if(drv->num_input_channels > num_ports)
+      {
+        for(i = num_ports; i < drv->num_input_channels; i++)
+        {
+          int n = i % num_ports;
+          TRACE("jack_connect() to port %d('%p')\n", i, drv->input_port[n]);
+          if(jack_connect(drv->client, ports[n], jack_port_name(drv->input_port[i])))
+          {
+            // non fatal
+            ERR("cannot connect to input port %d('%s')\n", i, ports[n]);
+          }
+        }
+      }
+
+      free(ports);              /* free the returned array of ports */
+    }
+    else
+    {
+      for(i = 0; i < drv->jack_port_name_count; i++)
+      {
+        TRACE("jack_get_ports() portname %d of '%s\n", i,
+              drv->jack_port_name[i]);
+        ports = jack_get_ports(drv->client, drv->jack_port_name[i], NULL,
+                               drv->jack_input_port_flags);
+
+        if(!ports)
+        {
+          ERR("jack_get_ports() failed to find ports with jack port flags of 0x%lX'\n",
+              drv->jack_input_port_flags);
+          return ERR_PORT_NOT_FOUND;
+        }
+
+        TRACE("ports[%d] = '%s'\n", 0, ports[0]);       /* display a trace of the input port we found */
+
+        /* connect the port */
+        TRACE("jack_connect() to port %d('%p')\n", i, drv->input_port[i]);
+        if(jack_connect(drv->client, jack_port_name(drv->input_port[i]), ports[0]))
+        {
+          ERR("cannot connect to input port %d('%s')\n", 0, ports[0]);
+          failed = 1;
+        }
+        free(ports);            /* free the returned array of ports */
+      }
+    }
+  }                             /* if( drv->num_input_channels > 0 ) */
+
+  /* if something failed we need to shut the client down and return 0 */
+  if(failed)
+  {
+    TRACE("failed, closing and returning error\n");
+#if JACK_CLOSE_HACK
+    JACK_CloseDevice(drv, TRUE);
+#else
+    JACK_CloseDevice(drv);
+#endif
+    return ERR_OPENING_JACK;
+  }
+
+  TRACE("success\n");
+
+  drv->jackd_died = FALSE;      /* clear out this flag so we don't keep attempting to restart things */
+  drv->state = PLAYING;         /* clients seem to behave much better with this on from the start, especially when recording */
+
+  return ERR_SUCCESS;           /* return success */
+}
+
+
+/******************************************************************
+ *		JACK_CloseDevice
+ *
+ *	Close the connection to the server cleanly.
+ *  If close_client is TRUE we close the client for this device instead of
+ *    just marking the device as in_use(JACK_CLOSE_HACK only)
+ */
+#if JACK_CLOSE_HACK
+static void
+JACK_CloseDevice(jack_driver_t * drv, bool close_client)
+#else
+static void
+JACK_CloseDevice(jack_driver_t * drv)
+#endif
+{
+  unsigned int i;
+
+#if JACK_CLOSE_HACK
+  if(close_client)
+  {
+#endif
+
+    TRACE("closing the jack client thread\n");
+    if(drv->client)
+    {
+      TRACE("after jack_deactivate()\n");
+      int errorCode = jack_client_close(drv->client);
+      if(errorCode)
+        ERR("jack_client_close() failed returning an error code of %d\n",
+            errorCode);
+    }
+
+    /* reset client */
+    drv->client = 0;
+
+    /* free up the port strings */
+    TRACE("freeing up %d port strings\n", drv->jack_port_name_count);
+    if(drv->jack_port_name_count > 1)
+    {
+      for(i = 0; i < drv->jack_port_name_count; i++)
+        free(drv->jack_port_name[i]);
+      free(drv->jack_port_name);
+    }
+    JACK_CleanupDriver(drv);
+
+    JACK_ResetFromDriver(drv);
+
+#if JACK_CLOSE_HACK
+  } else
+  {
+    TRACE("setting in_use to FALSE\n");
+    drv->in_use = FALSE;
+
+    if(!drv->client)
+    {
+      TRACE("critical error, closing a device that has no client\n");
+    }
+  }
+#endif
+}
+
+
+
+
+/**************************************/
+/* External interface functions below */
+/**************************************/
+
+/* Clear out any buffered data, stop playing, zero out some variables */
+static void
+JACK_ResetFromDriver(jack_driver_t * drv)
+{
+  TRACE("resetting drv->deviceID(%d)\n", drv->deviceID);
+
+  /* NOTE: we use the RESET state so we don't need to worry about clearing out */
+  /* variables that the callback modifies while the callback is running */
+  /* we set the state to RESET and the callback clears the variables out for us */
+  drv->state = RESET;           /* tell the callback that we are to reset, the callback will transition this to STOPPED */
+}
+
+/* Clear out any buffered data, stop playing, zero out some variables */
+void
+JACK_Reset(int deviceID)
+{
+  jack_driver_t *drv = getDriver(deviceID);
+  TRACE("resetting deviceID(%d)\n", deviceID);
+  JACK_ResetFromDriver(drv);
+  releaseDriver(drv);
+}
+
+
+/*
+ * open the audio device for writing to
+ *
+ * deviceID is set to the opened device
+ * if client is non-zero and in_use is FALSE then just set in_use to TRUE
+ *
+ * return value is zero upon success, non-zero upon failure 
+ *
+ * if ERR_RATE_MISMATCH (*rate) will be updated with the jack servers rate
+ */
+int
+JACK_Open(int *deviceID, unsigned int bits_per_channel, unsigned long *rate,
+          int channels)
+{
+  /* we call through to JACK_OpenEx(), but default the input channels to 0 for better backwards
+     compatibility with clients written before recording was available */
+  return JACK_OpenEx(deviceID, bits_per_channel,
+                     rate,
+                     0, channels,
+                     NULL, 0, JackPortIsPhysical);
+}
+
+/*
+ * see JACK_Open() for comments
+ * NOTE: jack_port_name has three ways of being used:
+ *       - NULL - finds all ports with the given flags
+ *       - A single regex string used to retrieve all port names
+ *       - A series of port names, one for each output channel
+ *
+ * we set *deviceID
+ */
+int
+JACK_OpenEx(int *deviceID, unsigned int bits_per_channel,
+            unsigned long *rate,
+            unsigned int input_channels, unsigned int output_channels,
+            const char **jack_port_name,
+            unsigned int jack_port_name_count, unsigned long jack_port_flags)
+{
+  jack_driver_t *drv = 0;
+  unsigned int i;
+  int retval;
+
+  if(input_channels < 1 && output_channels < 1)
+  {
+    ERR("no input OR output channels, nothing to do\n");
+    return ERR_OPENING_JACK;
+  }
+
+  switch (bits_per_channel)
+  {
+  case 8:
+  case 16:
+    break;
+  default:
+    ERR("invalid bits_per_channel\n");
+    return ERR_OPENING_JACK;
+  }
+
+  /* Lock the device_mutex and find one that's not allocated already.
+     We'll keep this lock until we've either made use of it, or given up. */
+  pthread_mutex_lock(&device_mutex);
+
+  for(i = 0; i < MAX_OUTDEVICES; i++)
+  {
+    if(!outDev[i].allocated)
+    {
+      drv = &outDev[i];
+      break;
+    }
+  }
+
+  if(!drv)
+  {
+    ERR("no more devices available\n");
+    return ERR_OPENING_JACK;
+  }
+
+  /* We found an unallocated device, now lock it for extra saftey */
+  getDriver(drv->deviceID);
+
+  TRACE("bits_per_channel=%d rate=%ld, input_channels=%d, output_channels=%d\n",
+     bits_per_channel, *rate, input_channels, output_channels);
+
+  if(output_channels > MAX_OUTPUT_PORTS)
+  {
+    ERR("output_channels == %d, MAX_OUTPUT_PORTS == %d\n", output_channels,
+        MAX_OUTPUT_PORTS);
+    releaseDriver(drv);
+    pthread_mutex_unlock(&device_mutex);
+    return ERR_TOO_MANY_OUTPUT_CHANNELS;
+  }
+
+  if(input_channels > MAX_INPUT_PORTS)
+  {
+    ERR("input_channels == %d, MAX_INPUT_PORTS == %d\n", input_channels,
+        MAX_INPUT_PORTS);
+    releaseDriver(drv);
+    pthread_mutex_unlock(&device_mutex);
+    return ERR_TOO_MANY_INPUT_CHANNELS;
+  }
+
+  drv->jack_output_port_flags = jack_port_flags | JackPortIsInput;      /* port must be input(ie we can put data into it), so mask this in */
+  drv->jack_input_port_flags = jack_port_flags | JackPortIsOutput;      /* port must be output(ie we can get data from it), so mask this in */
+
+  /* check that we have the correct number of port names 
+     FIXME?: not sure how we should handle output ports vs input ports....
+   */
+  if((jack_port_name_count > 1)
+     && ((jack_port_name_count < output_channels)
+         || (jack_port_name_count < input_channels)))
+  {
+    ERR("specified individual port names but not enough, gave %d names, need %d\n",
+       jack_port_name_count, output_channels);
+    releaseDriver(drv);
+    pthread_mutex_unlock(&device_mutex);
+    return ERR_PORT_NAME_OUTPUT_CHANNEL_MISMATCH;
+  } else
+  {
+    /* copy this data into the device information */
+    drv->jack_port_name_count = jack_port_name_count;
+
+    if(drv->jack_port_name_count != 0)
+    {
+      drv->jack_port_name =
+        (char **) malloc(sizeof(char *) * drv->jack_port_name_count);
+      for(i = 0; i < drv->jack_port_name_count; i++)
+      {
+        drv->jack_port_name[i] = strdup(jack_port_name[i]);
+        TRACE("jack_port_name[%d] == '%s'\n", i, jack_port_name[i]);
+      }
+    } else
+    {
+      drv->jack_port_name = NULL;
+      TRACE("jack_port_name = NULL\n");
+    }
+  }
+
+  /* initialize some variables */
+  drv->in_use = FALSE;
+
+  JACK_ResetFromDriver(drv);    /* flushes all queued buffers, sets status to STOPPED and resets some variables */
+
+  /* drv->jack_sample_rate is set by JACK_OpenDevice() */
+  drv->client_sample_rate = *rate;
+  drv->bits_per_channel = bits_per_channel;
+  drv->num_input_channels = input_channels;
+  drv->num_output_channels = output_channels;
+  drv->bytes_per_input_frame = (drv->bits_per_channel * drv->num_input_channels) / 8;
+  drv->bytes_per_output_frame = (drv->bits_per_channel * drv->num_output_channels) / 8;
+  drv->bytes_per_jack_output_frame = sizeof(sample_t) * drv->num_output_channels;
+  drv->bytes_per_jack_input_frame = sizeof(sample_t) * drv->num_input_channels;
+
+  if(drv->num_output_channels > 0)
+  {
+    drv->pPlayPtr = jack_ringbuffer_create(drv->num_output_channels *
+                                           drv->bytes_per_jack_output_frame *
+                                           DEFAULT_RB_SIZE);
+  }
+
+  if(drv->num_input_channels > 0)
+  {
+      drv->pRecPtr = jack_ringbuffer_create(drv->num_input_channels *
+                                            drv->bytes_per_jack_input_frame *
+                                            DEFAULT_RB_SIZE);
+  }
+
+  DEBUG("bytes_per_output_frame == %ld\n", drv->bytes_per_output_frame);
+  DEBUG("bytes_per_input_frame  == %ld\n", drv->bytes_per_input_frame);
+  DEBUG("bytes_per_jack_output_frame == %ld\n",
+        drv->bytes_per_jack_output_frame);
+  DEBUG("bytes_per_jack_input_frame == %ld\n",
+        drv->bytes_per_jack_input_frame);
+
+  /* go and open up the device */
+  retval = JACK_OpenDevice(drv);
+  if(retval != ERR_SUCCESS)
+  {
+    TRACE("error opening jack device\n");
+    releaseDriver(drv);
+    pthread_mutex_unlock(&device_mutex);
+    return retval;
+  }
+  else
+  {
+    TRACE("succeeded opening jack device\n");
+  }
+
+  /* setup SRC objects just in case they'll be needed but only if requested */
+  if(do_sample_rate_conversion)
+  {
+    int error;
+    if(drv->num_output_channels > 0)
+    {
+      drv->output_src = src_new(preferred_src_converter, drv->num_output_channels, &error);
+      if(error != 0)
+      {
+        src_delete(drv->output_src);
+        drv->output_src = 0;
+        ERR("Could not created SRC object for output stream %d: %s\n",
+            error, src_strerror(error));
+      }
+    }
+    if(drv->num_input_channels > 0)
+    {
+      drv->input_src = src_new(preferred_src_converter, drv->num_input_channels, &error);
+      if(error != 0)
+      {
+        src_delete(drv->input_src);
+        drv->input_src = 0;
+        ERR("Could not created SRC object for input stream %d: %s\n",
+            error, src_strerror(error));
+      }
+    }
+  }
+  else if((long) (*rate) != drv->jack_sample_rate)
+  {
+    TRACE("rate of %ld doesn't match jack sample rate of %ld, returning error\n",
+          *rate, drv->jack_sample_rate);
+    *rate = drv->jack_sample_rate;
+#if JACK_CLOSE_HACK
+    JACK_CloseDevice(drv, TRUE);
+#else
+    JACK_CloseDevice(drv);
+#endif
+    releaseDriver(drv);
+    pthread_mutex_unlock(&device_mutex);
+    return ERR_RATE_MISMATCH;
+  }
+
+  drv->allocated = TRUE;        /* record that we opened this device */
+
+  DEBUG("sizeof(sample_t) == %d\n", sizeof(sample_t));
+
+  int periodSize = jack_get_buffer_size(drv->client);
+  int periods = 0;
+  /* FIXME: maybe we should keep different latency values for input vs output? */
+  if(drv->num_output_channels > 0)
+  {
+    periods = jack_port_get_total_latency(drv->client,
+                                          drv->output_port[0]) / periodSize;
+    drv->latencyMS = periodSize * periods * 1000 / (drv->jack_sample_rate *
+                                                    (drv->bits_per_channel / 8 *
+                                                     drv->num_output_channels));
+  }
+  else if(drv->num_input_channels > 0)
+  {
+    periods = jack_port_get_total_latency(drv->client,
+                                          drv->input_port[0]) / periodSize;
+    drv->latencyMS =
+      periodSize * periods * 1000 / (drv->jack_sample_rate *
+                                     (drv->bits_per_channel / 8 *
+                                      drv->num_input_channels));
+  }
+
+  TRACE("drv->latencyMS == %ldms\n", drv->latencyMS);
+
+  *deviceID = drv->deviceID;    /* set the deviceID for the caller */
+  releaseDriver(drv);
+  pthread_mutex_unlock(&device_mutex);
+  return ERR_SUCCESS;           /* success */
+}
+
+/* Close the jack device */
+//FIXME: add error handling in here at some point...
+/* NOTE: return 0 for success, non-zero for failure */
+int
+JACK_Close(int deviceID)
+{
+  jack_driver_t *drv = getDriver(deviceID);
+
+  TRACE("deviceID(%d)\n", deviceID);
+
+#if JACK_CLOSE_HACK
+  JACK_CloseDevice(drv, TRUE);
+#else
+  JACK_CloseDevice(drv);
+#endif
+
+  JACK_ResetFromDriver(drv);    /* reset this device to a normal starting state */
+
+  pthread_mutex_lock(&device_mutex);
+
+  /* free buffer memory */
+  drv->callback_buffer1_size = 0;
+  if(drv->callback_buffer1) free(drv->callback_buffer1);
+  drv->callback_buffer1 = 0;
+
+  drv->callback_buffer2_size = 0;
+  if(drv->callback_buffer2) free(drv->callback_buffer2);
+  drv->callback_buffer2 = 0;
+
+  drv->rw_buffer1_size = 0;
+  if(drv->rw_buffer1) free(drv->rw_buffer1);
+  drv->rw_buffer1 = 0;
+
+  if(drv->pPlayPtr) jack_ringbuffer_free(drv->pPlayPtr);
+  drv->pPlayPtr = 0;
+
+  if(drv->pRecPtr) jack_ringbuffer_free(drv->pRecPtr);
+  drv->pRecPtr = 0;
+
+  /* free the SRC objects */
+  if(drv->output_src) src_delete(drv->output_src);
+  drv->output_src = 0;
+
+  if(drv->input_src) src_delete(drv->input_src);
+  drv->input_src = 0;
+
+  drv->allocated = FALSE;       /* release this device */
+
+  pthread_mutex_unlock(&device_mutex);
+
+  releaseDriver(drv);
+
+  return 0;
+}
+
+/* If we haven't already taken in the max allowed data then create a wave header */
+/* to package the audio data and attach the wave header to the end of the */
+/* linked list of wave headers */
+/* These wave headers will be peeled off as they are played by the callback routine */
+/* Return value is the number of bytes written */
+/* NOTE: this function takes the length of data to be written bytes */
+long
+JACK_Write(int deviceID, unsigned char *data, unsigned long bytes)
+{
+  jack_driver_t *drv = getDriver(deviceID);
+
+  long frames_free, frames;
+
+  TIMER("start\n");
+
+  TRACE("deviceID(%d), bytes == %ld\n", deviceID, bytes);
+
+  /* check and see that we have enough space for this audio */
+  frames_free =
+    jack_ringbuffer_write_space(drv->pPlayPtr) /
+    drv->bytes_per_jack_output_frame;
+  frames = bytes / drv->bytes_per_output_frame;
+  TRACE("frames free == %ld, bytes = %lu\n", frames_free, bytes);
+
+  TRACE("state = '%s'\n", DEBUGSTATE(drv->state));
+  /* if we are currently STOPPED we should start playing now... 
+     do this before the check for bytes == 0 since some clients like
+     to write 0 bytes the first time out */
+  if(drv->state == STOPPED)
+  {
+    TRACE("currently STOPPED, transitioning to PLAYING\n");
+    drv->state = PLAYING;
+  }
+
+  /* handle the case where the user calls this routine with 0 bytes */
+  if(bytes == 0 || frames_free < 1)
+  {
+    TRACE("no room left\n");
+    TIMER("finish (nothing to do, buffer is full)\n");
+    releaseDriver(drv);
+    return 0;                   /* indicate that we couldn't write any bytes */
+  }
+
+  frames = min(frames, frames_free);
+  long jack_bytes = frames * drv->bytes_per_jack_output_frame;
+  if(!ensure_buffer_size(&drv->rw_buffer1, &drv->rw_buffer1_size, jack_bytes))
+  {
+    ERR("couldn't allocate enough space for the buffer\n");
+    releaseDriver(drv);
+    return 0;
+  }
+  /* adjust bytes to be how many client bytes we're actually writing */
+  bytes = frames * drv->bytes_per_output_frame;
+
+  /* convert from client samples to jack samples
+     we have to tell it how many samples there are, which is frames * channels */
+  switch (drv->bits_per_channel)
+  {
+  case 8:
+    sample_move_char_float((sample_t *) drv->rw_buffer1, (unsigned char *) data,
+                           frames * drv->num_output_channels);
+    break;
+  case 16:
+    sample_move_short_float((sample_t *) drv->rw_buffer1, (short *) data,
+                            frames * drv->num_output_channels);
+    break;
+  }
+
+  DEBUG("ringbuffer read space = %d, write space = %d\n",
+        jack_ringbuffer_read_space(drv->pPlayPtr),
+        jack_ringbuffer_write_space(drv->pPlayPtr));
+
+  jack_ringbuffer_write(drv->pPlayPtr, drv->rw_buffer1, jack_bytes);
+  DEBUG("wrote %lu bytes, %lu jack_bytes\n", bytes, jack_bytes);
+
+  DEBUG("ringbuffer read space = %d, write space = %d\n",
+        jack_ringbuffer_read_space(drv->pPlayPtr),
+        jack_ringbuffer_write_space(drv->pPlayPtr));
+
+  drv->client_bytes += bytes;   /* update client_bytes */
+
+  TIMER("finish\n");
+
+  DEBUG("returning bytes written of %ld\n", bytes);
+
+  releaseDriver(drv);
+  return bytes;                 /* return the number of bytes we wrote out */
+}
+
+long
+JACK_Read(int deviceID, unsigned char *data, unsigned long bytes)
+{
+  jack_driver_t *drv = getDriver(deviceID);
+
+  long frames_available, frames;
+
+  TIMER("start\n");
+
+  TRACE("deviceID(%d), bytes == %ld\n", deviceID, bytes);
+
+  /* find out if there's any room to write this data */
+  frames_available =
+    jack_ringbuffer_read_space(drv->pRecPtr) /
+    drv->bytes_per_jack_input_frame;
+  frames = bytes / drv->bytes_per_input_frame;
+  DEBUG("frames available = %ld, bytes = %lu\n", frames_available, bytes);
+
+  TRACE("state = '%s'\n", DEBUGSTATE(drv->state));
+  /* if we are currently STOPPED we should start recording now... */
+  if(drv->state == STOPPED)
+  {
+    TRACE("currently STOPPED, transitioning to PLAYING\n");
+    drv->state = PLAYING;
+  }
+
+  /* handle the case where the user calls this routine with 0 bytes */
+  if(bytes == 0 || frames_available < 1)
+  {
+    TRACE("no bytes in buffer\n");
+
+    TIMER("finish (nothing to do)\n");
+    releaseDriver(drv);
+    return 0;
+  }
+
+  frames = min(frames, frames_available);
+  long jack_bytes = frames * drv->bytes_per_jack_input_frame;
+  if(!ensure_buffer_size(&drv->rw_buffer1, &drv->rw_buffer1_size, jack_bytes))
+  {
+    ERR("couldn't allocate enough space for the buffer\n");
+    releaseDriver(drv);
+    return 0;
+  }
+
+  DEBUG("ringbuffer read space = %d, write space = %d\n",
+        jack_ringbuffer_read_space(drv->pRecPtr),
+        jack_ringbuffer_write_space(drv->pRecPtr));
+
+  jack_ringbuffer_read(drv->pRecPtr, drv->rw_buffer1,
+                       frames * drv->bytes_per_jack_input_frame);
+
+  DEBUG("ringbuffer read space = %d, write space = %d\n",
+        jack_ringbuffer_read_space(drv->pRecPtr),
+        jack_ringbuffer_write_space(drv->pRecPtr));
+
+  unsigned int i;
+  for(i = 0; i < drv->num_output_channels; i++)
+  {
+    /* apply volume to the floating value */
+    if(drv->volumeEffectType == dbAttenuation)
+    {
+      /* assume the volume setting is dB of attenuation, a volume of 0 */
+      /* is 0dB attenuation */
+      float volume = powf(10.0, -((float) drv->volume[i]) / 20.0);
+      float_volume_effect((sample_t *) drv->rw_buffer1 + i,
+                          frames, volume, drv->num_output_channels);
+    } else
+    {
+      float_volume_effect((sample_t *) drv->rw_buffer1 + i, frames,
+                          ((float) drv->volume[i] / 100.0),
+                          drv->num_output_channels);
+    }
+  }
+
+  /* convert from jack samples to client samples
+     we have to tell it how many samples there are, which is frames * channels */
+  switch (drv->bits_per_channel)
+  {
+  case 8:
+    sample_move_float_char((unsigned char *) data, (sample_t *) drv->rw_buffer1,
+                           frames * drv->num_input_channels);
+    break;
+  case 16:
+    sample_move_float_short((short *) data, (sample_t *) drv->rw_buffer1,
+                            frames * drv->num_input_channels);
+    break;
+  }
+
+  TIMER("finish\n");
+
+  long read_bytes = frames * drv->bytes_per_input_frame;
+
+  DEBUG("returning bytes read of %ld\n", bytes);
+
+  releaseDriver(drv);
+  return read_bytes;
+}
+
+/* return ERR_SUCCESS for success */
+static int
+JACK_SetVolumeForChannelFromDriver(jack_driver_t * drv,
+                                   unsigned int channel, unsigned int volume)
+{
+  /* TODO?: maybe we should have different volume levels for input & output */
+  /* ensure that we have the channel we are setting volume for */
+  if(channel > (drv->num_output_channels - 1))
+    return 1;
+
+  if(volume > 100)
+    volume = 100;               /* check for values in excess of max */
+
+  drv->volume[channel] = volume;
+  return ERR_SUCCESS;
+}
+
+/* return ERR_SUCCESS for success */
+int
+JACK_SetVolumeForChannel(int deviceID, unsigned int channel,
+                         unsigned int volume)
+{
+  jack_driver_t *drv = getDriver(deviceID);
+  int retval = JACK_SetVolumeForChannelFromDriver(drv, channel, volume);
+  releaseDriver(drv);
+  return retval;
+}
+
+/* Set the volume */
+/* return 0 for success */
+/* NOTE: we check for invalid volume values */
+int
+JACK_SetAllVolume(int deviceID, unsigned int volume)
+{
+  jack_driver_t *drv = getDriver(deviceID);
+  unsigned int i;
+
+  TRACE("deviceID(%d), setting volume of %d\n", deviceID, volume);
+
+  for(i = 0; i < drv->num_output_channels; i++)
+  {
+    if(JACK_SetVolumeForChannelFromDriver(drv, i, volume) != ERR_SUCCESS)
+    {
+      releaseDriver(drv);
+      return 1;
+    }
+  }
+
+  releaseDriver(drv);
+  return ERR_SUCCESS;
+}
+
+/* Return the current volume in the inputted pointers */
+/* NOTE: we check for null pointers being passed in just in case */
+void
+JACK_GetVolumeForChannel(int deviceID, unsigned int channel,
+                         unsigned int *volume)
+{
+  jack_driver_t *drv = getDriver(deviceID);
+
+  /* ensure that we have the channel we are getting volume for */
+  if(channel > (drv->num_output_channels - 1))
+  {
+    ERR("asking for channel index %d but we only have %ld channels\n", channel, drv->num_output_channels);
+    releaseDriver(drv);
+    return;
+  }
+
+  if(volume)
+    *volume = drv->volume[channel];
+
+#if VERBOSE_OUTPUT
+  if(volume)
+  {
+    TRACE("deviceID(%d), returning volume of %d for channel %d\n",
+          deviceID, *volume, channel);
+  }
+  else
+  {
+    TRACE("volume is null, can't dereference it\n");
+  }
+#endif
+
+  releaseDriver(drv);
+}
+
+
+/* linear means 0 volume is silence, 100 is full volume */
+/* dbAttenuation means 0 volume is 0dB attenuation */
+/* Bio2jack defaults to linear */
+enum JACK_VOLUME_TYPE
+JACK_SetVolumeEffectType(int deviceID, enum JACK_VOLUME_TYPE type)
+{
+  enum JACK_VOLUME_TYPE retval;
+  jack_driver_t *drv = getDriver(deviceID);
+
+  TRACE("setting type of '%s'\n",
+        (type == dbAttenuation ? "dbAttenuation" : "linear"));
+
+  retval = drv->volumeEffectType;
+  drv->volumeEffectType = type;
+
+  releaseDriver(drv);
+  return retval;
+}
+
+
+/* Controls the state of the playback(playing, paused, ...) */
+int
+JACK_SetState(int deviceID, enum status_enum state)
+{
+  jack_driver_t *drv = getDriver(deviceID);
+
+  switch (state)
+  {
+  case PAUSED:
+    drv->state = PAUSED;
+    break;
+  case PLAYING:
+    drv->state = PLAYING;
+    break;
+  case STOPPED:
+    drv->state = STOPPED;
+    break;
+  default:
+    TRACE("unknown state of %d\n", state);
+  }
+
+  TRACE("%s\n", DEBUGSTATE(drv->state));
+
+  releaseDriver(drv);
+  return 0;
+}
+
+/* Retrieve the current state of the device */
+enum status_enum
+JACK_GetState(int deviceID)
+{
+  jack_driver_t *drv = getDriver(deviceID);
+  enum status_enum return_val;
+
+  return_val = drv->state;
+  releaseDriver(drv);
+
+  TRACE("deviceID(%d), returning current state of %s\n", deviceID,
+        DEBUGSTATE(return_val));
+  return return_val;
+}
+
+/* Retrieve the number of bytes per second we are outputting */
+unsigned long
+JACK_GetOutputBytesPerSecondFromDriver(jack_driver_t * drv)
+{
+  unsigned long return_val;
+
+  return_val = drv->bytes_per_output_frame * drv->client_sample_rate;
+
+#if VERBOSE_OUTPUT
+  TRACE("deviceID(%d), return_val = %ld\n", drv->deviceID, return_val);
+#endif
+
+  return return_val;
+}
+
+/* Retrieve the number of bytes per second we are outputting */
+unsigned long
+JACK_GetOutputBytesPerSecond(int deviceID)
+{
+  jack_driver_t *drv = getDriver(deviceID);
+  unsigned long return_val;
+
+  return_val = JACK_GetOutputBytesPerSecondFromDriver(drv);
+  releaseDriver(drv);
+
+  return return_val;
+}
+
+/* Retrieve the number of input bytes(from jack) per second we are outputting
+   to the user of bio2jack */
+static long
+JACK_GetInputBytesPerSecondFromDriver(jack_driver_t * drv)
+{
+  long return_val;
+
+  return_val = drv->bytes_per_input_frame * drv->client_sample_rate;
+#if VERBOSE_OUTPUT
+  TRACE("drv->deviceID(%d), return_val = %ld\n", drv->deviceID, return_val);
+#endif
+
+  return return_val;
+}
+
+/* Retrieve the number of input bytes(from jack) per second we are outputting
+   to the user of bio2jack */
+unsigned long
+JACK_GetInputBytesPerSecond(int deviceID)
+{
+  jack_driver_t *drv = getDriver(deviceID);
+  long return_val = JACK_GetInputBytesPerSecondFromDriver(drv);
+  releaseDriver(drv);
+
+#if VERBOSE_OUTPUT
+  TRACE("deviceID(%d), return_val = %ld\n", deviceID, return_val);
+#endif
+
+  return return_val;
+}
+
+/* Return the number of bytes we have buffered thus far for output */
+/* NOTE: convert from output bytes to input bytes in here */
+static long
+JACK_GetBytesStoredFromDriver(jack_driver_t * drv)
+{
+  if(drv->pPlayPtr == 0 || drv->bytes_per_jack_output_frame == 0)
+    return 0;
+
+  /* leave at least one frame in the buffer at all times to prevent underruns */
+  long return_val =
+    jack_ringbuffer_read_space(drv->pPlayPtr) - drv->jack_buffer_size;
+  if(return_val <= 0)
+  {
+    return_val = 0;
+  } else
+  {
+    /* adjust from jack bytes to client bytes */
+    return_val =
+      return_val / drv->bytes_per_jack_output_frame *
+      drv->bytes_per_output_frame;
+  }
+
+  return return_val;
+}
+
+/* An approximation of how many bytes we have to send out to jack */
+/* that is computed as if we were sending jack a continuous stream of */
+/* bytes rather than chunks during discrete callbacks.  */
+/* Return the number of bytes we have buffered thus far for output */
+/* NOTE: convert from output bytes to input bytes in here */
+unsigned long
+JACK_GetBytesStored(int deviceID)
+{
+  jack_driver_t *drv = getDriver(deviceID);
+  long retval = JACK_GetBytesStoredFromDriver(drv);
+  releaseDriver(drv);
+  TRACE("deviceID(%d), retval = %ld\n", deviceID, retval);
+  return retval;
+}
+
+static unsigned long
+JACK_GetBytesFreeSpaceFromDriver(jack_driver_t * drv)
+{
+  if(drv->pPlayPtr == 0 || drv->bytes_per_jack_output_frame == 0)
+    return 0;
+
+  /* leave at least one frame in the buffer at all times to prevent underruns */
+  long return_val = jack_ringbuffer_write_space(drv->pPlayPtr) - drv->jack_buffer_size;
+  if(return_val <= 0)
+  {
+    return_val = 0;
+  } else
+  {
+    /* adjust from jack bytes to client bytes */
+    return_val =
+      return_val / drv->bytes_per_jack_output_frame *
+      drv->bytes_per_output_frame;
+  }
+
+  return return_val;
+}
+
+/* Return the number of bytes we can write to the device */
+unsigned long
+JACK_GetBytesFreeSpace(int deviceID)
+{
+  jack_driver_t *drv = getDriver(deviceID);
+  unsigned long return_val;
+
+  return_val = JACK_GetBytesFreeSpaceFromDriver(drv);
+  releaseDriver(drv);
+
+  TRACE("deviceID(%d), retval == %ld\n", deviceID, return_val);
+
+  return return_val;
+}
+
+/* bytes of space used in the input buffer */
+unsigned long
+JACK_GetBytesUsedSpace(int deviceID)
+{
+  jack_driver_t *drv = getDriver(deviceID);
+  long return_val;
+
+  if(drv->pRecPtr == 0 || drv->bytes_per_jack_input_frame == 0)
+  {
+    return_val = 0;
+  } else
+  {
+    /* adjust from jack bytes to client bytes */
+    return_val =
+      jack_ringbuffer_read_space(drv->pRecPtr) /
+      drv->bytes_per_jack_input_frame * drv->bytes_per_input_frame;
+  }
+
+  releaseDriver(drv);
+
+  if(return_val < 0)
+    return_val = 0;
+  TRACE("deviceID(%d), retval == %ld\n", deviceID, return_val);
+
+  return return_val;
+}
+
+/* Get the current position of the driver, either in bytes or */
+/* in milliseconds */
+/* NOTE: this is position relative to input bytes, output bytes may differ greatly due to
+   input vs. output channel count */
+static long
+JACK_GetPositionFromDriver(jack_driver_t * drv, enum pos_enum position,
+                           int type)
+{
+  long return_val = 0;
+  struct timeval now;
+  long elapsedMS;
+  double sec2msFactor = 1000;
+
+  char *type_str = "UNKNOWN type";
+
+  /* if we are reset we should return a position of 0 */
+  if(drv->state == RESET)
+  {
+    TRACE("we are currently RESET, returning 0\n");
+    return 0;
+  }
+
+  if(type == WRITTEN)
+  {
+    type_str = "WRITTEN";
+    return_val = drv->client_bytes;
+  } else if(type == WRITTEN_TO_JACK)
+  {
+    type_str = "WRITTEN_TO_JACK";
+    return_val = drv->written_client_bytes;
+  } else if(type == PLAYED)       /* account for the elapsed time for the played_bytes */
+  {
+    type_str = "PLAYED";
+    return_val = drv->played_client_bytes;
+    gettimeofday(&now, 0);
+
+    elapsedMS = TimeValDifference(&drv->previousTime, &now);    /* find the elapsed milliseconds since last JACK_Callback() */
+
+    TRACE("elapsedMS since last callback is '%ld'\n", elapsedMS);
+
+    /* account for the bytes played since the last JACK_Callback() */
+    /* NOTE: [Xms * (Bytes/Sec)] * (1 sec/1,000ms) */
+    /* NOTE: don't do any compensation if no data has been sent to jack since the last callback */
+    /* as this would result a bogus computed result */
+    if(drv->clientBytesInJack != 0)
+    {
+      return_val += (long) ((double) elapsedMS *
+                            ((double) JACK_GetOutputBytesPerSecondFromDriver(drv) /
+                             sec2msFactor));
+    } else
+    {
+      TRACE("clientBytesInJack == 0\n");
+    }
+  }
+
+  /* add on the offset */
+  return_val += drv->position_byte_offset;
+
+  /* convert byte position to milliseconds value if necessary */
+  if(position == MILLISECONDS)
+  {
+    if(JACK_GetOutputBytesPerSecondFromDriver(drv) != 0)
+    {
+      return_val = (long) (((double) return_val /
+                            (double) JACK_GetOutputBytesPerSecondFromDriver(drv)) *
+                           (double) sec2msFactor);
+    } else
+    {
+      return_val = 0;
+    }
+  }
+
+  TRACE("drv->deviceID(%d), type(%s), return_val = %ld\n", drv->deviceID,
+        type_str, return_val);
+
+  return return_val;
+}
+
+/* Get the current position of the driver, either in bytes or */
+/* in milliseconds */
+/* NOTE: this is position relative to input bytes, output bytes may differ greatly due to input vs. output channel count */
+long
+JACK_GetPosition(int deviceID, enum pos_enum position, int type)
+{
+  jack_driver_t *drv = getDriver(deviceID);
+  long retval = JACK_GetPositionFromDriver(drv, position, type);
+  releaseDriver(drv);
+  TRACE("retval == %ld\n", retval);
+  return retval;
+}
+
+// Set position always applies to written bytes
+// NOTE: we must apply this instantly because if we pass this as a message
+//   to the callback we risk the user sending us audio data in the mean time
+//   and there is no need to send this as a message, we don't modify any
+//   internal variables
+void
+JACK_SetPositionFromDriver(jack_driver_t * drv, enum pos_enum position,
+                           long value)
+{
+  double sec2msFactor = 1000;
+#if TRACE_ENABLE
+  long input_value = value;
+#endif
+
+  /* convert the incoming value from milliseconds into bytes */
+  if(position == MILLISECONDS)
+  {
+    value = (long) (((double) value *
+                     (double) JACK_GetOutputBytesPerSecondFromDriver(drv)) /
+                    sec2msFactor);
+  }
+
+  /* ensure that if the user asks for the position */
+  /* they will at this instant get the correct position */
+  drv->position_byte_offset = value - drv->client_bytes;
+
+  TRACE("deviceID(%d) input_value of %ld %s, new value of %ld, setting position_byte_offset to %ld\n",
+        drv->deviceID, input_value, (position == MILLISECONDS) ? "ms" : "bytes",
+        value, drv->position_byte_offset);
+}
+
+// Set position always applies to written bytes
+// NOTE: we must apply this instantly because if we pass this as a message
+//   to the callback we risk the user sending us audio data in the mean time
+//   and there is no need to send this as a message, we don't modify any
+//   internal variables
+void
+JACK_SetPosition(int deviceID, enum pos_enum position, long value)
+{
+  jack_driver_t *drv = getDriver(deviceID);
+  JACK_SetPositionFromDriver(drv, position, value);
+  releaseDriver(drv);
+
+  TRACE("deviceID(%d) value of %ld\n", drv->deviceID, value);
+}
+
+/* Return the number of bytes per frame, or (output_channels * bits_per_channel) / 8 */
+unsigned long
+JACK_GetBytesPerOutputFrame(int deviceID)
+{
+  jack_driver_t *drv = getDriver(deviceID);
+  long return_val = drv->bytes_per_output_frame;
+  releaseDriver(drv);
+  TRACE("deviceID(%d), return_val = %ld\n", deviceID, return_val);
+  return return_val;
+}
+
+/* Return the number of bytes per frame, or (input_channels * bits_per_channel) / 8 */
+unsigned long
+JACK_GetBytesPerInputFrame(int deviceID)
+{
+  jack_driver_t *drv = getDriver(deviceID);
+  long return_val = drv->bytes_per_input_frame;
+  releaseDriver(drv);
+  TRACE("deviceID(%d), return_val = %ld\n", deviceID, return_val);
+  return return_val;
+}
+
+/* Return the number of output bytes we buffer max */
+long
+JACK_GetMaxOutputBufferedBytes(int deviceID)
+{
+  jack_driver_t *drv = getDriver(deviceID);
+  long return_val;
+
+  if(drv->pPlayPtr == 0 || drv->bytes_per_jack_output_frame == 0) return_val = 0;
+
+  /* adjust from jack bytes to client bytes */
+  return_val =
+    (jack_ringbuffer_read_space(drv->pPlayPtr) +
+     jack_ringbuffer_write_space(drv->pPlayPtr)) /
+    drv->bytes_per_jack_output_frame * drv->bytes_per_output_frame;
+
+  releaseDriver(drv);
+
+  TRACE("return_val = %ld\n", return_val);
+
+  return return_val;
+}
+
+/* Return the number of input bytes we buffer max */
+long
+JACK_GetMaxInputBufferedBytes(int deviceID)
+{
+  jack_driver_t *drv = getDriver(deviceID);
+  long return_val;
+
+  if(drv->pRecPtr == 0 || drv->bytes_per_jack_input_frame == 0) return_val = 0;
+
+  /* adjust from jack bytes to client bytes */
+  return_val =
+    (jack_ringbuffer_read_space(drv->pRecPtr) +
+     jack_ringbuffer_write_space(drv->pRecPtr)) /
+    drv->bytes_per_jack_input_frame * drv->bytes_per_input_frame;
+
+  releaseDriver(drv);
+
+  TRACE("return_val = %ld\n", return_val);
+
+  return return_val;
+}
+
+/* Get the number of output channels */
+int
+JACK_GetNumOutputChannels(int deviceID)
+{
+  jack_driver_t *drv = getDriver(deviceID);
+  int return_val = drv->num_output_channels;
+  releaseDriver(drv);
+  TRACE("getting num_output_channels of %d\n", return_val);
+  return return_val;
+}
+
+/* Get the number of input channels */
+int
+JACK_GetNumInputChannels(int deviceID)
+{
+  jack_driver_t *drv = getDriver(deviceID);
+  int return_val = drv->num_input_channels;
+  releaseDriver(drv);
+  TRACE("getting num_input_channels of %d\n", return_val);
+  return return_val;
+}
+
+/* Get the number of samples per second, the sample rate */
+long
+JACK_GetSampleRate(int deviceID)
+{
+  jack_driver_t *drv = getDriver(deviceID);
+  int return_val = drv->client_sample_rate;
+  releaseDriver(drv);
+  TRACE("getting sample_rate of %d\n", return_val);
+  return return_val;
+}
+
+void
+JACK_CleanupDriver(jack_driver_t * drv)
+{
+  TRACE("\n");
+  /* things that need to be reset both in JACK_Init & JACK_CloseDevice */
+  drv->client = 0;
+  drv->in_use = FALSE;
+  drv->state = CLOSED;
+  drv->jack_sample_rate = 0;
+  drv->output_sample_rate_ratio = 1.0;
+  drv->input_sample_rate_ratio = 1.0;
+  drv->jackd_died = FALSE;
+  gettimeofday(&drv->previousTime, 0);  /* record the current time */
+  gettimeofday(&drv->last_reconnect_attempt, 0);
+}
+
+/* Initialize the jack porting library to a clean state */
+void
+JACK_Init(void)
+{
+  jack_driver_t *drv;
+  int x, y;
+
+  if(init_done)
+  {
+    TRACE("not initing twice\n");
+    return;
+  }
+
+  init_done = 1;
+
+  TRACE("\n");
+
+  pthread_mutex_lock(&device_mutex);
+
+  /* initialize the device structures */
+  for(x = 0; x < MAX_OUTDEVICES; x++)
+  {
+    drv = &outDev[x];
+
+    pthread_mutex_init(&drv->mutex, NULL);
+
+    getDriver(x);
+
+    memset(drv, 0, sizeof(jack_driver_t));
+    drv->volumeEffectType = linear;
+    drv->deviceID = x;
+
+    for(y = 0; y < MAX_OUTPUT_PORTS; y++)       /* make all volume 25% as a default */
+      drv->volume[y] = 25;
+
+    JACK_CleanupDriver(drv);
+    JACK_ResetFromDriver(drv);
+    releaseDriver(drv);
+  }
+
+  client_name = 0;              /* initialize the name to null */
+  do_sample_rate_conversion = TRUE;     /* default to on */
+  JACK_SetClientName("bio2jack");
+
+  pthread_mutex_unlock(&device_mutex);
+
+  TRACE("finished\n");
+}
+
+/* Get the latency, in frames, of jack */
+long
+JACK_GetJackOutputLatency(int deviceID)
+{
+  jack_driver_t *drv = getDriver(deviceID);
+  long return_val = 0;
+
+  if(drv->client && drv->num_output_channels)
+    return_val = jack_port_get_total_latency(drv->client, drv->output_port[0]);
+
+  TRACE("got latency of %ld frames\n", return_val);
+
+  releaseDriver(drv);
+  return return_val;
+}
+
+/* Get the latency, in frames, of jack */
+long
+JACK_GetJackInputLatency(int deviceID)
+{
+  jack_driver_t *drv = getDriver(deviceID);
+  long return_val = 0;
+
+  if(drv->client && drv->num_input_channels)
+    return_val = jack_port_get_total_latency(drv->client, drv->input_port[0]);
+
+  TRACE("got latency of %ld frames\n", return_val);
+
+  releaseDriver(drv);
+  return return_val;
+}
+
+/* bytes that jack requests during each callback */
+unsigned long
+JACK_GetJackBufferedBytes(int deviceID)
+{
+  jack_driver_t *drv = getDriver(deviceID);
+  long return_val;
+
+  if(drv->bytes_per_jack_output_frame == 0)
+  {
+    return_val = 0;
+  } else
+  {
+    /* adjust from jack bytes to client bytes */
+    return_val =
+      drv->jack_buffer_size / drv->bytes_per_jack_output_frame *
+      drv->bytes_per_output_frame * drv->num_output_channels;
+  }
+
+  releaseDriver(drv);
+  return return_val;
+}
+
+/* value = TRUE, perform sample rate conversion */
+void
+JACK_DoSampleRateConversion(bool value)
+{
+  do_sample_rate_conversion = value;
+}
+
+/* FIXME: put the filename of the resample library header file with the decoders in here */
+/* consider mapping them in the bio2jack.h header file since its useless to the user unless */
+/* they can figure out wtf the settings on */
+void
+JACK_SetSampleRateConversionFunction(int converter)
+{
+  preferred_src_converter = converter;
+}
+
+/* set the client name that will be reported to jack when we open a */
+/* connection via JACK_OpenDevice() */
+void
+JACK_SetClientName(char *name)
+{
+  if(name)
+  {
+    if(client_name) free(client_name);
+
+    /* jack_client_name_size() is the max length of a client name, including
+       the terminating null. */
+    int size = strlen(name) + 1;        /* take into account the terminating null */
+    if(size > jack_client_name_size())
+      size = jack_client_name_size();
+
+    client_name = malloc(size);
+    if(client_name)
+      snprintf(client_name, size, "%s", name);
+    else
+      ERR("unable to allocate %d bytes for client_name\n", size);
+  }
+}
+
+void
+JACK_SetPortConnectionMode(enum JACK_PORT_CONNECTION_MODE mode)
+{
+    port_connection_mode = mode;
+}
diff --git a/lib/qmmp/Output/jack/bio2jack.h b/lib/qmmp/Output/jack/bio2jack.h
new file mode 100644
index 000000000..f81a7c777
--- /dev/null
+++ b/lib/qmmp/Output/jack/bio2jack.h
@@ -0,0 +1,145 @@
+/*
+ * Copyright 2003-2004 Chris Morgan <cmorgan@alum.wpi.edu>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef _H_JACK_OUT_H
+#define _H_JACK_OUT_H
+
+#include <jack/jack.h>
+
+#ifdef __cplusplus
+extern "C" {
+#else
+#define bool long
+#endif
+
+#ifndef TRUE
+#define TRUE 1
+#endif
+
+#ifndef FALSE
+#define FALSE 0
+#endif
+
+#define ERR_SUCCESS                           0
+#define ERR_OPENING_JACK                      1
+#define ERR_RATE_MISMATCH                     2
+#define ERR_BYTES_PER_OUTPUT_FRAME_INVALID    3
+#define ERR_BYTES_PER_INPUT_FRAME_INVALID     4
+#define ERR_TOO_MANY_OUTPUT_CHANNELS          5
+#define ERR_PORT_NAME_OUTPUT_CHANNEL_MISMATCH 6
+#define ERR_PORT_NOT_FOUND                    7
+#define ERR_TOO_MANY_INPUT_CHANNELS           8
+#define ERR_PORT_NAME_INPUT_CHANNEL_MISMATCH  9
+
+enum status_enum { PLAYING, PAUSED, STOPPED, CLOSED, RESET };
+enum pos_enum    { BYTES, MILLISECONDS };
+
+#define PLAYED          1 /* played out of the speakers(estimated value but should be close */
+#define WRITTEN_TO_JACK 2 /* amount written out to jack */
+#define WRITTEN         3 /* amount written to the bio2jack device */
+
+/**********************/
+/* External functions */
+void JACK_Init(void); /* call this before any other bio2jack calls */
+void JACK_DoSampleRateConversion(bool value); /* whether the next device that's Open()d should do
+                                                 sample rate conversion if necessary */
+void JACK_SetSampleRateConversionFunction(int converter); /* which SRC converter function should be used
+                                                             for the next Open()d device */
+int  JACK_Open(int *deviceID, unsigned int bits_per_sample, unsigned long *rate, int channels); /* Note: defaults to 0 input channels
+												   if you need input (record) use OpenEx
+												   instead */
+int  JACK_OpenEx(int *deviceID, unsigned int bits_per_channel,
+                 unsigned long *rate,
+                 unsigned int input_channels, unsigned int output_channels,
+                 const char **jack_port_name, unsigned int jack_port_name_count,
+                 unsigned long jack_port_flags);
+int  JACK_Close(int deviceID); /* return 0 for success */
+void JACK_Reset(int deviceID); /* free all buffered data and reset several values in the device */
+long JACK_Write(int deviceID, unsigned char *data, unsigned long bytes); /* returns the number of bytes written */
+long JACK_Read(int deviceID, unsigned char *data, unsigned long bytes); /* returns the number of bytes read */
+
+/* state setting values */
+/* set/get the written/played/buffered value based on a byte or millisecond input value */
+long JACK_GetPosition(int deviceID, enum pos_enum position, int type);
+void JACK_SetPosition(int deviceID, enum pos_enum position, long value);
+
+long JACK_GetJackLatency(int deviceID); /* deprectated, you probably want JACK_GetJackOutputLatency */
+long JACK_GetJackOutputLatency(int deviceID); /* return the output latency in frames */
+long JACK_GetJackInputLatency(int deviceID); /* return the input latency in frames */
+
+int JACK_SetState(int deviceID, enum status_enum state); /* playing, paused, stopped */
+enum status_enum JACK_GetState(int deviceID);
+
+long JACK_GetMaxOutputBufferedBytes(int deviceID);
+long JACK_GetMaxInputBufferedBytes(int deviceID);
+
+/* bytes that jack requests during each callback */
+unsigned long JACK_GetJackBufferedBytes(int deviceID);
+
+/* Properties of the jack driver */
+
+/* linear means 0 volume is silence, 100 is full volume */
+/* dbAttenuation means 0 volume is 0dB attenuation */
+/* Bio2jack defaults to linear */
+/* Note: volume controls only effect output channels for now */
+enum JACK_VOLUME_TYPE { linear, dbAttenuation };
+enum JACK_VOLUME_TYPE JACK_SetVolumeEffectType(int deviceID,
+                                               enum JACK_VOLUME_TYPE type);
+
+int  JACK_SetAllVolume(int deviceID, unsigned int volume); /* returns 0 on success */
+int  JACK_SetVolumeForChannel(int deviceID, unsigned int channel, unsigned int volume);
+void JACK_GetVolumeForChannel(int deviceID, unsigned int channel, unsigned int *volume);
+
+
+unsigned long JACK_GetOutputBytesPerSecond(int deviceID); /* bytes_per_output_frame * sample_rate */
+unsigned long JACK_GetInputBytesPerSecond(int deviceID);  /* bytes_per_input_frame * sample_rate */
+unsigned long JACK_GetBytesStored(int deviceID);          /* bytes currently buffered in the output buffer */
+unsigned long JACK_GetBytesFreeSpace(int deviceID);       /* bytes of free space in the output buffer */
+unsigned long JACK_GetBytesUsedSpace(int deviceID);       /* bytes of space used in the input buffer */
+unsigned long JACK_GetBytesPerOutputFrame(int deviceID);
+unsigned long JACK_GetBytesPerInputFrame(int deviceID);
+
+/* Note: these will probably be removed in a future release */
+int  JACK_GetNumInputChannels(int deviceID);
+int  JACK_GetNumOutputChannels(int deviceID);
+
+long JACK_GetSampleRate(int deviceID); /* samples per second */
+
+void JACK_SetClientName(char *name); /* sets the name that bio2jack will use when
+                                        creating a new jack client.  name_%pid%_%deviceID%%counter%
+                                        will be used
+                                        NOTE: this defaults to name = bio2jack
+                                        NOTE: we limit the size of the client name to
+                                           jack_client_name_size() */
+
+enum JACK_PORT_CONNECTION_MODE
+{
+    CONNECT_ALL,    /* connect to all avaliable ports */
+    CONNECT_OUTPUT, /* connect only to the ports we need for output */
+    CONNECT_NONE    /* don't connect to any ports */
+};
+
+/* set the mode for port connections */
+/* defaults to CONNECT_ALL */ 
+void JACK_SetPortConnectionMode(enum JACK_PORT_CONNECTION_MODE mode);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* #ifndef JACK_OUT_H */
diff --git a/lib/qmmp/Output/jack/jack.pro b/lib/qmmp/Output/jack/jack.pro
new file mode 100644
index 000000000..1e81bfc08
--- /dev/null
+++ b/lib/qmmp/Output/jack/jack.pro
@@ -0,0 +1,26 @@
+
+
+HEADERS += outputjackfactory.h \
+           outputjack.h \
+           bio2jack.h
+
+SOURCES += outputjackfactory.cpp \
+           outputjack.cpp \
+           bio2jack.c
+
+INCLUDEPATH += ../../../
+QMAKE_LIBDIR += ../../../
+QMAKE_CLEAN = ../libjack.so
+CONFIG += release \
+warn_on \
+thread \
+plugin \
+link_pkgconfig
+DESTDIR = ../
+TEMPLATE = lib
+LIBS += -lqmmp
+PKGCONFIG += jack samplerate
+#TRANSLATIONS = translations/jack_plugin_ru.ts
+#RESOURCES = translations/translations.qrc
+target.path = /lib/qmmp/Output
+INSTALLS += target
diff --git a/lib/qmmp/Output/jack/outputjack.cpp b/lib/qmmp/Output/jack/outputjack.cpp
new file mode 100644
index 000000000..221968372
--- /dev/null
+++ b/lib/qmmp/Output/jack/outputjack.cpp
@@ -0,0 +1,210 @@
+#include <QObject>
+#include <QApplication>
+#include <QtGlobal>
+#include <QDir>
+#include <QSettings>
+
+#include "outputjack.h"
+#include "constants.h"
+#include "buffer.h"
+#include "visualization.h"
+
+#include <stdio.h>
+#include <string.h>
+
+void OutputJACK::stop()
+{
+    m_userStop = TRUE;
+}
+
+void OutputJACK::status()
+{
+    long ct = (m_totalWritten - latency()) / m_bps;
+
+    if (ct < 0)
+        ct = 0;
+
+    if (ct > m_currentSeconds)
+    {
+        m_currentSeconds = ct;
+        dispatch(m_currentSeconds, m_totalWritten, m_rate,
+                 m_frequency, m_precision, m_channels);
+    }
+}
+
+long OutputJACK::written()
+{
+    return m_totalWritten;
+}
+
+void OutputJACK::seek(long pos)
+{
+    recycler()->mutex()->lock ();
+    recycler()->clear();
+    recycler()->mutex()->unlock();
+
+    m_totalWritten = (pos * m_bps);
+    m_currentSeconds = -1;
+}
+
+OutputJACK::OutputJACK(QObject * parent)
+        : Output(parent), m_inited(FALSE), m_pause(FALSE), m_play(FALSE),
+        m_userStop(FALSE), m_totalWritten(0), m_currentSeconds(-1),
+        m_bps(-1), m_frequency(-1), m_channels(-1), m_precision(-1)
+{
+    JACK_Init();
+}
+
+OutputJACK::~OutputJACK()
+{
+    uninitialize();
+}
+
+void OutputJACK::configure(long freq, int chan, int prec, int brate)
+{
+    qDebug("OutputJACK: configure");
+    m_precision = prec;
+    m_channels = chan;
+    m_frequency = freq;
+    m_bps = freq * chan * (prec / 8);
+    if(JACK_Open(&jack_device, prec, (unsigned long *)&freq, chan))
+	{
+        m_configure = FALSE;
+	return;
+	}
+    else
+        m_configure = TRUE;
+
+
+    prepareVisuals();
+    qDebug("OutputJACK: configure end");
+}
+
+void OutputJACK::pause()
+{
+    m_pause = (m_pause) ? FALSE : TRUE;
+    {
+        int state = m_pause ? OutputState::Paused: OutputState::Playing;
+        dispatch(OutputState((OutputState::Type) state));
+    }
+
+}
+
+bool OutputJACK::initialize()
+{
+    m_inited = m_pause = m_play = m_userStop = FALSE;
+    m_currentSeconds = -1;
+    m_totalWritten = 0;
+    if (m_inited)
+        m_inited = TRUE;
+    m_inited = TRUE;
+    m_configure = FALSE;
+    jack_options_t options = JackNullOption;
+    jack_status_t status;
+    jack_client_t *client = jack_client_open ("test_qmmp", options, &status, NULL);
+    if (client == NULL)
+    {
+        qDebug("jack_client_open() failed.");
+        if (status & JackServerFailed)
+        {
+            qDebug("Unable to connect to JACK server.");
+        }
+    return FALSE;
+    }
+    jack_client_close (client);
+    return TRUE;
+}
+
+long OutputJACK::latency()
+{
+    ulong used = 0;
+    return used;
+}
+
+void OutputJACK::run()
+{
+    mutex()->lock ();
+    if (! m_inited)
+    {
+        mutex()->unlock();
+        return;
+    }
+
+    m_play = TRUE;
+    Buffer *b = 0;
+    bool done = FALSE;
+    long m = 0;
+    unsigned long l;
+
+    dispatch(OutputState::Playing);
+
+    mutex()->unlock();
+    while (!done&&m_configure)
+    {
+        mutex()->lock ();
+        recycler()->mutex()->lock ();
+        done = m_userStop;
+
+        while (! done && (recycler()->empty() || m_pause))
+        {
+            mutex()->unlock();
+            recycler()->cond()->wakeOne();
+            recycler()->cond()->wait(recycler()->mutex());
+            mutex()->lock ();
+            done = m_userStop;
+            status();
+        }
+
+        if (! b)
+        {
+            b = recycler()->next();
+            if (b->rate)
+                m_rate = b->rate;
+        }
+
+        recycler()->cond()->wakeOne();
+        recycler()->mutex()->unlock();
+
+        if (b)
+        {
+            l = int(b->nbytes);
+            unsigned char *buf = b->data;
+            m_totalWritten += l;
+            while (l > 0)
+            {
+                m = JACK_Write(jack_device, (unsigned char*)buf, l);
+                if (!m)
+                    usleep(2000);
+                usleep(((m/m_channels)*100000)/m_frequency);
+                l-=m;
+                buf+=m;
+            }
+
+            status();
+            dispatchVisual(b, m_totalWritten, m_channels, m_precision);
+        }
+        recycler()->mutex()->lock ();
+        recycler()->done();
+        recycler()->mutex()->unlock();
+        b = 0;
+        mutex()->unlock();
+    }
+    mutex()->lock ();
+    m_play = FALSE;
+    dispatch(OutputState::Stopped);
+    mutex()->unlock();
+}
+
+void OutputJACK::uninitialize()
+{
+    if (!m_inited)
+        return;
+    m_inited = FALSE;
+    m_inited = m_pause = m_play = m_userStop = FALSE;
+    m_currentSeconds = -1;
+    m_totalWritten = 0;
+    if (m_configure)
+        JACK_Close(jack_device);
+    dispatch(OutputState::Stopped);
+}
+
diff --git a/lib/qmmp/Output/jack/outputjack.h b/lib/qmmp/Output/jack/outputjack.h
new file mode 100644
index 000000000..e20a9570a
--- /dev/null
+++ b/lib/qmmp/Output/jack/outputjack.h
@@ -0,0 +1,49 @@
+#ifndef   OUTPUTJACK_H
+#define   OUTPUTJACK_H
+
+class OutputJACK;
+
+#include <output.h>
+#include <QObject>
+extern "C"
+{
+#include <jack/jack.h>
+}
+
+#include "bio2jack.h"
+
+class OutputJACK : public Output
+{
+    Q_OBJECT
+public:
+    OutputJACK(QObject * parent = 0);
+    ~OutputJACK();
+    bool initialize();
+    bool isInitialized() const
+    {
+        return m_inited;
+    }
+    void uninitialize();
+    void configure(long, int, int, int);
+    void stop();
+    void pause();
+    long written();
+    long latency();
+    void seek(long);
+
+private:
+    // thread run function
+    void run();
+    // helper functions
+    void status();
+    QString audio_device;
+    bool m_inited, m_configure, m_pause, m_play, m_userStop;
+    long m_totalWritten, m_currentSeconds, m_bps;
+    int m_rate, m_frequency, m_channels, m_precision, jack_device;
+    bool do_select;
+    int audio_fd;
+};
+
+
+#endif
+
diff --git a/lib/qmmp/Output/jack/outputjackfactory.cpp b/lib/qmmp/Output/jack/outputjackfactory.cpp
new file mode 100644
index 000000000..acb8d1376
--- /dev/null
+++ b/lib/qmmp/Output/jack/outputjackfactory.cpp
@@ -0,0 +1,57 @@
+/***************************************************************************
+ *   Copyright (C) 2007 by Zhuravlev Uriy                                  *
+ *   stalkerg@gmail.com                                                    *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#include <QtGui>
+
+#include "outputjack.h"
+#include "outputjackfactory.h"
+
+
+const QString& OutputJACKFactory::name() const
+{
+    static QString name(tr("JACK Plugin"));
+    return name;
+}
+
+Output* OutputJACKFactory::create(QObject* parent)
+{
+    return new OutputJACK(parent);
+}
+
+void OutputJACKFactory::showSettings(QWidget*)
+{
+}
+
+void OutputJACKFactory::showAbout(QWidget *parent)
+{
+QMessageBox::about (parent, tr("About Jack Output Plugin"),
+                        tr("Qmmp Jack Output Plugin")+"\n"+
+                        tr("Writen by: Yuriy Zhuravlev <slalkerg@gmail.com>"));
+}
+
+QTranslator *OutputJACKFactory::createTranslator(QObject *parent)
+{
+    QTranslator *translator = new QTranslator(parent);
+    QString locale = QLocale::system().name();
+    translator->load(QString(":/jack_plugin_") + locale);
+    return translator;
+}
+
+Q_EXPORT_PLUGIN(OutputJACKFactory)
diff --git a/lib/qmmp/Output/jack/outputjackfactory.h b/lib/qmmp/Output/jack/outputjackfactory.h
new file mode 100644
index 000000000..d96c73df5
--- /dev/null
+++ b/lib/qmmp/Output/jack/outputjackfactory.h
@@ -0,0 +1,48 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef OUTPUTJACKFACTORY_H
+#define OUTPUTJACKFACTORY_H
+
+
+#include <QObject>
+#include <QString>
+#include <QIODevice>
+#include <QWidget>
+
+#include <output.h>
+#include <outputfactory.h>
+
+
+class OutputJACKFactory : public QObject,
+                          OutputFactory
+{
+Q_OBJECT
+Q_INTERFACES(OutputFactory);
+
+public:
+    const QString& name() const;
+    Output* create(QObject* parent);
+    void showSettings(QWidget* parent);
+    void showAbout(QWidget *parent);
+    QTranslator *createTranslator(QObject *parent);
+
+};
+
+#endif
diff --git a/lib/qmmp/Output/jack/translations/jack_plugin_ru.qm b/lib/qmmp/Output/jack/translations/jack_plugin_ru.qm
new file mode 100644
index 000000000..4050034bc
--- /dev/null
+++ b/lib/qmmp/Output/jack/translations/jack_plugin_ru.qm
diff --git a/lib/qmmp/Output/jack/translations/jack_plugin_ru.ts b/lib/qmmp/Output/jack/translations/jack_plugin_ru.ts
new file mode 100644
index 000000000..1aff62f98
--- /dev/null
+++ b/lib/qmmp/Output/jack/translations/jack_plugin_ru.ts
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS><TS version="1.1" language="pl">
+<context>
+    <name>OutputJACKFactory</name>
+    <message>
+        <location filename="../outputjackfactory.cpp" line="29"/>
+        <source>JACK Plugin</source>
+        <translation>Модуль JACK</translation>
+    </message>
+    <message>
+        <location filename="../outputjackfactory.cpp" line="44"/>
+        <source>About Jack Output Plugin</source>
+        <translation>О модуле вывода Jack</translation>
+    </message>
+    <message>
+        <location filename="../outputjackfactory.cpp" line="45"/>
+        <source>Qmmp Jack Output Plugin</source>
+        <translation>Модуль вывода Jack для Qmmp</translation>
+    </message>
+    <message>
+        <location filename="../outputjackfactory.cpp" line="46"/>
+        <source>Writen by: Yuriy Zhuravlev &lt;slalkerg@gmail.com&gt;</source>
+        <translation>Разработчик: Юрий Журавлёв &lt;slalkerg@gmail.com&gt;</translation>
+    </message>
+</context>
+</TS>
diff --git a/lib/qmmp/Output/jack/translations/translations.qrc b/lib/qmmp/Output/jack/translations/translations.qrc
new file mode 100644
index 000000000..af9447328
--- /dev/null
+++ b/lib/qmmp/Output/jack/translations/translations.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+  <qresource>
+    <file>jack_plugin_ru.qm</file>
+  </qresource>
+</RCC>
diff --git a/lib/qmmp/qmmp.pro b/lib/qmmp/qmmp.pro
new file mode 100644
index 000000000..04b244b6c
--- /dev/null
+++ b/lib/qmmp/qmmp.pro
@@ -0,0 +1,4 @@
+
+SUBDIRS += Input \
+           Output 
+TEMPLATE = subdirs
diff --git a/lib/recycler.cpp b/lib/recycler.cpp
new file mode 100644
index 000000000..515652fb0
--- /dev/null
+++ b/lib/recycler.cpp
@@ -0,0 +1,103 @@
+// Copyright (c) 2000-2001 Brad Hughes <bhughes@trolltech.com>
+//
+// Use, modification and distribution is allowed without limitation,
+// warranty, or liability of any kind.
+//
+
+#include "recycler.h"
+#include "constants.h"
+#include "buffer.h"
+
+
+Recycler::Recycler ( unsigned int sz )
+		: add_index ( 0 ), done_index ( 0 ), current_count ( 0 )
+{
+	buffer_count = ( sz / Buffer::size() );
+	if ( buffer_count < 1 )
+	{
+		buffer_count = 1;
+	}
+
+	buffers = new Buffer*[buffer_count];
+
+	for ( unsigned int i = 0; i < buffer_count; i ++ )
+	{
+		buffers[i] = new Buffer;
+	}
+}
+
+
+Recycler::~Recycler()
+{
+	for ( unsigned int i = 0; i < buffer_count; i++ )
+	{
+		delete buffers[i];
+		buffers[i] = 0;
+	}
+
+	delete [] buffers;
+}
+
+
+bool Recycler::full() const
+{
+	return current_count == buffer_count;
+}
+
+
+bool Recycler::empty() const
+{
+	return current_count == 0;
+}
+
+
+int Recycler::available() const
+{
+	return buffer_count - current_count;
+}
+
+
+int Recycler::used() const
+{
+	return current_count;
+}
+
+
+Buffer *Recycler::get()
+{
+	if ( full() )
+		return 0;
+	return buffers[add_index];
+}
+
+
+void Recycler::add()
+{
+	add_index = ++add_index % buffer_count;
+	current_count++;
+}
+
+
+Buffer *Recycler::next()
+{
+	return buffers[done_index];
+}
+
+
+void Recycler::done()
+{
+	done_index = ++done_index % buffer_count;
+	current_count--;
+}
+
+
+void Recycler::clear()
+{
+	add_index = done_index = current_count = 0;
+}
+
+
+unsigned int Recycler::size() const
+{
+	return buffer_count * Buffer::size();
+}
diff --git a/lib/recycler.h b/lib/recycler.h
new file mode 100644
index 000000000..b01742350
--- /dev/null
+++ b/lib/recycler.h
@@ -0,0 +1,49 @@
+// Copyright (c) 2000-2001 Brad Hughes <bhughes@trolltech.com>
+//
+// Use, modification and distribution is allowed without limitation,
+// warranty, or liability of any kind.
+//
+
+#ifndef __recycler_h
+#define __recycler_h
+
+#include <QMutex>
+#include <QWaitCondition>
+
+class Buffer;
+
+
+class Recycler
+{
+public:
+    Recycler(unsigned int sz); // sz = size in bytes
+    ~Recycler();
+
+    bool full() const;
+    bool empty() const;
+
+    int available() const;
+    int used() const;
+
+    Buffer *next(); // get next in queue
+    Buffer *get(); // get next in recycle
+
+    void add(); // add to queue
+    void done(); // add to recycle
+
+    void clear(); // clear queue
+
+    unsigned int size() const; // size in bytes
+
+    QMutex *mutex() { return &mtx; }
+    QWaitCondition *cond() { return &cnd; }
+
+
+private:
+    unsigned int buffer_count, add_index, done_index, current_count;
+    Buffer **buffers;
+    QMutex mtx;
+    QWaitCondition cnd;
+};
+
+#endif // __recycler_h
diff --git a/lib/soundcore.cpp b/lib/soundcore.cpp
new file mode 100644
index 000000000..a0716afe8
--- /dev/null
+++ b/lib/soundcore.cpp
@@ -0,0 +1,314 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#include <QIODevice>
+#include <QFile>
+#include <QApplication>
+
+#include "decoderfactory.h"
+#include "constants.h"
+
+#include "soundcore.h"
+
+SoundCore::SoundCore(QObject *parent)
+        : QObject(parent)
+{
+    m_decoder = 0;
+    m_output = 0;
+    m_input = 0;
+    m_paused = FALSE;
+    m_useEQ = FALSE;
+    m_update = FALSE;
+    m_preamp = 0;
+    m_vis = 0;
+    for (int i = 1; i < 10; ++i)
+        m_bands[i] = 0;
+    m_error = NoError;
+    m_output = Output::create(this);
+    if (!m_output)
+    {
+        m_error = DecoderError;
+        qWarning("SoundCore: unable to create output");
+    }
+    connect(m_output, SIGNAL(stateChanged(const OutputState&)),
+            SIGNAL(outputStateChanged(const OutputState&)));
+
+    QList<OutputFactory*> *outputFactories = Output::outputFactories();
+    foreach(OutputFactory* of, *outputFactories)
+        qApp->installTranslator(of->createTranslator(this));
+
+    QList<DecoderFactory*> *decoderFactories = Decoder::decoderFactories();
+    foreach(DecoderFactory* df, *decoderFactories)
+        qApp->installTranslator(df->createTranslator(this));
+}
+
+
+SoundCore::~SoundCore()
+{}
+
+bool SoundCore::play(const QString &source)
+{
+    stop();
+    if (source.isEmpty())
+    {
+        m_error = DecoderError;
+        return FALSE;
+    }
+    m_input = new QFile(source);
+
+    m_error = OutputError;
+    if (!m_output)
+    {
+        m_output = Output::create(this);
+        if (!m_output)
+        {
+            qWarning("SoundCore: unable to create output");
+            return FALSE;
+        }
+        connect(m_output, SIGNAL(stateChanged(const OutputState&)),
+                SIGNAL(outputStateChanged(const OutputState&)));
+    }
+    if (! m_output->initialize())
+        return FALSE;
+
+    m_error = DecoderError;
+
+    if(m_vis)
+    {
+        m_vis->setOutput(m_output);
+        m_output->addVisual(m_vis);
+    }
+
+    //if (m_decoder && ! m_decoder->factory()->supports(source))
+      //  m_decoder = 0;
+
+
+    if (! m_decoder)
+    {
+        qDebug ("SoundCore: creating decoder");
+        m_decoder = Decoder::create(this, source, m_input, m_output);
+
+        if (! m_decoder)
+        {
+            qWarning("SoundCore: unsupported fileformat");
+            stop();
+            emit decoderStateChanged(DecoderState(DecoderState::Error));
+            return FALSE;
+        }
+        qDebug ("ok");
+        m_decoder->setBlockSize(globalBlockSize);
+        connect(m_decoder, SIGNAL(stateChanged(const DecoderState&)),
+                SIGNAL(decoderStateChanged(const DecoderState&)));
+        setEQ(m_bands, m_preamp);
+        setEQEnabled(m_useEQ);
+    }
+
+    if (m_decoder->initialize())
+    {
+        m_output->start();
+        m_decoder->start();
+        m_error = NoError;
+        return TRUE;
+    }
+    stop();
+    return FALSE;
+}
+
+uint SoundCore::error()
+{
+    return m_error;
+}
+
+void SoundCore::stop()
+{
+    m_paused = FALSE;
+    if (m_decoder && m_decoder->isRunning())
+    {
+        m_decoder->mutex()->lock ();
+        m_decoder->stop();
+        m_decoder->mutex()->unlock();
+    }
+
+    if (m_output)
+    {
+        m_output->mutex()->lock ();
+        m_output->stop();
+        m_output->mutex()->unlock();
+    }
+
+    // wake up threads
+    if (m_decoder)
+    {
+        m_decoder->mutex()->lock ();
+        m_decoder->cond()->wakeAll();
+        m_decoder->mutex()->unlock();
+    }
+
+    if (m_output)
+    {
+        m_output->recycler()->mutex()->lock ();
+        m_output->recycler()->cond()->wakeAll();
+        m_output->recycler()->mutex()->unlock();
+    }
+
+    if (m_decoder)
+        m_decoder->wait();
+
+    if (m_output)
+        m_output->wait();
+
+    if (m_output && m_output->isInitialized())
+    {
+        m_output->uninitialize();
+    }
+    if (m_input)
+    {
+        delete m_input;
+        m_input = 0;
+    }
+    //display->setTime(0);
+    if (m_decoder)
+    {
+        delete m_decoder;
+        m_decoder = 0;
+    }
+    // recreate output
+    if (m_update && m_output)
+    {
+        delete m_output;
+        m_output = 0;
+        m_update = FALSE;
+        m_output = Output::create(this);
+        if (!m_output)
+        {
+            qWarning("SoundCore: unable to create output");
+        }
+        connect(m_output, SIGNAL(stateChanged(const OutputState&)),
+                SIGNAL(outputStateChanged(const OutputState&)));
+    }
+}
+
+void SoundCore::pause()
+{
+    if (m_output)
+    {
+        m_output->mutex()->lock ();
+        m_output->pause();
+        m_output->mutex()->unlock();
+    }
+
+    // wake up threads
+    if (m_decoder)
+    {
+        m_paused = !m_paused;
+        m_decoder->mutex()->lock ();
+        m_decoder->cond()->wakeAll();
+        m_decoder->mutex()->unlock();
+    }
+
+    if (m_output)
+    {
+        m_output->recycler()->mutex()->lock ();
+        m_output->recycler()->cond()->wakeAll();
+        m_output->recycler()->mutex()->unlock();
+    }
+}
+
+void SoundCore::seek(int pos)
+{
+    if (m_output && m_output->isRunning())
+    {
+        m_output->mutex()->lock ();
+        m_output->seek(pos);
+
+        if (m_decoder && m_decoder->isRunning())
+        {
+            m_decoder->mutex()->lock ();
+            m_decoder->seek(pos);
+            m_decoder->mutex()->unlock();
+        }
+
+        m_output->mutex()->unlock();
+    }
+}
+
+int SoundCore::length()
+{
+    if (m_decoder)
+        return int(m_decoder->lengthInSeconds());
+    return 0;
+}
+
+bool SoundCore::isInitialized()
+{
+    if (m_decoder)
+        return TRUE;
+    return FALSE;
+}
+
+bool SoundCore::isPaused()
+{
+    return m_paused;
+}
+
+void SoundCore::setEQ(int bands[10], const int &preamp)
+{
+    for (int i = 0; i < 10; ++i)
+        m_bands[i] = bands[i];
+    m_preamp = preamp;
+    if (m_decoder)
+    {
+        m_decoder->mutex()->lock ();
+        m_decoder->setEQ(m_bands, m_preamp);
+        m_decoder->setEQEnabled(m_useEQ);
+        m_decoder->mutex()->unlock();
+    }
+}
+
+void SoundCore::setEQEnabled(bool on)
+{
+    m_useEQ = on;
+    if (m_decoder)
+    {
+        m_decoder->mutex()->lock ();
+        m_decoder->setEQ(m_bands, m_preamp);
+        m_decoder->setEQEnabled(on);
+        m_decoder->mutex()->unlock();
+    }
+}
+
+void SoundCore::setVolume(int L, int R)
+{
+    if (m_output)
+        m_output->setVolume(L,R);
+}
+
+void SoundCore::updateConfig()
+{
+    m_update = TRUE;
+    if (isInitialized())
+        return;
+    stop();
+}
+
+void SoundCore::addVisualization(Visualization *visual)
+{
+    m_vis = visual;
+}
diff --git a/lib/soundcore.h b/lib/soundcore.h
new file mode 100644
index 000000000..1f88fe691
--- /dev/null
+++ b/lib/soundcore.h
@@ -0,0 +1,166 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef SOUNDCORE_H
+#define SOUNDCORE_H
+
+#include <QObject>
+
+#include "decoder.h"
+#include "output.h"
+#include "visualization.h"
+
+/**
+   @author Ilya Kotov <forkotov02@hotmail.ru>
+*/
+
+class QIODevice;
+
+class SoundCore : public QObject
+{
+    Q_OBJECT
+public:
+
+    /*! This enum describes the errors that may be returned by the error() function.
+     *  Available values is:
+     *  \b SoundCore:NoError - no error occurred,
+     *  \b SoundCore:DecoderError - an error occurred when creating decoder,
+     *  \b SoundCore:OutputError - an error occurred when creating output.
+     */
+    enum ErrorType { NoError = 0, DecoderError, OutputError };
+
+    SoundCore(QObject *parent = 0);
+
+    ~SoundCore();
+
+
+    //control
+
+    /*!
+    *  This function plays file with given path, returns \b TRUE if all is OK, otherwise \b FALSE
+    */
+    bool play(const QString &source);
+
+    /*!
+    *  Returns the playback error status.
+    *  For example, if play() returns false, this function can be called to find out
+    *  the reason why the operation failed.
+    */
+    uint error();
+
+    /*!
+    *  Stops playing
+    */
+    void stop();
+
+    /*!
+    *  Pauses/resumes playing
+    */
+    void pause();
+
+    /*!
+    *This function sets the current play position to \b pos
+    */
+    void seek(int pos);
+
+    // properties
+
+    /*!
+    * Returns length in seconds
+    */
+    int length();
+
+    /*!
+    * Returns \b TRUE if \b play() called successful, otherwise \b FALSE.
+    */
+    bool isReady();
+
+    /*!
+    * Returns \b TRUE if \b play() called successful, otherwise \b FALSE.
+    * Also this function returns \b FALSE if \b stop() called before
+    */
+    bool isInitialized();
+
+    /*!
+    * Returns \b TRUE if plugins in pause mode, otherwise \b FALSE.
+    */
+    bool isPaused();
+
+    //equalizer
+
+    /*!
+    * Sets equalizer settings. Each item of \b bands[] and \b reamp should be
+    *  \b -100..100
+    */
+    void setEQ(int bands[10], const int &preamp);
+
+    /*!
+    * Enables equalizer if on is \b TRUE or disables it if on is \b FALSE
+    */
+    void setEQEnabled(bool on);
+
+    //volume
+
+    /*!
+    * Sets volume. \b L - volume of left channel. \b R - volume of right channel.
+    * \b L and \b R should be 0..100
+    */
+    void setVolume(int L, int R);
+
+    //config
+
+    /*!
+    * updates configuration
+    */
+    void updateConfig();
+
+    //visualization
+    /*!
+    * adds visualization
+    */
+    void addVisualization(Visualization *visual);
+
+signals:
+
+    /*!
+    *  This signal is emited when the state of the decoder changes.
+    *  The argument \b state is the new state of the decoder
+    */
+    void decoderStateChanged(const DecoderState& state);
+
+    /*!
+    *  This signal is emited when the state of the output changes.
+    *  The argument \b state is the new state of the output
+    */
+    void outputStateChanged(const OutputState& state);
+
+private:
+    Decoder* m_decoder;
+    Output* m_output;
+    QIODevice* m_input;
+    uint m_error;
+    bool m_paused;
+    bool m_useEQ;
+    bool m_update;
+    int m_preamp;
+    int m_bands[10];
+    Visualization *m_vis;
+};
+
+#endif
diff --git a/lib/visualization.h b/lib/visualization.h
new file mode 100644
index 000000000..e484606c2
--- /dev/null
+++ b/lib/visualization.h
@@ -0,0 +1,74 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef VISUALIZATION_H
+#define VISUALIZATION_H
+
+/**
+   @author Ilya Kotov <forkotov02@hotmail.ru>
+*/
+
+#include <QMutex>
+
+class Buffer;
+class Decoder;
+class Output;
+
+class Visualization
+{
+public:
+    Visualization() {};
+
+    virtual ~Visualization() {};
+
+    virtual void add(Buffer *, unsigned long, int, int) = 0;
+    virtual void prepare() = 0;
+
+    Decoder *decoder() const
+    {
+        return m_decoder;
+    }
+    void setDecoder(Decoder *decoder)
+    {
+        m_decoder = decoder;
+    }
+
+    Output *output() const
+    {
+        return m_output;
+    }
+    void setOutput(Output *output)
+    {
+        m_output = output;
+    }
+
+    QMutex *mutex()
+    {
+        return &m_mutex;
+    }
+
+
+private:
+    Decoder *m_decoder;
+    Output *m_output;
+    QMutex m_mutex;
+
+};
+
+#endif