mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-04-28 09:59:33 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,479 Commits 9 Branches 61 Tags
068066929fffb95a4e76cdf4e5ccad3d9ef87eed
Commit Graph

4479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lukas W
068066929f Merge commit 'b5538c7da818cbcdde5ff1c885ce4eee5b626f3b' into ed_refac 
Conflicts:
	plugins/audio_file_processor/audio_file_processor.cpp
	plugins/delay/delaycontrols.cpp
	plugins/delay/delaycontrolsdialog.cpp
	plugins/delay/delayeffect.cpp
	src/gui/MainWindow.cpp
 2015-01-06 16:33:41 +01:00
Lukas W
1706279ed1 Merge commit '25ab7260f5cc57075360c976826e13434ade058c' into ed_refac 2015-01-06 16:13:16 +01:00
Lukas W
834be948ee Merge commit 'f7741f184f83e6b9e2f081d39efffb2c499962f6' into ed_refac 2015-01-06 16:11:39 +01:00
Dave French
b5538c7da8 used newWaveView in constructor, to remove redundancy 2014-12-23 22:26:36 +00:00
Dave French
76a1b8c2b6 Proposed fix for 929 AFP wave display 2014-12-23 16:29:04 +00:00
Dave
ee39cbe94d Merge pull request #16 from LMMS/stable-1.1 
Stable 1.1
 2014-12-23 16:15:28 +00:00
Vesa V
af66303fc4 Merge pull request #1485 from curlymorphic/delay-1.1 
Delay effect   Clear buffer on load, correct use of interpolation, reformat
 2014-12-23 11:31:41 +02:00
Dave French
6aae0e6897 change as of issue 1474 2014-12-23 09:17:16 +00:00
Tres Finocchiaro
ef7d3ff328 Merge pull request #1479 from DanWin/title 
reset window title every time we change the state of a subwindow to show...
 2014-12-22 16:17:32 -05:00
Dave French
a0d07db8f1 Delay Clear buffer on load, correct use of interpolation, reformat 2014-12-22 19:29:41 +00:00
Lukas W
25ab7260f5 Merge pull request #1461 from DanWin/stable-1.1 
German translation update
 2014-12-22 11:53:45 +02:00
Dave French
5172acb1e3 Proposed fix for 1049 VST knobs won't remember settings 2014-12-21 23:34:08 -05:00
Daniel Winzen
2ee8f1445c reset window title every time we change the state of a subwindow to show the correct title 
When maximizing a subwindow it remembers the title the mainwindow had before and resets it after unmaximizing/closing.
As the title might have changed due to a project switch, we have to reset the title again as it would else show an incorrect/old title.
 2014-12-21 10:18:55 +01:00
Daniel Winzen
f7741f184f German translation update 2014-12-18 20:58:12 +01:00
Vesa V
3ad6d6ca7a Merge pull request #1459 from DanWin/stable-1.1 
More memory fixes
 2014-12-18 04:02:59 +02:00
Daniel Winzen
0891c53582 More memory fixes 
This fixes memory leaks in ZASF and Controller. It also sets an uninitalised variable in audio_file_processor.
 2014-12-17 21:01:26 +01:00
Tres Finocchiaro
3c5d940561 Fix ifdef typo leftover from clang fix 2014-12-17 14:20:58 -05:00
tresf
448b783e8b Fix compilation on Xcode 4.6 2014-12-17 13:43:14 -05:00
Tres Finocchiaro
85da25fe2a better naming consistency with windows builds 
i.e. `LMMS 1.1.0.dmg` will now be `lmms-1.1.0-mac10.7.dmg`
 2014-12-17 12:59:36 -05:00
Lukas W
eb79701acc Merge branch 'master' into ed_refac 2014-12-17 11:35:42 +01:00
Lukas W
657fb06c49 More Automation refactoring 2014-12-17 11:34:57 +01:00
Tres Finocchiaro
db551b9f43 Merge pull request #1457 from curlymorphic/fader 
Added EXPORT macro to Fader, to allow use in plugins on windows
 2014-12-17 00:20:00 -05:00
Dave French
43ad2d52bd added EXPORT to Fader to allow use in plugins in windows builds 2014-12-17 01:32:10 +00:00
Dave
6df00fffdf Merge pull request #8 from LMMS/master 
merge from master
 2014-12-17 01:17:15 +00:00
Vesa V
28ec70decd Merge pull request #1456 from diizy/crossovereq 
LR filter -> direct form 2
 2014-12-17 00:59:10 +02:00
Vesa V
fa86a2cdac Merge pull request #1455 from LMMS/stable-1.1 
Stable 1.1
 2014-12-17 00:49:14 +02:00
Vesa V
de56c989e9 Merge pull request #1454 from DanWin/stable-1.1 
Remove RackView widget before deleting the ChannelView (Rebase for stable-1.1 of #1448 )
 2014-12-17 00:48:47 +02:00
Vesa
8402bcb525 LR filter -> direct form 2 2014-12-16 23:49:39 +02:00
Daniel Winzen
d21f0a7114 Remove RackView widget before deleting the ChannelView 
Fixes the following two errors I spotted using valgrind:
When deleting a channel;
==936== Invalid read of size 8
==936==    at 0x56FA1D: FxMixerView::deleteChannel(int) (FxMixerView.cpp:374)
==936==    by 0x60E9A79: QMetaObject::activate(QObject*, QMetaObject const*, int, void**) (in /usr/lib/x86_64-linux-gnu/libQtCore.so.4.8.6)
==936==    by 0x5216BF1: QAction::triggered(bool) (in /usr/lib/x86_64-linux-gnu/libQtGui.so.4.8.6)
==936==    by 0x52185C2: QAction::activate(QAction::ActionEvent) (in /usr/lib/x86_64-linux-gnu/libQtGui.so.4.8.6)
==936==  Address 0x14d51b90 is 32 bytes inside a block of size 40 free'd
==936==    at 0x4C2C2E0: operator delete(void*) (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==936==    by 0x56F9ED: FxMixerView::deleteChannel(int) (FxMixerView.cpp:370)
==936==    by 0x60E9A79: QMetaObject::activate(QObject*, QMetaObject const*, int, void**) (in /usr/lib/x86_64-linux-gnu/libQtCore.so.4.8.6)
==936==    by 0x5216BF1: QAction::triggered(bool) (in /usr/lib/x86_64-linux-gnu/libQtGui.so.4.8.6)

When loading a new project after adding some channels:
==936== Invalid read of size 8
==936==    at 0x570785: FxMixerView::refreshDisplay() (FxMixerView.cpp:202)
==936==    by 0x4B590E: Song::clearProject() (Song.cpp:740)
==936==    by 0x4B7885: Song::createNewProject() (Song.cpp:817)
==936==    by 0x60E9A79: QMetaObject::activate(QObject*, QMetaObject const*, int, void**) (in /usr/lib/x86_64-linux-gnu/libQtCore.so.4.8.6)
==936==  Address 0x56a12ab0 is 32 bytes inside a block of size 40 free'd
==936==    at 0x4C2C2E0: operator delete(void*) (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==936==    by 0x57075B: FxMixerView::refreshDisplay() (FxMixerView.cpp:201)
==936==    by 0x4B590E: Song::clearProject() (Song.cpp:740)
==936==    by 0x4B7885: Song::createNewProject() (Song.cpp:817)
 2014-12-16 22:46:37 +01: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
Vesa V
347b5a121d Update papu_instrument.cpp 2014-12-16 23:02:00 +02:00
Vesa V
da6fd6ef5c Update opl2instrument.cpp 2014-12-16 23:00:14 +02:00
Tres Finocchiaro
ed0dc6770d Merge pull request #1453 from falkTX/stable-1.1 
Fix for updated Carla API, and fix build on old linux systems
 2014-12-16 15:49:01 -05:00
Tres Finocchiaro
f65ec07603 Bump version v1.0.100 2014-12-16 15:32:20 -05:00
falkTX
f2ab783db9 Fix build when using old linux systems 2014-12-16 19:40:31 +00:00
falkTX
91063ab7d2 Update Carla plugin to latest API 2014-12-16 19:40:02 +00:00
Tres Finocchiaro
b789eb9a69 Merge pull request #1449 from curlymorphic/I1432 
Proposed fix for issue 1432 LB302 preset preview audio cut-off
 2014-12-16 12:30:03 -05:00
Tres Finocchiaro
569c83101a Merge pull request #1451 from curlymorphic/i1450 
Proposed fix for 1450 Mem leak in sample-track
 2014-12-16 12:23:39 -05:00
Dave French
8b2ce06da8 Proposed fix for 1450 Mem leak in sample-track 2014-12-16 16:41:08 +00:00
Dave French
8d3637e754 Proposed fix for #1411 Crash on LB302 preset preview . 2014-12-16 16:51:06 +01:00
Tres Finocchiaro
c6a22747da Merge pull request #1433 from Sti2nd/stable-1.1 
New SnareMarch preset and updated KickPower

No objections after a week, merging. -Tres
 2014-12-16 10:48:42 -05:00
Tres Finocchiaro
5e8e52ff27 Merge pull request #1447 from curlymorphic/1411 
Proposed fix for #1411 Crash on LB302 preset preview .
 2014-12-16 08:53:59 -05:00
Dave French
f27ea7bc2b Proposed fix for #1432 LB302 preset preview audio cut-off 2014-12-15 21:40:58 +00:00
Dave
2aa7b64938 Merge pull request #7 from LMMS/stable-1.1 
merge LMMS/lmms
 2014-12-15 16:37:53 +00:00
Dave French
f357bc7291 Proposed fix for #1411 Crash on LB302 preset preview . 2014-12-15 15:54:05 +00:00
Vesa V
24f8bd4c20 Merge pull request #1445 from diizy/crossovereq 
Crossover EQ initial commit, also fix bugs in LR4 filter and Fader
 2014-12-15 10:45:00 +02:00
Vesa
0789bae53a Crossover EQ initial commit, also fix bugs in LR4 filter and Fader 2014-12-15 10:41:43 +02:00
Tres Finocchiaro
e6ae2be65a Bump DualFilter high cutoff to 20k 
Closes #1395.
 2014-12-13 12:19:20 -05:00
Tres Finocchiaro
a182a3e8cc Fix scroll bar gap 
Closes #1437
 2014-12-13 12:11:31 -05:00
Tres Finocchiaro
90bb470642 Merge pull request #1442 from tresf/stable-1.1 
Check major/minor version before setting theme directory
 2014-12-13 08:46:06 -08:00