Merge remote-tracking branch 'stepmania/master'

Themes/_fallback/Languages/ja.ini

@@ -543,7 +543,7 @@ AllowSongDeletion=ミュージックホイールでCtrl+Backspaceキーを押す
 AllowW1=Fantastic判定の使用範囲を設定します。NEVERでは出なくなります。\nCOURSES ONLYではExtendedモードかOniモードのみで出ます。\nALWAYSではどのモードでも出ます。
 AutogenGroupCourses=OnにするとExtendedモードとEndlessモードのコースが自動生成されます。
 AutogenSteps=Onにすると他のゲームモードやスタイルから譜面が自動生成されます。
-AxisFix=Onにすると方向キーを軸に割り当てるアダプタへの対応策を行います。\nMax OS XおよびLinux Joystickドライバは未対応です。
+AxisFix=Onにすると方向キーを軸に割り当てるアダプタへの対応策を行います。\nMac OS XおよびLinux Joystickドライバは未対応です。
 DefaultFailType=IMMEDIATEはゲージが無くなると即終了します。\nDELAYEDはゲージがなくなってからもミスが続くと終了します。\n END OF SONGはゲージが切れても最後まで演奏が続きます。
 DefaultFailTypeNoOff=IMMEDIATEはゲージが無くなると即終了します。30 MISSESはゲージがなくなってから30ミスすると終了します。\n END OF SONGはゲージが切れても最後まで演奏が続きます。
 EasterEggs=このオプションをOnにして、Perfect以上で250コンボ繋ぐと…?

src/StepMania.cpp

@@ -176,7 +176,7 @@ bool StepMania::GetHighResolutionTextures()
 	case HighResolutionTextures_Auto:
 		{
 			int height = PREFSMAN->m_iDisplayHeight;
-			return height > 480;
+			return height > THEME->GetMetricI("Common", "ScreenHeight");
 		}
 	case HighResolutionTextures_ForceOn:
 		return true;

src/arch/Lights/LightsDriver_Linux_PIUIO_Leds.cpp

@@ -85,6 +85,13 @@ void LightsDriver_Linux_PIUIO_Leds::Set( const LightsState *ls )
 {
 	FOREACH_CabinetLight(light)
 	{
+		// Only SetLight if LightsState has changed since previous iteration.
+		// This reduces unncessary strain on udev.  -dguzek
+		if (ls->m_bCabinetLights[light] == previousLS.m_bCabinetLights[light] )
+		{
+			continue;
+		}
+
 		if (!SetLight(cabinet_leds[light], ls->m_bCabinetLights[light]))
 		{
 			LOG->Warn("Error setting cabinet light %s",
@@ -101,6 +108,11 @@ void LightsDriver_Linux_PIUIO_Leds::Set( const LightsState *ls )
 		{
 			FOREACH_GameButton_Custom(gb)
 			{
+				if (ls->m_bGameButtonLights[c][gb] == previousLS.m_bGameButtonLights[c][gb])
+				{
+					continue;
+				}
+
 				if (!SetLight(dance_leds[c][gb], ls->m_bGameButtonLights[c][gb]))
 				{
 					LOG->Warn("Error setting button light %s",
@@ -116,6 +128,11 @@ void LightsDriver_Linux_PIUIO_Leds::Set( const LightsState *ls )
 		{
 			FOREACH_GameButton_Custom(gb)
 			{
+				if (ls->m_bGameButtonLights[c][gb] == previousLS.m_bGameButtonLights[c][gb])
+				{
+					continue;
+				}
+
 				if (!SetLight(pump_leds[c][gb], ls->m_bGameButtonLights[c][gb]))
 				{
 					LOG->Warn("Error setting button light %s",
@@ -129,12 +146,14 @@ void LightsDriver_Linux_PIUIO_Leds::Set( const LightsState *ls )
 	{
 		return;
 	}
+
+	previousLS = *ls;
 }
 
 /*
  * (c) 2014 StepMania team
  * All rights reserved.
- * 
+ *
  * 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
@@ -144,7 +163,7 @@ void LightsDriver_Linux_PIUIO_Leds::Set( const LightsState *ls )
  * copyright notice(s) and this permission notice appear in all copies of
  * the Software and that both the above copyright notice(s) and this
  * permission notice appear in supporting documentation.
- * 
+ *
  * 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 OF

src/arch/Lights/LightsDriver_Linux_PIUIO_Leds.h

@@ -7,6 +7,9 @@
 
 class LightsDriver_Linux_PIUIO_Leds : public LightsDriver
 {
+private:
+	LightsState previousLS;
+
 public:
 	LightsDriver_Linux_PIUIO_Leds();
 	virtual ~LightsDriver_Linux_PIUIO_Leds();
@@ -19,7 +22,7 @@ public:
 /*
  * (c) 2014 StepMania team
  * All rights reserved.
- * 
+ *
  * 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
@@ -29,7 +32,7 @@ public:
  * copyright notice(s) and this permission notice appear in all copies of
  * the Software and that both the above copyright notice(s) and this
  * permission notice appear in supporting documentation.
- * 
+ *
  * 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 OF