From d9d22bf78037b9d4e0e5235330ed2e5010ff651a Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sun, 12 May 2013 16:34:08 +0000 Subject: changed libqmmp api git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3455 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/cue/decoder_cue.cpp | 4 ++-- src/plugins/Ui/skinned/visualmenu.cpp | 6 +++--- src/qmmp/decoder.cpp | 1 - src/qmmp/decoder.h | 3 --- src/qmmp/inputsource.cpp | 6 +++--- src/qmmp/inputsource.h | 4 ++-- src/qmmp/output.h | 7 ------- src/qmmp/soundcore.cpp | 2 +- src/qmmp/soundcore.h | 3 ++- src/qmmp/visual.cpp | 8 ++++---- src/qmmp/visual.h | 4 ++-- src/qmmpui/aboutdialog.cpp | 2 +- src/qmmpui/configdialog.cpp | 4 ++-- 13 files changed, 22 insertions(+), 32 deletions(-) (limited to 'src') diff --git a/src/plugins/Input/cue/decoder_cue.cpp b/src/plugins/Input/cue/decoder_cue.cpp index 4c88f06b2..f9d31f48d 100644 --- a/src/plugins/Input/cue/decoder_cue.cpp +++ b/src/plugins/Input/cue/decoder_cue.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2012 by Ilya Kotov * + * Copyright (C) 2008-2013 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -18,8 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include #include +#include #include #include #include diff --git a/src/plugins/Ui/skinned/visualmenu.cpp b/src/plugins/Ui/skinned/visualmenu.cpp index 691c4ef6e..2a8bf2227 100644 --- a/src/plugins/Ui/skinned/visualmenu.cpp +++ b/src/plugins/Ui/skinned/visualmenu.cpp @@ -26,7 +26,7 @@ VisualMenu::VisualMenu(QWidget *parent) : QMenu(tr("Visualization"), parent) { VisualFactory *factory = 0; - foreach(factory, *Visual::factories()) + foreach(factory, Visual::factories()) { VisualAction *act = new VisualAction(factory, this); addAction(act); @@ -39,9 +39,9 @@ VisualMenu::~VisualMenu() void VisualMenu::updateActions() { - for(int i = 0; i < Visual::factories()->size(); ++i) + for(int i = 0; i < Visual::factories().size(); ++i) { - actions()[i]->setChecked(Visual::isEnabled(Visual::factories()->at(i))); + actions()[i]->setChecked(Visual::isEnabled(Visual::factories().at(i))); } } diff --git a/src/qmmp/decoder.cpp b/src/qmmp/decoder.cpp index f47679ce7..eced422bb 100644 --- a/src/qmmp/decoder.cpp +++ b/src/qmmp/decoder.cpp @@ -14,7 +14,6 @@ #include "output.h" #include "visual.h" #include "decoderfactory.h" -#include "qmmp.h" extern "C" { diff --git a/src/qmmp/decoder.h b/src/qmmp/decoder.h index 4d586fc13..090e6d4fc 100644 --- a/src/qmmp/decoder.h +++ b/src/qmmp/decoder.h @@ -7,11 +7,8 @@ #ifndef DECODER_H #define DECODER_H -#include #include -#include #include -#include #include #include "fileinfo.h" #include "qmmp.h" diff --git a/src/qmmp/inputsource.cpp b/src/qmmp/inputsource.cpp index 74745ca7f..62b8d77ec 100644 --- a/src/qmmp/inputsource.cpp +++ b/src/qmmp/inputsource.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2012 by Ilya Kotov * + * Copyright (C) 2009-2013 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -121,10 +121,10 @@ InputSource *InputSource::create(const QString &url, QObject *parent) } } -QList *InputSource::factories() +QList InputSource::factories() { checkFactories(); - return m_factories; + return *m_factories; } QString InputSource::file(InputSourceFactory *factory) diff --git a/src/qmmp/inputsource.h b/src/qmmp/inputsource.h index 0609f3550..d32bef1d8 100644 --- a/src/qmmp/inputsource.h +++ b/src/qmmp/inputsource.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2012 by Ilya Kotov * + * Copyright (C) 2009-2013 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -113,7 +113,7 @@ public: /*! * Returns a list of transport factories. */ - static QList *factories(); + static QList factories(); /*! * Returns plugin file path. * @param factory Transport plugin factory. diff --git a/src/qmmp/output.h b/src/qmmp/output.h index 05a4741c8..8b2ab67e4 100644 --- a/src/qmmp/output.h +++ b/src/qmmp/output.h @@ -8,16 +8,9 @@ #ifndef OUTPUT_H #define OUTPUT_H -#include -#include -#include #include -#include #include -#include "visual.h" #include "outputfactory.h" -#include "visualfactory.h" -#include "statehandler.h" #include "audioparameters.h" class QTimer; diff --git a/src/qmmp/soundcore.cpp b/src/qmmp/soundcore.cpp index a45d2c7a7..d3950c45b 100644 --- a/src/qmmp/soundcore.cpp +++ b/src/qmmp/soundcore.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2012 by Ilya Kotov * + * Copyright (C) 2006-2013 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/qmmp/soundcore.h b/src/qmmp/soundcore.h index 4bfd44037..62481ba28 100644 --- a/src/qmmp/soundcore.h +++ b/src/qmmp/soundcore.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2012 by Ilya Kotov * + * Copyright (C) 2006-2013 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -35,6 +35,7 @@ class QIODevice; class VolumeControl; class AbstractEngine; class InputSource; +class StateHandler; /*! \brief The SoundCore class provides a simple interface for audio playback. * @author Ilya Kotov diff --git a/src/qmmp/visual.cpp b/src/qmmp/visual.cpp index d1da7425d..a65742ce7 100644 --- a/src/qmmp/visual.cpp +++ b/src/qmmp/visual.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2012 by Ilya Kotov * + * Copyright (C) 2008-2013 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -75,10 +75,10 @@ QWidget *Visual::m_parentWidget = 0; QObject *Visual::m_receiver = 0; const char *Visual::m_member = 0; -QList *Visual::factories() +QList Visual::factories() { checkFactories(); - return m_factories; + return *m_factories; } QString Visual::file(VisualFactory *factory) @@ -152,7 +152,7 @@ void Visual::initialize(QWidget *parent , QObject *receiver, const char *member) m_receiver = receiver; m_member = member; m_parentWidget = parent; - foreach(VisualFactory* factory, *factories()) + foreach(VisualFactory* factory, factories()) { if (isEnabled(factory)) { diff --git a/src/qmmp/visual.h b/src/qmmp/visual.h index 6c922f8f7..03e885524 100644 --- a/src/qmmp/visual.h +++ b/src/qmmp/visual.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2012 by Ilya Kotov * + * Copyright (C) 2008-2013 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -66,7 +66,7 @@ public: /*! * Returns a list of visual factories. */ - static QList *factories(); + static QList factories(); /*! * Returns plugin file path. * @param factory Visual plugin factory. diff --git a/src/qmmpui/aboutdialog.cpp b/src/qmmpui/aboutdialog.cpp index 84a896ebe..79ca40fd8 100644 --- a/src/qmmpui/aboutdialog.cpp +++ b/src/qmmpui/aboutdialog.cpp @@ -93,7 +93,7 @@ QString AboutDialog::loadAbout() text.append(""); text.append("
"+tr("Visual plugins:")+"
"); text.append("
    "); - foreach(VisualFactory *fact, *Visual::factories()) + foreach(VisualFactory *fact, Visual::factories()) { text.append("
  • "); text.append(fact->properties().name); diff --git a/src/qmmpui/configdialog.cpp b/src/qmmpui/configdialog.cpp index af9811f84..8fc747cb0 100644 --- a/src/qmmpui/configdialog.cpp +++ b/src/qmmpui/configdialog.cpp @@ -172,7 +172,7 @@ void ConfigDialog::loadPluginsInfo() load transport plugin information */ QTreeWidgetItem *item = new QTreeWidgetItem (m_ui->treeWidget, QStringList() << tr("Transports")); - foreach(InputSourceFactory *factory, *InputSource::factories()) + foreach(InputSourceFactory *factory, InputSource::factories()) { new PluginItem (item, factory, InputSource::file(factory)); } @@ -212,7 +212,7 @@ void ConfigDialog::loadPluginsInfo() load visual plugin information */ item = new QTreeWidgetItem (m_ui->treeWidget, QStringList() << tr("Visualization")); - foreach(VisualFactory *factory, *Visual::factories()) + foreach(VisualFactory *factory, Visual::factories()) { new PluginItem (item, factory, Visual::file(factory)); } -- cgit v1.2.3-13-gbd6f