Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Paint in different color normal beats, bar beats, and phrase beats. #1918

Closed
wants to merge 12 commits into from
Closed

[WIP] Paint in different color normal beats, bar beats, and phrase beats. #1918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5883024
Paint in different color normal beats, bar beats, and phrase beats.
JaviVilarroig Nov 25, 2018
92bdfdd
Adde preference for showing or not the bar and phrase markers
JaviVilarroig Dec 15, 2018
f06ce6a
Fixes merge conflict on skin definitions.
JaviVilarroig Jan 11, 2019
0673f34
Swap colors between Bar and Phrase markers
JaviVilarroig Jan 12, 2019
e60a6e1
Update src/waveform/waveformwidgetfactory.h
Be-ing Jan 12, 2019
8472504
Update src/waveform/waveformwidgetfactory.cpp
Be-ing Jan 12, 2019
0d2f2bd
Misc fixes proposed by Be-ing
JaviVilarroig Jan 12, 2019
adc8bf6
Merge branch 'lp1128005_Bar_and_phrase_marking' of github.com:JaviVil…
JaviVilarroig Jan 12, 2019
c21f910
Different fixes requested by the PR reviewers.
JaviVilarroig Jan 21, 2019
ddede35
Beat/Bar/Phrase logic moved to Beats and BeatGrid classes. BeatMap is
JaviVilarroig Jan 28, 2019
c48d8bc
Cleanup of unused constants.
JaviVilarroig Feb 11, 2019
b174415
Fixes unitilized variable
JaviVilarroig Feb 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions res/skins/Deere/deck_visual_row.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
<SignalRGBLowColor></SignalRGBLowColor>
<SignalColor><Variable name="DeckSignalColor"/></SignalColor>
<BeatColor>#ffffff</BeatColor>
<BarColor>#ccffff</BarColor>
<PhraseColor>#00ff00</PhraseColor>
<PlayPosColor>#00FF00</PlayPosColor>
<EndOfTrackColor>#EA0000</EndOfTrackColor>
<AxesColor></AxesColor>
Expand Down
128 changes: 66 additions & 62 deletions res/skins/LateNight/waveform.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,62 +1,64 @@
<Template>
<SetVariable name="group">[Channel<Variable name="channum"/>]</SetVariable>
<WidgetGroup>
<WidgetGroup>
<ObjectName>Waveform</ObjectName>
<Layout>horizontal</Layout>
<SizePolicy>me,me</SizePolicy>
<Children>
<Visual>
<TooltipId>waveform_display</TooltipId>
<Channel><Variable name="channum"/></Channel>
<BgColor><Variable name="SignalBgColor"/></BgColor>
<SignalColor><Variable name="signal_color"/></SignalColor>
<Layout>horizontal</Layout>
<SizePolicy>me,me</SizePolicy>
<Children>
<Visual>
<TooltipId>waveform_display</TooltipId>
<Channel><Variable name="channum"/></Channel>
<BgColor><Variable name="SignalBgColor"/></BgColor>
<SignalColor><Variable name="signal_color"/></SignalColor>
<SignalRGBLowColor><Variable name="SignalRGBLowColor"/></SignalRGBLowColor>
<SignalRGBMidColor><Variable name="SignalRGBMidColor"/></SignalRGBMidColor>
<SignalRGBHighColor><Variable name="SignalRGBHighColor"/></SignalRGBHighColor>
<BeatColor>#ffffff</BeatColor>
<BeatHighlightColor></BeatHighlightColor>
<PlayPosColor>#00FF00</PlayPosColor>
<EndOfTrackColor>#EA0000</EndOfTrackColor>
<DefaultMark>
<Align>top</Align>
<Color>#00FF00</Color>
<TextColor>#FFFFFF</TextColor>
<Text> %1 </Text>
</DefaultMark>
<MarkRange>
<StartControl>loop_start_position</StartControl>
<EndControl>loop_end_position</EndControl>
<EnabledControl>loop_enabled</EnabledControl>
<Color>#00FF00</Color>
<DisabledColor>#FFFFFF</DisabledColor>
</MarkRange>
<Mark>
<Control>loop_start_position</Control>
<Text>IN</Text>
<Align>bottom</Align>
<Color>#00FF00</Color>
<TextColor>#FFFFFF</TextColor>
</Mark>
<Mark>
<Control>loop_end_position</Control>
<Text>OUT</Text>
<Align>bottom</Align>
<Color>#00FF00</Color>
<TextColor>#FFFFFF</TextColor>
</Mark>
<!--
The hotcues not represented by a button in the current skin show only in the waveform under two circumstances:
- if a MIDI device which supports more hotcues than buttons are in the current skin has them activated
- if you change from a skin which supports more hotcues than buttons are in the current skin (and has them activated)
-->
<Mark>
<Control>cue_point</Control>
<Text>CUE</Text>
<Align>top</Align>
<Color>#FF001C</Color>
<TextColor>#FFFFFF</TextColor>
</Mark>
</Visual>
<BeatColor>#ffffff</BeatColor>
<BarColor>#ccffff</BarColor>
<PhraseColor>#00ff00</PhraseColor>
<BeatHighlightColor></BeatHighlightColor>
<PlayPosColor>#00FF00</PlayPosColor>
<EndOfTrackColor>#EA0000</EndOfTrackColor>
<DefaultMark>
<Align>top</Align>
<Color>#00FF00</Color>
<TextColor>#FFFFFF</TextColor>
<Text> %1 </Text>
</DefaultMark>
<MarkRange>
<StartControl>loop_start_position</StartControl>
<EndControl>loop_end_position</EndControl>
<EnabledControl>loop_enabled</EnabledControl>
<Color>#00FF00</Color>
<DisabledColor>#FFFFFF</DisabledColor>
</MarkRange>
<Mark>
<Control>loop_start_position</Control>
<Text>IN</Text>
<Align>bottom</Align>
<Color>#00FF00</Color>
<TextColor>#FFFFFF</TextColor>
</Mark>
<Mark>
<Control>loop_end_position</Control>
<Text>OUT</Text>
<Align>bottom</Align>
<Color>#00FF00</Color>
<TextColor>#FFFFFF</TextColor>
</Mark>
<!--
The hotcues not represented by a button in the current skin show only in the waveform under two circumstances:
- if a MIDI device which supports more hotcues than buttons are in the current skin has them activated
- if you change from a skin which supports more hotcues than buttons are in the current skin (and has them activated)
-->
<Mark>
<Control>cue_point</Control>
<Text>CUE</Text>
<Align>top</Align>
<Color>#FF001C</Color>
<TextColor>#FFFFFF</TextColor>
</Mark>
</Visual>

<WidgetGroup><!-- Transparent container for beatgrid buttons -->
<ObjectName>BeatgridButtons</ObjectName>
Expand All @@ -72,12 +74,14 @@
<Layout>horizontal</Layout>
<SizePolicy>f,f</SizePolicy>
<Children>
<Template src="skin:button_1state.xml">
<Template src="skin:button_1state_right.xml">
<SetVariable name="TooltipId">beats_translate_curpos</SetVariable>
<SetVariable name="ObjectName">BeatCurpos</SetVariable>
<SetVariable name="Icon">beat_curpos_large</SetVariable>
<SetVariable name="Size">28f,56f</SetVariable>
<SetVariable name="state_0_pressed">beat_curpos_large_down</SetVariable>
<SetVariable name="state_0_unpressed">beat_curpos_large</SetVariable>
<SetVariable name="Size">26f,52f</SetVariable>
<SetVariable name="ConfigKey"><Variable name="group"/>,beats_translate_curpos</SetVariable>
<SetVariable name="ConfigKeyRight"><Variable name="group"/>,beats_translate_match_alignment</SetVariable>
</Template>

<WidgetGroup><!-- beats earlier & faster -->
Expand All @@ -88,15 +92,15 @@
<SetVariable name="TooltipId">beats_translate_earlier</SetVariable>
<SetVariable name="ObjectName">FxAssignButton</SetVariable>
<SetVariable name="Icon">beats_earlier</SetVariable>
<SetVariable name="Size">28f,28f</SetVariable>
<SetVariable name="Size">26f,26f</SetVariable>
<SetVariable name="ConfigKey"><Variable name="group"/>,beats_translate_earlier</SetVariable>
</Template>

<Template src="skin:button_1state.xml">
<SetVariable name="TooltipId">beats_adjust_faster</SetVariable>
<SetVariable name="ObjectName">FxAssignButton</SetVariable>
<SetVariable name="Icon">beats_faster</SetVariable>
<SetVariable name="Size">28f,28f</SetVariable>
<SetVariable name="Size">26f,26f</SetVariable>
<SetVariable name="ConfigKey"><Variable name="group"/>,beats_adjust_faster</SetVariable>
</Template>
</Children>
Expand All @@ -110,15 +114,15 @@
<SetVariable name="TooltipId">beats_translate_later</SetVariable>
<SetVariable name="ObjectName">FxAssignButton</SetVariable>
<SetVariable name="Icon">beats_later</SetVariable>
<SetVariable name="Size">28f,28f</SetVariable>
<SetVariable name="Size">26f,26f</SetVariable>
<SetVariable name="ConfigKey"><Variable name="group"/>,beats_translate_later</SetVariable>
</Template>

<Template src="skin:button_1state.xml">
<SetVariable name="TooltipId">beats_adjust_slower</SetVariable>
<SetVariable name="ObjectName">FxAssignButton</SetVariable>
<SetVariable name="Icon">beats_slower</SetVariable>
<SetVariable name="Size">28f,28f</SetVariable>
<SetVariable name="Size">26f,26f</SetVariable>
<SetVariable name="ConfigKey"><Variable name="group"/>,beats_adjust_slower</SetVariable>
</Template>
</Children>
Expand All @@ -133,6 +137,6 @@
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup><!-- /Transparent container for beatgrid buttons -->
</Children>
</WidgetGroup>
</Children>
</WidgetGroup>
</Template>
Loading