Skip to content

Commit

Permalink
parent a053061
Browse files Browse the repository at this point in the history
author Hussam al-Homsi <sawuare@gmail.com> 1591749945 -0400
committer adi <adityakumar4644@gmail.com> 1594357752 +0530

parent a053061
author Hussam al-Homsi <sawuare@gmail.com> 1591749945 -0400
committer adi <adityakumar4644@gmail.com> 1594357492 +0530

Remove macros likely() and unlikely() (LMMS#5530)

* Remove macros likely() and unlikely(): LMMS#5530

* Remove only use of macro Q_UNLIKELY(): LMMS#5530

Adds a button to clone the BB track pattern

Adds a button on the BBEditor that clones the current BB track pattern, but without also cloning the song editor TCOs. That can be useful when an user is editing drumlines and wants to make a section with a slight variation for example.

Changes the clone pattern method name

- Changes method name from cloneBBTrackPattern to clonePattern
- Small fix on the comments
- Adds a TODO comment regarding reusing the code from TrackOperationsWidget as a reference, so we can later figure out a way to not repeat the code

Make better use of getSelectedNotes() in PianoRoll.cpp (LMMS#5526)

* Make better use of getSelectedNotes() in PianoRoll.cpp

* Save and reuse selected note vector more often

* Apply review suggestions

Thanks to @Veratil

* Comment, style, consistency

Automatically assign a midi input device to the selected track (LMMS#5499)

src/gui/editors/SongEditor.cpp

Gradient can be toggled and color can be changed.

Made playback line (and tail) transparent to mouse clicks

Gradient disappears when paused/stopped; tail length depends on zoom

Fixes bug where gradient appears when a pattern is played; style corrections

Cleaned up code

Rename m_zoomLevels to s_zoomLevels

Finalising code

Make positionLine class independent of parent zooming model

Edit a bug fix to make it more efficient

Rename m_x and finalise positionLine code

Rename m_x and finalise positionLine changes

Rename X to playHeadPos

Hotkey Shift+Space for pausing

Fix git inconsistensies

Blank commit to fix changes

Changed to use Song::togglePause()

Move shortucut to Editor.cpp to make it work across editors

Update LcdSpinBox.cpp (LMMS#5555)

Fix some TCOs not saving properly (LMMS#5537)

Travis: stop auto-uploading binary releases

Update CONTRIBUTORS

Add a CMake option for deploying Qt translations

Update PROJECT_YEAR

Bump version to 1.2.2

Fix a bug on the "Remove unused channels" command (LMMS#5559)

On the FX mixer, the "Remove unused channels" action only checked for InstrumentTracks on every channel but ignored SampleTracks that could be linked to the particular FX channel. Because of that, if there was a channel where only SampleTracks are forwarded to and we clicked on "Remove unused channels", it was going to be removed. This commit fixes it.

Make "Change Color" a track-wide setting for all tracks

Rebase #2 (#3)

* Refactor deleteUnusedChannels in FxMixerView (LMMS#5564)

* Refactor deleteUnusedChannels in FxMixerView

* Comments + style fix

Co-authored-by: Veratil <veratil@gmail.com>, formatting, suggestions on which lines to comment.

Co-authored-by: Kevin Zander <veratil@gmail.com>

* Update weird deleteChannel loop

* Use vector instead of array

Co-authored-by: Dominic Clark <mrdomclark@gmail.com>

Co-authored-by: Kevin Zander <veratil@gmail.com>
Co-authored-by: Dominic Clark <mrdomclark@gmail.com>

* Better minimum length when resizing notes (LMMS#5512)

* Limit note length to quantization value

Draging a note to it's minimum value of 1 will add this new length to
the note if you later choose to stretch it which will not be clearly
visible in the Piano Roll unless you zoom in a bit. Limit the note
length to the quantization value and use <Alt> key to override and set
a smaller value.

* Update src/gui/editors/PianoRoll.cpp

Co-authored-by: Spekular <Spekular@users.noreply.github.com>

* Remember min note length if shorter than quantization()

* Find note length modulo quantization, pick smallest from selected notes

* Comment on and improve m_minResizeLen calculation

Co-authored-by: Oskar Wallgren <oskar.wallgren13@gmail.com>

Co-authored-by: Spekular <Spekular@users.noreply.github.com>
Co-authored-by: Kevin Zander <veratil@gmail.com>
Co-authored-by: Dominic Clark <mrdomclark@gmail.com>
Co-authored-by: Oskar Wallgren <oskar.wallgren13@gmail.com>

Enable reset color to default

Merge branch (#1)

* Fix some TCOs not saving properly (LMMS#5537)

* Travis: stop auto-uploading binary releases

* Update CONTRIBUTORS

* Add a CMake option for deploying Qt translations

* Update PROJECT_YEAR

* Bump version to 1.2.2

* Update LcdSpinBox.cpp (LMMS#5555)

* Make Pause hotkey Shift+Space (LMMS#5554)

Co-authored-by: Dominic Clark <mrdomclark@gmail.com>
Co-authored-by: Hyunjin Song <tteu.ingog@gmail.com>
Co-authored-by: Lost Robot <34612565+DouglasDGI@users.noreply.github.com>

Enable fullscreen with hotkey & hotkey to toggle maximise in internal window

Update LcdSpinBox.cpp (LMMS#5555)

Travis: stop auto-uploading binary releases

Update CONTRIBUTORS

Add a CMake option for deploying Qt translations

Update PROJECT_YEAR

Bump version to 1.2.2

Make Pause hotkey Shift+Space (LMMS#5554)

Refactor deleteUnusedChannels in FxMixerView (LMMS#5564)

* Refactor deleteUnusedChannels in FxMixerView

* Comments + style fix

Co-authored-by: Veratil <veratil@gmail.com>, formatting, suggestions on which lines to comment.

Co-authored-by: Kevin Zander <veratil@gmail.com>

* Update weird deleteChannel loop

* Use vector instead of array

Co-authored-by: Dominic Clark <mrdomclark@gmail.com>

Co-authored-by: Kevin Zander <veratil@gmail.com>
Co-authored-by: Dominic Clark <mrdomclark@gmail.com>

Better minimum length when resizing notes (LMMS#5512)

* Limit note length to quantization value

Draging a note to it's minimum value of 1 will add this new length to
the note if you later choose to stretch it which will not be clearly
visible in the Piano Roll unless you zoom in a bit. Limit the note
length to the quantization value and use <Alt> key to override and set
a smaller value.

* Update src/gui/editors/PianoRoll.cpp

Co-authored-by: Spekular <Spekular@users.noreply.github.com>

* Remember min note length if shorter than quantization()

* Find note length modulo quantization, pick smallest from selected notes

* Comment on and improve m_minResizeLen calculation

Co-authored-by: Oskar Wallgren <oskar.wallgren13@gmail.com>

Make "Change Color" a track-wide setting for all tracks

Rebase #2 (#3)

* Refactor deleteUnusedChannels in FxMixerView (LMMS#5564)

* Refactor deleteUnusedChannels in FxMixerView

* Comments + style fix

Co-authored-by: Veratil <veratil@gmail.com>, formatting, suggestions on which lines to comment.

Co-authored-by: Kevin Zander <veratil@gmail.com>

* Update weird deleteChannel loop

* Use vector instead of array

Co-authored-by: Dominic Clark <mrdomclark@gmail.com>

Co-authored-by: Kevin Zander <veratil@gmail.com>
Co-authored-by: Dominic Clark <mrdomclark@gmail.com>

* Better minimum length when resizing notes (LMMS#5512)

* Limit note length to quantization value

Draging a note to it's minimum value of 1 will add this new length to
the note if you later choose to stretch it which will not be clearly
visible in the Piano Roll unless you zoom in a bit. Limit the note
length to the quantization value and use <Alt> key to override and set
a smaller value.

* Update src/gui/editors/PianoRoll.cpp

Co-authored-by: Spekular <Spekular@users.noreply.github.com>

* Remember min note length if shorter than quantization()

* Find note length modulo quantization, pick smallest from selected notes

* Comment on and improve m_minResizeLen calculation

Co-authored-by: Oskar Wallgren <oskar.wallgren13@gmail.com>

Co-authored-by: Spekular <Spekular@users.noreply.github.com>
Co-authored-by: Kevin Zander <veratil@gmail.com>
Co-authored-by: Dominic Clark <mrdomclark@gmail.com>
Co-authored-by: Oskar Wallgren <oskar.wallgren13@gmail.com>

Enable track-wide color coding

Enable track-wide color changing
  • Loading branch information
Sawuare authored and ryuukumar committed Jul 10, 2020
1 parent a053061 commit 329f4ef
Show file tree
Hide file tree
Showing 43 changed files with 1,010 additions and 335 deletions.
14 changes: 0 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,3 @@ script: ${TRAVIS_BUILD_DIR}/.travis/script.sh
after_script: ${TRAVIS_BUILD_DIR}/.travis/after_script.sh
before_deploy:
- if [ "$TARGET_OS" != debian-sid ]; then make package; fi
deploy:
provider: releases
api_key:
secure: d4a+x4Gugpss7JK2DcHjyBZDmEFFh4iVfKDfITSD50T6Mc6At4LMgojvEu+6qT6IyOY2vm3UVT6fhyeuWDTRDwW9tfFlaHVA0h8aTRD+eAXOA7pQ8rEMwQO3+WCKuKTfEqUkpL4wxhww8dpkv54tqeIs0S4TBqz9tk8UhzU7XbE=
file_glob: true
file:
- lmms-${TRAVIS_TAG:1}-$TARGET_OS.exe
- /var/cache/pbuilder/result/lmms_*.tar.xz
skip_cleanup: true
on:
tags: true
all_branches: true
condition: '"$TARGET_DEPLOY" = True'
repo: LMMS/lmms
2 changes: 1 addition & 1 deletion .travis/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if [ "$TYPE" = 'style' ]; then

else

export CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=RelWithDebInfo"
export CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUNDLE_QT_TRANSLATIONS=ON"

if [ -z "$TRAVIS_TAG" ]; then
export CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_CCACHE=ON"
Expand Down
49 changes: 40 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ INCLUDE(GenerateExportHeader)

STRING(TOUPPER "${CMAKE_PROJECT_NAME}" PROJECT_NAME_UCASE)

SET(PROJECT_YEAR 2019)
SET(PROJECT_YEAR 2020)

SET(PROJECT_AUTHOR "LMMS Developers")
SET(PROJECT_URL "https://lmms.io")
Expand All @@ -36,7 +36,7 @@ SET(PROJECT_DESCRIPTION "${PROJECT_NAME_UCASE} - Free music production software"
SET(PROJECT_COPYRIGHT "2008-${PROJECT_YEAR} ${PROJECT_AUTHOR}")
SET(VERSION_MAJOR "1")
SET(VERSION_MINOR "2")
SET(VERSION_RELEASE "1")
SET(VERSION_RELEASE "2")
SET(VERSION_STAGE "")
SET(VERSION_BUILD "0")
SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}")
Expand Down Expand Up @@ -76,7 +76,8 @@ OPTION(WANT_VST "Include VST support" ON)
OPTION(WANT_VST_32 "Include 32-bit VST support" ON)
OPTION(WANT_VST_64 "Include 64-bit VST support" ON)
OPTION(WANT_WINMM "Include WinMM MIDI support" OFF)
OPTION(WANT_DEBUG_FPE "Debug floating point exceptions" OFF)
OPTION(WANT_QT5 "Build with Qt5" OFF)
OPTION(BUNDLE_QT_TRANSLATIONS "Install Qt translation files for LMMS" OFF)


IF(LMMS_BUILD_APPLE)
Expand All @@ -101,6 +102,7 @@ IF(LMMS_BUILD_WIN32)
SET(WANT_SNDIO OFF)
SET(WANT_SOUNDIO OFF)
SET(WANT_WINMM ON)
SET(BUNDLE_QT_TRANSLATIONS ON)
SET(LMMS_HAVE_WINMM TRUE)
SET(STATUS_ALSA "<not supported on this platform>")
SET(STATUS_JACK "<not supported on this platform>")
Expand Down Expand Up @@ -149,12 +151,30 @@ LIST(APPEND CMAKE_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}")
FIND_PACKAGE(Qt5 5.6.0 COMPONENTS Core Gui Widgets Xml REQUIRED)
FIND_PACKAGE(Qt5 COMPONENTS LinguistTools QUIET)

INCLUDE_DIRECTORIES(
${Qt5Core_INCLUDE_DIRS}
${Qt5Gui_INCLUDE_DIRS}
${Qt5Widgets_INCLUDE_DIRS}
${Qt5Xml_INCLUDE_DIRS}
)
# Resolve Qt5::qmake to full path for use in packaging scripts
GET_TARGET_PROPERTY(QT_QMAKE_EXECUTABLE "${Qt5Core_QMAKE_EXECUTABLE}" IMPORTED_LOCATION)
execute_process(COMMAND ${QT_QMAKE_EXECUTABLE} -query QT_INSTALL_TRANSLATIONS
OUTPUT_VARIABLE QT_TRANSLATIONS_DIR
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET
)
IF(EXISTS "${QT_TRANSLATIONS_DIR}")
MESSAGE("-- Found Qt translations in ${QT_TRANSLATIONS_DIR}")
ADD_DEFINITIONS(-D'QT_TRANSLATIONS_DIR="${QT_TRANSLATIONS_DIR}"')
ENDIF()

FIND_PACKAGE(Qt5Test)
SET(QT_QTTEST_LIBRARY Qt5::Test)
ELSE()
SET(QT5 FALSE)

# check for Qt4
SET(QT_MIN_VERSION "4.6.0" COMPONENTS QtCore QtGui QtXml)
FIND_PACKAGE(Qt4 REQUIRED)
SET(QT_USE_QTXML 1)
IF(WIN32)
SET(QT_TRANSLATIONS_DIR "${MINGW_PREFIX}/share/qt4/translations/")
ENDIF(WIN32)

SET(QT_LIBRARIES
Qt5::Core
Expand All @@ -171,6 +191,17 @@ ENDIF()
# Resolve Qt5::qmake to full path for use in packaging scripts
GET_TARGET_PROPERTY(QT_QMAKE_EXECUTABLE "${Qt5Core_QMAKE_EXECUTABLE}" IMPORTED_LOCATION)

# Find the location of Qt translation files
execute_process(COMMAND ${QT_QMAKE_EXECUTABLE} -query QT_INSTALL_TRANSLATIONS
OUTPUT_VARIABLE QT_TRANSLATIONS_DIR
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET
)
IF(EXISTS "${QT_TRANSLATIONS_DIR}")
MESSAGE("-- Found Qt translations in ${QT_TRANSLATIONS_DIR}")
ADD_DEFINITIONS(-D'QT_TRANSLATIONS_DIR="${QT_TRANSLATIONS_DIR}"')
ENDIF()

FIND_PACKAGE(Qt5Test)
SET(QT_QTTEST_LIBRARY Qt5::Test)

Expand Down
6 changes: 3 additions & 3 deletions data/locale/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ FOREACH(_item ${qm_targets})
ADD_DEPENDENCIES(finalize-locales "${_item}")
ENDFOREACH(_item ${qm_targets})

IF(LMMS_BUILD_WIN32)
FILE(GLOB QT_QM_FILES "${QT_TRANSLATIONS_DIR}/qt*[^h].qm")
IF(BUNDLE_QT_TRANSLATIONS)
FILE(GLOB QT_QM_FILES "${QT_TRANSLATIONS_DIR}/qt*.qm")
LIST(SORT QT_QM_FILES)
ENDIF(LMMS_BUILD_WIN32)
ENDIF()

INSTALL(FILES ${QM_FILES} ${QT_QM_FILES} DESTINATION "${LMMS_DATA_DIR}/locale")
Binary file added data/themes/classic/clone_bb_track_pattern.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions data/themes/classic/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,11 @@ QMenu::indicator:selected {
background-color: #747474;
}

positionLine {
qproperty-tailGradient: false;
qproperty-lineColor: rgb(255, 255, 255);
}

PianoRoll {
background-color: rgb(0, 0, 0);
qproperty-backgroundShade: rgba( 255, 255, 255, 10 );
Expand Down
Binary file added data/themes/default/clone_bb_track_pattern.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions data/themes/default/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,11 @@ QMenu::indicator:selected {
background-color: #101213;
}

positionLine {
qproperty-tailGradient: true;
qproperty-lineColor: rgb(255, 255, 255);
}

PianoRoll {
background-color: #141616;
qproperty-backgroundShade: rgba(255, 255, 255, 10);
Expand Down
42 changes: 28 additions & 14 deletions doc/CONTRIBUTORS
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,26 @@ Colin Wallace <wallacoloo@gmail.com>
Oskar Wallgren <oskar.wallgren13@gmail.com>
Raine M. Ekman <raine@iki.fi>
Umcaruje <uros.maravic@gmail.com>
Michael Gregorius <michael.gregorius.git@arcor.de>
Hyunjin Song <tteu.ingog@gmail.com>
Javier Serrano Polo <javier--IfwAyVwL9S8xJKrdU2QtlAdbjyPl9T@jasp.net>
Michael Gregorius <michael.gregorius.git@arcor.de>
grejppi <grejppi@gmail.com>
Javier Serrano Polo <javier@jasp.net>
Hyunjin Song <tteu.ingog@gmail.com>
Wong Cho Ching <chwong249664@yahoo.com>
Alexandre Almeida <wilsalx@gmail.com>
Daniel Winzen <d@winzen4.de>
LMMS Service Account <lmms.service@gmail.com>
Steffen Baranowsky <BaraMGB@freenet.de>
Danny McRae <khjklujn@yahoo.com>
Johannes Lorenz <j.git@lorenz-ho.me>
Garrett <g@floft.net>
Hyunin Song <tteu.ingog@gmail.com>
liushuyu <liushuyu011@gmail.com>
Dominic Clark <mrdomclark@gmail.com>
Hyunin Song <tteu.ingog@gmail.com>
Andrew Kelley <superjoe30@gmail.com>
Spekular <Spekularr@gmail.com>
Andreas Brandmaier <andy@brandmaier.de>
Fastigium <fastigiummusic@gmail.com>
Spekular <Spekularr@gmail.com>
Amadeus Folego <amadeusfolego@gmail.com>
Jonas Trappenberg <jonas@trappenberg.ch>
M374LX <wilsalx@gmail.com>
Expand All @@ -35,18 +37,17 @@ grindhold <grindhold@gmx.net>
Mike Choi <rdavidian71@gmail.com>
Karmo Rosental <karmo.rosental@gmail.com>
Christopher L. Simons <christopherleesimons@gmail.com>
Dominic Clark <mrdomclark@gmail.com>
NoiseByNorthwest <noisebynorthwest@gmail.com>
falkTX <falktx@gmail.com>
Johannes Lorenz <johannes89@mailueberfall.de>
Rebecca DeField <rebeccadefield@gmail.com>
falkTX <falktx@gmail.com>
Stian Jørgensrud <stianahj@gmail.com>
David Carlier <devnexen@gmail.com>
Ryan Roden-Corrent <ryan@rcorre.net>
Shmuel H <shmuelhazan0@gmail.com>
midi-pascal <midi-pascal@videotron.ca>
Augustin Cavalier <waddlesplash@gmail.com>
BaraMGB <BaraMGB@freenet.de>
Csaba Hruska <csaba.hruska@gmail.com>
David Carlier <devnexen@gmail.com>
DeRobyJ <derobyj@gmail.com>
Hussam Eddin Alhomsi <hussameddin.alhomsi@gmail.com>
Rüdiger Ranft <rudi@qzzq.de>
Expand All @@ -66,11 +67,15 @@ Jonathan Aquilina <eagles051387@gmail.com>
Mohammad Amin Sameti <mamins1376@gmail.com>
ra <symbiants@gmail.com>
wongcc966422 <wongcc966422@users.noreply.github.com>
Cyp <cyp@wz2100.net>
David CARLIER <devnexen@gmail.com>
Douglas <34612565+DouglasDGI@users.noreply.github.com>
Gurjot Singh <bhattigurjot@gmail.com>
Janne Sinisalo <janne.m.sinisalo@gmail.com>
Krzysztof Foltman <wdev@foltman.com>
Lou Herard <lherard@gmail.com>
Noah Brecht <noahb2713@gmail.com>
Olivier Humbert <trebmuh@tuxfamily.org>
Paul Batchelor <thisispaulbatchelor@gmail.com>
Paul Wayper <paulway@mabula.net>
Petter Reinholdtsen <pere@hungry.com>
Expand All @@ -86,9 +91,8 @@ Cyrille Bollu <cyrille.bollu2@gmail.com>
Dan Williams <BumblingCoder@users.noreply.github.com>
Ian Sannar <ian.sannar@gmail.com>
Jaroslav Petrnoušek <baegus@gmail.com>
Johannes Lorenz <1042576+JohannesLorenz@users.noreply.github.com>
Johannes Lorenz <j.git@lorenz-ho.me>
Kenneth Perry (thothonegan) <thothonegan@gmail.com>
Kevin Zander <veratil@gmail.com>
LYF610400210 <lyfjxymf@sina.com>
Lukas W <lukas@Lukass-iMac.fritz.box>
Mark-Agent003 <wgreeves01@gmail.com>
Expand All @@ -101,29 +105,37 @@ Rebecca LaVie <rebeccadefield@gmail.com>
Roberto Giaconia <DeRobyJ@users.noreply.github.com>
SecondFlight <qbgeekjtw@gmail.com>
Steffen Baranowsky <baramgb@freenet.de>
T0NIT0 RMX <t0nit0rmx@gmail.com>
TheTravelingSpaceman <smuts.walter@gmail.com>
Thomas Clark <the.thomas.j.clark@gmail.com>
gnudles <gnudles@users.noreply.github.com>
liushuyu <liushuyu_011@163.com>
makepost <makepost@firemail.cc>
miketurn <miketurn1234@yahoo.com>
psyomn <lethaljellybean@gmail.com>
quadro <quadro2@email.cz>
sarahkeefe <sarahjanekeefe@gmail.com>
thmueller64 <64359888+thmueller64@users.noreply.github.com>
Achim Settelmeier <lmms@m1.sirlab.de>
Alexandra Dutton <alxdttn@umich.edu>
Andreas Müller <schnitzeltony@gmail.com>
André Hentschel <nerv@dawncrow.de>
Armin Kazmi <armin.kazmi@tu-dortmund.de>
Artur Twardowski <32247490+artur-twardowski@users.noreply.github.com>
Attila Herman <attila589@gmail.com>
Bastian Kummer <bastian.kummer@securepoint.de>
Christopher A. Oliver <oliver@onion.private>
Cyp <48363+Cyp@users.noreply.github.com>
Devin Venable <venable.devin@gmail.com>
Diego Ramos Ruggeri <diego@ruggeri.net.br>
Douglas <34612565+DouglasDGI@users.noreply.github.com>
DragonEagle <allensoard@yahoo.com>
Filip Hron <filip.hron@gmail.com>
Frank Mather <tinycat2001@gmail.com>
Frederik <freggy@gmail.com>
Gingka Akiyama <33764485+GingkathFox@users.noreply.github.com>
Greg Simpson <geedubess@users.noreply.github.com>
Hexasoft <yperret@in2p3.fr>
Hubert Figuière <hub@figuiere.net>
IvanMaldonado <ivan.gm94@gmail.com>
Ivo Wetzel <ivo.wetzel@googlemail.com>
Jens Lang <jenslang@users.sf.net>
Expand All @@ -138,17 +150,17 @@ Lee Avital <leeavital@gmail.com>
LocoMatt <samozelko123@gmail.com>
Léo Andrès <leo@ndrs.fr>
Markus Elfring <elfring@users.sourceforge.net>
Martin Pavelek <he29.HS@gmail.com>
Maurizio Lo Bosco <maurizio.lobosco@gmail.com>
Mehdi <powergame_coder2@yahoo.com>
Mikobuntu <chrissy.mc.1@hotmail.co.uk>
Mingcong Bai <jeffbai@aosc.xyz>
Nikos Chantziaras <realnc@arcor.de>
Noah Brecht <noahb2713@gmail.com>
Ododo <olivierdautricourt@gmail.com>
Olivier Humbert <trebmuh@users.noreply.github.com>
Paul Nasca <zynaddsubfx_AT_yahoo com>
Peter Nelson <peter1138@users.sourceforge.net>
Ra <symbiants@gmail.com>
Ron U <sharpblade4@gmail.com>
Ryan Schmidt <github@ryandesign.com>
Shane Ambler <GitHub@ShaneWare.Biz>
Simon Jackson (Netbook) <jackokring@gmail.com>
Expand All @@ -170,13 +182,15 @@ follower <follower@rancidbacon.com>
fundamental <mark.d.mccurry@gmail.com>
gandalf3 <gandalf3@users.noreply.github.com>
groboclown <matt@groboclown.net>
https://gitlab.com/users/CYBERDEViLNL <1148379+CYBERDEViLNL@users.noreply.github.com>
irrenhaus3 <irrenhaus3@users.noreply.github.com>
jasp00 <javier--IfwAyVwL9S8xJKrdU2QtlAdbjyPl9T@jasp.net>
justnope <dont@email.invalid>
kamnxt <kamnxt@kamnxt.com>
knittl <knittl89+github@gmail.com>
lmmsservice <lmms.service@gmail.com>
m-xbutterfly <m-xbutterfly@tutanota.com>
noahb01 <noahb2713@gmail.com>
necrashter <iiilker99@gmail.com>
projectpitchin <githobbyacct@gmail.com>
rgwan <kmlinuxm@gmail.com>
xhe <xhebox@users.noreply.github.com>
Expand Down
2 changes: 1 addition & 1 deletion include/AutomatableModel.h
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ class LMMS_EXPORT AutomatableModel : public Model, public JournallingObject
template<class T>
inline T value( int frameOffset = 0 ) const
{
if( unlikely( hasLinkedModels() || m_controllerConnection != NULL ) )
if( hasLinkedModels() || m_controllerConnection != NULL )
{
return castValue<T>( controllerValue( frameOffset ) );
}
Expand Down
16 changes: 16 additions & 0 deletions include/AutomationPattern.h
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,19 @@ class LMMS_EXPORT AutomationPattern : public TrackContentObject

static int quantization() { return s_quantization; }
static void setQuantization(int q) { s_quantization = q; }

QColor colorObj() const
{
return m_color;
}
unsigned int color() const
{
return( m_color.rgb() );
}
void setColor( const QColor & c )
{
m_color = QColor( c );
}

public slots:
void clear();
Expand Down Expand Up @@ -193,6 +206,9 @@ public slots:
static const float DEFAULT_MIN_VALUE;
static const float DEFAULT_MAX_VALUE;

bool m_useStyleColor;
QColor m_color;

friend class AutomationPatternView;

} ;
Expand Down
13 changes: 12 additions & 1 deletion include/AutomationPatternView.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
#include <QStaticText>

#include "Track.h"
#include "AutomationPattern.h"
#include "Song.h"
#include "SongEditor.h"

class AutomationPattern;

Expand All @@ -45,7 +48,12 @@ public slots:
/// Opens this view's pattern in the global automation editor
void openInAutomationEditor();
void update() override;


QColor color() const
{
return( m_pat->m_color );
}
void setColor( QColor );

protected slots:
void resetName();
Expand All @@ -54,6 +62,9 @@ protected slots:
void toggleRecording();
void flipY();
void flipX();

void trackColorChanged( QColor & );
void resetColor();

protected:
void constructContextMenu( QMenu * ) override;
Expand Down
1 change: 1 addition & 0 deletions include/BBEditor.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ public slots:
void removeSteps();
void addSampleTrack();
void addAutomationTrack();
void clonePattern();

protected slots:
void dropEvent(QDropEvent * de ) override;
Expand Down
1 change: 1 addition & 0 deletions include/BBTrack.h
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ protected slots:
void changeName();
void changeColor();
void resetColor();
void trackColorChanged( QColor & );


protected:
Expand Down
Loading

0 comments on commit 329f4ef

Please sign in to comment.