From 18043f2a0e302e2f3cd46fe24fdcf3638de34a0b Mon Sep 17 00:00:00 2001
From: tmj-fstate <dyvach@yahoo.com>
Date: Mon, 21 Aug 2017 20:25:41 +0200
Subject: [PATCH] maintenance: removed deprecated audio code

---
 Train.cpp | 658 +-----------------------------------------------------
 1 file changed, 2 insertions(+), 656 deletions(-)

diff --git a/Train.cpp b/Train.cpp
index 3db1a780..c46ff0bf 100644
--- a/Train.cpp
+++ b/Train.cpp
@@ -557,14 +557,7 @@ void TTrain::OnCommand_mastercontrollerincrease( TTrain *Train, command_data con
 
     if( Command.action != GLFW_RELEASE ) {
         // on press or hold
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-        if( Train->mvControlled->IncMainCtrl( 1 ) ) {
-            // sound feedback
-            Train->play_sound( Train->dsbNastawnikJazdy );
-        }
-#else
         Train->mvControlled->IncMainCtrl( 1 );
-#endif
     }
 }
 
@@ -572,14 +565,7 @@ void TTrain::OnCommand_mastercontrollerincreasefast( TTrain *Train, command_data
 
     if( Command.action != GLFW_RELEASE ) {
         // on press or hold
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-        if( Train->mvControlled->IncMainCtrl( 2 ) ) {
-            // sound feedback
-            Train->play_sound( Train->dsbNastawnikJazdy );
-        }
-#else
         Train->mvControlled->IncMainCtrl( 2 );
-#endif
     }
 }
 
@@ -587,14 +573,7 @@ void TTrain::OnCommand_mastercontrollerdecrease( TTrain *Train, command_data con
 
     if( Command.action != GLFW_RELEASE ) {
         // on press or hold
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-        if( Train->mvControlled->DecMainCtrl( 1 ) ) {
-            // sound feedback
-            Train->play_sound( Train->dsbNastawnikJazdy );
-        }
-#else
         Train->mvControlled->DecMainCtrl( 1 );
-#endif
     }
 }
 
@@ -602,14 +581,7 @@ void TTrain::OnCommand_mastercontrollerdecreasefast( TTrain *Train, command_data
 
     if( Command.action != GLFW_RELEASE ) {
         // on press or hold
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-        if( Train->mvControlled->DecMainCtrl( 2 ) ) {
-            // sound feedback
-            Train->play_sound( Train->dsbNastawnikJazdy );
-        }
-#else
         Train->mvControlled->DecMainCtrl( 2 );
-#endif
     }
 }
 
@@ -622,16 +594,9 @@ void TTrain::OnCommand_secondcontrollerincrease( TTrain *Train, command_data con
             if( Train->mvControlled->AnPos > 1 )
                 Train->mvControlled->AnPos = 1;
         }
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-        else if( Train->mvControlled->IncScndCtrl( 1 ) ) {
-            // sound feedback
-            Train->play_sound( Train->dsbNastawnikBocz, Train->dsbNastawnikJazdy, DSBVOLUME_MAX, 0 );
-        }
-#else
         else {
             Train->mvControlled->IncScndCtrl( 1 );
         }
-#endif
     }
 }
 
@@ -639,14 +604,7 @@ void TTrain::OnCommand_secondcontrollerincreasefast( TTrain *Train, command_data
 
     if( Command.action != GLFW_RELEASE ) {
         // on press or hold
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-        if( Train->mvControlled->IncScndCtrl( 2 ) ) {
-            // sound feedback
-            Train->play_sound( Train->dsbNastawnikBocz, Train->dsbNastawnikJazdy, DSBVOLUME_MAX, 0 );
-        }
-#else
         Train->mvControlled->IncScndCtrl( 2 );
-#endif
     }
 }
 
@@ -656,31 +614,11 @@ void TTrain::OnCommand_notchingrelaytoggle( TTrain *Train, command_data const &C
         // only reacting to press, so the switch doesn't flip back and forth if key is held down
         if( false == Train->mvOccupied->AutoRelayFlag ) {
             // turn on
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            if( Train->mvOccupied->AutoRelaySwitch( true ) ) {
-                // audio feedback
-                Train->play_sound( Train->dsbSwitch );
-                // visual feedback
-                // NOTE: there's no button for notching relay control
-                // TBD, TODO: add notching relay control button?
-            }
-#else
             Train->mvOccupied->AutoRelaySwitch( true );
-#endif
         }
         else {
             //turn off
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            if( Train->mvOccupied->AutoRelaySwitch( false ) ) {
-                // audio feedback
-                Train->play_sound( Train->dsbSwitch );
-                // visual feedback
-                // NOTE: there's no button for notching relay control
-                // TBD, TODO: add notching relay control button?
-            }
-#else
             Train->mvOccupied->AutoRelaySwitch( false );
-#endif
         }
     }
 }
@@ -697,24 +635,12 @@ void TTrain::OnCommand_mucurrentindicatorothersourceactivate( TTrain *Train, com
     if( Command.action == GLFW_PRESS ) {
         // turn on
         Train->ShowNextCurrent = true;
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-        // audio feedback
-        if( Train->ggNextCurrentButton.GetValue() < 0.5 ) {
-            Train->play_sound( Train->dsbSwitch );
-        }
-#endif
         // visual feedback
         Train->ggNextCurrentButton.UpdateValue( 1.0, Train->dsbSwitch );
     }
     else if( Command.action == GLFW_RELEASE ) {
         //turn off
         Train->ShowNextCurrent = false;
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-        // audio feedback
-        if( Train->ggNextCurrentButton.GetValue() > 0.5 ) {
-            Train->play_sound( Train->dsbSwitch );
-        }
-#endif
         // visual feedback
         Train->ggNextCurrentButton.UpdateValue( 0.0, Train->dsbSwitch );
     }
@@ -729,14 +655,7 @@ void TTrain::OnCommand_secondcontrollerdecrease( TTrain *Train, command_data con
             if( Train->mvControlled->AnPos > 1 )
                 Train->mvControlled->AnPos = 1;
         }
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-        else if( Train->mvControlled->DecScndCtrl( 1 ) ) {
-            // sound feedback
-            Train->play_sound( Train->dsbNastawnikBocz, Train->dsbNastawnikJazdy, DSBVOLUME_MAX, 0 );
-        }
-#else
         Train->mvControlled->DecScndCtrl( 1 );
-#endif
     }
 }
 
@@ -744,14 +663,7 @@ void TTrain::OnCommand_secondcontrollerdecreasefast( TTrain *Train, command_data
 
     if( Command.action != GLFW_RELEASE ) {
         // on press or hold
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-        if( Train->mvControlled->DecScndCtrl( 2 ) ) {
-            // sound feedback
-            Train->play_sound( Train->dsbNastawnikBocz, Train->dsbNastawnikJazdy, DSBVOLUME_MAX, 0 );
-        }
-#else
         Train->mvControlled->DecScndCtrl( 2 );
-#endif
     }
 }
 
@@ -813,12 +725,6 @@ void TTrain::OnCommand_independentbrakebailoff( TTrain *Train, command_data cons
         if( Command.action != GLFW_RELEASE ) {
             // press or hold
             Train->mvOccupied->BrakeReleaser( 1 );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // audio feedback
-            if( Train->ggReleaserButton.GetValue() < 0.05 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
             // visual feedback
             Train->ggReleaserButton.UpdateValue( 1.0, Train->dsbSwitch );
         }
@@ -1020,12 +926,6 @@ void TTrain::OnCommand_wheelspinbrakeactivate( TTrain *Train, command_data const
     if( Command.action != GLFW_RELEASE ) {
         // press or hold
         Train->mvControlled->AntiSlippingBrake();
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-        // audio feedback
-        if( Train->ggAntiSlipButton.GetValue() < 0.05 ) {
-            Train->play_sound( Train->dsbSwitch );
-        }
-#endif
         // visual feedback
         Train->ggAntiSlipButton.UpdateValue( 1.0, Train->dsbSwitch );
     }
@@ -1055,10 +955,6 @@ void TTrain::OnCommand_sandboxactivate( TTrain *Train, command_data const &Comma
     if( Command.action == GLFW_PRESS ) {
         // press
         Train->mvControlled->Sandbox( true );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-        // audio feedback
-        Train->play_sound( Train->dsbSwitch );
-#endif
         // visual feedback
         Train->ggSandButton.UpdateValue( 1.0, Train->dsbSwitch );
     }
@@ -1115,13 +1011,6 @@ void TTrain::OnCommand_brakeactingspeedincrease( TTrain *Train, command_data con
                 Train->mvOccupied->BrakeDelayFlag << 1 :
                 Train->mvOccupied->BrakeDelayFlag | bdelay_M );
         if( true == Train->mvOccupied->BrakeDelaySwitch( fasterbrakesetting ) ) {
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // audio feedback
-            Train->play_sound( Train->dsbSwitch );
-/*
-            Train->play_sound( Train->dsbPneumaticRelay );
-*/
-#endif
             // visual feedback
             if( Train->ggBrakeProfileCtrl.SubModel != nullptr ) {
                 Train->ggBrakeProfileCtrl.UpdateValue(
@@ -1160,13 +1049,6 @@ void TTrain::OnCommand_brakeactingspeeddecrease( TTrain *Train, command_data con
                 Train->mvOccupied->BrakeDelayFlag >> 1 :
                 Train->mvOccupied->BrakeDelayFlag ^ bdelay_M );
         if( true == Train->mvOccupied->BrakeDelaySwitch( slowerbrakesetting ) ) {
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // audio feedback
-            Train->play_sound( Train->dsbSwitch );
-/*
-            Train->play_sound( Train->dsbPneumaticRelay );
-*/
-#endif
             // visual feedback
             if( Train->ggBrakeProfileCtrl.SubModel != nullptr ) {
                 Train->ggBrakeProfileCtrl.UpdateValue(
@@ -1211,24 +1093,12 @@ void TTrain::OnCommand_mubrakingindicatortoggle( TTrain *Train, command_data con
         if( false == Train->mvControlled->Signalling) {
             // turn on
             Train->mvControlled->Signalling = true;
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // audio feedback
-            if( Train->ggSignallingButton.GetValue() < 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
             // visual feedback
             Train->ggSignallingButton.UpdateValue( 1.0, Train->dsbSwitch );
         }
         else {
             //turn off
             Train->mvControlled->Signalling = false;
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // audio feedback
-            if( Train->ggSignallingButton.GetValue() > 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
             // visual feedback
             Train->ggSignallingButton.UpdateValue( 0.0, Train->dsbSwitch );
         }
@@ -1240,10 +1110,6 @@ void TTrain::OnCommand_reverserincrease( TTrain *Train, command_data const &Comm
     if( Command.action == GLFW_PRESS ) {
 
         if( Train->mvOccupied->DirectionForward() ) {
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // sound feedback
-            Train->play_sound( Train->dsbReverserKey, Train->dsbSwitch, DSBVOLUME_MAX, 0 );
-#endif
             // aktualizacja skrajnych pojazdów w składzie
             if( ( Train->mvOccupied->ActiveDir )
              && ( Train->DynamicObject->Mechanik ) ) {
@@ -1259,10 +1125,6 @@ void TTrain::OnCommand_reverserdecrease( TTrain *Train, command_data const &Comm
     if( Command.action == GLFW_PRESS ) {
 
         if( Train->mvOccupied->DirectionBackward() ) {
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // sound feedback
-            Train->play_sound( Train->dsbReverserKey, Train->dsbSwitch, DSBVOLUME_MAX, 0 );
-#endif
             // aktualizacja skrajnych pojazdów w składzie
             if( ( Train->mvOccupied->ActiveDir )
              && ( Train->DynamicObject->Mechanik ) ) {
@@ -1289,12 +1151,6 @@ void TTrain::OnCommand_alerteracknowledge( TTrain *Train, command_data const &Co
         }
         // visual feedback
         Train->ggSecurityResetButton.UpdateValue( 1.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-        // sound feedback
-        if( Train->ggSecurityResetButton.GetValue() < 0.05 ) {
-            Train->play_sound( Train->dsbSwitch );
-        }
-#endif
     }
     else {
         // release
@@ -1322,10 +1178,6 @@ void TTrain::OnCommand_batterytoggle( TTrain *Train, command_data const &Command
                 if( Train->ggBatteryButton.SubModel ) {
                     Train->ggBatteryButton.UpdateValue( 1.0, Train->dsbSwitch );
                 }
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-                // audio feedback
-                Train->play_sound( Train->dsbSwitch );
-#endif
                 // side-effects
                 if( Train->mvOccupied->LightsPosNo > 0 ) {
                     Train->SetLights();
@@ -1344,10 +1196,6 @@ void TTrain::OnCommand_batterytoggle( TTrain *Train, command_data const &Command
                 if( Train->ggBatteryButton.SubModel ) {
                     Train->ggBatteryButton.UpdateValue( 0.0, Train->dsbSwitch );
                 }
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-                // audio feedback
-                Train->play_sound( Train->dsbSwitch );
-#endif
                 // side-effects
                 if( false == Train->mvControlled->ConverterFlag ) {
                     // if there's no (low voltage) power source left, drop pantographs
@@ -1533,18 +1381,10 @@ void TTrain::OnCommand_pantographcompressorvalvetoggle( TTrain *Train, command_d
         if( Train->mvControlled->bPantKurek3 == false ) {
             // connect pantographs with primary tank
             Train->mvControlled->bPantKurek3 = true;
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // audio feedback
-            Train->play_sound( Train->dsbSwitch );
-#endif
         }
         else {
             // connect pantograps with pantograph compressor
             Train->mvControlled->bPantKurek3 = false;
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // audio feedback
-            Train->play_sound( Train->dsbSwitch );
-#endif
         }
     }
 }
@@ -1567,12 +1407,6 @@ void TTrain::OnCommand_pantographcompressoractivate( TTrain *Train, command_data
     if( Command.action != GLFW_RELEASE ) {
         // press or hold to activate
         Train->mvControlled->PantCompFlag = true;
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-        // audio feedback
-        if( Command.action == GLFW_PRESS ) {
-            Train->play_sound( Train->dsbSwitch );
-        }
-#endif
     }
     else {
         // release to disable
@@ -1599,13 +1433,6 @@ void TTrain::OnCommand_pantographlowerall( TTrain *Train, command_data const &Co
         // ...and rear
         Train->mvControlled->PantRearSP = false;
         Train->mvControlled->PantRear( false );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-        // sound feedback
-        // TODO: separate sound effect for pneumatic buttons
-        if( Train->ggPantAllDownButton.GetValue() < 0.35 ) {
-            Train->play_sound( Train->dsbSwitch );
-        }
-#endif
         // visual feedback
         if( Train->ggPantAllDownButton.SubModel )
             Train->ggPantAllDownButton.UpdateValue( 1.0, Train->dsbSwitch );
@@ -1615,16 +1442,6 @@ void TTrain::OnCommand_pantographlowerall( TTrain *Train, command_data const &Co
     }
     else if( Command.action == GLFW_RELEASE ) {
         // release the button
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-        // sound feedback
-/*
-        // NOTE: release sound disabled as this is typically pneumatic button
-        // TODO: separate sound effect for pneumatic buttons
-        if( Train->ggPantAllDownButton.GetValue() > 0.65 ) {
-            Train->play_sound( Train->dsbSwitch );
-        }
-*/
-#endif
         // visual feedback
         if( Train->ggPantAllDownButton.SubModel )
             Train->ggPantAllDownButton.UpdateValue( 0.0 );
@@ -1663,23 +1480,11 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com
             }
             if( Train->ggMainOnButton.SubModel != nullptr ) {
                 // two separate switches to close and break the circuit
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-                // audio feedback
-                if( Command.action == GLFW_PRESS ) {
-                    Train->play_sound( Train->dsbSwitch );
-                }
-#endif
                 // visual feedback
                 Train->ggMainOnButton.UpdateValue( 1.0, Train->dsbSwitch );
             }
             else if( Train->ggMainButton.SubModel != nullptr ) {
                 // single two-state switch
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-                // audio feedback
-                if( Command.action == GLFW_PRESS ) {
-                    Train->play_sound( Train->dsbSwitch );
-                }
-#endif
                 // visual feedback
                 Train->ggMainButton.UpdateValue( 1.0, Train->dsbSwitch );
             }
@@ -1722,12 +1527,6 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com
 
                 if( Train->ggMainOffButton.SubModel != nullptr ) {
                     // two separate switches to close and break the circuit
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-                    // audio feedback
-                    if( Command.action == GLFW_PRESS ) {
-                        Train->play_sound( Train->dsbSwitch );
-                    }
-#endif
                     // visual feedback
                     Train->ggMainOffButton.UpdateValue( 1.0, Train->dsbSwitch );
                 }
@@ -1748,12 +1547,6 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com
                     else
 */
                     {
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-                        // audio feedback
-                        if( Command.action == GLFW_PRESS ) {
-                            Train->play_sound( Train->dsbSwitch );
-                        }
-#endif
                         // visual feedback
                         Train->ggMainButton.UpdateValue( 0.0, Train->dsbSwitch );
                     }
@@ -1779,24 +1572,12 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com
             // for setup with two separate swiches
             if( Train->ggMainOnButton.SubModel != nullptr ) {
                 Train->ggMainOnButton.UpdateValue( 0.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-                // audio feedback
-                if( Train->ggMainOnButton.GetValue() > 0.5 ) {
-                    Train->play_sound( Train->dsbSwitch );
-                }
-#endif
             }
             if( Train->ggMainOffButton.SubModel != nullptr ) {
                 Train->ggMainOffButton.UpdateValue( 0.0, Train->dsbSwitch );
             }
             // and the two-state switch too, for good measure
             if( Train->ggMainButton.SubModel != nullptr ) {
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-                // audio feedback
-                if( Train->ggMainButton.GetValue() > 0.5 ) {
-                    Train->play_sound( Train->dsbSwitch );
-                }
-#endif
                 // visual feedback
                 Train->ggMainButton.UpdateValue( 0.0, Train->dsbSwitch );
             }
@@ -1813,12 +1594,6 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com
                     Train->mvControlled->CompressorSwitch( Train->ggCompressorButton.GetValue() > 0.5 );
                 }
             }
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // audio feedback
-            if( Train->ggMainOnButton.GetValue() > 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
             // visual feedback
             if( Train->ggMainOnButton.SubModel != nullptr ) {
                 // setup with two separate switches
@@ -1829,12 +1604,6 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com
             // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz
             if( Train->mvControlled->TrainType == dt_EZT ) {
                 if( Train->ggMainButton.SubModel != nullptr ) {
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-                    // audio feedback
-                    if( Train->ggMainButton.GetValue() > 0.5 ) {
-                        Train->play_sound( Train->dsbSwitch );
-                    }
-#endif
                     // visual feedback
                     Train->ggMainButton.UpdateValue( 0.0, Train->dsbSwitch );
                 }
@@ -1859,12 +1628,6 @@ void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Comma
         if( ( false == Train->mvControlled->ConverterAllow )
          && ( Train->ggConverterButton.GetValue() < 0.5 ) ) {
             // turn on
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // sound feedback
-            if( Train->ggConverterButton.GetValue() < 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
             // visual feedback
             Train->ggConverterButton.UpdateValue( 1.0, Train->dsbSwitch );
 /*
@@ -1892,19 +1655,6 @@ void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Comma
         }
         else {
             //turn off
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // sound feedback
-            if( Train->mvOccupied->ConvSwitchType == "impulse" ) {
-                if( Train->ggConverterOffButton.GetValue() < 0.5 ) {
-                    Train->play_sound( Train->dsbSwitch );
-                }
-            }
-            else {
-                if( Train->ggConverterButton.GetValue() > 0.5 ) {
-                    Train->play_sound( Train->dsbSwitch );
-                }
-            }
-#endif
             // visual feedback
             Train->ggConverterButton.UpdateValue( 0.0, Train->dsbSwitch );
             if( Train->ggConverterOffButton.SubModel != nullptr ) {
@@ -1933,13 +1683,6 @@ void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Comma
         // on button release...
         if( Train->mvOccupied->ConvSwitchType == "impulse" ) {
             // ...return switches to start position if applicable
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            if( ( Train->ggConverterButton.GetValue() > 0.0 )
-             || ( Train->ggConverterOffButton.GetValue() > 0.0 ) ) {
-                // sound feedback
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
             Train->ggConverterButton.UpdateValue( 0.0, Train->dsbSwitch );
             Train->ggConverterOffButton.UpdateValue( 0.0, Train->dsbSwitch );
         }
@@ -1961,12 +1704,6 @@ void TTrain::OnCommand_convertertogglelocal( TTrain *Train, command_data const &
         if( ( false == Train->mvOccupied->ConverterAllowLocal )
          && ( Train->ggConverterLocalButton.GetValue() < 0.5 ) ) {
             // turn on
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // sound feedback
-            if( Train->ggConverterLocalButton.GetValue() < 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
             // visual feedback
             Train->ggConverterLocalButton.UpdateValue( 1.0, Train->dsbSwitch );
             // effect
@@ -1984,12 +1721,6 @@ void TTrain::OnCommand_convertertogglelocal( TTrain *Train, command_data const &
         }
         else {
             //turn off
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // sound feedback
-            if( Train->ggConverterLocalButton.GetValue() > 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
             // visual feedback
             Train->ggConverterLocalButton.UpdateValue( 0.0, Train->dsbSwitch );
             // effect
@@ -2029,23 +1760,11 @@ void TTrain::OnCommand_converteroverloadrelayreset( TTrain *Train, command_data
          && ( Train->mvControlled->TrainType != dt_EZT ) ) {
             Train->mvControlled->ConvOvldFlag = false;
         }
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-        // sound feedback
-        if( Train->ggConverterFuseButton.GetValue() < 0.5 ) {
-            Train->play_sound( Train->dsbSwitch );
-        }
-#endif
         // visual feedback
         Train->ggConverterFuseButton.UpdateValue( 1.0, Train->dsbSwitch );
     }
     else if( Command.action == GLFW_RELEASE ) {
         // release
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-        // sound feedback
-        if( Train->ggConverterFuseButton.GetValue() > 0.5 ) {
-            Train->play_sound( Train->dsbSwitch );
-        }
-#endif
         // visual feedback
         Train->ggConverterFuseButton.UpdateValue( 0.0, Train->dsbSwitch );
     }
@@ -2063,12 +1782,6 @@ void TTrain::OnCommand_compressortoggle( TTrain *Train, command_data const &Comm
             // turn on
             // visual feedback
             Train->ggCompressorButton.UpdateValue( 1.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // sound feedback
-            if( Train->ggCompressorButton.GetValue() < 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
             // impulse type switch has no effect if there's no power
             // NOTE: this is most likely setup wrong, but the whole thing is smoke and mirrors anyway
             // (we're presuming impulse type switch for all EMUs for the time being)
@@ -2081,10 +1794,6 @@ void TTrain::OnCommand_compressortoggle( TTrain *Train, command_data const &Comm
         else {
             //turn off
             if( true == Train->mvControlled->CompressorSwitch( false ) ) {
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-                // sound feedback
-                Train->play_sound( Train->dsbSwitch );
-#endif
                 // NOTE: we don't have switch type definition for the compresor switch
                 // so for the time being we have hard coded "impulse" switches for all EMUs
                 // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz
@@ -2131,25 +1840,13 @@ void TTrain::OnCommand_compressortogglelocal( TTrain *Train, command_data const
         // only reacting to press, so the switch doesn't flip back and forth if key is held down
         if( false == Train->mvOccupied->CompressorAllowLocal ) {
             // turn on
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // sound feedback
-            if( Train->ggCompressorLocalButton.GetValue() < 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
             // visual feedback
             Train->ggCompressorLocalButton.UpdateValue( 1.0, Train->dsbSwitch );
             // effect
             Train->mvOccupied->CompressorAllowLocal = true;
         }
         else {
-            //turn off
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // sound feedback
-            if( Train->ggCompressorLocalButton.GetValue() > 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
+            // turn off
             // visual feedback
             Train->ggCompressorLocalButton.UpdateValue( 0.0, Train->dsbSwitch );
             // effect
@@ -2189,12 +1886,6 @@ void TTrain::OnCommand_motorconnectorsopen( TTrain *Train, command_data const &C
                     Train->mvControlled->Couplers[ 1 ].Connected->StLinSwitchOff = true;
                 }
             }
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // sound feedback
-            if( Train->ggStLinOffButton.GetValue() < 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
             // visual feedback
             Train->ggStLinOffButton.UpdateValue( 1.0, Train->dsbSwitch );
             // effect
@@ -2238,12 +1929,6 @@ void TTrain::OnCommand_motorconnectorsopen( TTrain *Train, command_data const &C
                         Train->mvControlled->Couplers[ 1 ].Connected->StLinSwitchOff = false;
                     }
                 }
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-                // sound feedback
-                if( Train->ggStLinOffButton.GetValue() > 0.5 ) {
-                    Train->play_sound( Train->dsbSwitch );
-                }
-#endif
                 // visual feedback
                 Train->ggStLinOffButton.UpdateValue( 0.0, Train->dsbSwitch );
             }
@@ -2269,12 +1954,6 @@ void TTrain::OnCommand_motorconnectorsopen( TTrain *Train, command_data const &C
                     Train->mvControlled->Couplers[ 1 ].Connected->StLinSwitchOff = false;
                 }
             }
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // sound feedback
-            if( Train->ggStLinOffButton.GetValue() > 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
             // visual feedback
             Train->ggStLinOffButton.UpdateValue( 0.0, Train->dsbSwitch );
         }
@@ -2291,14 +1970,7 @@ void TTrain::OnCommand_motordisconnect( TTrain *Train, command_data const &Comma
     }
 
     if( Command.action == GLFW_PRESS ) {
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-        if( true == Train->mvControlled->CutOffEngine() ) {
-            // sound feedback
-            Train->play_sound( Train->dsbSwitch );
-        }
-#else
         Train->mvControlled->CutOffEngine();
-#endif
     }
 }
 
@@ -2311,12 +1983,6 @@ void TTrain::OnCommand_motoroverloadrelaythresholdtoggle( TTrain *Train, command
             if( true == Train->mvControlled->CurrentSwitch( true ) ) {
                 // visual feedback
                 Train->ggMaxCurrentCtrl.UpdateValue( 1.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-                // sound feedback
-                if( Train->ggMaxCurrentCtrl.GetValue() < 0.5 ) {
-                    Train->play_sound( Train->dsbSwitch );
-                }
-#endif
             }
         }
         else {
@@ -2324,12 +1990,6 @@ void TTrain::OnCommand_motoroverloadrelaythresholdtoggle( TTrain *Train, command
             if( true == Train->mvControlled->CurrentSwitch( false ) ) {
                 // visual feedback
                 Train->ggMaxCurrentCtrl.UpdateValue( 0.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-                // sound feedback
-                if( Train->ggMaxCurrentCtrl.GetValue() > 0.5 ) {
-                    Train->play_sound( Train->dsbSwitch );
-                }
-#endif
             }
         }
     }
@@ -2347,23 +2007,11 @@ void TTrain::OnCommand_motoroverloadrelayreset( TTrain *Train, command_data cons
     if( Command.action == GLFW_PRESS ) {
         // press
         Train->mvControlled->FuseOn();
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-        // sound feedback
-        if( Train->ggFuseButton.GetValue() < 0.05 ) {
-            Train->play_sound( Train->dsbSwitch );
-        }
-#endif
         // visual feedback
         Train->ggFuseButton.UpdateValue( 1.0, Train->dsbSwitch );
     }
     else if( Command.action == GLFW_RELEASE ) {
         // release
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-        // sound feedback
-        if( Train->ggFuseButton.GetValue() > 0.5 ) {
-            Train->play_sound( Train->dsbSwitch );
-        }
-#endif
         // visual feedback
         Train->ggFuseButton.UpdateValue( 0.0, Train->dsbSwitch );
     }
@@ -2388,24 +2036,12 @@ void TTrain::OnCommand_headlighttoggleleft( TTrain *Train, command_data const &C
             Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_left;
             // visual feedback
             Train->ggLeftLightButton.UpdateValue( 1.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // sound feedback
-            if( Train->ggLeftLightButton.GetValue() < 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
         }
         else {
             //turn off
             Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_left;
             // visual feedback
             Train->ggLeftLightButton.UpdateValue( 0.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // sound feedback
-            if( Train->ggLeftLightButton.GetValue() > 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
         }
     }
 }
@@ -2429,24 +2065,12 @@ void TTrain::OnCommand_headlighttoggleright( TTrain *Train, command_data const &
             Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_right;
             // visual feedback
             Train->ggRightLightButton.UpdateValue( 1.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // sound feedback
-            if( Train->ggRightLightButton.GetValue() < 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
         }
         else {
             //turn off
             Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_right;
             // visual feedback
             Train->ggRightLightButton.UpdateValue( 0.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // sound feedback
-            if( Train->ggRightLightButton.GetValue() > 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
         }
     }
 }
@@ -2470,24 +2094,12 @@ void TTrain::OnCommand_headlighttoggleupper( TTrain *Train, command_data const &
             Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_upper;
             // visual feedback
             Train->ggUpperLightButton.UpdateValue( 1.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // sound feedback
-            if( Train->ggUpperLightButton.GetValue() < 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
         }
         else {
             //turn off
             Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_upper;
             // visual feedback
             Train->ggUpperLightButton.UpdateValue( 0.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // sound feedback
-            if( Train->ggUpperLightButton.GetValue() > 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
         }
     }
 }
@@ -2511,24 +2123,12 @@ void TTrain::OnCommand_redmarkertoggleleft( TTrain *Train, command_data const &C
             Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_left;
             // visual feedback
             Train->ggLeftEndLightButton.UpdateValue( 1.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // sound feedback
-            if( Train->ggLeftEndLightButton.GetValue() < 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
         }
         else {
             //turn off
             Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_left;
             // visual feedback
             Train->ggLeftEndLightButton.UpdateValue( 0.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // sound feedback
-            if( Train->ggLeftEndLightButton.GetValue() > 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
         }
     }
 }
@@ -2552,24 +2152,12 @@ void TTrain::OnCommand_redmarkertoggleright( TTrain *Train, command_data const &
             Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_right;
             // visual feedback
             Train->ggRightEndLightButton.UpdateValue( 1.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // sound feedback
-            if( Train->ggRightEndLightButton.GetValue() < 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
         }
         else {
             //turn off
             Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_right;
             // visual feedback
             Train->ggRightEndLightButton.UpdateValue( 0.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // sound feedback
-            if( Train->ggRightEndLightButton.GetValue() > 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
         }
     }
 }
@@ -2594,24 +2182,12 @@ void TTrain::OnCommand_headlighttogglerearleft( TTrain *Train, command_data cons
             Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_right;
             // visual feedback
             Train->ggRearLeftLightButton.UpdateValue( 1.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // sound feedback
-            if( Train->ggRearLeftLightButton.GetValue() < 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
         }
         else {
             //turn off
             Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_right;
             // visual feedback
             Train->ggRearLeftLightButton.UpdateValue( 0.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // sound feedback
-            if( Train->ggRearLeftLightButton.GetValue() > 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
         }
     }
 }
@@ -2636,24 +2212,12 @@ void TTrain::OnCommand_headlighttogglerearright( TTrain *Train, command_data con
             Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_left;
             // visual feedback
             Train->ggRearRightLightButton.UpdateValue( 1.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // sound feedback
-            if( Train->ggRearRightLightButton.GetValue() < 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
         }
         else {
             //turn off
             Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_left;
             // visual feedback
             Train->ggRearRightLightButton.UpdateValue( 0.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // sound feedback
-            if( Train->ggRearRightLightButton.GetValue() > 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
         }
     }
 }
@@ -2677,24 +2241,12 @@ void TTrain::OnCommand_headlighttogglerearupper( TTrain *Train, command_data con
             Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_upper;
             // visual feedback
             Train->ggRearUpperLightButton.UpdateValue( 1.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // sound feedback
-            if( Train->ggRearUpperLightButton.GetValue() < 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
         }
         else {
             //turn off
             Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_upper;
             // visual feedback
             Train->ggRearUpperLightButton.UpdateValue( 0.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // sound feedback
-            if( Train->ggRearUpperLightButton.GetValue() > 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
         }
     }
 }
@@ -2719,24 +2271,12 @@ void TTrain::OnCommand_redmarkertogglerearleft( TTrain *Train, command_data cons
             Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_right;
             // visual feedback
             Train->ggRearLeftEndLightButton.UpdateValue( 1.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // sound feedback
-            if( Train->ggRearLeftEndLightButton.GetValue() < 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
         }
         else {
             //turn off
             Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_right;
             // visual feedback
             Train->ggRearLeftEndLightButton.UpdateValue( 0.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // sound feedback
-            if( Train->ggRearLeftEndLightButton.GetValue() > 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
         }
     }
 }
@@ -2761,24 +2301,12 @@ void TTrain::OnCommand_redmarkertogglerearright( TTrain *Train, command_data con
             Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_left;
             // visual feedback
             Train->ggRearRightEndLightButton.UpdateValue( 1.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // sound feedback
-            if( Train->ggRearRightEndLightButton.GetValue() < 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
         }
         else {
             //turn off
             Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_left;
             // visual feedback
             Train->ggRearRightEndLightButton.UpdateValue( 0.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // sound feedback
-            if( Train->ggRearRightEndLightButton.GetValue() > 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
         }
     }
 }
@@ -2799,24 +2327,12 @@ void TTrain::OnCommand_headlightsdimtoggle( TTrain *Train, command_data const &C
         if( false == Train->DynamicObject->DimHeadlights ) {
             // turn on
             Train->DynamicObject->DimHeadlights = true;
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // audio feedback
-            if( Train->ggDimHeadlightsButton.GetValue() < 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
             // visual feedback
             Train->ggDimHeadlightsButton.UpdateValue( 1.0, Train->dsbSwitch );
         }
         else {
             //turn off
             Train->DynamicObject->DimHeadlights = false;
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // audio feedback
-            if( Train->ggDimHeadlightsButton.GetValue() > 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
             // visual feedback
             Train->ggDimHeadlightsButton.UpdateValue( 0.0, Train->dsbSwitch );
         }
@@ -2840,12 +2356,6 @@ void TTrain::OnCommand_interiorlighttoggle( TTrain *Train, command_data const &C
             // turn on
             Train->bCabLight = true;
             Train->btCabLight.TurnOn();
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // audio feedback
-            if( Train->ggCabLightButton.GetValue() < 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
             // visual feedback
             Train->ggCabLightButton.UpdateValue( 1.0, Train->dsbSwitch );
         }
@@ -2853,12 +2363,6 @@ void TTrain::OnCommand_interiorlighttoggle( TTrain *Train, command_data const &C
             //turn off
             Train->bCabLight = false;
             Train->btCabLight.TurnOff();
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // audio feedback
-            if( Train->ggCabLightButton.GetValue() > 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
             // visual feedback
             Train->ggCabLightButton.UpdateValue( 0.0, Train->dsbSwitch );
         }
@@ -2880,24 +2384,12 @@ void TTrain::OnCommand_interiorlightdimtoggle( TTrain *Train, command_data const
         if( false == Train->bCabLightDim ) {
             // turn on
             Train->bCabLightDim = true;
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // audio feedback
-            if( Train->ggCabLightDimButton.GetValue() < 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
             // visual feedback
             Train->ggCabLightDimButton.UpdateValue( 1.0, Train->dsbSwitch );
         }
         else {
             //turn off
             Train->bCabLightDim = false;
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // audio feedback
-            if( Train->ggCabLightDimButton.GetValue() > 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
             // visual feedback
             Train->ggCabLightDimButton.UpdateValue( 0.0, Train->dsbSwitch );
         }
@@ -2921,24 +2413,12 @@ void TTrain::OnCommand_instrumentlighttoggle( TTrain *Train, command_data const
         if( false == Train->InstrumentLightActive ) {
             // turn on
             Train->InstrumentLightActive = true;
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // audio feedback
-            if( Train->ggInstrumentLightButton.GetValue() < 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
             // visual feedback
             Train->ggInstrumentLightButton.UpdateValue( 1.0, Train->dsbSwitch );
         }
         else {
             //turn off
             Train->InstrumentLightActive = false;
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // audio feedback
-            if( Train->ggInstrumentLightButton.GetValue() > 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
             // visual feedback
             Train->ggInstrumentLightButton.UpdateValue( 0.0, Train->dsbSwitch );
         }
@@ -2959,24 +2439,12 @@ void TTrain::OnCommand_heatingtoggle( TTrain *Train, command_data const &Command
         if( false == Train->mvControlled->Heating ) {
             // turn on
             Train->mvControlled->Heating = true;
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // audio feedback
-            if( Train->ggTrainHeatingButton.GetValue() < 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
             // visual feedback
             Train->ggTrainHeatingButton.UpdateValue( 1.0, Train->dsbSwitch );
         }
         else {
             //turn off
             Train->mvControlled->Heating = false;
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // audio feedback
-            if( Train->ggTrainHeatingButton.GetValue() > 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
             // visual feedback
             Train->ggTrainHeatingButton.UpdateValue( 0.0, Train->dsbSwitch );
         }
@@ -2999,23 +2467,11 @@ void TTrain::OnCommand_generictoggle( TTrain *Train, command_data const &Command
         // only reacting to press, so the switch doesn't flip back and forth if key is held down
         if( item.GetValue() < 0.25 ) {
             // turn on
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // audio feedback
-            if( item.GetValue() < 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
             // visual feedback
             item.UpdateValue( 1.0, Train->dsbSwitch );
         }
         else {
-            //turn off
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // audio feedback
-            if( item.GetValue() > 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
+            // turn off
             // visual feedback
             item.UpdateValue( 0.0, Train->dsbSwitch );
         }
@@ -3038,12 +2494,6 @@ void TTrain::OnCommand_doorlocktoggle( TTrain *Train, command_data const &Comman
             // TODO: check wheter we really need separate flags for this
             Train->mvControlled->DoorSignalling = true;
             Train->mvOccupied->DoorBlocked = true;
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // audio feedback
-            if( Train->ggDoorSignallingButton.GetValue() < 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
             // visual feedback
             Train->ggDoorSignallingButton.UpdateValue( 1.0, Train->dsbSwitch );
         }
@@ -3052,12 +2502,6 @@ void TTrain::OnCommand_doorlocktoggle( TTrain *Train, command_data const &Comman
             // TODO: check wheter we really need separate flags for this
             Train->mvControlled->DoorSignalling = false;
             Train->mvOccupied->DoorBlocked = false;
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // audio feedback
-            if( Train->ggDoorSignallingButton.GetValue() > 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
             // visual feedback
             Train->ggDoorSignallingButton.UpdateValue( 0.0, Train->dsbSwitch );
         }
@@ -3079,12 +2523,6 @@ void TTrain::OnCommand_doortoggleleft( TTrain *Train, command_data const &Comman
             if( Train->mvOccupied->ActiveCab == 1 ) {
                 if( Train->mvOccupied->DoorLeft( true ) ) {
                     Train->ggDoorLeftButton.UpdateValue( 1.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-                    // sound feedback
-                    if( Train->ggDoorLeftButton.GetValue() < 0.5 ) {
-                        Train->play_sound( Train->dsbSwitch );
-                    }
-#endif
                     Train->play_sound( Train->dsbDoorOpen );
                 }
             }
@@ -3092,12 +2530,6 @@ void TTrain::OnCommand_doortoggleleft( TTrain *Train, command_data const &Comman
                 // in the rear cab sides are reversed
                 if( Train->mvOccupied->DoorRight( true ) ) {
                     Train->ggDoorRightButton.UpdateValue( 1.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-                    // sound feedback
-                    if( Train->ggDoorRightButton.GetValue() < 0.5 ) {
-                        Train->play_sound( Train->dsbSwitch );
-                    }
-#endif
                     Train->play_sound( Train->dsbDoorOpen );
                 }
             }
@@ -3107,12 +2539,6 @@ void TTrain::OnCommand_doortoggleleft( TTrain *Train, command_data const &Comman
             if( Train->mvOccupied->ActiveCab == 1 ) {
                 if( Train->mvOccupied->DoorLeft( false ) ) {
                     Train->ggDoorLeftButton.UpdateValue( 0.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-                    // sound feedback
-                    if( Train->ggDoorLeftButton.GetValue() > 0.5 ) {
-                        Train->play_sound( Train->dsbSwitch );
-                    }
-#endif
                     Train->play_sound( Train->dsbDoorClose );
                 }
             }
@@ -3120,12 +2546,6 @@ void TTrain::OnCommand_doortoggleleft( TTrain *Train, command_data const &Comman
                 // in the rear cab sides are reversed
                 if( Train->mvOccupied->DoorRight( false ) ) {
                     Train->ggDoorRightButton.UpdateValue( 0.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-                    // sound feedback
-                    if( Train->ggDoorRightButton.GetValue() > 0.5 ) {
-                        Train->play_sound( Train->dsbSwitch );
-                    }
-#endif
                     Train->play_sound( Train->dsbDoorClose );
                 }
             }
@@ -3148,12 +2568,6 @@ void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Comma
             if( Train->mvOccupied->ActiveCab == 1 ) {
                 if( Train->mvOccupied->DoorRight( true ) ) {
                     Train->ggDoorRightButton.UpdateValue( 1.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-                    // sound feedback
-                    if( Train->ggDoorRightButton.GetValue() < 0.5 ) {
-                        Train->play_sound( Train->dsbSwitch );
-                    }
-#endif
                     Train->play_sound( Train->dsbDoorOpen );
                 }
             }
@@ -3161,12 +2575,6 @@ void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Comma
                 // in the rear cab sides are reversed
                 if( Train->mvOccupied->DoorLeft( true ) ) {
                     Train->ggDoorLeftButton.UpdateValue( 1.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-                    // sound feedback
-                    if( Train->ggDoorLeftButton.GetValue() < 0.5 ) {
-                        Train->play_sound( Train->dsbSwitch );
-                    }
-#endif
                     Train->play_sound( Train->dsbDoorOpen );
                 }
             }
@@ -3176,12 +2584,6 @@ void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Comma
             if( Train->mvOccupied->ActiveCab == 1 ) {
                 if( Train->mvOccupied->DoorRight( false ) ) {
                     Train->ggDoorRightButton.UpdateValue( 0.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-                    // sound feedback
-                    if( Train->ggDoorRightButton.GetValue() > 0.5 ) {
-                        Train->play_sound( Train->dsbSwitch );
-                    }
-#endif
                     Train->play_sound( Train->dsbDoorClose );
                 }
             }
@@ -3189,12 +2591,6 @@ void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Comma
                 // in the rear cab sides are reversed
                 if( Train->mvOccupied->DoorLeft( false ) ) {
                     Train->ggDoorLeftButton.UpdateValue( 0.0, Train->dsbSwitch );
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-                    // sound feedback
-                    if( Train->ggDoorLeftButton.GetValue() > 0.5 ) {
-                        Train->play_sound( Train->dsbSwitch );
-                    }
-#endif
                     Train->play_sound( Train->dsbDoorClose );
                 }
             }
@@ -3216,12 +2612,6 @@ void TTrain::OnCommand_departureannounce( TTrain *Train, command_data const &Com
         if( false == Train->mvControlled->DepartureSignal ) {
             // turn on
             Train->mvControlled->DepartureSignal = true;
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // audio feedback
-            if( Train->ggDepartureSignalButton.GetValue() < 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
             // visual feedback
             Train->ggDepartureSignalButton.UpdateValue( 1.0, Train->dsbSwitch );
         }
@@ -3229,12 +2619,6 @@ void TTrain::OnCommand_departureannounce( TTrain *Train, command_data const &Com
     else if( Command.action == GLFW_RELEASE ) {
         // turn off
         Train->mvControlled->DepartureSignal = false;
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-        // audio feedback
-        if( Train->ggDepartureSignalButton.GetValue() > 0.5 ) {
-            Train->play_sound( Train->dsbSwitch );
-        }
-#endif
         // visual feedback
         Train->ggDepartureSignalButton.UpdateValue( 0.0, Train->dsbSwitch );
     }
@@ -3261,13 +2645,6 @@ void TTrain::OnCommand_hornlowactivate( TTrain *Train, command_data const &Comma
                 Train->mvControlled->WarningSignal &= ~2;
             }
 */
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // audio feedback
-            if( ( Train->ggHornButton.GetValue() > -0.5 )
-             || ( Train->ggHornLowButton.GetValue() < 0.5 ) ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
             // visual feedback
             Train->ggHornButton.UpdateValue( -1.0 );
             Train->ggHornLowButton.UpdateValue( 1.0 );
@@ -3280,13 +2657,6 @@ void TTrain::OnCommand_hornlowactivate( TTrain *Train, command_data const &Comma
         Train->mvOccupied->WarningSignal &= ~( 1 | 2 );
 */
         Train->mvOccupied->WarningSignal &= ~1;
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-        // audio feedback
-        if( ( Train->ggHornButton.GetValue() < -0.5 )
-         || ( Train->ggHornLowButton.GetValue() > 0.5 ) ) {
-            Train->play_sound( Train->dsbSwitch );
-        }
-#endif
         // visual feedback
         Train->ggHornButton.UpdateValue( 0.0 );
         Train->ggHornLowButton.UpdateValue( 0.0 );
@@ -3314,12 +2684,6 @@ void TTrain::OnCommand_hornhighactivate( TTrain *Train, command_data const &Comm
                 Train->mvControlled->WarningSignal &= ~1;
             }
 */
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // audio feedback
-            if( Train->ggHornButton.GetValue() < 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
             // visual feedback
             Train->ggHornButton.UpdateValue( 1.0 );
             Train->ggHornHighButton.UpdateValue( 1.0 );
@@ -3332,12 +2696,6 @@ void TTrain::OnCommand_hornhighactivate( TTrain *Train, command_data const &Comm
         Train->mvOccupied->WarningSignal &= ~( 1 | 2 );
 */
         Train->mvOccupied->WarningSignal &= ~2;
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-        // audio feedback
-        if( Train->ggHornButton.GetValue() > 0.5 ) {
-            Train->play_sound( Train->dsbSwitch );
-        }
-#endif
         // visual feedback
         Train->ggHornButton.UpdateValue( 0.0 );
         Train->ggHornHighButton.UpdateValue( 0.0 );
@@ -3361,24 +2719,12 @@ void TTrain::OnCommand_radiotoggle( TTrain *Train, command_data const &Command )
         if( false == Train->mvOccupied->Radio ) {
             // turn on
             Train->mvOccupied->Radio = true;
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // audio feedback
-            if( Train->ggRadioButton.GetValue() < 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
             // visual feedback
             Train->ggRadioButton.UpdateValue( 1.0, Train->dsbSwitch );
         }
         else {
             // turn off
             Train->mvOccupied->Radio = false;
-#ifdef EU07_USE_OLD_CONTROLSOUNDS
-            // audio feedback
-            if( Train->ggRadioButton.GetValue() > 0.5 ) {
-                Train->play_sound( Train->dsbSwitch );
-            }
-#endif
             // visual feedback
             Train->ggRadioButton.UpdateValue( 0.0, Train->dsbSwitch );
         }