aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-06-08 01:46:10 -0700
committerMcCabe Maxsted2009-06-08 01:46:10 -0700
commit73340eb0edfbb0e39c9c78656d041f5b8b1fdc3a (patch)
treed28f383245b1ac87e26d65f5c3e0da4f57a1e00a
parentFixed VC++ error C2864: 'LLAudioEngine_OpenAL::WIND_BUFFER_SIZE_SEC' (diff)
downloadmeta-impy-73340eb0edfbb0e39c9c78656d041f5b8b1fdc3a.zip
meta-impy-73340eb0edfbb0e39c9c78656d041f5b8b1fdc3a.tar.gz
meta-impy-73340eb0edfbb0e39c9c78656d041f5b8b1fdc3a.tar.bz2
meta-impy-73340eb0edfbb0e39c9c78656d041f5b8b1fdc3a.tar.xz
Fixed VC++ warning C4305: '=' : truncation from 'double' to 'float' for mVolume
-rw-r--r--ChangeLog.txt6
-rw-r--r--linden/indra/llmedia/llmediaimplgstreamer.cpp2
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 404b9fd..75fe2af 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -3,7 +3,7 @@
3 * Updated Imprudence to be based on SL 1.22.11. 3 * Updated Imprudence to be based on SL 1.22.11.
4 4
5 5
6 McCabe Maxsted <hakushakukun@gmail.com> 6 McCabe Maxsted <hakushakukun@gmail.com>
7 7
8 * Fixed CopyWinLibs.CMake errors. 8 * Fixed CopyWinLibs.CMake errors.
9 9
@@ -15,6 +15,10 @@
15 15
16 modified: linden/indra/llaudio/audioengine_openal.cpp 16 modified: linden/indra/llaudio/audioengine_openal.cpp
17 modified: linden/indra/llaudio/audioengine_openal.h 17 modified: linden/indra/llaudio/audioengine_openal.h
18
19 * Fixed VC++ warning C4305: '=' : truncation from 'double' to 'float' for mVolume.
20
21 modified: linden/indra/llmedia/llmediaimplgstreamer.cpp
18 22
19 23
20=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- 24=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index e83caf7..d1bab29 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -97,8 +97,6 @@ LLMediaImplGStreamer () :
97 LL_DEBUGS("MediaManager") << "constructing media..." << LL_ENDL; 97 LL_DEBUGS("MediaManager") << "constructing media..." << LL_ENDL;
98 mVolume = -1.0; // XXX Hack to make the vould change happend first time 98 mVolume = -1.0; // XXX Hack to make the vould change happend first time
99 99
100 mVolume = 0.1234567; // minor hack to force an initial volume update
101
102 setMediaDepth(4); 100 setMediaDepth(4);
103 101
104 // Create a pumpable main-loop for this media 102 // Create a pumpable main-loop for this media