Browse Source

Fix for pluginId, forgot about this before

tags/1.9.4
falkTX 11 years ago
parent
commit
848c098f6c
4 changed files with 7 additions and 7 deletions
  1. +1
    -1
      source/backend/plugin/CarlaPlugin.cpp
  2. +4
    -4
      source/backend/plugin/CarlaPluginInternal.hpp
  3. +1
    -1
      source/carla
  4. +1
    -1
      source/carla-plugin

+ 1
- 1
source/backend/plugin/CarlaPlugin.cpp View File

@@ -188,7 +188,7 @@ unsigned int CarlaPluginProtectedData::loadSettings(const unsigned int options,
// Constructor and destructor // Constructor and destructor


CarlaPlugin::CarlaPlugin(CarlaEngine* const engine, const unsigned int id) CarlaPlugin::CarlaPlugin(CarlaEngine* const engine, const unsigned int id)
: pData(new CarlaPluginProtectedData(engine, this))
: pData(new CarlaPluginProtectedData(engine, id, this))
{ {
CARLA_SAFE_ASSERT_RETURN(engine != nullptr,); CARLA_SAFE_ASSERT_RETURN(engine != nullptr,);
CARLA_ASSERT(id < engine->getMaxPluginNumber()); CARLA_ASSERT(id < engine->getMaxPluginNumber());


+ 4
- 4
source/backend/plugin/CarlaPluginInternal.hpp View File

@@ -634,10 +634,10 @@ struct CarlaPluginProtectedData {
#endif #endif
} osc; } osc;


CarlaPluginProtectedData(CarlaEngine* const e, CarlaPlugin* const p)
: engine(e),
CarlaPluginProtectedData(CarlaEngine* const eng, const unsigned int idx, CarlaPlugin* const self)
: engine(eng),
client(nullptr), client(nullptr),
id(0),
id(idx),
hints(0x0), hints(0x0),
options(0x0), options(0x0),
active(false), active(false),
@@ -654,7 +654,7 @@ struct CarlaPluginProtectedData {
filename(nullptr), filename(nullptr),
iconName(nullptr), iconName(nullptr),
identifier(nullptr), identifier(nullptr),
osc(e, p) {}
osc(eng, self) {}


#ifdef CARLA_PROPER_CPP11_SUPPORT #ifdef CARLA_PROPER_CPP11_SUPPORT
CarlaPluginProtectedData() = delete; CarlaPluginProtectedData() = delete;


+ 1
- 1
source/carla View File

@@ -235,8 +235,8 @@ class CarlaHostW(HostWindow):
# ----------------------------------------------------------------- # -----------------------------------------------------------------


def resizeEvent(self, event): def resizeEvent(self, event):
self.updateInfoLabelSize()
HostWindow.resizeEvent(self, event) HostWindow.resizeEvent(self, event)
self.updateInfoLabelSize()


def timerEvent(self, event): def timerEvent(self, event):
HostWindow.timerEvent(self, event) HostWindow.timerEvent(self, event)


+ 1
- 1
source/carla-plugin View File

@@ -313,7 +313,7 @@ class CarlaMiniW(HostWindow, ExternalUI):
if not self.idleExternalUI(): if not self.idleExternalUI():
self.d_uiQuit() self.d_uiQuit()


QWidget.timerEvent(self, event)
HostWindow.timerEvent(self, event)


def closeEvent(self, event): def closeEvent(self, event):
self.closeExternalUI() self.closeExternalUI()


Loading…
Cancel
Save