Merge remote-tracking branch 'upstream/2.2' into coverart_scaling

build/features.py

@@ -441,34 +441,43 @@ class ModPlug(Feature):
     def description(self):
         return "Modplug module decoder plugin"
 
-    def default(self, build):
-        return 1 if build.platform_is_linux else 0
-
     def enabled(self, build):
-        build.flags['modplug'] = util.get_flags(build.env, 'modplug', self.default(build))
+        # Default to enabled on but only throw an error if it was explicitly
+        # requested and is not available.
+        if 'modplug' in build.flags:
+            return int(build.flags['modplug']) > 0
+        build.flags['modplug'] = util.get_flags(build.env, 'modplug', 1)
         if int(build.flags['modplug']):
             return True
         return False
 
     def add_options(self, build, vars):
         vars.Add('modplug',
                  'Set to 1 to enable libmodplug based module tracker support.',
-                 self.default(build))
+                 1)
 
     def configure(self, build, conf):
         if not self.enabled(build):
             return
 
-        build.env.Append(CPPDEFINES='__MODPLUG__')
+        # Only block the configure if modplug was explicitly requested.
+        explicit = 'modplug' in SCons.ARGUMENTS
 
-        have_modplug_h = conf.CheckHeader('libmodplug/modplug.h')
-        have_modplug = conf.CheckLib(['modplug', 'libmodplug'], autoadd=True)
+        if not conf.CheckHeader('libmodplug/modplug.h'):
+            if explicit:
+                raise Exception('Could not find libmodplug development headers.')
+            else:
+                build.flags['modplug'] = 0
+            return
 
-        if not have_modplug_h:
-            raise Exception('Could not find libmodplug development headers.')
+        if not conf.CheckLib(['modplug', 'libmodplug'], autoadd=True):
+            if explicit:
+                raise Exception('Could not find libmodplug shared library.')
+            else:
+                build.flags['modplug'] = 0
+            return
 
-        if not have_modplug:
-            raise Exception('Could not find libmodplug shared library.')
+        build.env.Append(CPPDEFINES='__MODPLUG__')
 
     def sources(self, build):
         depends.Qt.uic(build)('preferences/dialog/dlgprefmodplugdlg.ui')

res/controllers/Pioneer-DDJ-SX-scripts.js

@@ -14,10 +14,10 @@ var PioneerDDJSX = function() {};
 	Version: 		1.19, 05/01/2018
 	Description: 	Pioneer DDJ-SX Controller Mapping for Mixxx
     Source: 		http://github.com/DJMaxergy/mixxx/tree/pioneerDDJSX_mapping
-    
+
     Copyright (c) 2018 DJMaxergy, licensed under GPL version 2 or later
     Copyright (c) 2014-2015 various contributors, base for this mapping, licensed under MIT license
-    
+
     Contributors:
     - Michael Stahl (DG3NEC): original DDJ-SB2 mapping for Mixxx 2.0
     - Sophia Herzog: midiAutoDJ-scripts
@@ -26,31 +26,31 @@ var PioneerDDJSX = function() {};
       https://github.com/wingcom/Mixxx-Pioneer-DDJ-SB
     - Hilton Rudham: Pioneer DDJ-SR mapping
       https://github.com/hrudham/Mixxx-Pioneer-DDJ-SR
-      
+
     GPL license notice for current version:
     This program is free software; you can redistribute it and/or modify it under the terms of the
     GNU General Public License as published by the Free Software Foundation; either version 2
     of the License, or (at your option) any later version.
-    
+
     This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
     without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
     the GNU General Public License for more details.
-    
+
     You should have received a copy of the GNU General Public License along with this program; if
     not, write to the Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-    
-    
+
+
     MIT License for earlier versions:
     Permission is hereby granted, free of charge, to any person obtaining a copy of this software
     and associated documentation files (the "Software"), to deal in the Software without
     restriction, including without limitation the rights to use, copy, modify, merge, publish,
     distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
     Software is furnished to do so, subject to the following conditions:
-    
+
     The above copyright notice and this permission notice shall be included in all copies or
     substantial portions of the Software.
-    
+
     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
     BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
@@ -79,17 +79,17 @@ PioneerDDJSX.autoDJTickInterval = 1000;
 // Sets the maximum adjustment of BPM allowed for beats to sync if AutoDJ is enabled [BPM] (default: 10).
 PioneerDDJSX.autoDJMaxBpmAdjustment = 10;
 // If true, AutoDJ queue is being shuffled after skipping a track (default: false).
-// When using a fixed set of tracks without manual intervention, some tracks may be unreachable, 
+// When using a fixed set of tracks without manual intervention, some tracks may be unreachable,
 // due to having an unfortunate place in the queue ordering. This solves the issue.
 PioneerDDJSX.autoDJShuffleAfterSkip = false;
 
-// If true, by releasing rotary selector, 
+// If true, by releasing rotary selector,
 // track in preview player jumps forward to "jumpPreviewPosition"
-// (default: jumpPreviewEnabled = true, jumpPreviewPosition = 0.3). 
+// (default: jumpPreviewEnabled = true, jumpPreviewPosition = 0.3).
 PioneerDDJSX.jumpPreviewEnabled = true;
 PioneerDDJSX.jumpPreviewPosition = 0.3;
 
-// If true, pad press in SAMPLER-PAD-MODE repeatedly causes sampler to play 
+// If true, pad press in SAMPLER-PAD-MODE repeatedly causes sampler to play
 // loaded track from cue-point, else it causes to play loaded track from the beginning (default: false).
 PioneerDDJSX.samplerCueGotoAndPlay = false;
 
@@ -114,6 +114,7 @@ PioneerDDJSX.chFaderStart = [null, null, null, null];
 PioneerDDJSX.toggledBrake = [false, false, false, false];
 PioneerDDJSX.scratchMode = [true, true, true, true];
 PioneerDDJSX.wheelLedsBlinkStatus = [0, 0, 0, 0];
+PioneerDDJSX.wheelLedsPosition = [0, 0, 0, 0];
 PioneerDDJSX.setUpSpeedSliderRange = [0.08, 0.08, 0.08, 0.08];
 
 // PAD mode storage:
@@ -1570,7 +1571,7 @@ PioneerDDJSX.panelSelectButton = function(channel, control, value, status, group
 PioneerDDJSX.shiftPanelSelectButton = function(channel, control, value, status, group) {
     var channelGroup;
     PioneerDDJSX.shiftPanelSelectPressed = value ? true : false;
-    
+
     for (var index in PioneerDDJSX.fxUnitGroups) {
         if (PioneerDDJSX.fxUnitGroups.hasOwnProperty(index)) {
             if (PioneerDDJSX.fxUnitGroups[index] < 2) {
@@ -1846,7 +1847,13 @@ PioneerDDJSX.wheelLeds = function(value, group, control) {
         }
         PioneerDDJSX.wheelLedsBlinkStatus[deck]++;
     }
-    PioneerDDJSX.wheelLedControl(group, wheelPos);
+    wheelPos = parseInt(wheelPos);
+    // Only send midi message when the position is actually updated.
+    // Otherwise, the amount of messages may exceed the maximum rate at high position update rates.
+    if (PioneerDDJSX.wheelLedsPosition[deck] !== wheelPos) {
+      PioneerDDJSX.wheelLedControl(group, wheelPos);
+    }
+    PioneerDDJSX.wheelLedsPosition[deck] = wheelPos;
 };
 
 PioneerDDJSX.cueLed = function(value, group, control) {
@@ -2322,4 +2329,4 @@ PioneerDDJSX.slicerBeatActive = function(value, group, control) {
         PioneerDDJSX.slicerPreviousBeatsPassed[deck] = 0;
         PioneerDDJSX.slicerActive[deck] = false;
     }
-};
+};

res/skins/Tango/mixer_channel_left.xml

@@ -66,10 +66,11 @@ Variables:
         <SizePolicy>f,min</SizePolicy>
         <Children>
           <SliderComposed><!-- Volume slider -->
+            <Size>34f,103f</Size>
             <ObjectName>VolumeSlider</ObjectName>
             <TooltipId>channel_volume</TooltipId>
-            <Slider>knobs_sliders/volume_scale.svg</Slider>
-            <Handle>knobs_sliders/volume_handle.svg</Handle>
+            <Slider scalemode="STRETCH_ASPECT">knobs_sliders/volume_scale.svg</Slider>
+            <Handle scalemode="STRETCH_ASPECT">knobs_sliders/volume_handle.svg</Handle>
             <Horizontal>false</Horizontal>
             <Connection>
               <ConfigKey><Variable name="group"/>,volume</ConfigKey>

res/skins/Tango/mixer_channel_right.xml

@@ -54,10 +54,11 @@ Variables:
         <SizePolicy>f,min</SizePolicy>
         <Children>
           <SliderComposed><!-- Volume slider -->
+            <Size>34f,103f</Size>
             <ObjectName>VolumeSlider</ObjectName>
             <TooltipId>channel_volume</TooltipId>
-            <Slider>knobs_sliders/volume_scale.svg</Slider>
-            <Handle>knobs_sliders/volume_handle.svg</Handle>
+            <Slider scalemode="STRETCH_ASPECT">knobs_sliders/volume_scale.svg</Slider>
+            <Handle scalemode="STRETCH_ASPECT">knobs_sliders/volume_handle.svg</Handle>
             <Horizontal>false</Horizontal>
             <Connection>
               <ConfigKey><Variable name="group"/>,volume</ConfigKey>

res/skins/Tango/mixer_headphone.xml

@@ -66,10 +66,10 @@ Description:
 
           <SliderComposed>
             <TooltipId>headMix</TooltipId>
+            <Size>60f,24f</Size>
             <ObjectName>MixerbarSlider</ObjectName>
-            <SizePolicy>min,min</SizePolicy>
-            <Handle>knobs_sliders/headMix_handle.svg</Handle>
-            <Slider>knobs_sliders/headMix_scale.svg</Slider>
+            <Handle scalemode="STRETCH_ASPECT">knobs_sliders/headMix_handle.svg</Handle>
+            <Slider scalemode="STRETCH_ASPECT">knobs_sliders/headMix_scale.svg</Slider>
             <Horizontal>true</Horizontal>
             <Connection>
               <ConfigKey>[Master],headMix</ConfigKey>

res/skins/Tango/mixer_master_booth.xml

@@ -31,9 +31,9 @@ Description:
           <SliderComposed>
             <TooltipId>balance</TooltipId>
             <ObjectName>MixerbarSlider</ObjectName>
-            <SizePolicy>min,min</SizePolicy>
-            <Handle>knobs_sliders/balance_handle.svg</Handle>
-            <Slider>knobs_sliders/balance_scale.svg</Slider>
+            <Size>48f,24f</Size>
+            <Handle scalemode="STRETCH_ASPECT">knobs_sliders/balance_handle.svg</Handle>
+            <Slider scalemode="STRETCH_ASPECT">knobs_sliders/balance_scale.svg</Slider>
             <Horizontal>true</Horizontal>
             <Connection>
               <ConfigKey>[Master],balance</ConfigKey>

res/skins/Tango/rate_pitch_key.xml

@@ -169,7 +169,7 @@ Variables:
             <MaximumSize>50,136</MaximumSize>
             <SizePolicy>f,me</SizePolicy>
             <TooltipId>rate</TooltipId>
-            <Handle>knobs_sliders/pitch_handle.svg</Handle>
+            <Handle scalemode="STRETCH_ASPECT">knobs_sliders/pitch_handle.svg</Handle>
             <Slider scalemode="STRETCH">knobs_sliders/pitch_scale.svg</Slider>
             <Horizontal>false</Horizontal>
             <Connection>

res/skins/Tango/sampler.xml

@@ -239,8 +239,8 @@ Variables:
             <ObjectName>SamplerPitchSlider</ObjectName>
             <TooltipId>rate</TooltipId>
             <Size>20f,54f</Size>
-            <Handle>knobs_sliders/pitch_sampler_handle.svg</Handle>
-            <Slider>knobs_sliders/pitch_sampler_scale.svg</Slider>
+            <Handle scalemode="STRETCH_ASPECT">knobs_sliders/pitch_sampler_handle.svg</Handle>
+            <Slider scalemode="STRETCH_ASPECT">knobs_sliders/pitch_sampler_scale.svg</Slider>
             <Horizontal>false</Horizontal>
             <Connection>
               <ConfigKey><Variable name="group"/>,rate</ConfigKey>

res/skins/Tango/spinnyCover_maxi.xml

@@ -67,7 +67,7 @@ Variables:
             <TooltipId>coverart</TooltipId>
             <Size>111f,111f</Size>
             <Group><Variable name="group"/></Group>
-            <DefaultCover>skin:/graphics/cover_default.svg</DefaultCover>
+            <DefaultCover scalemode="STRETCH_ASPECT">skin:/graphics/cover_default.svg</DefaultCover>
             <Connection>
               <ConfigKey persist="true">[Skin],show_coverart</ConfigKey>
               <BindProperty>visible</BindProperty>

res/skins/Tango/spinnyCover_mini.xml

@@ -69,7 +69,7 @@ Variables:
             <TooltipId>coverart</TooltipId>
             <Size>50f,50f</Size>
             <Group>[Channel<Variable name="chanNum"/>]</Group>
-            <DefaultCover>skin:/graphics/cover_default_mini_<Variable name="chanNum"/>.svg</DefaultCover>
+            <DefaultCover scalemode="STRETCH_ASPECT">skin:/graphics/cover_default_mini_<Variable name="chanNum"/>.svg</DefaultCover>
             <Connection>
               <ConfigKey persist="true">[Skin],show_coverart</ConfigKey>
               <BindProperty>visible</BindProperty>

res/skins/Tango/topbar.xml

@@ -117,8 +117,9 @@ Description:
 		                <Children>
 		                  <SliderComposed>
 		                    <TooltipId>crossfader</TooltipId>
-		                    <Handle>knobs_sliders/crossfader_handle.svg</Handle>
-		                    <Slider>knobs_sliders/crossfader_scale.svg</Slider>
+		                    <Size>108f,32f</Size>
+		                    <Handle scalemode="STRETCH_ASPECT">knobs_sliders/crossfader_handle.svg</Handle>
+		                    <Slider scalemode="STRETCH_ASPECT">knobs_sliders/crossfader_scale.svg</Slider>
 		                    <Horizontal>true</Horizontal>
 		                    <Connection>
 		                      <ConfigKey>[Master],crossfader</ConfigKey>