Browse Source

Misc

tags/1.9.4
falkTX 11 years ago
parent
commit
ada9eeb151
5 changed files with 21 additions and 6 deletions
  1. +13
    -0
      source/carla_widgets.py
  2. +4
    -4
      source/plugin/Makefile
  3. +1
    -1
      source/plugin/carla-native-base.cpp
  4. +1
    -1
      source/plugin/carla-native-export.cpp
  5. +2
    -0
      source/plugin/carla-native-plugin.cpp

+ 13
- 0
source/carla_widgets.py View File

@@ -1638,3 +1638,16 @@ class PluginWidget(QFrame):

painter.restore()
QFrame.paintEvent(self, event)

# ------------------------------------------------------------------------------------------------------------
# TESTING

hasGL = True

from PyQt5.QtWidgets import QApplication
app = QApplication(sys.argv)
#gui = PluginParameter(None, pInfo, 0, 0)
#gui = PluginEdit(None, 0)
gui = PluginWidget(None, 0)
gui.show()
app.exec_()

+ 4
- 4
source/plugin/Makefile View File

@@ -118,20 +118,20 @@ debug:

# --------------------------------------------------------------

carla-native-base.cpp.o: carla-native-base.cpp ../modules/carla_native/CarlaNative.h
carla-native-base.cpp.o: carla-native-base.cpp ../modules/CarlaNative.h
$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@

carla-native-export.cpp.o: carla-native-export.cpp carla-native-base.cpp ../modules/carla_native/CarlaNative.h
carla-native-export.cpp.o: carla-native-export.cpp carla-native-base.cpp ../modules/CarlaNative.h
$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@

carla-native-plugin.cpp.o: carla-native-plugin.cpp carla-native-base.cpp ../modules/carla_native/CarlaNative.h
carla-native-plugin.cpp.o: carla-native-plugin.cpp carla-native-base.cpp ../modules/CarlaNative.h
$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@

# --------------------------------------------------------------

carla-native-export: carla-native-export.cpp.o $(LIBS)
$(CXX) $^ $(LINK_FLAGS) -o $@
# ./carla-native-export
./carla-native-export

carla-native-export.exe: carla-native-export.cpp.o $(LIBS)
$(CXX) $^ $(LINK_FLAGS) -o $@


+ 1
- 1
source/plugin/carla-native-base.cpp View File

@@ -15,7 +15,7 @@
* For a full copy of the GNU General Public License see the doc/GPL.txt file.
*/

#include "carla_native/CarlaNative.h"
#include "CarlaNative.h"
#include "RtList.hpp"

#include "lv2/lv2.h"


+ 1
- 1
source/plugin/carla-native-export.cpp View File

@@ -17,7 +17,7 @@

#include "carla-native-base.cpp"

#include "JuceHeader.h"
#include "juce_core.h"

#include "lv2/atom.h"
#include "lv2/buf-size.h"


+ 2
- 0
source/plugin/carla-native-plugin.cpp View File

@@ -17,6 +17,8 @@

#include "carla-native-base.cpp"

#include "juce_audio_basics.h"

#include "CarlaString.hpp"

#include "lv2/atom.h"


Loading…
Cancel
Save