Commit Graph

3826 Commits

Author SHA1 Message Date
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
00086c9f20 Merge branch 'stable-1.1' into fix_for_doubleclick_knob_bug 2014-09-09 01:19:58 +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
Tres Finocchiaro
9a80205407 Merge pull request #1143 from tresf/stable-1.1
(Apple only) WANT_SF2 OFF, Disable Zyn GUI
2014-09-08 12:54:06 -04:00
Ubuntu
74e53f8354 Set "WANT_SF2" to "OFF" for Apple 2014-09-08 12:35:57 -04:00
Tres Finocchiaro
e17e84266d Fix bad #ifdef, make ANSI compliant
`#elif  LMMS_BUILD_APPLE` is not correct, it should be `#elif defined(LMMS_BUILD_APPLE)`
2014-09-08 11:24:39 -04:00
Tres Finocchiaro
adc134bbca Merge pull request #1142 from tresf/stable-1.1
(Apple only) Re-enable OPL2, Disable SF2
2014-09-08 11:14:38 -04:00
Ubuntu
40f640951c Disable "Show GUI" button on Apple to prevent crash 2014-09-08 11:13:50 -04:00
Ubuntu
d95fea2d3f Re-enable OPL2 on Apple, Disable SF2 2014-09-08 10:53:59 -04:00
Tres Finocchiaro
7fdb52c172 Merge pull request #1141 from tresf/stable-1.1
Fix AFP crash, bump version

Tested by @DeRobyJ, merging.
2014-09-08 10:33:39 -04:00
Ubuntu
c01799e998 Fix AFP crash, bump version 2014-09-08 09:26:50 -04:00
Vesa V
02dd2cf63f Merge pull request #1139 from Umcaruje/stable-1.1-newpresets
New presets for Monstro, Bitinvader, Watsyn and Kicker.
2014-09-08 06:01:48 +03:00
Vesa V
13928eb4d9 Merge pull request #1138 from tresf/stable-1.1
Fix win32 compilation
2014-09-08 06:01:20 +03:00
Umcaruje
97c903e76c Added some presets for Monstro, Bitinvader, Watsyn and Kicker. 2014-09-08 00:14:02 +02:00
tresf
a278505cda Fix win32 compilation 2014-09-07 17:41:53 -04:00
Vesa V
619f912d12 Merge pull request #1136 from tresf/stable-1.1
Make start/end/loop knobs responsive to each other
2014-09-07 23:54:49 +03:00
Tres Finocchiaro
2ca84c15a1 Invert loop button pixmaps 2014-09-07 16:30:53 -04:00
Tres Finocchiaro
b33eceda7e Make loop end move with sample end 2014-09-07 16:20:17 -04:00
Tres Finocchiaro
dc681604e0 Make start/end/loop knobs all responsive 2014-09-07 16:02:52 -04: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
Lukas W
42cd21a943 Change sidebar root to /Volumes on OS X 2014-09-03 11:06:56 +02:00
Tobias Doerffel
f07287c771 Added support for profile command line option 2014-09-02 11:21:11 +02: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
c4f2311032 LadspaEffect/CMT: remove unused variables and useless assignments for better Clang compatibility 2014-09-01 16:24:48 +02:00
Tobias Doerffel
a1d6adfe10 LadspaEffect/SWH: remove unused variables and useless assignments for better Clang compatibility 2014-09-01 16:24:20 +02:00
Tobias Doerffel
d85f649897 Nes/NesObject: remove unused m_fpp variable 2014-09-01 16:23:33 +02:00
Tobias Doerffel
c400c9ba4d LadspaEffect/CALF: Clang compatibility fixes 2014-09-01 16:22:54 +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
124c835cda LadspaEffect/CALF: enable inline flags for GCC only 2014-09-01 14:57:39 +02:00
Tobias Doerffel
f3a890edd0 Organic: remove unused member variable 2014-09-01 14:26:54 +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
89a363741a Plugin: use qWarning() instead of printf() 2014-09-01 14:03:51 +02:00
Tobias Doerffel
1c289b0726 Plugin: use QFileInfo::baseName() 2014-09-01 14:00:32 +02:00
Tobias Doerffel
dcdc8d9e3e Added first Monstro preset 2014-09-01 13:37:43 +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
Tobias Doerffel
81ca7b157b Merge pull request #1127 from StakeoutPunch/stable-1.1
More Presets
2014-09-01 12:15:54 +02:00
StakeoutPunch
f24b82ae62 More Presets
LB302:
-AcidLead
-AngryLead
-DroneArp
Organic:
-Pwnage
-Rubberband
SID:
-Bass
-CheesyGuitar
-Lead
-MadMind
-Overdrive
-Pad

No presets of any kind were removed or otherwise changed.
2014-09-01 00:43:37 -05:00
tresf
807d3af68c Win64 fix for missing _isnanf 2014-09-01 00:35:48 -04:00
Vesa V
e915bab433 Merge pull request #1100 from StakeoutPunch/stable-1.1
Updated 3OSC Presets
2014-08-31 08:05:04 +03:00
StakeoutPunch
f05bff157d Added back stuff
AmazingBubbles (NC), Freaky-Bass (NC), SawReso (Tweaked), TranceLead
(NC). Removed stupid readme file I added earlier and forgot to delete.
2014-08-30 23:28:17 -05:00
StakeoutPunch
7ca9dfb065 Added percussion presets (5 total)
Added Drums_HardKick, Drums_Kick (Vesa's tutorial kick) Drums_HihatO,
Drums_HihatC, Drums_Snare
2014-08-30 23:09:50 -05:00
Vesa V
08abdd0468 Merge pull request #1117 from Sti2nd/revert-1116-revert-1015-stable-1.1
Revert "Revert ""What is this" additions by @musikBear #896""
2014-08-30 08:44:23 +03:00
Stian Jørgensrud
83ed94f509 LAST 2014-08-30 02:02:09 +02:00