Commit: 2d0323631c85c0d3be5385b43fe5be76bddf0728 - main (git)

Commit MetaInfo

• Revisión: 2d0323631c85c0d3be5385b43fe5be76bddf0728 (tree)
• Tiempo: 2012-09-23 14:54:02
• Autor: h2so5 <h2so5@git....>
• Commiter: h2so5

Log Message

Merge branch 'master' of git.sourceforge.jp:/gitroot/mmo/main

Cambiar Resumen

• modified: client/Card.cpp
• modified: client/Music.cpp
• modified: client/Music.hpp
• modified: client/bin/cards/bgmlist/main.js

Diferencia incremental

--- a/client/Card.cpp
+++ b/client/Card.cpp
@@ -241,10 +241,10 @@ Handle<Value> Card::Function_Music_stopBGM(const Arguments& args)
 {
 
 	if (args.Length() == 1 && args[0]->IsBoolean()) {
-		auto fade = args[1]->ToBoolean()->BooleanValue();
+		auto fade = args[0]->ToBoolean()->BooleanValue();
 		ResourceManager::music()->Stop(fade);
 	}else if(args.Length() == 0) {
-		ResourceManager::music()->Stop(false);
+		ResourceManager::music()->Stop(true);
 	}
 
     return Undefined();

--- a/client/Music.cpp
+++ b/client/Music.cpp
@@ -9,15 +9,16 @@
 
 extern int LoadFile(const TCHAR *FilePath, void **FileImageAddr, int *FileSize);
 
+
 Music::Music() :
 bgm_handle_(),
 se_handle_(),
-prev_bgm_(-1),
-present_bgm_(-1),
-requested_bgm_(-1),
-music_paths_(),
 crossfade_now_(false),
-fade_count_(0)
+fade_out_(false),
+fade_count_(-1),
+present_bgm_(-1),
+prev_bgm_(-1),
+requested_bgm_(-1)
 {
 }
 
@@ -137,8 +138,16 @@ void Music::Stop(bool fadeout)
 	{
 		StopSoundMem(present_bgm_);
 	}
-	crossfade_now_ = fadeout;
+	if(crossfade_now_)
+	{
+		StopSoundMem(present_bgm_);
+		present_bgm_ = requested_bgm_;
+	}
+	crossfade_now_ = false;
+	fade_out_ = fadeout;
+	fadeout_count_ = GetVolumeSoundMem(present_bgm_);
 	fade_count_ = 0;
+	requested_bgm_ = -1;
 }
 
 void Music::PlaySE(tstring name)
@@ -176,10 +185,12 @@ void Music::Update()
 			crossfade_now_ = true;
 		}
 	}
-	if(!crossfade_now_)return;
-	if(CheckHandleASyncLoad(requested_bgm_) == false && requested_bgm_ != -1)
+	if(CheckHandleASyncLoad(requested_bgm_) == false && requested_bgm_ != -1 && crossfade_now_)
 	{
 		if(fade_count_ == 0)PlaySoundMem(requested_bgm_,DX_PLAYTYPE_LOOP);
+		ChangeVolumeSoundMem((int)((90.0-(double)fade_count_)/0.9),present_bgm_);
+		ChangeVolumeSoundMem((int)((double)fade_count_/0.9),requested_bgm_);
+		++fade_count_;
 		if(fade_count_ >= 90)
 		{
 			ChangeVolumeSoundMem(100,requested_bgm_);
@@ -190,9 +201,20 @@ void Music::Update()
 			fade_count_ = 0;
 			crossfade_now_ = false;
 		}
-		ChangeVolumeSoundMem((int)((double)fade_count_/0.9),requested_bgm_);
-		ChangeVolumeSoundMem((int)((90.0-(double)fade_count_)/0.9),present_bgm_);
-		++fade_count_;
+	}
+	if(fade_out_ == true)
+	{
+		if(fadeout_count_ >= 90)
+		{
+			StopSoundMem(present_bgm_);
+			ChangeVolumeSoundMem(100,present_bgm_);
+			present_bgm_ = -1;
+			fadeout_count_ = 0;
+			fade_out_ = false;
+			requested_bgm_ = -1;
+		}
+		ChangeVolumeSoundMem((int)((90.0-(double)fadeout_count_)/0.9),present_bgm_);
+		++fadeout_count_;
 	}
 }
 

--- a/client/Music.hpp
+++ b/client/Music.hpp
@@ -30,7 +30,9 @@ public:
 
 private:
 	bool crossfade_now_;
+	bool fade_out_;
 	int fade_count_;
+	int fadeout_count_;
 	int present_bgm_;
 	int prev_bgm_;
 	int requested_bgm_;

--- a/client/bin/cards/bgmlist/main.js
+++ b/client/bin/cards/bgmlist/main.js
@@ -2,7 +2,7 @@
 /***MetaData***
 
 {
-	"name": "BGMリスト",
+	"name": "BGM繝ｪ繧ｹ繝?,
 	"icon": "icon.png",
 	"api_version": 1
 }
@@ -17,7 +17,6 @@ list = new UI.List({
 Music.onReload = function () {
 
     list.clearItems();
-
     var even_line = false;
     var music_names = Music.all();
     for (var i = 0; i < music_names.length; i++) {
@@ -33,7 +32,17 @@ Music.onReload = function () {
 				})
 			);
         })(music_names[i])
-    }
+}
+    list.addItem(
+			new UI.Label({
+			    docking: UI.DOCKING_TOP | UI.DOCKING_LEFT | UI.DOCKING_RIGHT,
+			    text: "蜀咲函蛛懈ｭ｢",
+			    bgcolor: ((even_line = !even_line) ? "#EEAFEECC" : "#FFFFFFCC"),
+			    onclick: function () {
+			        Music.stop(true)
+			    }
+			})
+		);
 }
 
 Music.onReload();