Commit Graph

30 Commits

Author SHA1 Message Date
Hyunjin Song
4069aaada2 Merge branch 'stable-1.2'
# Conflicts:
#	.travis/osx..install.sh
#	CMakeLists.txt
#	cmake/apple/install_apple.sh.in
#	doc/lmms.1
#	include/VstSyncController.h
#	plugins/carlabase/carla.h
#	plugins/vestige/vestige.cpp
#	plugins/vst_base/CMakeLists.txt
#	plugins/vst_base/RemoteVstPlugin.cpp
#	plugins/vst_base/Win64/CMakeLists.txt
#	plugins/zynaddsubfx/zynaddsubfx
#	plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.cpp
#	src/core/Song.cpp
#	src/core/main.cpp
2018-09-18 09:54:38 +09:00
Tres Finocchiaro
153f15f4b4 Add Carla support for MacOS (#4558)
Add Carla support for MacOS
2018-09-15 09:32:29 -04:00
Hussam al-Homsi
6d46bd473f Remove "What's This?" and update tooltips (#4128) 2018-06-06 01:50:11 +03:00
Hyunin Song
59cfcf41a7 Merge branch 'stable-1.2'
# Conflicts:
#	.travis/linux..before_install.sh
#	.travis/linux..install.sh
#	.travis/linux..script.sh
#	cmake/linux/package_linux.sh.in
#	include/AudioWeakJack.def
#	plugins/vst_base/CMakeLists.txt
#	plugins/zynaddsubfx/zynaddsubfx
2017-12-20 14:16:16 +09:00
Tres Finocchiaro
d711b8b55e Add Carla Support to AppImage (#4026)
Build AppImage with Carla support
* Disables HiDPI support in the AppImages
* Ignores deprecated jack usage
* Fix Carla compilation warnings
* Detects carla prefix in AppRun
2017-12-01 13:19:44 -05:00
Lukas W
9f905bce3e Use Qt's Resource System (2nd approach) (#1891)
* Remove bin2res, use Qt's resource system
* Use QDir search paths and QImageReader in getIconPixmap
* Don't include "embed.cpp" in plugins
* getIconPixmap: Use QPixmapCache, use QPixmap::fromImageReader
* Require CMake 2.8.9

* Fix ReverbSC embed usage
2017-03-26 22:06:43 +02:00
grejppi
9e85d7c66e update all copyright headers to the proper url (#3326) 2017-02-06 02:41:15 +02:00
Javier Serrano Polo
d31089ceb5 Fixed removal of track when notes are playing 2016-06-16 17:42:00 +02:00
Fastigium
da8040764f Require explicit types when removing PlayHandles in the Mixer
This fixes a few deadlocks where a PresetPreviewPlayHandle would be removed by
the creation of a new PresetPreviewPlayHandle.
2016-02-16 19:23:08 +01:00
falkTX
64b138b7ad Implement NATIVE_HOST_OPCODE_HOST_IDLE in carla plugin 2015-04-17 20:59:46 +02:00
Vesa
6f23ef7df2 Merge branch 'stable-1.1'
Conflicts:
	plugins/DualFilter/DualFilterControls.cpp
	src/gui/PluginBrowser.cpp
2014-12-16 23:12:02 +02:00
falkTX
91063ab7d2 Update Carla plugin to latest API 2014-12-16 19:40:02 +00:00
Vesa
eaf4d80206 Fixed missed rename 2014-11-28 00:33:56 +02:00
Lukas W
5b77abd9a5 Rename fixes 2014-11-26 01:46:12 +01:00
Vesa
50bfed7180 Fix Carla in memmgr branch 2014-11-18 13:58:40 +02:00
Lukas W
8e8879f735 Merge stable-1.1
Conflicts:
	include/ConfigManager.h
	include/MidiTime.h
	include/string_pair_drag.h
	src/gui/string_pair_drag.cpp
	src/gui/widgets/rubberband.cpp
2014-11-10 19:26:59 +01:00
Umcaruje
6fb923cba2 Correct the program name and site in the descriptions. 2014-11-04 22:56:50 +01:00
Vesa
b084e91345 Merge branch 'stable-1.1'
Conflicts:
	data/locale/de.qm
	data/locale/zh.qm
	data/locale/zh.ts
2014-10-19 14:58:23 +03:00
Vesa
886bf2b16e Revert "Adjust Carla for master branch"
This reverts commit 30e0140ecb.
2014-10-18 22:11:47 +03:00
Vesa
95eaa86a6f Revert "Revert "Make carla compile in master""
This reverts commit b12e6b773c.
2014-10-18 22:11:17 +03:00
Vesa
b12e6b773c Revert "Make carla compile in master"
This reverts commit 633609fdc7.
2014-10-18 22:07:07 +03:00
Vesa
633609fdc7 Make carla compile in master 2014-10-15 20:43:47 +03:00
Vesa
30e0140ecb Adjust Carla for master branch 2014-10-15 20:36:50 +03:00
falkTX
9fabc0e8b6 Add background artwork for carla 2014-10-10 11:21:23 +01:00
falkTX
9f6c9d96ef Carla: Misc fixing 2014-09-27 00:31:28 +01:00
falkTX
5dddbe7c30 Pass timeInfo to Carla plugin 2014-09-26 11:58:42 +01:00
falkTX
8aa29bb4ba Add TODO items for carla 2014-09-26 10:38:05 +01:00
falkTX
b0fab3d3c2 Carla: Implement UI Save/Open for plugins; Misc fixes 2014-09-26 10:31:08 +01:00
falkTX
b88225ffc8 Carla: Fix link (rpath) and finding binary dir (needs latest carla) 2014-09-16 17:22:23 +01:00
falkTX
849d08c6ef Initial version of Carla plugin for LMMS 2014-09-11 16:54:31 +01:00