mirror/lmms
1
0 Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-10-23 15:18:53 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,619 Commits 9 Branches 62 Tags
af22d396128d1becd487fa451bff4aee39535da7
Commit Graph
140 Commits
Author SHA1 Message Date
Dave French af22d39612 Proposed fix for 1345 Exclude Tracks from master pitch 2015-01-10 17:11:17 +00:00
Vesa 0cbb506f50 Fix preview crash caused by earlier commit 2015-01-04 18:47:05 +02:00
Vesa V 146577d34b Merge pull request #1516 from grejppi/master-mute 
attempt to fix #1512
 2015-01-04 17:15:17 +02:00
Dave French 1e25b91410 1527 removed socket slot for indicator activation 2014-12-30 14:07:28 +00:00
Dave French 6d4d958ec6 Proposed fix 1527 Not all Played Notes shows the indicator on the InstrumentTrackView 2014-12-29 22:48:54 +00:00
Hannu Haahti bbbe515e58 attempt to fix #1512 2014-12-27 11:46:19 +02: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
Tres Finocchiaro a182a3e8cc Fix scroll bar gap 
Closes #1437
 2014-12-13 12:11:31 -05:00
dave 2295545ac6 Remove whitespace from setHintText, change spaces to tabs 2014-12-08 23:48:44 +00:00
dave 4993eba3c1 Remove unused and unnessary +" " in all knob.setHintText calls 2014-12-08 10:57:21 +00:00
Lukas W 5f4cdac802 Merge branch 'master' into rename 
Conflicts:
	src/core/Song.cpp
	src/gui/LfoControllerDialog.cpp
	src/tracks/InstrumentTrack.cpp
 2014-11-26 11:45:55 +01:00
Lukas W 6d4a6ed9cd Rename bbTrack, trackContentObject and friends 2014-11-26 10:53:47 +01:00
Lukas W 95798da9d0 Rename a lot of classes 
* aboutDialog -> AboutDialog
* bbEditor -> BBEditor
* exportProjectDialog -> ExportProjectDialog
* setupDialog -> SetupDialog
* stringPairDrag -> StringPairDrag
 2014-11-26 10:39:02 +01:00
Lukas W 7d4f179b4b Rename a lot of files 
* about_dialog -> AboutDialog
* bb_editor -> BBEditor
* export_project_dialog -> ExportProjectDialog
* setup_dialog -> SetupDialog
* string_pair_drag -> StringPairDrag
 2014-11-26 10:27:25 +01:00
Lukas W 1bbf7455a4 Rename a lot… 2014-11-26 10:09:49 +01:00
Lukas W aaeb5216ad Rename note to Note 2014-11-26 01:14:52 +01:00
Lukas W 968909c07c Rename engine to Engine 2014-11-26 00:49:55 +01:00
Lukas W 7d0e3945e5 Rename song to Song 2014-11-26 00:44:41 +01:00
Vesa V 435c64cc70 Merge pull request #1285 from grindhold/issue_55 
Issue 55
 2014-11-25 21:20:21 +02:00
Lukas W 9dfb1385cd Rename track class to Track 2014-11-25 17:03:39 +01:00
Lukas W 02cbc89f0f Merge branch 'stable-1.1' of git@github.com:LMMS/lmms.git 
Conflicts:
	src/gui/MainWindow.cpp
	src/gui/plugin_browser.cpp
 2014-11-25 01:01:47 +01:00
pascal e6ca46fabb Merge branch 'stable-1.1' of https://github.com/midi-pascal/lmms into stable-1.1 2014-11-23 15:44:38 -05:00
pascal d1e50b9f32 Bug #1335 
Hide Size and Maximize options from the intrument dialog
system menu since its size is fixed.
 2014-11-23 15:24:42 -05:00
grindhold 69bf4b4a24 implemented proper behaviour for VST plugins 2014-11-20 01:47:13 +01:00
Vesa 1deb80acc3 Finish audioport rehaul, get vol/pan knobs working again, also some bugfixes 
We're now doing the vol/pan stuff in audioport, since this way we avoid the pointless repetition of doing it in the playhandles
 2014-11-18 13:58:39 +02:00
Vesa 857de8d2c8 Huge structural changes 
Well, this commit got a bit out of hand, what with 26 files changed. Oh well.

Basically, we're using the buffermanager to dispense temporary buffers for playhandles and audioports to use.
This allows us to change the way playhandles work. Earlier, playhandles of the same track were waiting in line
to push their output to the audioport. This was of course inefficient, so now they just register themselves to the port,
then the port handles mixing the buffers.

Caveat: this is still a work in progress, the vol/pan knobs on instruments are temporarily non-functional - will be fixed in
the next commit, but I have to get some sleep now.
 2014-11-18 13:58:39 +02:00
Vesa 42e67d27a1 Add dedicated manager for noteplayhandles 
This caches and reuses nph's independently of the generic memory manager.
 2014-11-18 13:58:37 +02:00
Vesa 5e4308507b More fixes 2014-11-18 13:58:37 +02:00
Vesa 740a7e6850 Merge branch 'stable-1.1' 
Conflicts:
	include/AutomatableModel.h
	include/FxMixer.h
	src/core/FxMixer.cpp
	src/gui/widgets/caption_menu.cpp
	src/tracks/InstrumentTrack.cpp
 2014-11-16 15:16:40 +02:00
Vesa V df843e2b32 Merge pull request #1288 from tresf/stable-1.1 
Set pitch range
 2014-11-14 01:16:19 +02:00
Tres Finocchiaro 808e18f20a Set pitch range 2014-11-11 22:42:02 -05:00
Lukas W 8e8879f735 Merge stable-1.1 
Conflicts:
	include/ConfigManager.h
	include/MidiTime.h
	include/string_pair_drag.h
	src/gui/string_pair_drag.cpp
	src/gui/widgets/rubberband.cpp
 2014-11-10 19:26:59 +01:00
grindhold f746db27f0 unexpected codestyle fixes 2014-11-10 10:35:36 +01:00
grindhold 27a136fe03 added capability to collect multiple errormessages and display them at once 2014-11-10 10:35:07 +01:00
Umcaruje 6fb923cba2 Correct the program name and site in the descriptions. 2014-11-04 22:56:50 +01:00
Lukas W 47831c99c5 Rename ConfigManager files (2) 2014-11-02 01:08:27 +01:00
Lukas W 100a67cd3c Rename configManager to ConfigManager 2014-11-02 01:02:33 +01:00
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
Vesa bf6659fbb1 Merge branch 'stable-1.1' 
Conflicts:
	src/gui/FileBrowser.cpp
 2014-09-09 23:55:39 +03: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 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 ff3c4da802 InstrumentTrack: fixed whats-this text 2014-08-18 23:22:01 +02:00
Tobias Doerffel 327aaee695 Song, InstrumentTrack: use DataFile::LocaleHelper 
Always save projects and presets with default C locale in order to avoid
problems in the future. At the same time properly load floating point
strings which have been saved with different locale settings.

Closes #1051.
 2014-08-18 23:21:50 +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
Vesa 7a7c7c9467 Fix crash at track adding: don't play instrumentTracks when instrument is null 2014-08-16 09:36:29 +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 9e1cdd0441 Start work on replacing/removing global locks 2014-08-03 14:49:45 +03:00