Commit Graph

5227 Commits

Author SHA1 Message Date
Colin Wallace
dad4e8ef10 Merge pull request #2105 from Wallacoloo/doc_typos
Correct filenames within documentation strings
2015-06-20 15:28:55 -07:00
Lukas W
96a1d412dd Merge pull request #2116 from Wallacoloo/rm-legacy-friends
Removed legacy friend declarations
2015-06-18 10:00:26 +02:00
Colin Wallace
c112e50ddd Removed legacy friend declarations 2015-06-18 03:23:43 +00:00
Tres Finocchiaro
05d4b1398d Merge pull request #2006 from softrabbit/midi_import
Midi import: various small improvements
2015-06-17 15:48:27 -04:00
Lukas W
aaaa11c943 CMake: Add Qt5 include directories
Fixes #2107
2015-06-16 17:23:18 +02:00
Lukas W
4d4f0ed438 CMake proper version comparison 2015-06-16 16:55:38 +02:00
Lukas W
ca746e50f9 Merge pull request #2106 from Wallacoloo/remove-hasGUI
Replace 'Engine::hasGUI()' with 'gui != nullptr'
2015-06-16 14:26:08 +02:00
Colin Wallace
860d419c14 Replace 'Engine::hasGUI()' with 'gui != nullptr' 2015-06-16 05:40:05 +00:00
Colin Wallace
8a145b6baf Merge pull request #2097 from zonkmachine/mallets-spam
Stop mallet spamming the terminal
2015-06-15 17:00:06 -07:00
Colin Wallace
81164e91a9 Correct filenames within documentation strings 2015-06-15 23:52:13 +00:00
Lukas W
4f40583cfb Merge pull request #2102 from zonkmachine/organic-wave-lables
Fix Organic wave labels
2015-06-15 10:39:26 +02:00
Lukas W
61a9e9de02 Merge pull request #2104 from Wallacoloo/init_m_fb
Properly initialize InstrumentTrack::m_fb
2015-06-15 10:30:52 +02:00
Lukas W
44f8b24fb3 Merge branch 'stable-1.1'
# Conflicts:
#	include/PianoRoll.h
#	src/gui/editors/PianoRoll.cpp
2015-06-15 10:11:53 +02:00
Colin Wallace
eaf6ad35d8 Connect slots *after* initializing members 2015-06-15 06:48:04 +00:00
Colin Wallace
2616269b68 initialize m_fb to NULL 2015-06-15 06:33:41 +00:00
Lukas W
8b9868e0e5 Merge branch 'cmake_dist'
# Conflicts:
#	src/gui/FileBrowser.cpp
2015-06-14 21:38:12 +02:00
Oskar Wallgren
91aafceba5 Fix Organic wave labels 2015-06-14 09:23:39 +02:00
Dave
979fa2fb93 Merge pull request #2048 from Wallacoloo/issue-2015-4
Reorder Editor/Song destruction order to prevent bad memory accesses
2015-06-13 11:37:22 +01:00
Oskar Wallgren
5fabdfdb20 Stop mallet spamming the terminal 2015-06-13 00:55:27 +02:00
Dave
6c934d6aae Merge pull request #2096 from curlymorphic/i1660
Remove MessageBox warning of incomplete stk installation from mallets
2015-06-12 22:09:24 +01:00
Dave French
d6ff89af68 Remove MessageBox waring of incomplete stk instalation from mallets
The merge of stable 1.1 into master introduced the messagebox into the incorrect
place in the code. It is alrady present in the correct place in master,
 so simply removed the extra instance.

This stops the segfault and fixes #1660
2015-06-12 20:46:04 +01:00
Tres Finocchiaro
4142a55f5f Merge pull request #2095 from curlymorphic/i2094
No longer try to validate sf2 and gig files
2015-06-12 13:58:39 -04:00
Dave French
0c205ba504 Nolonger try to validate sf2 anf gig files
Removed trying to validate non lmms files when clicked in the file browser.
This had been the cause of erronus dialog box, and caused a bug, not allowing
drag and drop of sf2 files.

fixes #2094
2015-06-12 18:21:09 +01:00
Tres Finocchiaro
90dd8b2abb Merge pull request #2091 from softrabbit/issue1812
Don't save templates in "recently opened" list
2015-06-11 09:48:47 -04:00
Raine M. Ekman
d9193960fc Coding style fixup. 2015-06-11 10:27:09 +03:00
Raine M. Ekman
f896316de4 ConfigManager: Don't add templates to "recent files" list
Fixes #1812.
2015-06-11 10:19:48 +03:00
Tres Finocchiaro
ecbeaf788c Merge pull request #2065 from midi-pascal/master
Add and correct some French translation
2015-06-10 13:08:00 -04:00
midi-pascal
fa498caf5c Add and correct some French translation
The translation of the instrument plugins description does not work in Instruments pluginBrowser

Translation of the effect plugins description not showing in effects selector

Replace tabs with spaces in the fix indentation (as Tres request)

More French translations added

Remove the call to tr() inside the macro makeknob (DualFilterControlDialog.cpp) and tr() the strings before calling makeknob
Fix DualFilter description (was labeled as "A native amplifier plugin") (DualFilter.cpp)
Add French translation for the Dual filter knobs.

Move tr() out of macro's so lupdate find them for translation (extract litterals in "ts" file).
Full French translation of Monstro :-)

Make NES translatable (some tr() missing)
Remove tr() from macros (litterals not extracted by lupdate
Translate NES to French

Translate Watsyn Synth as others

Missing Q_OBJECT in DelayControlsDialog definition prevents its translation
Translate Delay plugin to French

Make EqControlsDialog translatable

Fix selected-note volume bug

Closes #2070

Fix a typo in French translation.

Add EqControlsDialog.h to the MOCFILES list in Eq CMakeLists.txt

Remove definition of slot updateVuMeters() in EqControlsDialog.h which is not implemented
2015-06-10 09:07:55 -04:00
Tres Finocchiaro
5265ec988f Merge pull request #2069 from BaraMGB/preset
Sets Focus to InstrumentTrackWindow
2015-06-02 13:43:44 -04:00
Lukas W
cc454b2b53 Fix pixmap discovery 2015-05-30 22:59:18 +02:00
Lukas W
422fbbc8d3 Merge branch 'master' into cmake_dist
# Conflicts:
#	include/ConfigManager.h
#	include/Engine.h
#	plugins/CMakeLists.txt
#	plugins/vst_base/CMakeLists.txt
#	plugins/vst_base/Win64/CMakeLists.txt
#	src/core/Engine.cpp
2015-05-30 22:59:06 +02:00
Tres Finocchiaro
f403299460 Fix selected-note volume bug
Closes #2070
2015-05-24 13:55:09 -04:00
Steffen Baranowsky
0e5c6aeaf8 Sets the Focus to the InstrumentTrackWindow if a preset or a sample droped to it. 2015-05-24 02:30:58 +02:00
Tres Finocchiaro
a644183a57 Merge pull request #2062 from midi-pascal/master
Issue #2061Sf2Player: Chorus tooltip assigned to reverb
2015-05-19 20:32:30 -04:00
pascal
46f72d97ce Issue #2061
Sf2Player: Chorus tooltip assigned to reverb
2015-05-19 19:26:58 -04:00
Raine M. Ekman
c4f4fe3657 MIDI import: i18n in default track names, control names for automation tracks 2015-05-18 21:54:21 +03:00
Colin Wallace
12f299bb9e Reorder Editor/Song destruction order to prevent bad memory accesses (issue #2015) 2015-05-12 18:56:58 +00:00
Raine M. Ekman
22b1e4fb4c Clarified the reason for qApp->processEvents(),
changed an odd type juggling into something slightly saner.
2015-05-05 22:21:33 +03:00
Raine M. Ekman
542250e127 MIDI import: set default pitch bend range to +/-2 semitones
AFAIK, this is how the General MIDI standard says it should be.
2015-05-05 12:25:13 +03:00
Raine M. Ekman
06d87174e4 MIDI import: call qApp->processEvents(); before creating tracks
This should keep LMMS responsive from the window managers POV, unless
the user selects a huge enough default sound font that loading it
takes too long.
2015-05-05 12:25:12 +03:00
Raine M. Ekman
61ab0ed093 MIDI import: add naming of AutomationTracks
Name the automation tracks like "[MIDI trackname] CC ##". And don't
call the automation track creation function for every CC event, as
it now will involve constructing a QString.
2015-05-05 12:25:12 +03:00
Raine M. Ekman
2a72d5f119 MIDI import: ensure minimum note length 1 tick
Too short notes had their duration rounded down to 0 on import,
as MIDI precision allows way shorter notes than LMMS, and
portsmf reports the duration as a double, where a beat == 1.0.

Was going to use ceil() first, but that might round some notes
up to a slightly longer duration.
2015-05-05 12:25:12 +03:00
Raine M. Ekman
ff44854cde MIDI import: don't call AutomationPattern::addObject all the time
Should be enough to add the object to the automation pattern only once,
as the objModel variable that is added will always be the same for the
same value of ccid, which indexes the ccs array.

This will speed up creation of automation tracks for MIDI CCs and pitch
bend.
2015-05-05 12:25:12 +03:00
Tres Finocchiaro
2f969c1e1c Merge pull request #2033 from michaelgregorius/2028-slow_midi_import
Solves issue #2028 (Slow MIDI import due to repeated message)
2015-05-05 00:31:08 -04:00
Michael Gregorius
cbf4e59691 Yet another tab correction
The wrong settings concerning tabs in QtCreator lead to bad display of
the code in other editors.
2015-05-04 19:37:54 +02:00
Michael Gregorius
3e72793465 Fixes the wrong tab spacing for #2028 2015-05-03 22:19:42 +02:00
Michael Gregorius
53f5ef1980 Solves issue #2028 (Slow MIDI import due to repeated message)
AutomationPattern::addObject now returns a boolean which indicates
whether the object was added or not. This change enables the removal of
the error message that is shown in the case that a model is already
connected from AutomationPattern::addObject. Instead all interactive
callers now check for the return value and show the message in case it
is needed.

This change set improves the import of MIDI files significantly. These
have been slowed down quite a lot due to the message being shown
repeatedly during the MIDI import.
2015-05-03 19:22:47 +02:00
Tres Finocchiaro
9f95c041b6 Merge pull request #1987 from Wallacoloo/instrument-nav-btns
Add instrument switcher buttons to InstrumentTrackWindow
2015-05-02 00:29:56 -04:00
Colin Wallace
26fc16b78b Implementation of next & previous instrument buttons in InstrumentTrackWindow 2015-05-02 02:09:57 +00:00
Tres Finocchiaro
388dfbc38c Merge pull request #2027 from BaraMGB/#1866
Add a focusOutEvent to PianoRoll as fix for Issue #1866
2015-04-30 10:26:19 -04:00