Skip to content
This repository
Browse code

Merge pull request #3383 from arnova/no_volamp_with_passthrough

changed: Don't allow change of volume amplification with passthrough
  • Loading branch information...
commit 3a1813dd8d83d984c505545cd8ae5ba5484f9716 2 parents 31ec980 + eef3f52
arnova authored October 07, 2013

Showing 1 changed file with 10 additions and 0 deletions. Show diff stats Hide diff stats

  1. 10  xbmc/video/PlayerController.cpp
10  xbmc/video/PlayerController.cpp
@@ -361,6 +361,16 @@ bool CPlayerController::OnAction(const CAction &action)
361 361
     case ACTION_VOLAMP_UP:
362 362
     case ACTION_VOLAMP_DOWN:
363 363
     {
  364
+      // Don't allow change with passthrough audio
  365
+      if (g_application.m_pPlayer->IsPassthrough())
  366
+      {
  367
+        CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Warning,
  368
+                                              g_localizeStrings.Get(660),
  369
+                                              g_localizeStrings.Get(29802),
  370
+                                              TOAST_DISPLAY_TIME, false);
  371
+        return false;
  372
+      }
  373
+
364 374
       float sliderMax = VOLUME_DRC_MAXIMUM / 100.0f;
365 375
       float sliderMin = VOLUME_DRC_MINIMUM / 100.0f;
366 376
 

0 notes on commit 3a1813d

Please sign in to comment.
Something went wrong with that request. Please try again.