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.

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

Revert to raster level meters in LateNight and Tango to fix severe GUI lag on macOS #1573

Merged
merged 3 commits into from
Apr 1, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions res/skins/LateNight/mixer.xml
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@
<Children>
<VuMeter>
<TooltipId>master_VuMeterL</TooltipId>
<PathVu>style/volume_display_deck_over.svg</PathVu>
<PathBack>style/volume_display_deck.svg</PathBack>
<PathVu>style/volume_display_deck_over.png</PathVu>
<PathBack>style/volume_display_deck.png</PathBack>
<Horizontal>false</Horizontal>
<PeakHoldSize>5</PeakHoldSize>
<PeakHoldTime>500</PeakHoldTime>
Expand All @@ -105,8 +105,8 @@
</VuMeter>
<VuMeter>
<TooltipId>master_VuMeterR</TooltipId>
<PathVu>style/volume_display_deck_over.svg</PathVu>
<PathBack>style/volume_display_deck.svg</PathBack>
<PathVu>style/volume_display_deck_over.png</PathVu>
<PathBack>style/volume_display_deck.png</PathBack>
<Horizontal>false</Horizontal>
<PeakHoldSize>5</PeakHoldSize>
<PeakHoldTime>500</PeakHoldTime>
Expand Down
8 changes: 4 additions & 4 deletions res/skins/LateNight/mixer_channel_4decks.xml
Original file line number Diff line number Diff line change
Expand Up @@ -136,16 +136,16 @@
<Children>
<StatusLight>
<TooltipId>channel_PeakIndicator</TooltipId>
<PathStatusLight>style/clipping_deck_over.svg</PathStatusLight>
<PathBack>style/clipping_deck.svg</PathBack>
<PathStatusLight>style/clipping_deck_over.png</PathStatusLight>
<PathBack>style/clipping_deck.png</PathBack>
<Connection>
<ConfigKey><Variable name="group"/>,PeakIndicator</ConfigKey>
</Connection>
</StatusLight>
<VuMeter>
<TooltipId>channel_VuMeter</TooltipId>
<PathVu>style/volume_display_deck_over.svg</PathVu>
<PathBack>style/volume_display_deck.svg</PathBack>
<PathVu>style/volume_display_deck_over.png</PathVu>
<PathBack>style/volume_display_deck.png</PathBack>
<Horizontal>false</Horizontal>
<PeakHoldSize>5</PeakHoldSize>
<PeakHoldTime>500</PeakHoldTime>
Expand Down
8 changes: 4 additions & 4 deletions res/skins/LateNight/mixer_channel_left.xml
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ vertical layout and a side-by-side layout for two-deck mode -->
<Children>
<StatusLight>
<TooltipId>channel_PeakIndicator</TooltipId>
<PathStatusLight>style/clipping_deck_over.svg</PathStatusLight>
<PathBack>style/clipping_deck.svg</PathBack>
<PathStatusLight>style/clipping_deck_over.png</PathStatusLight>
<PathBack>style/clipping_deck.png</PathBack>
<Connection>
<ConfigKey><Variable name="group"/>,PeakIndicator</ConfigKey>
</Connection>
Expand All @@ -144,8 +144,8 @@ vertical layout and a side-by-side layout for two-deck mode -->
<Children>
<VuMeter>
<TooltipId>channel_VuMeter</TooltipId>
<PathVu>style/volume_display_deck_over.svg</PathVu>
<PathBack>style/volume_display_deck.svg</PathBack>
<PathVu>style/volume_display_deck_over.png</PathVu>
<PathBack>style/volume_display_deck.png</PathBack>
<Horizontal>false</Horizontal>
<PeakHoldSize>5</PeakHoldSize>
<PeakHoldTime>500</PeakHoldTime>
Expand Down
8 changes: 4 additions & 4 deletions res/skins/LateNight/mixer_channel_right.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ vertical layout and a reversed side-by-side layout for two-deck mode -->
<Children>
<StatusLight>
<TooltipId>channel_PeakIndicator</TooltipId>
<PathStatusLight>style/clipping_deck_over.svg</PathStatusLight>
<PathBack>style/clipping_deck.svg</PathBack>
<PathStatusLight>style/clipping_deck_over.png</PathStatusLight>
<PathBack>style/clipping_deck.png</PathBack>
<Connection>
<ConfigKey><Variable name="group"/>,PeakIndicator</ConfigKey>
</Connection>
Expand All @@ -61,8 +61,8 @@ vertical layout and a reversed side-by-side layout for two-deck mode -->
<Children>
<VuMeter>
<TooltipId>channel_VuMeter</TooltipId>
<PathVu>style/volume_display_deck_over.svg</PathVu>
<PathBack>style/volume_display_deck.svg</PathBack>
<PathVu>style/volume_display_deck_over.png</PathVu>
<PathBack>style/volume_display_deck.png</PathBack>
<Horizontal>false</Horizontal>
<PeakHoldSize>5</PeakHoldSize>
<PeakHoldTime>500</PeakHoldTime>
Expand Down
16 changes: 8 additions & 8 deletions res/skins/LateNight/mixer_master_headphone.xml
Original file line number Diff line number Diff line change
Expand Up @@ -205,16 +205,16 @@
<Children>
<StatusLight>
<TooltipId>master_PeakIndicator</TooltipId>
<PathStatusLight>style/clipping_deck_over.svg</PathStatusLight>
<PathBack>style/clipping_deck.svg</PathBack>
<PathStatusLight>style/clipping_deck_over.png</PathStatusLight>
<PathBack>style/clipping_deck.png</PathBack>
<Connection>
<ConfigKey>[Master],PeakIndicatorL</ConfigKey>
</Connection>
</StatusLight>
<StatusLight>
<TooltipId>master_PeakIndicator</TooltipId>
<PathStatusLight>style/clipping_deck_over.svg</PathStatusLight>
<PathBack>style/clipping_deck.svg</PathBack>
<PathStatusLight>style/clipping_deck_over.png</PathStatusLight>
<PathBack>style/clipping_deck.png</PathBack>
<Connection>
<ConfigKey>[Master],PeakIndicatorR</ConfigKey>
</Connection>
Expand All @@ -229,8 +229,8 @@
<Children>
<VuMeter>
<TooltipId>master_VuMeterL</TooltipId>
<PathVu>style/volume_display_deck_over.svg</PathVu>
<PathBack>style/volume_display_deck.svg</PathBack>
<PathVu>style/volume_display_deck_over.png</PathVu>
<PathBack>style/volume_display_deck.png</PathBack>
<Horizontal>false</Horizontal>
<PeakHoldSize>5</PeakHoldSize>
<PeakHoldTime>500</PeakHoldTime>
Expand All @@ -242,8 +242,8 @@
</VuMeter>
<VuMeter>
<TooltipId>master_VuMeterR</TooltipId>
<PathVu>style/volume_display_deck_over.svg</PathVu>
<PathBack>style/volume_display_deck.svg</PathBack>
<PathVu>style/volume_display_deck_over.png</PathVu>
<PathBack>style/volume_display_deck.png</PathBack>
<Horizontal>false</Horizontal>
<PeakHoldSize>5</PeakHoldSize>
<PeakHoldTime>500</PeakHoldTime>
Expand Down
8 changes: 4 additions & 4 deletions res/skins/LateNight/preview_deck.xml
Original file line number Diff line number Diff line change
Expand Up @@ -153,17 +153,17 @@
<Children>
<StatusLight>
<TooltipId>preview_PeakIndicator</TooltipId>
<PathStatusLight>style/clipping_previewdeck_over.svg</PathStatusLight>
<PathBack>style/clipping_previewdeck.svg</PathBack>
<PathStatusLight>style/clipping_previewdeck_over.png</PathStatusLight>
<PathBack>style/clipping_previewdeck.png</PathBack>
<Connection>
<ConfigKey>[PreviewDeck1],PeakIndicator</ConfigKey>
</Connection>
</StatusLight>

<VuMeter>
<TooltipId>preview_VuMeter</TooltipId>
<PathVu>style/volume_display_previewdeck_over.svg</PathVu>
<PathBack>style/volume_display_previewdeck.svg</PathBack>
<PathVu>style/volume_display_previewdeck_over.png</PathVu>
<PathBack>style/volume_display_previewdeck.png</PathBack>
<Horizontal>false</Horizontal>
<PeakHoldSize>3</PeakHoldSize>
<PeakHoldTime>250</PeakHoldTime>
Expand Down
8 changes: 4 additions & 4 deletions res/skins/LateNight/sampler.xml
Original file line number Diff line number Diff line change
Expand Up @@ -503,16 +503,16 @@
<Children>
<StatusLight>
<TooltipId>sampler_PeakIndicator</TooltipId>
<PathStatusLight>style/clipping_deck_over.svg</PathStatusLight>
<PathBack>style/clipping_deck.svg</PathBack>
<PathStatusLight>style/clipping_deck_over.png</PathStatusLight>
<PathBack>style/clipping_deck.png</PathBack>
<Connection>
<ConfigKey><Variable name="group"/>,PeakIndicator</ConfigKey>
</Connection>
</StatusLight>
<VuMeter>
<TooltipId>sampler_VuMeter</TooltipId>
<PathVu>style/volume_display_sampler_over.svg</PathVu>
<PathBack>style/volume_display_sampler.svg</PathBack>
<PathVu>style/volume_display_sampler_over.png</PathVu>
<PathBack>style/volume_display_sampler.png</PathBack>
<Horizontal>false</Horizontal>
<PeakHoldSize>5</PeakHoldSize>
<PeakHoldTime>500</PeakHoldTime>
Expand Down
Binary file added res/skins/LateNight/style/clipping_deck.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/skins/LateNight/style/clipping_deck_over.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/skins/LateNight/style/clipping_micAux_over.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/skins/LateNight/style/clipping_previewdeck.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/skins/LateNight/style/latency_bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/skins/LateNight/style/latency_over.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/skins/LateNight/style/volume_display_deck.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/skins/LateNight/style/volume_display_micAux.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/skins/LateNight/style/volume_display_sampler.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/skins/Tango/graphics/vumeter_floating.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/skins/Tango/graphics/vumeter_floating_over.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/skins/Tango/graphics/vumeter_mini.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/skins/Tango/graphics/vumeter_mini_clipping.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/skins/Tango/graphics/vumeter_mini_over.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/skins/Tango/graphics/vumeter_mixer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/skins/Tango/graphics/vumeter_mixer_clipping.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/skins/Tango/graphics/vumeter_mixer_over.png
20 changes: 12 additions & 8 deletions res/skins/Tango/vumeter_floating.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ Description:
Visible when mixer is hidden and Permanent Level Meters are enabled.
Variables:
group : [ChannelN]


Rendering the meters from SVGs makes the entire GUI very laggy on older Macs.
Refer to https://bugs.launchpad.net/mixxx/+bug/1759433
-->
<Template>
<WidgetGroup>
Expand All @@ -21,15 +25,15 @@ Variables:
<Children>
<StatusLight>
<TooltipId>channel_VuMeterL</TooltipId>
<PathStatusLight>graphics/vumeter_floating_clipping_over.svg</PathStatusLight>
<PathBack>graphics/vumeter_floating_clipping.svg</PathBack>
<PathStatusLight>skin:/graphics/vumeter_floating_clipping_over.png</PathStatusLight>
<PathBack>skin:/graphics/vumeter_floating_clipping.png</PathBack>
<Connection>
<ConfigKey><Variable name="group"/>,PeakIndicatorL</ConfigKey>
</Connection>
</StatusLight>
<VuMeter>
<PathVu>graphics/vumeter_floating_over.svg</PathVu>
<PathBack>graphics/vumeter_floating.svg</PathBack>
<PathVu>skin:/graphics/vumeter_floating_over.png</PathVu>
<PathBack>skin:/graphics/vumeter_floating.png</PathBack>
<Horizontal>false</Horizontal>
<PeakHoldSize>4</PeakHoldSize>
<PeakHoldTime>800</PeakHoldTime>
Expand All @@ -48,15 +52,15 @@ Variables:
<Children>
<StatusLight>
<TooltipId>channel_VuMeterR</TooltipId>
<PathStatusLight>graphics/vumeter_floating_clipping_over.svg</PathStatusLight>
<PathBack>graphics/vumeter_floating_clipping.svg</PathBack>
<PathStatusLight>skin:/graphics/vumeter_floating_clipping_over.png</PathStatusLight>
<PathBack>skin:/graphics/vumeter_floating_clipping.png</PathBack>
<Connection>
<ConfigKey><Variable name="group"/>,PeakIndicatorR</ConfigKey>
</Connection>
</StatusLight>
<VuMeter>
<PathVu>graphics/vumeter_floating_over.svg</PathVu>
<PathBack>graphics/vumeter_floating.svg</PathBack>
<PathVu>skin:/graphics/vumeter_floating_over.png</PathVu>
<PathBack>skin:/graphics/vumeter_floating.png</PathBack>
<Horizontal>false</Horizontal>
<PeakHoldSize>4</PeakHoldSize>
<PeakHoldTime>800</PeakHoldTime>
Expand Down
19 changes: 11 additions & 8 deletions res/skins/Tango/vumeter_master.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<!--
Description:
Container for the master level meter, suiting various configurations.

Rendering the meters from SVGs makes the entire GUI very laggy on older Macs.
Refer to https://bugs.launchpad.net/mixxx/+bug/1759433
-->
<Template>
<SingletonDefinition>
Expand All @@ -25,15 +28,15 @@ Description:
<Children>
<StatusLight>
<TooltipId>master_VuMeterL</TooltipId>
<PathStatusLight>graphics/vumeter_floating_clipping_over.svg</PathStatusLight>
<PathBack>graphics/vumeter_floating_clipping.svg</PathBack>
<PathStatusLight>skin:/graphics/vumeter_floating_clipping_over.png</PathStatusLight>
<PathBack>skin:/graphics/vumeter_floating_clipping.png</PathBack>
<Connection>
<ConfigKey>[Master],PeakIndicatorL</ConfigKey>
</Connection>
</StatusLight>
<VuMeter>
<PathVu>graphics/vumeter_floating_over.svg</PathVu>
<PathBack>graphics/vumeter_floating.svg</PathBack>
<PathVu>skin:/graphics/vumeter_floating_over.png</PathVu>
<PathBack>skin:/graphics/vumeter_floating.png</PathBack>
<Horizontal>false</Horizontal>
<PeakHoldSize>4</PeakHoldSize>
<PeakHoldTime>800</PeakHoldTime>
Expand All @@ -52,15 +55,15 @@ Description:
<Children>
<StatusLight>
<TooltipId>master_VuMeterR</TooltipId>
<PathStatusLight>graphics/vumeter_floating_clipping_over.svg</PathStatusLight>
<PathBack>graphics/vumeter_floating_clipping.svg</PathBack>
<PathStatusLight>skin:/graphics/vumeter_floating_clipping_over.png</PathStatusLight>
<PathBack>skin:/graphics/vumeter_floating_clipping.png</PathBack>
<Connection>
<ConfigKey>[Master],PeakIndicatorR</ConfigKey>
</Connection>
</StatusLight>
<VuMeter>
<PathVu>graphics/vumeter_floating_over.svg</PathVu>
<PathBack>graphics/vumeter_floating.svg</PathBack>
<PathVu>skin:/graphics/vumeter_floating_over.png</PathVu>
<PathBack>skin:/graphics/vumeter_floating.png</PathBack>
<Horizontal>false</Horizontal>
<PeakHoldSize>4</PeakHoldSize>
<PeakHoldTime>800</PeakHoldTime>
Expand Down
11 changes: 7 additions & 4 deletions res/skins/Tango/vumeter_mini.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,25 @@ Description:
Variables:
group : [MicrophoneN], [AuxiliaryN], [PerviewDeck]
chanNum : channel number

Rendering the meters from SVGs makes the entire GUI very laggy on older Macs.
Refer to https://bugs.launchpad.net/mixxx/+bug/1759433
-->
<Template>
<WidgetGroup>
<Size><Variable name="Size"/></Size>
<Layout>stacked</Layout>
<Children>
<StatusLight>
<PathStatusLight scalemode="STRETCH">graphics/vumeter_mini_clipping_over.svg</PathStatusLight>
<PathBack scalemode="STRETCH">graphics/vumeter_mini_clipping.svg</PathBack>
<PathStatusLight scalemode="STRETCH">skin:/graphics/vumeter_mini_clipping_over.png</PathStatusLight>
<PathBack scalemode="STRETCH">skin:/graphics/vumeter_mini_clipping.png</PathBack>
<Connection>
<ConfigKey><Variable name="group"/>,PeakIndicator</ConfigKey>
</Connection>
</StatusLight>
<VuMeter>
<PathVu scalemode="STRETCH">graphics/vumeter_mini_over.svg</PathVu>
<PathBack scalemode="STRETCH">graphics/vumeter_mini.svg</PathBack>
<PathVu scalemode="STRETCH">skin:/graphics/vumeter_mini_over.png</PathVu>
<PathBack scalemode="STRETCH">skin:/graphics/vumeter_mini.png</PathBack>
<Horizontal>false</Horizontal>
<PeakHoldSize>5</PeakHoldSize>
<PeakHoldTime>500</PeakHoldTime>
Expand Down
19 changes: 11 additions & 8 deletions res/skins/Tango/vumeter_mixer.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ Description:
Variables:
group : [ChannelN]
chanNum : channel number

Rendering the meters from SVGs makes the entire GUI very laggy on older Macs.
Refer to https://bugs.launchpad.net/mixxx/+bug/1759433
-->
<Template>
<WidgetGroup>
Expand All @@ -17,15 +20,15 @@ Variables:
<Children>
<StatusLight>
<TooltipId>channel_VuMeterL</TooltipId>
<PathStatusLight>graphics/vumeter_mixer_clipping_over.svg</PathStatusLight>
<PathBack>graphics/vumeter_mixer_clipping.svg</PathBack>
<PathStatusLight>skin:/graphics/vumeter_mixer_clipping_over.png</PathStatusLight>
<PathBack>skin:/graphics/vumeter_mixer_clipping.png</PathBack>
<Connection>
<ConfigKey><Variable name="group"/>,PeakIndicatorL</ConfigKey>
</Connection>
</StatusLight>
<VuMeter>
<PathVu>graphics/vumeter_mixer_over.svg</PathVu>
<PathBack>graphics/vumeter_mixer.svg</PathBack>
<PathVu>skin:/graphics/vumeter_mixer_over.png</PathVu>
<PathBack>skin:/graphics/vumeter_mixer.png</PathBack>
<Horizontal>false</Horizontal>
<PeakHoldSize>4</PeakHoldSize>
<PeakHoldTime>800</PeakHoldTime>
Expand All @@ -44,15 +47,15 @@ Variables:
<Children>
<StatusLight>
<TooltipId>channel_VuMeterR</TooltipId>
<PathStatusLight>graphics/vumeter_mixer_clipping_over.svg</PathStatusLight>
<PathBack>graphics/vumeter_mixer_clipping.svg</PathBack>
<PathStatusLight>skin:/graphics/vumeter_mixer_clipping_over.png</PathStatusLight>
<PathBack>skin:/graphics/vumeter_mixer_clipping.png</PathBack>
<Connection>
<ConfigKey><Variable name="group"/>,PeakIndicatorR</ConfigKey>
</Connection>
</StatusLight>
<VuMeter>
<PathVu>graphics/vumeter_mixer_over.svg</PathVu>
<PathBack>graphics/vumeter_mixer.svg</PathBack>
<PathVu>skin:/graphics/vumeter_mixer_over.png</PathVu>
<PathBack>skin:/graphics/vumeter_mixer.png</PathBack>
<Horizontal>false</Horizontal>
<PeakHoldSize>4</PeakHoldSize>
<PeakHoldTime>800</PeakHoldTime>
Expand Down