Move some more files

Makefile

@@ -113,8 +113,8 @@ WIDGETS = \
 
 WIDGETS: $(WIDGETS)
 
-source/%.py: source/modules/widgets/%.py
-	$(LINK) modules/widgets/$*.py $@
+source/%.py: source/widgets/%.py
+	$(LINK) widgets/$*.py $@
 
 # --------------------------------------------------------------
 

source/backend/CarlaStandalone.hpp → source/backend/CarlaHost.hpp

@@ -1,5 +1,5 @@
 /*
- * Carla Standalone API
+ * Carla Host API
  * Copyright (C) 2011-2013 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
@@ -15,17 +15,17 @@
  * For a full copy of the GNU General Public License see the doc/GPL.txt file.
  */
 
-#ifndef CARLA_STANDALONE_HPP_INCLUDED
-#define CARLA_STANDALONE_HPP_INCLUDED
+#ifndef CARLA_HOST_HPP_INCLUDED
+#define CARLA_HOST_HPP_INCLUDED
 
 #include "CarlaBackend.hpp"
 
 /*!
- * @defgroup CarlaStandaloneAPI Carla Standalone API
+ * @defgroup CarlaHostAPI Carla Host API
  *
- * The Carla Standalone API.
+ * The Carla Host API.
  *
- * This API makes it possible to use the Carla Backend in a Standalone application.\n
+ * This API makes it possible to use the Carla Backend in a Host application.\n
  * All functions are C-compatible, making it possible to use this API in non-C++ hosts.
  *
  * None of the returned values in this API calls need to be deleted or free'd.\n
@@ -729,4 +729,4 @@ CARLA_EXPORT bool carla_engine_init_bridge(const char* audioBaseName, const char
 
 /**@}*/
 
-#endif // CARLA_STANDALONE_HPP_INCLUDED
+#endif // CARLA_HOST_HPP_INCLUDED

source/backend/native/notes/DistrhoPluginNotes.cpp

@@ -1,121 +0,0 @@
-/*
- * DISTRHO Notes Plugin
- * Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.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 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.
- *
- * For a full copy of the GNU General Public License see the doc/GPL.txt file.
- */
-
-#include "DistrhoPluginNotes.hpp"
-
-#include <cmath>
-
-START_NAMESPACE_DISTRHO
-
-// -----------------------------------------------------------------------
-
-DistrhoPluginNotes::DistrhoPluginNotes()
-    : Plugin(1, 0, 103) // 1 parameter, 0 programs, 103 states
-{
-    fCurPage = 0;
-}
-
-DistrhoPluginNotes::~DistrhoPluginNotes()
-{
-}
-
-// -----------------------------------------------------------------------
-// Init
-
-void DistrhoPluginNotes::d_initParameter(uint32_t index, Parameter& parameter)
-{
-    if (index != 0)
-        return;
-
-    parameter.hints      = PARAMETER_IS_AUTOMABLE | PARAMETER_IS_INTEGER;
-    parameter.name       = "Page";
-    parameter.symbol     = "page";
-    parameter.ranges.def = 1;
-    parameter.ranges.min = 1;
-    parameter.ranges.max = 100;
-    parameter.ranges.step = 1;
-    parameter.ranges.stepSmall = 1;
-    parameter.ranges.stepLarge = 10;
-}
-
-void DistrhoPluginNotes::d_initStateKey(uint32_t index, d_string& stateKey)
-{
-    switch (index)
-    {
-    case 0:
-        stateKey = "readOnly";
-        break;
-    case 1 ... 100:
-        stateKey = "pageText #" + d_string(index);
-        break;
-    case 101:
-        stateKey = "guiWidth";
-        break;
-    case 102:
-        stateKey = "guiHeight";
-        break;
-    }
-}
-
-// -----------------------------------------------------------------------
-// Internal data
-
-float DistrhoPluginNotes::d_getParameterValue(uint32_t index) const
-{
-    if (index != 0)
-        return 0.0f;
-
-    return fCurPage;
-}
-
-void DistrhoPluginNotes::d_setParameterValue(uint32_t index, float value)
-{
-    if (index != 0)
-        return;
-
-    fCurPage = int(value);
-}
-
-void DistrhoPluginNotes::d_setState(const char*, const char*)
-{
-    // do nothing, used only for UI state
-}
-
-// -----------------------------------------------------------------------
-// Process
-
-void DistrhoPluginNotes::d_run(float** inputs, float** outputs, uint32_t frames, uint32_t, const MidiEvent*)
-{
-    float* in1  = inputs[0];
-    float* in2  = inputs[1];
-    float* out1 = outputs[0];
-    float* out2 = outputs[1];
-
-    std::memcpy(out1, in1, sizeof(float)*frames);
-    std::memcpy(out2, in2, sizeof(float)*frames);
-}
-
-// -----------------------------------------------------------------------
-
-Plugin* createPlugin()
-{
-    return new DistrhoPluginNotes();
-}
-
-// -----------------------------------------------------------------------
-
-END_NAMESPACE_DISTRHO

source/backend/native/notes/DistrhoPluginNotes.hpp

@@ -1,90 +0,0 @@
-/*
- * DISTRHO Notes Plugin
- * Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.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 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.
- *
- * For a full copy of the GNU General Public License see the doc/GPL.txt file.
- */
-
-#ifndef DISTRHO_PLUGIN_NOTES_HPP_INCLUDED
-#define DISTRHO_PLUGIN_NOTES_HPP_INCLUDED
-
-#include "DistrhoPlugin.hpp"
-
-START_NAMESPACE_DISTRHO
-
-// -----------------------------------------------------------------------
-
-class DistrhoPluginNotes : public Plugin
-{
-public:
-    DistrhoPluginNotes();
-    ~DistrhoPluginNotes() override;
-
-protected:
-    // -------------------------------------------------------------------
-    // Information
-
-    const char* d_getLabel() const noexcept override
-    {
-        return "Notes";
-    }
-
-    const char* d_getMaker() const noexcept override
-    {
-        return "DISTRHO";
-    }
-
-    const char* d_getLicense() const noexcept override
-    {
-        return "GPL v2+";
-    }
-
-    uint32_t d_getVersion() const noexcept override
-    {
-        return 0x1000;
-    }
-
-    long d_getUniqueId() const noexcept override
-    {
-        return d_cconst('D', 'N', 'o', 't');
-    }
-
-    // -------------------------------------------------------------------
-    // Init
-
-    void d_initParameter(uint32_t index, Parameter& parameter) override;
-    void d_initStateKey(uint32_t index, d_string& stateKeyName) override;
-
-    // -------------------------------------------------------------------
-    // Internal data
-
-    float d_getParameterValue(uint32_t index) const override;
-    void  d_setParameterValue(uint32_t index, float value) override;
-    void  d_setState(const char* key, const char* value) override;
-
-    // -------------------------------------------------------------------
-    // Process
-
-    void d_run(float** inputs, float** outputs, uint32_t frames, uint32_t midiEventCount, const MidiEvent* midiEvents) override;
-
-    // -------------------------------------------------------------------
-
-private:
-    int fCurPage;
-};
-
-// -----------------------------------------------------------------------
-
-END_NAMESPACE_DISTRHO
-
-#endif  // DISTRHO_PLUGIN_NOTES_HPP_INCLUDED

source/backend/native/notes/DistrhoUINotes.cpp

@@ -1,222 +0,0 @@
-/*
- * DISTRHO Notes Plugin
- * Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.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 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.
- *
- * For a full copy of the GNU General Public License see the doc/GPL.txt file.
- */
-
-#include "DistrhoUINotes.hpp"
-
-#include <QtGui/QResizeEvent>
-
-START_NAMESPACE_DISTRHO
-
-#include "moc_DistrhoUINotes.cpp"
-
-// -----------------------------------------------------------------------
-
-DistrhoUINotes::DistrhoUINotes()
-    : QtUI(),
-      fCurPage(1),
-      fSaveSizeNowChecker(-1),
-      fSaveTextNowChecker(-1),
-      fTextEdit(this),
-      fButton(this),
-      fProgressBar(this),
-      fSpacer(this),
-      fGridLayout(this)
-{
-    fButton.setCheckable(true);
-    fButton.setChecked(true);
-    fButton.setText("Edit");
-    fButton.setFixedSize(fButton.minimumSizeHint());
-
-    fProgressBar.set_minimum(1);
-    fProgressBar.set_maximum(100);
-    fProgressBar.set_value(1);
-
-    fSpacer.setText("");
-    fSpacer.setFixedSize(5, 5);
-
-    fTextEdit.setReadOnly(false);
-
-    setLayout(&fGridLayout);
-    fGridLayout.addWidget(&fTextEdit, 0, 0, 1, 3);
-    fGridLayout.addWidget(&fButton, 1, 0, 1, 1);
-    fGridLayout.addWidget(&fProgressBar, 1, 1, 1, 1);
-    fGridLayout.addWidget(&fSpacer, 1, 2, 1, 1);
-    fGridLayout.setContentsMargins(0, 0, 0, 0);
-
-    connect(&fButton, SIGNAL(clicked(bool)), SLOT(buttonClicked(bool)));
-    connect(&fProgressBar, SIGNAL(valueChangedFromBar(float)), SLOT(progressBarValueChanged(float)));
-    connect(&fTextEdit, SIGNAL(textChanged()), SLOT(textChanged()));
-
-    setSize(300, 200);
-}
-
-DistrhoUINotes::~DistrhoUINotes()
-{
-}
-
-void DistrhoUINotes::saveCurrentTextState()
-{
-    QString pageKey   = QString("pageText #%1").arg(fCurPage);
-    QString pageValue = fTextEdit.toPlainText();
-
-    if (pageValue != fNotes[fCurPage-1])
-    {
-        fNotes[fCurPage-1] = pageValue;
-        d_setState(pageKey.toUtf8().constData(), pageValue.toUtf8().constData());
-    }
-}
-
-// -----------------------------------------------------------------------
-// DSP Callbacks
-
-void DistrhoUINotes::d_parameterChanged(uint32_t index, float value)
-{
-    if (index != 0)
-        return;
-
-    int nextCurPage = value;
-
-    if (nextCurPage != fCurPage && nextCurPage >= 1 && nextCurPage <= 100)
-    {
-        saveCurrentTextState();
-        fCurPage = nextCurPage;
-
-        fTextEdit.setPlainText(fNotes[fCurPage-1]);
-        fProgressBar.set_value(fCurPage);
-        fProgressBar.update();
-    }
-}
-
-void DistrhoUINotes::d_stateChanged(const char* key, const char* value)
-{
-    if (std::strcmp(key, "guiWidth") == 0)
-    {
-        bool ok;
-        int width = QString(value).toInt(&ok);
-
-        if (ok && width > 0)
-            setSize(width, height());
-    }
-
-    else if (std::strcmp(key, "guiHeight") == 0)
-    {
-        bool ok;
-        int height = QString(value).toInt(&ok);
-
-        if (ok && height > 0)
-            setSize(width(), height);
-    }
-
-    else if (std::strncmp(key, "pageText #", 10) == 0)
-    {
-        bool ok;
-        int pageIndex = QString(key+10).toInt(&ok);
-
-        if (ok && pageIndex >= 1 && pageIndex <= 100)
-        {
-            fNotes[pageIndex-1] = QString(value);
-
-            if (pageIndex == fCurPage)
-                fTextEdit.setPlainText(fNotes[pageIndex-1]);
-        }
-    }
-
-    else if (strcmp(key, "readOnly") == 0)
-    {
-        bool readOnly = !strcmp(value, "yes");
-        fButton.setChecked(!readOnly);
-        fTextEdit.setReadOnly(readOnly);
-    }
-}
-
-// -----------------------------------------------------------------------
-// UI Callbacks
-
-void DistrhoUINotes::d_uiIdle()
-{
-    if (fSaveSizeNowChecker == 11)
-    {
-        d_setState("guiWidth", QString::number(width()).toUtf8().constData());
-        d_setState("guiHeight", QString::number(height()).toUtf8().constData());
-        fSaveSizeNowChecker = -1;
-    }
-
-    if (fSaveTextNowChecker == 11)
-    {
-        saveCurrentTextState();
-        fSaveTextNowChecker = -1;
-    }
-
-    if (fSaveSizeNowChecker >= 0)
-        fSaveSizeNowChecker++;
-
-    if (fSaveTextNowChecker >= 0)
-        fSaveTextNowChecker++;
-}
-
-void DistrhoUINotes::resizeEvent(QResizeEvent* event)
-{
-    fSaveSizeNowChecker = 0;
-    QtUI::resizeEvent(event);
-}
-
-// -----------------------------------------------------------------------
-
-void DistrhoUINotes::buttonClicked(bool click)
-{
-    bool readOnly = !click;
-    fTextEdit.setReadOnly(readOnly);
-
-    d_setState("readOnly", readOnly ? "yes" : "no");
-}
-
-void DistrhoUINotes::progressBarValueChanged(float value)
-{
-    value = rint(value);
-
-    if (fCurPage == (int)value)
-        return;
-
-    // maybe save current text before changing page
-    if (fSaveTextNowChecker >= 0 && value >= 1.0f && value <= 100.0f)
-    {
-        saveCurrentTextState();
-        fSaveTextNowChecker = -1;
-    }
-
-    // change current page
-    d_parameterChanged(0, value);
-
-    // tell host about this change
-    d_setParameterValue(0, value);
-}
-
-void DistrhoUINotes::textChanged()
-{
-    fSaveTextNowChecker = 0;
-}
-
-// -----------------------------------------------------------------------
-
-UI* createUI()
-{
-    return new DistrhoUINotes();
-}
-
-// -----------------------------------------------------------------------
-
-END_NAMESPACE_DISTRHO

source/backend/native/notes/DistrhoUINotes.hpp

@@ -1,113 +0,0 @@
-/*
- * DISTRHO Notes Plugin
- * Copyright (C) 2012-2013 Filipe Coelho <falktx@falktx.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 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.
- *
- * For a full copy of the GNU General Public License see the doc/GPL.txt file.
- */
-
-#ifndef DISTRHO_UI_NOTES_HPP_INCLUDED
-#define DISTRHO_UI_NOTES_HPP_INCLUDED
-
-#include "DistrhoUIQt.hpp"
-#include "paramspinbox.hpp"
-
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
-# include <QtWidgets/QProgressBar>
-# include <QtWidgets/QGridLayout>
-# include <QtWidgets/QLabel>
-# include <QtWidgets/QPushButton>
-# include <QtWidgets/QTextEdit>
-#else
-# include <QtGui/QGridLayout>
-# include <QtGui/QLabel>
-# include <QtGui/QPushButton>
-# include <QtGui/QTextEdit>
-#endif
-
-class QResizeEvent;
-
-START_NAMESPACE_DISTRHO
-
-// -----------------------------------------------------------------------
-
-class DistrhoUINotes : public QtUI
-{
-    Q_OBJECT
-
-public:
-    DistrhoUINotes();
-    ~DistrhoUINotes() override;
-
-protected:
-    // -------------------------------------------------------------------
-    // Information
-
-    bool d_isResizable() const noexcept override
-    {
-        return true;
-    }
-
-    uint d_getMinimumWidth() const noexcept override
-    {
-        return 180;
-    }
-
-    uint d_getMinimumHeight() const noexcept override
-    {
-        return 150;
-    }
-
-    // -------------------------------------------------------------------
-    // DSP Callbacks
-
-    void d_parameterChanged(uint32_t index, float value) override;
-    void d_stateChanged(const char* key, const char* value) override;
-
-    // -------------------------------------------------------------------
-    // UI Callbacks
-
-    void d_uiIdle() override;
-
-    // -------------------------------------------------------------------
-    // listen for resize events
-
-    void resizeEvent(QResizeEvent*) override;
-
-    // -------------------------------------------------------------------
-
-private slots:
-    void buttonClicked(bool click);
-    void progressBarValueChanged(float value);
-    void textChanged();
-
-private:
-    int fCurPage;
-    int fSaveSizeNowChecker;
-    int fSaveTextNowChecker;
-
-    QString fNotes[100];
-
-    QTextEdit        fTextEdit;
-    QPushButton      fButton;
-    ParamProgressBar fProgressBar;
-    QLabel           fSpacer;
-    QGridLayout      fGridLayout;
-
-    void saveCurrentTextState();
-};
-
-// -----------------------------------------------------------------------
-
-END_NAMESPACE_DISTRHO
-
-#endif // DISTRHO_UI_NOTES_HPP_INCLUDED