hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity
2,438 Commits 9 Branches 62 Tags
dddf5eb61c7b5cbb168e485be53860deed7a950a
Commit Graph

2438 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tobias Doerffel
dddf5eb61c FxMixer: ignore mute state in addChannelLeaf() to fix lockup 
Even if we do not process the FX chain later, we at least have to enqueue
all related FX channels to the job queue in order to prevent a lockup.
 2014-01-17 19:53:05 +01:00
Tobias Doerffel
abc3c8080f Merge branch 'stable-0.4' into stable-0.4-new-fx-mixer 2014-01-16 23:08:04 +01:00
tobydox
2d4e769bd8 Merge pull request #38 from grejppi/stable-0.4-defaultpresetnames 
"Default preset" is not descriptive; change it to the actual plugin name
 2014-01-16 14:07:26 -08:00
tobydox
e7c24767bb Merge pull request #37 from Lukas-W/stable-0.4 
ZynAddSubFX/FLTK: The last freetype fix, I promise.
 2014-01-16 14:05:50 -08:00
Lukas W
79b31a9926 ZynAddSubFX/FLTK: The last freetype fix, I promise. 
Using FREETYPE_INCLUDE_DIRS turned out to break the build as it is a list consisting of two paths.
During configuring, the list is then concatenated to "path1 path2". This makes cmake to think of the second path as the directory to configure.
Fixed by manually concatenating the strings with a ";" character.
 2014-01-16 19:21:13 +01:00
Tobias Doerffel
ee9160c024 Merge branch 'stable-0.4' into stable-0.4-new-fx-mixer 2014-01-16 18:25:39 +01:00
tobydox
0030486c82 Merge pull request #35 from softrabbit/stable-0.4 
Make cancelling an export work immediately
 2014-01-16 09:08:42 -08:00
tobydox
7f604dfd52 Merge pull request #36 from Lukas-W/stable-0.4 
ZynAddSubFX/FLTK: Yet another fix for finding freetype
 2014-01-16 09:07:56 -08:00
Lukas W
3a456cd1e3 ZynAddSubFX/FLTK: Yet another fix for finding freetype 
Revert changes of commit 17babf6abc as commit 26665dde55 was complete indeed regarding the FIND_PACKAGE statement.
Add REQUIRED statement to FIND_PACKAGE(Freetype)
Use FREETYPE_INCLUDE_DIRS instead of FREETYPE_INCLUDE_DIR_freetype2 or FREETYPE_INCLUDE_DIR_ft2build
 2014-01-16 17:55:55 +01:00
Hannu Haahti
5849157435 Changed "Default preset" to the actual plugin name 2014-01-16 18:11:03 +02:00
Raine M. Ekman
664f109cb5 Export dialog: Make cancelling an export work immediately 2014-01-16 17:33:07 +02:00
tobydox
c57664d6a8 Merge pull request #33 from grejppi/stable-0.4-pianorollsegfaultfix 
fixed segfault in piano roll when no pattern is open
 2014-01-16 06:26:13 -08:00
Hannu Haahti
4f0a73e9fa fixed segfault in piano roll when no pattern is open 2014-01-16 16:20:48 +02:00
Raine M. Ekman
a482c8101c Merge pull request #1 from LMMS/stable-0.4 
pulling changes
 2014-01-16 06:13:00 -08:00
tobydox
302a04f0ef Merge pull request #31 from grejppi/stable-0.4-displaywaveform 
config option to enable waveform display by default
 2014-01-16 04:58:48 -08:00
tobydox
f37e69a383 Merge pull request #30 from softrabbit/stable-0.4 
PianoRoll: fix odd time signature issues (bugs 274 and 172 at SF)
 2014-01-16 04:58:13 -08:00
Hannu Haahti
9fc64418bd config option to enable waveform display by default 2014-01-16 12:01:35 +02:00
Raine M. Ekman
50a49c52fe PianoRoll: fix odd time signature issues (bugs #274 and #172 at Sourceforge) 2014-01-16 07:55:54 +02:00
Tobias Doerffel
b4030478c3 AutomatableModelView: adopted new coding style 2014-01-16 00:01:47 +01:00
Tobias Doerffel
17c1ede50c AutomatableModelView/ContextMenu: option for unlinking all controls 
Integrated patch by Rodrigo Rodrigues da Silva which adds an option
to all AutomatableModelView's context menu allowing to unlink all
linked controls.
 2014-01-15 23:50:13 +01:00
Tobias Doerffel
17babf6abc ZynAddSubFX/FLTK: fixed detection of freetype2 include path once more 
Commit 26665dde55 was not complete as we have
to find the Freetype package and also look for freetype2 include path.
 2014-01-15 23:11:59 +01:00
Tobias Doerffel
6993eda404 Merge branch 'stable-0.4' into stable-0.4-new-fx-mixer 
Conflicts:
	src/gui/FxMixerView.cpp
 2014-01-15 22:59:49 +01:00
tobydox
4728fb425a Merge pull request #25 from diizy/stable-0.4-new-fx-mixer 
Ported the FX mixer UI changes from stable-0.4
 2014-01-15 13:20:21 -08:00
Vesa
037b977137 Ported the FX mixer UI changes from stable-0.4 2014-01-15 21:51:35 +02:00
tobydox
8e165bdbcf Merge pull request #24 from diizy/stable-0.4 
Merge for now and let's fix things later.
 2014-01-15 10:29:03 -08:00
Vesa
7d534eaabc Fixed typo :P 2014-01-15 20:24:08 +02:00
Vesa
cf2fb230a2 Stylesheet changes, added palette customizability, fx mixer obeys palette, etc... 2014-01-15 20:08:33 +02:00
tobydox
14e6b71150 Merge pull request #22 from Lukas-W/stable-0.4 
Fix build problems: Find wine and freetype headers
 2014-01-15 08:58:54 -08:00
Lukas W
22ca7acb81 Add FindWine module and use it in main CMakeLists.txt 
Old CheckLibraryExists implementation didn't work on my system.
A find module should be better and also easier to maintain.
 2014-01-15 17:17:29 +01:00
Lukas W
26665dde55 ZynAddSubFx: Fixed fltk not finding freetype header files. 
In cases where the freetype headers are not in /usr/include, fltk wouldn't find ft2build.h.
 2014-01-15 15:56:06 +01:00
Vesa
1b8e2b003b New led graphics, initial style sheet changes (work still in progress), other theme changes 2014-01-15 11:45:46 +02:00
Vesa
00346d5ec1 Final tweaks to SF2 artwork (based on feedback), moved chorus & reverb buttons a bit to fit them better with new artwork 2014-01-15 11:45:46 +02:00
Vesa
2b336d6cf4 New SF2 plugin artwork 2014-01-15 11:45:46 +02:00
Tobias Doerffel
31e712a675 PianoRoll: fixed typo leading to big white key at wrong position when pressed 2014-01-14 23:36:27 +01:00
Tobias Doerffel
df76921226 PianoRoll: always use the PianoModel for note on/off + other improvements 2014-01-14 23:34:49 +01:00
Tobias Doerffel
8c8763721c Piano: added optional velocity argument to handleKeyPress() 2014-01-14 23:34:03 +01:00
Tobias Doerffel
7dfaf2d44b Added volumeToMidi() helper function 2014-01-14 23:33:49 +01:00
Tobias Doerffel
7e4db63de5 PianoRoll: coding style improvements 2014-01-14 23:19:37 +01:00
Tobias Doerffel
c40b8350ef Piano: refactored class to be usable without friend classes 2014-01-14 23:12:43 +01:00
tobydox
340789c191 Merge pull request #17 from bhattigurjot/stable-0.4 
PianoRoll: added support for pressed keys
 2014-01-14 13:52:46 -08:00
Tobias Doerffel
dbb4a8e6ab FxMixerView: fixed clear() 
Before calling refreshDisplay() we have to actually clear the backend model.
 2014-01-14 18:18:59 +01:00
Tobias Doerffel
27b51c2508 Song: added missing refresh of FxMixerView when loading project 
Missed this call when backporting.
 2014-01-14 18:17:51 +01:00
Tobias Doerffel
5b480dd898 FxMixer: rewrote loop for adjusting FX channel models in deleteChannel() 2014-01-14 18:04:51 +01:00
Tobias Doerffel
af693c562c Merge branch 'stable-0.4' into stable-0.4-new-fx-mixer 2014-01-14 18:02:13 +01:00
Tobias Doerffel
9a7ad0264f SampleBuffer, SamplePlayHandle, SampleRecordHandle, SampleTrack: new coding style 
Renamed file and class names.
 2014-01-14 18:01:14 +01:00
Tobias Doerffel
4e5507a30a TrackContainer, TrackContainerView: adopted coding style 
Renamed file and class names.
 2014-01-14 17:39:02 +01:00
Gurjot Singh
61ac073cc2 Merge branch 'stable-0.4' of https://github.com/bhattigurjot/lmms into stable-0.4 2014-01-14 22:02:50 +05:30
Gurjot Singh
d4a2e33bf5 adds piano_roll key presses 2014-01-14 21:58:43 +05:30
tobydox
7105c8ac90 Merge pull request #14 from diizy/fix32 
SampleBuffer: fix import of 32-bit floating point samples
 2014-01-14 00:30:39 -08:00
Vesa
79119149ef Fix import of 32-bit floating point samples 2014-01-14 03:32:33 +02:00