X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=source%2Fsrc%2Femu.cpp;h=3aa83774bb76c8e08b61c261deaee69ab6aa11d8;hb=2fc3688fce9d88e48aebd26b694fd2bb143a2574;hp=80c722f58b32c7146273d6f2422d4b1160b76d8f;hpb=7193d07172d95e957c3e4c3e58f793931ad57e5b;p=csp-qt%2Fcommon_source_project-fm7.git

diff --git a/source/src/emu.cpp b/source/src/emu.cpp
index 80c722f58..3aa83774b 100644
--- a/source/src/emu.cpp
+++ b/source/src/emu.cpp
@@ -89,6 +89,11 @@ EMU::EMU()
 #endif
 	initialize_media();
 	vm->initialize_sound(sound_rate, sound_samples);
+#ifdef USE_SOUND_VOLUME
+	for(int i = 0; i < USE_SOUND_VOLUME; i++) {
+		vm->set_sound_device_volume(i, config.sound_volume_l[i], config.sound_volume_r[i]);
+	}
+#endif
 	vm->reset();
 	
 	now_suspended = false;
@@ -206,6 +211,11 @@ void EMU::reset()
 		delete vm;
 		osd->vm = vm = new VM(this);
 		vm->initialize_sound(sound_rate, sound_samples);
+#ifdef USE_SOUND_VOLUME
+		for(int i = 0; i < USE_SOUND_VOLUME; i++) {
+			vm->set_sound_device_volume(i, config.sound_volume_l[i], config.sound_volume_r[i]);
+		}
+#endif
 		vm->reset();
 		osd->unlock_vm();
 		// restore inserted medias
@@ -361,16 +371,17 @@ bool EMU::now_auto_key()
 }
 #endif
 
-uint8* EMU::key_buffer()
+const uint8* EMU::key_buffer()
 {
 	return osd->key_buffer();
 }
 
-uint32* EMU::joy_buffer()
+const uint32* EMU::joy_buffer()
 {
 	return osd->joy_buffer();
 }
-int* EMU::mouse_buffer()
+
+const int* EMU::mouse_buffer()
 {
 	return osd->mouse_buffer();
 }
@@ -1276,6 +1287,13 @@ uint32 EMU::get_led_status(void)
 }
 #endif
 
+#ifdef USE_SOUND_VOLUME
+void EMU::set_sound_device_volume(int ch, int decibel_l, int decibel_r)
+{
+	vm->set_sound_device_volume(ch, decibel_l, decibel_r);
+}
+#endif
+
 void EMU::update_config()
 {
 	vm->update_config();
@@ -1392,6 +1410,11 @@ bool EMU::load_state_tmp(const _TCHAR* file_path)
 					delete vm;
 					osd->vm = vm = new VM(this);
 					vm->initialize_sound(sound_rate, sound_samples);
+#ifdef USE_SOUND_VOLUME
+					for(int i = 0; i < USE_SOUND_VOLUME; i++) {
+						vm->set_sound_device_volume(i, config.sound_volume_l[i], config.sound_volume_r[i]);
+					}
+#endif
 					vm->reset();
 					//osd->unlock_vm();
 				}