mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-03-15 12:37:45 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,977 Commits 9 Branches 61 Tags
b12e6b773c8dbc64bc5d709bb0f3dfe9fafcfe43
Commit Graph

1138 Commits

Author SHA1 Message Date
Tobias Doerffel
f2876ea650 Merge remote-tracking branch 'origin/stable-1.1' 
Conflicts:
	data/locale/zh.ts
	src/tracks/Pattern.cpp
 2014-09-30 22:53:24 +02:00
Tobias Doerffel
de45718351 Renamed pattern/patternView to Pattern/PatternView 2014-09-30 22:49:16 +02:00
Tobias Doerffel
fab7f8fea8 PianoRoll, Pattern: manage reset of currently edited pattern more reliably 
Introduce one central signal in the pattern class which is emitted before
the pattern object is being destroyed. This way we can easily and more
reliably hide this pattern in the PianoRoll without any race conditions
or other glitches.

Closes #1089.
 2014-09-30 22:34:01 +02:00
Vesa
498d939e76 Merge branch 'stable-1.1' 2014-09-10 00:43:32 +03:00
Vesa
44993319eb Fix channel send connections 
Fix #1147
Backwards compat should be maintained.
 2014-09-10 00:40:29 +03:00
Vesa
bf6659fbb1 Merge branch 'stable-1.1' 
Conflicts:
	src/gui/FileBrowser.cpp
 2014-09-09 23:55:39 +03:00
Matthew Krafczyk
e20e863a99 Change isJournallingStackEmpty to isJournallingStateStackEmpty 2014-09-09 20:08:14 +02:00
Matthew Krafczyk
0cdfd7c354 Fix syntax a bit. 2014-09-09 17:15:54 +02:00
Matthew Krafczyk
32eae51128 Made isEmpty function name more specific. Moved doubleclick fix to restoreJournallingState. 2014-09-09 17:07:40 +02:00
Matthew Krafczyk
c628387cd2 Make syntax for fix more consistent with existing code. 2014-09-09 01:39:08 +02:00
Matthew Krafczyk
84895a4f79 Fix for 'Crash double-clicking any knob in debug build (git master) (#948)' 
Conflicts:
	src/gui/widgets/knob.cpp
 2014-09-09 01:14:19 +02:00
Tobias Doerffel
84f711fb2c Merge pull request #1131 from Lukas-W/stable-1.1-iss1058 
Change Sidebar file browser root to `/Volumes` on OS X
 2014-09-03 16:37:10 +02:00
Lukas W
876642c342 FileBrowser rename fixes 2014-09-03 11:43:40 +02:00
Lukas W
efacfdfae9 Rename file_browser.* to FileBrowser.* 2014-09-03 11:29:25 +02:00
Lukas W
5245f6181c Apply new coding conventions to file_browser.h 2014-09-03 11:19:45 +02:00
Vesa
c2d7cf787e Merge branch 'stable-1.1' 
Conflicts:
	include/Plugin.h
	src/core/Plugin.cpp
 2014-09-02 16:59:04 +03:00
Tobias Doerffel
8628bcc77b Mixer: integrated MixerProfiler 2014-09-02 11:20:52 +02:00
Tobias Doerffel
e1664b106c MixerProfiler: initial simple implementation 2014-09-02 11:19:57 +02:00
Tobias Doerffel
0ef3d6c1f6 FxMixerView: declare as class for consistency with friend declaration later 2014-09-01 14:59:30 +02:00
Tobias Doerffel
70ef29981f Plugin: remove unused base64.h header 2014-09-01 14:23:31 +02:00
Tobias Doerffel
feba89354b Plugin: cleanup & coding style fixes 2014-09-01 14:18:45 +02:00
Tobias Doerffel
5572cdde64 Merge pull request #1126 from tresf/stable-1.1 
Win64 fix for missing _isnanf
 2014-09-01 12:16:28 +02:00
tresf
807d3af68c Win64 fix for missing _isnanf 2014-09-01 00:35:48 -04:00
Vesa
d8cc0cc2cc Merge branch 'stable-1.1' 
Skipped the chinese translation files because of merge conflict, those should be re-submitted for master

Conflicts:
	data/locale/zh.qm
	data/locale/zh.ts
 2014-08-19 09:10:19 +03:00
Tobias Doerffel
a09fd51060 DataFile: added nested LocaleHelper class 
In order to address issues with differently coded floating points in
strings provide a helper class which can be instantiated when loading
or saving data.
 2014-08-18 23:17:47 +02:00
Tobias Doerffel
311d290b32 Added support for building for Win32/Win64 with Qt5 2014-08-16 17:20:00 +02:00
Vesa V
128a3ec927 Merge pull request #1053 from diizy/banish-all-locks 
Banish all locks
 2014-08-16 09:58:52 +03: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
Vesa
f2eca0aaa3 More fixes, stuff 2014-08-12 23:39:16 +03:00
Vesa
079a54e159 More fixing of teh playhandles 2014-08-03 22:09:27 +03:00
Vesa
9e1cdd0441 Start work on replacing/removing global locks 2014-08-03 14:49:45 +03:00
Vesa
945ee12311 Optimize autoquit check in effect 2014-07-27 03:47:02 +03:00
Vesa
f2d88d1fc2 Fix "disable autoquit" option 
Wasn't getting saved/loaded properly, fixed that
TODO: disable autoquit causes some effects to keep running even when the song is stopped... this should be addressed at some point
 2014-07-27 01:10:34 +03:00
Vesa V
1934879109 Merge pull request #1026 from LMMS/stable-1.1 
sync
 2014-07-26 00:31:03 +03:00
Vesa
dacb8adc4c Add "clear track" option, fix copying of tracks from song ed -> bb ed 
- Tracks copied from song->bb will no longer be unusable
- Since doing this required creating a "delete TCOs from track" function, I also added the option to trackops menu to clear a track
Fix #757
 2014-07-18 11:18:10 +03:00
Hannu Haahti
932768dac0 add option to keep effects running even without input 2014-07-17 16:19:00 +03:00
Vesa
88c60f5f94 Merge branch 'stable-1.1' 
Conflicts:
	src/core/NotePlayHandle.cpp
 2014-07-17 02:06:01 +03:00
Vesa
1a2351bbd0 Improve performance of effect processing, fix autoquit bugs 
Also a slight NPH tweak
 2014-07-17 01:48:24 +03:00
Vesa
921943bce1 Merge branch 'stable-1.1' 
Conflicts:
	include/MixHelpers.h
	src/core/FxMixer.cpp
 2014-07-13 22:20:10 +03:00
Vesa
e06c281132 Sanitize master output 
Replace any inf/nan in master output with zero, to prevent corrupted files/audio.
 2014-07-13 22:11:17 +03:00
Vesa V
00aba44251 Merge pull request #961 from diizy/master-atomic 
Improve RT-safety by eliminating some global locks
 2014-07-12 19:12:58 +03:00
Vesa
6f8c910f5c Peak Controller: improve envelope calculation 2014-07-12 05:27:05 +03:00
Vesa
4855634bf4 ProjectJournal: cap the number of undo states to prevent infinite memory buildup 
The cap is hardcoded to 100 for now, TODO: make this number configurable (or even better: use a max. memory amount instead of max number of states)
 2014-07-10 14:22:40 +03:00
Vesa
e6582fcd17 InstrumentTrack.h: Remove unneeded includes 2014-07-09 21:24:10 +03:00
Vesa
f33d1f4972 Instrument track, mixer... 2014-07-09 20:42:54 +03:00
Vesa
4eb486be1e Attempt to remove mutex calls from instrumenttrack::processinevent 2014-07-09 20:39:41 +03:00
Vesa V
8407427c4b Merge pull request #933 from LMMS/stable-1.1 
Stable 1.1
 2014-07-05 16:34:34 +03:00
Vesa
06b47a52a2 Fix styling of textFloat & whatsthis, make text floats consistent in style with tooltips 
Should fix #925
 2014-07-03 14:09:31 +03:00
Tres Finocchiaro
63a5a16cd0 isinf and isnan declarations win32/apple 2014-06-30 23:21:17 -04:00
Vesa V
6ffcc0e799 Merge pull request #911 from diizy/master-nph 
Revision of handling of frameoffset for NPH, SPH
 2014-06-30 12:52:44 +03:00