diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-10-14 08:00:23 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-10-14 08:00:23 +0000 |
| commit | 7ec7682216837a903f9cc18f69a081781c55f5af (patch) | |
| tree | f76de8abc315a7e8f9c052470601d70425f5d85a /src | |
| parent | 99c581a124e9a301e88eb1e3af9e09bce182fd3f (diff) | |
| download | usdx-7ec7682216837a903f9cc18f69a081781c55f5af.tar.gz usdx-7ec7682216837a903f9cc18f69a081781c55f5af.tar.xz usdx-7ec7682216837a903f9cc18f69a081781c55f5af.zip | |
revert accidental previous commit
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2665 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src')
| -rw-r--r-- | src/media/UAudioInput_Portaudio.pas | 3 | ||||
| -rw-r--r-- | src/media/UVisualizer.pas | 1 | ||||
| -rw-r--r-- | src/screens/UScreenSong.pas | 10 |
3 files changed, 2 insertions, 12 deletions
diff --git a/src/media/UAudioInput_Portaudio.pas b/src/media/UAudioInput_Portaudio.pas index 786318b0..c7364eb4 100644 --- a/src/media/UAudioInput_Portaudio.pas +++ b/src/media/UAudioInput_Portaudio.pas @@ -517,8 +517,7 @@ function MicrophoneCallback(input: pointer; output: pointer; frameCount: culong; inputDevice: pointer): cint; cdecl; begin AudioInputProcessor.HandleMicrophoneData(input, frameCount*4, inputDevice); -// rauls bug ist behoben mit: AudioInputProcessor.HandleMicrophoneData(input, frameCount*2, inputDevice); -result := paContinue; + result := paContinue; end; {* diff --git a/src/media/UVisualizer.pas b/src/media/UVisualizer.pas index e2995c04..1cdc3500 100644 --- a/src/media/UVisualizer.pas +++ b/src/media/UVisualizer.pas @@ -532,7 +532,6 @@ begin begin // Create() might fail if the config-file is not found Log.LogError('TProjectM.Create: ' + E.Message, 'TVideoPlayback_ProjectM.VisualizerStart'); - Log.LogError('TProjectM.Create: ', fProjectMPath + 'config.inp'); Exit; end; end; diff --git a/src/screens/UScreenSong.pas b/src/screens/UScreenSong.pas index abd4f760..6fe8d204 100644 --- a/src/screens/UScreenSong.pas +++ b/src/screens/UScreenSong.pas @@ -283,23 +283,15 @@ begin SDL_ModState := SDL_GetModState and (KMOD_LSHIFT + KMOD_RSHIFT + KMOD_LCTRL + KMOD_RCTRL + KMOD_LALT + KMOD_RALT); - Log.LogError('TScreenSong.ParseInput', 'SDL_ModState: ' + IntToStr(SDL_ModState)); - Log.LogError('TScreenSong.ParseInput', 'KMOD_LALT: ' + IntToStr(KMOD_LALT)); - Log.LogError('TScreenSong.ParseInput', 'Mode: ' + IntToStr(Ord(Mode))); - Log.LogError('TScreenSong.ParseInput', 'smNormal: ' + IntToStr(Ord(smNormal))); - Log.LogError('TScreenSong.ParseInput', 'PressedKey: ' + IntToStr(Ord(PressedKey))); - Log.LogError('TScreenSong.ParseInput', 'CharCode: ' + IntToStr(Ord(CharCode))); //Jump to Artist/Titel if ((SDL_ModState and KMOD_LALT <> 0) and (Mode = smNormal)) then begin - UpperLetter := UCS4UpperCase(PressedKey); - Log.LogError('TScreenSong.ParseInput', 'UpperLetter: ' + IntToStr(Ord(UpperLetter))); + UpperLetter := UCS4UpperCase(CharCode); if (UpperLetter in ([Ord('A')..Ord('Z'), Ord('0') .. Ord('9')]) ) then begin I2 := Length(CatSongs.Song); - Log.LogError('TScreenSong.ParseInput', '**** Got a key.'); //Jump To Titel if (SDL_ModState = (KMOD_LALT or KMOD_LSHIFT)) then |