Commit Graph

1370 Commits

Author SHA1 Message Date
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
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
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
Hannu Haahti
4f0a73e9fa fixed segfault in piano roll when no pattern is open 2014-01-16 16:20:48 +02: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
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
Vesa
037b977137 Ported the FX mixer UI changes from stable-0.4 2014-01-15 21:51:35 +02: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
Vesa
1b8e2b003b New led graphics, initial style sheet changes (work still in progress), other theme changes 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
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
Tobias Doerffel
fc7cd1bd40 Song: use Kicker as default instrument in B+B-Editor
Using TripleOscillator as default instrument in B+B-Editor doesn't
make much sense so use Kicker instead.
2014-01-12 15:36:06 +01:00
Tobias Doerffel
e8190dc01e Merge remote-tracking branch 'ranft/notelabels-2' into stable-0.4 2014-01-09 23:23:34 +01:00
Tobias Doerffel
a955fb755a FxMixer, Mixer, FxMixerView: backported FX send support from master branch
There once have been huge efforts to implement FX send support in the
master branch. In order to make it available on a stable base here's
a backport which is non-trivial as there have been major rewrites of
the mixer's worker thread architecture.

There still seem to be bugs which we have to fix before merging into
stable branch.

Thanks to Andrew Kelley for the original work.
2014-01-08 23:21:41 +01:00
Tobias Doerffel
0ff1f91c1b Mixer: renamed class and file name
The mixer class is now named "Mixer" and accessible via engine::mixer().
2014-01-08 22:35:14 +01:00
Tobias Doerffel
40290117ff Song: fixed tracking of elapsed milliseconds
After merging play/pause button corrections there are a few other places
where we have to take care of m_elapsedMilliseconds.
2014-01-08 22:07:25 +01:00
Tobias Doerffel
9f35042e3e Mixer: use MixHelpers for mixing buffers of AudioPort 2014-01-08 22:01:33 +01:00
Tobias Doerffel
4a99b953b5 MixHelpers: helper functions for mixing buffers
Introduced central helper functions for mixing buffers in order to
reduce local loops all around LMMS.
2014-01-08 21:58:03 +01:00
Tobias Doerffel
6f7b6978bd FxMixerView: use LcdWidget for FX lines
We only need to display numbers in LCD style, therefore use new LcdWidget
class instead of LcdSpinBox.

Fixes display problems introduced in commit f568a81c7a.

Thanks to Vesa for pointing out this issue.
2014-01-08 00:27:50 +01:00
Tobias Doerffel
c9ea6a559d SongEditor: do not add extra spacing
In commit a73e8636eb we introduced an extra
spacing which is not neccessary and causes layout problems.

Thanks to Vesa for pointing out this issue.
2014-01-08 00:22:42 +01:00
Tobias Doerffel
3c1e3c17b4 TimeDisplayWidget: expand all LcdWidgets to 3 digits
Most songs have more than 99 bars and in some situations also more
than 99 ticks.

Thanks to Vesa for pointing out this issue.
2014-01-08 00:20:14 +01:00
Joel Muzzerall
6249b23f1f AutomationEditor: add option for smooth lines and curves
Besides discrete automation it's now possible to setup interpolation
modes such as linear and cubic-hermite.

Signed-off-by: Tobias Doerffel <tobias.doerffel@gmail.com>
2014-01-08 00:08:21 +01:00
Tobias Doerffel
ddad2da162 Merge remote-tracking branch 'origin/next' into stable-0.4 2014-01-07 23:24:26 +01:00
Tobias Doerffel
c0c10cf9d8 Merge remote-tracking branch 'origin/stable-0.4-test' into stable-0.4
Conflicts:
	include/song.h
	src/core/song.cpp
2014-01-07 23:04:21 +01:00
Tobias Doerffel
90024c3699 LcdWidget: decreased spacing between text label and LCD label 2014-01-06 21:18:20 +01:00
Tobias Doerffel
a73e8636eb SongEditor: integrated new TimeDisplayWidget 2014-01-06 21:17:48 +01:00
Tobias Doerffel
8a4440936c TimeDisplayWidget: new widget for displaying current playback time
This new widget displays current playback times in LCD style. An initial
basic implementation has been provided by by Rubén Ibarra Pastor.
2014-01-06 21:15:28 +01:00