aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmarshallnz <jcmarsha@gmail.com>2014-08-07 19:45:23 +1200
committerjmarshallnz <jcmarsha@gmail.com>2014-08-07 19:45:23 +1200
commit80c61b8c1d9479dfee4aec500e09fdfdc822a8f6 (patch)
tree255966da81ecb7bc416b0224f3c6255df58a2513
parentd1025a7043f8cc889bdaa38ec4ddb6c16413e66c (diff)
parent1734423223a12bcbae69a277c8ed1861000d4be9 (diff)
Merge pull request #5063 from ksooo/volume-maximum-cleanup
VOLUME_MINIMUM and VOLUME_MAXIMUM cleanup
-rw-r--r--xbmc/Application.cpp2
-rw-r--r--xbmc/ApplicationPlayer.cpp3
2 files changed, 1 insertions, 4 deletions
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index 14de7189cc..09be13df0f 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -438,7 +438,7 @@ CApplication::CApplication(void)
m_bTestMode = false;
m_muted = false;
- m_volumeLevel = 1.0f;
+ m_volumeLevel = VOLUME_MAXIMUM;
}
CApplication::~CApplication(void)
diff --git a/xbmc/ApplicationPlayer.cpp b/xbmc/ApplicationPlayer.cpp
index 1d1c0c6801..fcf3dc3653 100644
--- a/xbmc/ApplicationPlayer.cpp
+++ b/xbmc/ApplicationPlayer.cpp
@@ -23,9 +23,6 @@
#include "Application.h"
#include "settings/MediaSettings.h"
-#define VOLUME_MINIMUM 0.0f // -60dB
-#define VOLUME_MAXIMUM 1.0f // 0dB
-
CApplicationPlayer::CApplicationPlayer()
{
m_iPlayerOPSeq = 0;