mirror/lmms
1
0 Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-10-06 08:51:50 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,279 Commits 9 Branches 62 Tags
ffba37c7f2a895e8b80098d5612cee6f461bfa54
Commit Graph
29 Commits
Author SHA1 Message Date
Colin Wallace 908591ba7d Have MainWindow and others make use of the new SubWindow class 2015-06-15 03:32:25 +00:00
Lukas W 748cccd266 Merge branch 'gui_application' into ed_refac 
Conflicts:
	src/core/Song.cpp
	src/gui/MainWindow.cpp
 2015-01-07 00:03:32 +01:00
Tres Finocchiaro dd053b99d2 Fix whitespace 2014-12-22 00:31:50 -05:00
Dave French 5fc1b36f6f 856 reformat 2014-12-22 05:17:53 +00:00
Dave French f54540dea7 856 now loads absolute and relative paths correctly 2014-12-21 10:51:11 +00:00
Dave French 0d44dc6ac5 Proposed fix for 856 Recursive VST Effect Enhancement Request 2014-12-21 03:38:11 +00:00
Lukas W 1ee93409d1 Move Engine' GUI code to new GuiApplication class 2014-12-17 23:25:55 +01:00
Lukas W 5f4cdac802 Merge branch 'master' into rename 
Conflicts:
	src/core/Song.cpp
	src/gui/LfoControllerDialog.cpp
	src/tracks/InstrumentTrack.cpp
 2014-11-26 11:45:55 +01:00
Lukas W 1bbf7455a4 Rename a lot… 2014-11-26 10:09:49 +01:00
Lukas W 968909c07c Rename engine to Engine 2014-11-26 00:49:55 +01:00
Lukas W 7d0e3945e5 Rename song to Song 2014-11-26 00:44:41 +01:00
Vesa ed11ccbf50 Fix conflict 2014-11-25 21:29:00 +02:00
Vesa eea784ce71 Merge branch 'master' of github.com:LMMS/lmms 2014-11-25 21:24:21 +02:00
Vesa 33665a2848 Merge branch 'stable-1.1' 
Conflicts:
	include/Effect.h
	include/Plugin.h
 2014-11-25 21:23:57 +02:00
Vesa V 435c64cc70 Merge pull request #1285 from grindhold/issue_55 
Issue 55
 2014-11-25 21:20:21 +02:00
grindhold 61a380a2d4 renamed method logError to collectErrorForUI 2014-11-21 19:02:27 +01:00
Daniel Winzen 5c0829399f Fix moc_file inclusion in cmake files 
This should fix the Windows builds
 2014-11-21 07:16:45 +01:00
Daniel Winzen 3ca76d40ed Add missing Q_OBJECT macros in header files 
Fixes 20 warnings similar to the following ones when generating a translation file with e.g. "make de.ts":
/home/daniel/Lmms/src/tracks/AutomationTrack.cpp:40: Class 'AutomationTrack' lacks Q_OBJECT macro
/home/daniel/Lmms/src/core/FxMixer.cpp:41: Class 'FxRoute' lacks Q_OBJECT macro
/home/daniel/Lmms/src/core/FxMixer.cpp:554: Class 'FxMixer' lacks Q_OBJECT macro
/home/daniel/Lmms/src/gui/widgets/MeterDialog.cpp:52: Class 'MeterDialog' lacks Q_OBJECT macro
...
 2014-11-21 06:46:47 +01:00
Daniel Winzen 1a1e012632 Revert "Add missing Q_OBJECT macros in header files" 
This reverts commit 337003a3b0.
Seams to break Windows builds.
 2014-11-18 20:20:10 +01:00
Daniel Winzen 337003a3b0 Add missing Q_OBJECT macros in header files 
Fixes 20 warnings similar to the following ones when generating a translation file with e.g. "make de.ts":
/home/daniel/Lmms/src/tracks/AutomationTrack.cpp:40: Class 'AutomationTrack' lacks Q_OBJECT macro
/home/daniel/Lmms/src/core/FxMixer.cpp:41: Class 'FxRoute' lacks Q_OBJECT macro
/home/daniel/Lmms/src/core/FxMixer.cpp:554: Class 'FxMixer' lacks Q_OBJECT macro
/home/daniel/Lmms/src/gui/widgets/MeterDialog.cpp:52: Class 'MeterDialog' lacks Q_OBJECT macro
...
 2014-11-18 19:38:26 +01: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
grindhold ec457ac69b fixed argument being passed into errormessage of vsteffect 2014-11-10 10:45:38 +01:00
grindhold 27a136fe03 added capability to collect multiple errormessages and display them at once 2014-11-10 10:35:07 +01:00
Umcaruje 6fb923cba2 Correct the program name and site in the descriptions. 2014-11-04 22:56:50 +01:00
Lukas W f6f44d0c5c Rename ConfigManager files (3) 2014-11-02 01:26:46 +01:00
Tobias Doerffel 4cee046909 Added initial Qt5 support 
LMMS now properly builds and runs with Qt5. Various deprecated functions
had to be replaced like QString::toAscii()/fromAscii(). Also occurences
of FALSE/TRUE have been replaced with false/true.

LmmsStyle now derives from QProxyStyle and sets a style instance as base
style (Plastique for Qt4, Fusion for Qt5).

MOC files are not included anymore but added as regular source files.

What's missing is support for embedding VST plugins into a subwindow
inside LMMS on Linux/X11 due to missing QX11EmbedContainer class in Qt5.

Build instructions can be found in INSTALL.Qt5

Minimum version requirement for Qt4 has been raised to 4.6.0 for best
API compatibility between Qt4 and Qt5.
 2014-08-14 17:34:49 +02:00
Tobias Doerffel 13a41b5bff VstEffectControlDialog: remove unused variable 2014-03-21 11:16:45 +01:00
Tobias Doerffel ed973bd8be LadspaEffect, VstEffect: shortened plugin name 
In order to display less redundancy in EffectSelectDialog, the plugin
names were shortened to "LADSPA" and "VST".
 2014-02-23 15:24:15 +01:00
Tobias Doerffel 408c98f473 VstEffect: fixed some messages 2014-02-23 15:08:19 +01:00