Skip to content

Deere: enabled "shadow position feature" for preview + samplers#1488

Merged
Be-ing merged 3 commits intomixxxdj:2.1from
nopeppermint:patch-3
Jan 23, 2018
Merged

Deere: enabled "shadow position feature" for preview + samplers#1488
Be-ing merged 3 commits intomixxxdj:2.1from
nopeppermint:patch-3

Conversation

@nopeppermint
Copy link
Copy Markdown
Contributor

add PlayedOverlayColor to preview
(used same color as in https://github.com/mixxxdj/mixxx/blob/2.1/res/skins/Deere/left_gutter.xml for deck1/2)
before:
deere_before_fix

after:
deere_fix

@nopeppermint
Copy link
Copy Markdown
Contributor Author

This feature is also missing in the samplers

I tried to add "PlayedOverlayColor" to
https://github.com/mixxxdj/mixxx/blob/2.1/res/skins/Deere/sampler_overview_row.xml
as well but there it changes nothing...

@ronso0 any idea why?

like this:

                <Overview>
                <TooltipId>waveform_overview</TooltipId>
                <Group><Variable name="group"/></Group>
                <SizePolicy>me,me</SizePolicy>
                <BgColor></BgColor>
                <PlayedOverlayColor>#88000000</PlayedOverlayColor>
                <SignalHighColor>#FFE300</SignalHighColor>
                <SignalMidColor>#0099FF</SignalMidColor>
                <SignalLowColor>#FF0035</SignalLowColor>
                <SignalRGBHighColor></SignalRGBHighColor>
                <SignalRGBMidColor></SignalRGBMidColor>
                <SignalRGBLowColor></SignalRGBLowColor>
                <SignalColor>#FF8000</SignalColor>
                <PlayPosColor>#00FF00</PlayPosColor>
                <DefaultMark>
                  <Align>bottom</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>cue_point</Control>
                  <Align>top</Align>
                  <Color>#FF001C</Color>
                  <TextColor>#FFFFFF</TextColor>
                  <Text>C</Text>
                </Mark>
                <Connection>
                  <ConfigKey><Variable name="group"/>,playposition</ConfigKey>
                  <EmitOnDownPress>false</EmitOnDownPress>
                </Connection>
              </Overview>```

@nopeppermint nopeppermint changed the title enabled "shadow position feature" for preview Deere: enabled "shadow position feature" for preview Jan 21, 2018
@esbrandt
Copy link
Copy Markdown
Contributor

Add PlayedOverlayColor near sampler_controls_row.xml#L33.

Looks like parts of sampler_overview_row.xml are unused.

@nopeppermint nopeppermint changed the title Deere: enabled "shadow position feature" for preview Deere: enabled "shadow position feature" for preview + samplers Jan 21, 2018
@nopeppermint
Copy link
Copy Markdown
Contributor Author

thanks @esbrandt
now with fix for samplers
before:
deere_sampler_no_fix
after:
deere_sampler_fix

@nopeppermint
Copy link
Copy Markdown
Contributor Author

Looks like parts of sampler_overview_row.xml are unused.

the whole file sampler_overview_row.xml is unused!

If I delete this file, and reload the skin there is NO change...

this file was last changed by @Be-ing in #940

In https://github.com/mixxxdj/mixxx/blob/2.1/res/skins/Deere/sampler.xml the file sampler_overview_row.xml is no longer used, this was changed by @Be-ing

728c06c#diff-6ac4554c9d507ce52e901ebcede22be2

sampler_overview_row.xml is not used in anther file as the following command shows:

/mixxx/res/skins/Deere $ grep -Ril "sampler_overview_row" ./

I suggest to delete "sampler_overview_row.xml "

@nopeppermint
Copy link
Copy Markdown
Contributor Author

BTW: I am done with this PR, ready to merge in my opinion

@daschuer
Copy link
Copy Markdown
Member

LGTM. @Be-ing, merge?

@Be-ing Be-ing merged commit 97b34a0 into mixxxdj:2.1 Jan 23, 2018
@Be-ing
Copy link
Copy Markdown
Contributor

Be-ing commented Jan 23, 2018

Thanks for implementing this and cleaning up the old file.

@nopeppermint nopeppermint deleted the patch-3 branch January 23, 2018 21:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants