Changeset 3:c4af1e9ab8d1

Timestamp:

08/01/08 22:07:29 (4 years ago)

Author:

thib

Branch:

default

convert_revision:

svn:d0a2da98-017c-47d2-8c43-22b54484806d/trunk@4

Message:

music volume can be changed (harcorded constant atm)

Files:

• music2/music.cc (modified) (4 diffs)

music2/music.cc

@@ -44 +44 @@
 using namespace std;
 
+#define MUSIC_VOLUME 0.2
+
 int pcm_enable   = 0;
 Mix_Chunk *play_chunk[MIX_PCM_SIZE];
@@ -199 +201 @@
                 }
         }
+        
+        int cur_vol = MUSIC_VOLUME*SDL_MIX_MAXVOLUME;
+        
         if (fadetime_total) {
                 // ²»³Ú€òÄä»ßÃæ (fade out)
@@ -208 +213 @@
                 }
                 // int cur_vol = 256*(count_total-fadecount)/count_total;
-                int cur_vol = SDL_MIX_MAXVOLUME*(count_total-fadecount)/count_total;
-                char* stream_dup = new char[len];
-                memcpy(stream_dup, stream, len);
-                memset(stream, 0, len);
-                SDL_MixAudio(stream, (Uint8*)stream_dup, len, cur_vol);
+                cur_vol = cur_vol*(count_total-fadecount)/count_total;
                 fadecount += len/4;
         }
+        
+        char* stream_dup = new char[len];
+        memcpy(stream_dup, stream, len);
+        memset(stream, 0, len);
+        SDL_MixAudio(stream, (Uint8*)stream_dup, len, cur_vol);
+        
         return;
 }
@@ -243 +250 @@
         fadecount = 0;
         Mix_HookMusic( &(WavChunk::callback), (void*)&wav_playing);
-        Mix_VolumeMusic(128);
+        Mix_VolumeMusic(MUSIC_VOLUME*MIX_MAX_VOLUME);
         return;
 }