[UI][Qt][Sound] .

diff --git a/source/src/qt/gui/qt_input.cpp b/source/src/qt/gui/qt_input.cpp
index c0f98ec..d5ae353 100644 (file)
--- a/source/src/qt/gui/qt_input.cpp
+++ b/source/src/qt/gui/qt_input.cpp
@@ -257,18 +257,7 @@ void GLDrawClass::keyReleaseEvent(QKeyEvent *event)
        }
 #endif
        //printf("Key: UP: VK=%d SCAN=%04x MOD=%08x\n", vk, scan, mod);
-#if 0  
-       emu->lock_vm();
-       emu->key_modifiers(mod);
-       // Note: Qt4 with 106KEY, event->modifier() don't get Shift key as KEYMOD.
-       // At least, linux.
-       if(vk != 0) {
-               emu->key_up(vk);
-       }
-       emu->unlock_vm();
-#else
        emit sig_key_up(vk, mod);
-#endif 
 }
 
 void GLDrawClass::keyPressEvent(QKeyEvent *event)
@@ -302,16 +291,7 @@ void GLDrawClass::keyPressEvent(QKeyEvent *event)
 #endif
    
        //printf("Key: DOWN: VK=%d SCAN=%04x MOD=%08x\n", vk, scan, mod);
-#if 0  
-       emu->lock_vm();
-       emu->key_modifiers(mod);
-       if(vk != 0) {
-               emu->key_down(vk, false);
-       }
-       emu->unlock_vm();
-#else
        emit sig_key_down(vk, mod, false);
-#endif 
 }
 
 

diff --git a/source/src/qt/osd_sound.cpp b/source/src/qt/osd_sound.cpp
index 8a09d14..62962dc 100644 (file)
--- a/source/src/qt/osd_sound.cpp
+++ b/source/src/qt/osd_sound.cpp
@@ -256,9 +256,9 @@ void OSD::update_sound(int* extra_frames)
                                                                                                  osd_timer.elapsed(), sound_samples);
                                        //SDL_PauseAudioDevice(audio_dev_id, 1);
                                        //SDL_LockAudio();
-                                       SDL_SemWait(*snddata.snd_apply_sem);
+                                       //SDL_SemWait(*snddata.snd_apply_sem);
                                        ssize = sound_samples * snd_spec_presented.channels;
-                                       //ssize = sound_buffer_size / 2;
+
                                pos = sound_data_pos;
                                pos2 = pos + ssize;
                                ptr1 = &sound_buf_ptr[pos];
@@ -281,7 +281,7 @@ void OSD::update_sound(int* extra_frames)
                                        if(sound_data_len >= sound_buffer_size) sound_data_len = sound_buffer_size;
                                        sound_data_pos = sound_data_pos + ssize;
                                        if(sound_data_pos >= sound_buffer_size) sound_data_pos = sound_data_pos - sound_buffer_size;
-                                       SDL_SemPost(*snddata.snd_apply_sem);
+                                       //SDL_SemPost(*snddata.snd_apply_sem);
                                        //SDL_UnlockAudio();
                                        //SDL_PauseAudioDevice(audio_dev_id, 0);
                        }